diff --git a/README.md b/README.md
index 6bdb7fda0..b0bc6e497 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ You’ve installed Talk on your server, and you’re preparing to launch it on y
 
 ## End-to-End Testing
 
-Talk uses [Nightwatch](https://nightwatchjs.org/) as our e2e testing framework. The testing infrastructure that allows us to run our tests in real browsers is provided with love by our friends at [Browserstack](https://browserstack.com).
+Talk uses [Nightwatch](http://nightwatchjs.org/) as our e2e testing framework. The testing infrastructure that allows us to run our tests in real browsers is provided with love by our friends at [Browserstack](https://browserstack.com).
 
 [![Browserstack](/public/img/browserstack_logo.png)](https://browserstack.com)
 
diff --git a/client/coral-embed-stream/style/default.css b/client/coral-embed-stream/style/default.css
index 98416d68d..b9330ba62 100644
--- a/client/coral-embed-stream/style/default.css
+++ b/client/coral-embed-stream/style/default.css
@@ -177,8 +177,8 @@ button.comment__action-button[disabled],
 }
 
 .talk-plugin-flags-popup-header {
-  font-weight: bolder;
-  font-size: 1.33rem;
+  font-weight: bold;
+  font-size: 1rem;
   margin-bottom: 10px;
 }
 
diff --git a/client/coral-ui/components/PopupMenu.css b/client/coral-ui/components/PopupMenu.css
index 35544fbad..e6a084736 100644
--- a/client/coral-ui/components/PopupMenu.css
+++ b/client/coral-ui/components/PopupMenu.css
@@ -9,7 +9,7 @@
   box-sizing: border-box;
   background: white;
   border-radius: 3px;
-  padding: 20px 10px;
+  padding: 10px 10px;
   z-index: 300;
   right: 1%;
 }
diff --git a/locales/en.yml b/locales/en.yml
index d7ad006cb..a7ff51dfc 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -164,7 +164,7 @@ en:
     tech_settings: "Tech Settings"
     organization_information: "Organization information"
     organization_info_copy: "We use this information in email notifications generated by Talk. This connects the messages to your organization, and provides a way for users to contact you if they have an issue with their account."
-    organization_info_copy_2: "We recommend creating a generic email account (eg. community@yournewsroom.com) for this purpuse. This means it can remain consistent over time, and doesn't expose a name that users could target if their account were blocked."
+    organization_info_copy_2: "We recommend creating a generic email account (eg. community@yournewsroom.com) for this purpose. This means it can remain consistent over time, and doesn't expose a name that users could target if their account were blocked."
     organization_details: "Organization Details"
     organization_name: "Organization Name"
     organization_contact_email: "Organization Contact Email"
@@ -218,6 +218,7 @@ en:
       we_received_a_request: "We received a request to reset your password. If you did not request this change, you can ignore this email."
       if_you_did: "If you did,"
       please_click: "please click here to reset password"
+      subject: "Password reset"
     password_change:
       subject: "{0} password change"
       body: "The password on your account has been changed.\n\nIf you did not request this change, please contact us at {0}."
diff --git a/locales/es.yml b/locales/es.yml
index f5cade3f3..2cbb1b107 100644
--- a/locales/es.yml
+++ b/locales/es.yml
@@ -215,6 +215,7 @@ es:
       we_received_a_request: "Recibimos un pedido para resetear su contraseña. Si no ha pedido ese cambio, por favor ignorar el correo. "
       if_you_did: "Si lo hizo,"
       please_click: "por favor cliquea aqui para resetear la contraseña."
+      subject: "Recuperar contraseña"
   embedlink:
     copy: "Copiar al portapapeles"
   error:
diff --git a/plugins/talk-plugin-sort-most-liked/client/translations.yml b/plugins/talk-plugin-sort-most-liked/client/translations.yml
index 963561cfd..710519f50 100644
--- a/plugins/talk-plugin-sort-most-liked/client/translations.yml
+++ b/plugins/talk-plugin-sort-most-liked/client/translations.yml
@@ -12,7 +12,7 @@ de:
     label: Beliebteste zuerst
 es:
   talk-plugin-sort-most-liked:
-    label: Most liked first
+    label: Más valoradas primero
 fr:
   talk-plugin-sort-most-liked:
     label: Most liked first
diff --git a/plugins/talk-plugin-sort-most-loved/client/translations.yml b/plugins/talk-plugin-sort-most-loved/client/translations.yml
index dfb24ff44..f9bf60d18 100644
--- a/plugins/talk-plugin-sort-most-loved/client/translations.yml
+++ b/plugins/talk-plugin-sort-most-loved/client/translations.yml
@@ -12,7 +12,7 @@ de:
     label: Häufigste "Ich liebe es" zuerst
 es:
   talk-plugin-sort-most-loved:
-    label: Most loved first
+    label: Más amadas primero
 fr:
   talk-plugin-sort-most-loved:
     label: Most loved first
diff --git a/plugins/talk-plugin-sort-most-replied/client/translations.yml b/plugins/talk-plugin-sort-most-replied/client/translations.yml
index 1325d9dd1..2249a5437 100644
--- a/plugins/talk-plugin-sort-most-replied/client/translations.yml
+++ b/plugins/talk-plugin-sort-most-replied/client/translations.yml
@@ -12,7 +12,7 @@ de:
     label: Häufigste Antworten zuerst
 es:
   talk-plugin-sort-most-replied:
-    label: Most replied first
+    label: Más respondidas primero
 fr:
   talk-plugin-sort-most-replied:
     label: Most replied first
diff --git a/plugins/talk-plugin-sort-most-respected/client/translations.yml b/plugins/talk-plugin-sort-most-respected/client/translations.yml
index 782145237..5ebf85b90 100644
--- a/plugins/talk-plugin-sort-most-respected/client/translations.yml
+++ b/plugins/talk-plugin-sort-most-respected/client/translations.yml
@@ -12,7 +12,7 @@ de:
     label: Häufigste "Respektiert" zuerst
 es:
   talk-plugin-sort-most-respected:
-    label: Most respected first
+    label: Más respetadas primero
 fr:
   talk-plugin-sort-most-respected:
     label: Most respected first
diff --git a/plugins/talk-plugin-sort-most-upvoted/client/translations.yml b/plugins/talk-plugin-sort-most-upvoted/client/translations.yml
index 7b3c7c29f..6a673a767 100644
--- a/plugins/talk-plugin-sort-most-upvoted/client/translations.yml
+++ b/plugins/talk-plugin-sort-most-upvoted/client/translations.yml
@@ -1,3 +1,6 @@
 en:
   talk-plugin-sort-most-upvoted:
     label: Most upvoted first
+es:
+  talk-plugin-sort-oldest:
+    label: Más votadas primero
diff --git a/plugins/talk-plugin-sort-newest/client/translations.yml b/plugins/talk-plugin-sort-newest/client/translations.yml
index 294a1a070..663088395 100644
--- a/plugins/talk-plugin-sort-newest/client/translations.yml
+++ b/plugins/talk-plugin-sort-newest/client/translations.yml
@@ -12,7 +12,7 @@ de:
     label: Neueste zuerst
 es:
   talk-plugin-sort-newest:
-    label: Newest first
+    label: Más nuevas primero
 fr:
   talk-plugin-sort-newest:
     label: Newest first
diff --git a/plugins/talk-plugin-sort-oldest/client/translations.yml b/plugins/talk-plugin-sort-oldest/client/translations.yml
index 7a6cd6e96..5dfe656a1 100644
--- a/plugins/talk-plugin-sort-oldest/client/translations.yml
+++ b/plugins/talk-plugin-sort-oldest/client/translations.yml
@@ -12,7 +12,7 @@ de:
     label: Älteste zuerst
 es:
   talk-plugin-sort-oldest:
-    label: Oldest first
+    label: Más viejas primero
 fr:
   talk-plugin-sort-oldest:
     label: Oldest first
diff --git a/plugins/talk-plugin-viewing-options/client/translations.yml b/plugins/talk-plugin-viewing-options/client/translations.yml
index 9586263e0..e3516ad7f 100644
--- a/plugins/talk-plugin-viewing-options/client/translations.yml
+++ b/plugins/talk-plugin-viewing-options/client/translations.yml
@@ -21,8 +21,8 @@ de:
 es:
   talk-plugin-viewing-options:
     viewing_options: "Opciones de visualización"
-    sort: Sorting
-    filter: Filtering
+    sort: Ordenado por
+    filter: Filtrado por
 fr:
   talk-plugin-viewing-options:
     viewing_options: "Viewing Options"
diff --git a/routes/api/v1/account.js b/routes/api/v1/account.js
index bc642f93f..176728a8c 100644
--- a/routes/api/v1/account.js
+++ b/routes/api/v1/account.js
@@ -88,7 +88,7 @@ router.post('/password/reset', async (req, res, next) => {
         locals: {
           token,
         },
-        subject: 'Password Reset',
+        subject: res.locals.t('email.password_reset.subject'),
         email,
       });
     }