diff --git a/public/js/directives/directives.js b/public/js/directives/directives.js
index 796864c5e3..2d36fea375 100644
--- a/public/js/directives/directives.js
+++ b/public/js/directives/directives.js
@@ -85,19 +85,19 @@ habitrpg
         scope.main = attrs.main;
         $rootScope.lists = [
           {
-            header: env.t('Habits'),
+            header: env.t('habits'),
             type: 'habit',
             placeHolder: env.t('newHabit')
           }, {
-            header: env.t('Dailies'),
+            header: env.t('dailies'),
             type: 'daily',
             placeHolder: env.t('newDaily')
           }, {
-            header: env.t('Todos'),
+            header: env.t('todos'),
             type: 'todo',
             placeHolder: env.t('newTodo')
           }, {
-            header: env.t('Rewards'),
+            header: env.t('rewards'),
             type: 'reward',
             placeHolder: env.t('newReward')
           }
diff --git a/src/middleware.js b/src/middleware.js
index 6ae2af370e..829e9e2cc0 100644
--- a/src/middleware.js
+++ b/src/middleware.js
@@ -172,7 +172,7 @@ var getUserLanguage = function(req, callback){
 
 module.exports.locals = function(req, res, next) {
   getUserLanguage(req, function(err, language){
-    if(err) return res.json(500, {err: err});
+    if(err) return res.json(500, {err: err});    
 
     language.momentLang = (momentLangs[language.code] || undefined);
     
diff --git a/views/main/filters.jade b/views/main/filters.jade
index 06180ec2e3..0a5de7e1db 100644
--- a/views/main/filters.jade
+++ b/views/main/filters.jade
@@ -1,9 +1,10 @@
 .filters.tag-list(ng-controller='FiltersCtrl')
   .pull-left.filter-description
-    | Tags:
+    =env.t('tags')
+    |:
   ul.nav.nav-pills
     li
-      a(rel='tooltip', title='Edit Tags', ng-click='saveOrEdit()')
+      a(rel='tooltip', title=env.t('editTags'), ng-click='saveOrEdit()')
         i(ng-class='{"icon-ok": _editing, "icon-pencil": !_editing}')
     li(bindonce='user.tags', ng-class='{active: user.filters[tag.id]}', ng-repeat='tag in user.tags', style='position: relative;')
       .input-append.option-group.tag-editing(ng-show='_editing')
@@ -17,9 +18,9 @@
     li
       form.form-inline(ng-show='_editing', ng-submit='createTag(_newTag)')
         .input-append.tag-editing
-          input.span2.tag-editing-pill(type='text', ng-model='_newTag', placeholder='New Tag')
-          button.add-on.tag-editing-pill(type='submit') Add
+          input.span2.tag-editing-pill(type='text', ng-model='_newTag', placeholder=env.t('newTag'))
+          button.add-on.tag-editing-pill(type='submit')=env.t('add')
     // <li class="{#unless activeFilters(users[_userId].filters)}hidden{/}">
     li
-      a(rel='tooltip', title='Clear Filters', ng-click='user.filters = {}')
+      a(rel='tooltip', title=env.t('clearFilters'), ng-click='user.filters = {}')
         i.icon-remove-sign
diff --git a/views/options/profile.jade b/views/options/profile.jade
index 24c996abc4..c2fe8f8bce 100644
--- a/views/options/profile.jade
+++ b/views/options/profile.jade
@@ -85,7 +85,7 @@ script(id='partials/options.profile.avatar.html', type='text/ng-template')
           button.btn.btn-small.btn-primary(ng-hide='user.purchased.hair.mustache.1 && user.purchased.hair.mustache.2 && user.purchased.hair.beard.1 && user.purchased.hair.beard.2 && user.purchased.hair.beard.3', ng-click='unlock("hair.mustache.1,hair.mustache.2,hair.beard.1,hair.beard.2,hair.beard.3")')!= env.t('unlockset5') + ' <span class="Pet_Currency_Gem1x inline-gems"/>'
 
     .span4
-        h3=env.t('skin')
+        h3=env.t('bodyskin')
         small
           | 2 <span class="Pet_Currency_Gem1x inline-gems"/> /
           = ' ' + env.t('locked')
diff --git a/views/options/settings.jade b/views/options/settings.jade
index b3b54dc3a9..c3a4c4ebf5 100644
--- a/views/options/settings.jade
+++ b/views/options/settings.jade
@@ -30,7 +30,7 @@ script(type='text/ng-template', id='partials/options.settings.settings.html')
       h4=env.t('language')
       select(ng-model='language.code', ng-options='lang.code as lang.name for lang in avalaibleLanguages', ng-change='changeLanguage()')
       hr
-      h4=env.t('hideHeader')
+      h4=env.t('misc')
       label.checkbox
         input(type='checkbox', ng-click='set({"preferences.hideHeader":user.preferences.hideHeader?false:true})', ng-checked='user.preferences.hideHeader!==true')
         =env.t('showHeader')
diff --git a/views/options/social/create-group.jade b/views/options/social/create-group.jade
index d4e954c706..edf985d1a4 100644
--- a/views/options/social/create-group.jade
+++ b/views/options/social/create-group.jade
@@ -1,7 +1,9 @@
 form.form-horizontal(ng-submit='create(newGroup)')
   .control-group.whatever-options
     .control-group
-      label.control-label(for='new-group-name') {{text}} Name
+      label.control-label(for='new-group-name') 
+       | {{text}}&nbsp;
+       =env.t('name')
       .controls
         input#new-group-name.input-medium.option-content(required, type='text', placeholder='{{text}} Name', ng-model='newGroup.name')
     .control-group
diff --git a/views/options/social/group.jade b/views/options/social/group.jade
index 16397795cb..037c72d979 100644
--- a/views/options/social/group.jade
+++ b/views/options/social/group.jade
@@ -168,7 +168,7 @@ a.pull-right.gem-wallet(popover-trigger='mouseenter', popover-title=env.t('guild
             .popover-content
               markdown(ng-model='group.leaderMessage')
     div(ng-controller='ChatCtrl')
-      h3 Chat
+      h3=env.t('chat')
       include ./chat-box
       include ../../shared/formatting-help
 
diff --git a/views/options/social/tavern.jade b/views/options/social/tavern.jade
index 6413b3a7b3..fc70e90b22 100644
--- a/views/options/social/tavern.jade
+++ b/views/options/social/tavern.jade
@@ -68,35 +68,35 @@
               a.label.label-contributor-1(ng-click='toggleUserTier($event)')=env.t('friendBadge')
               div(style='display:none;')
                 p
-                  != '<span class="achievement achievement-firefox"></span> ' + env.t('friendText') + '<strong> ' + env.t('first') + '</strong> ' + env.t('friend1Text') + '<strong> ' + env.t('2gems') + '</strong>.'
+                  != '<span class="achievement achievement-firefox"></span> ' + env.t('friendText') + '<strong> ' + env.t('first') + '</strong> ' + env.t('friend1Text') + '<strong> 2' + env.t('gems') + '</strong>.'
                 hr
                 p
-                  != '<span class="shop_armor_special_1 shop-sprite item-img"></span> ' + env.t('friendText') + '<strong> ' + env.t('second') + '</strong> ' + env.t('friendText2') + '<strong> ' + env.t('crystalArmor') + '</strong> ' + env.t('friendText3') + ' <strong>' + env.t('2gems') + '</strong>.'
+                  != '<span class="shop_armor_special_1 shop-sprite item-img"></span> ' + env.t('friendText') + '<strong> ' + env.t('second') + '</strong> ' + env.t('friendText2') + '<strong> ' + env.t('crystalArmor') + '</strong> ' + env.t('friendText3') + '<strong> 2' + env.t('gems') + '</strong>.'
           tr
             td
               a.label.label-contributor-3(ng-click='toggleUserTier($event)')=env.t('eliteBadge')
               div(style='display:none;')
                 p
-                  != '<span class="shop_head_special_1 shop-sprite item-img"></span> ' + env.t('friendText') + ' <strong>' + env.t('third') + '</strong> ' + env.t('friendText2') + ' <strong>' + env.t('crystalHelmet') + '</strong> ' + env.t('friendText3') + ' <strong>' + env.t('2gems') + '</strong>.'
+                  != '<span class="shop_head_special_1 shop-sprite item-img"></span> ' + env.t('friendText') + ' <strong>' + env.t('third') + '</strong> ' + env.t('friendText2') + ' <strong>' + env.t('crystalHelmet') + '</strong> ' + env.t('friendText3') + '<strong> 2' + env.t('gems') + '</strong>.'
                 hr
                 p
-                  != '<span class="shop_weapon_special_1 shop-sprite item-img"></span> ' + env.t('friendText') + ' <strong>' + env.t('fourth') + '</strong> ' + env.t('friendText2') + ' <strong>' + env.t('crystalSword') + '</strong> ' + env.t('friendText3') + ' <strong>' + env.t('2gems') + '</strong>.'
+                  != '<span class="shop_weapon_special_1 shop-sprite item-img"></span> ' + env.t('friendText') + ' <strong>' + env.t('fourth') + '</strong> ' + env.t('friendText2') + ' <strong>' + env.t('crystalSword') + '</strong> ' + env.t('friendText3') + '<strong> 2' + env.t('gems') + '</strong>.'
 
           tr
             td
               a.label.label-contributor-5(ng-click='toggleUserTier($event)')=env.t('championBadge')
               div(style='display:none;')
                 p
-                  != '<span class="shop_head_special_1 shop-sprite item-img"></span> ' + env.t('friendText') + ' <em>' + env.t('fifth') + '</em> ' + env.t('friendText2') + ' <strong>' + env.t('crystalShield') + '</strong> ' + env.t('friendText3') + ' <strong>' + env.t('2gems') + '</strong>.'
+                  != '<span class="shop_head_special_1 shop-sprite item-img"></span> ' + env.t('friendText') + ' <em>' + env.t('fifth') + '</em> ' + env.t('friendText2') + ' <strong>' + env.t('crystalShield') + '</strong> ' + env.t('friendText3') + '<strong> 2' + env.t('gems') + '</strong>.'
                 hr
                 p
-                  != '<div class="Pet-Dragon-Hydra pull-left"></div>' + env.t('friendText') + ' <em>' + env.t('sixth') + '</em> ' + env.t('friendText2b') + ' <strong>' + env.t('hydraPet') + '</strong> ' + env.t('friendText3b') + ' <strong>' + env.t('2gems') + '</strong>.'
+                  != '<div class="Pet-Dragon-Hydra pull-left"></div>' + env.t('friendText') + ' <em>' + env.t('sixth') + '</em> ' + env.t('friendText2b') + ' <strong>' + env.t('hydraPet') + '</strong> ' + env.t('friendText3b') + '<strong> 2' + env.t('gems') + '</strong>.'
           tr
             td
               a.label.label-contributor-7(ng-click='toggleUserTier($event)')=env.t('legendaryBadge')
               div(style='display:none;')
                 p
-                  != env.t('friendText') + ' <em>' + env.t('seventh') + '</em> ' + env.t('friendText2c') + ' <strong>' + env.t('2gems') + ' </strong>' + env.t('friendText3c')
+                  != env.t('friendText') + ' <em>' + env.t('seventh') + '</em> ' + env.t('friendText2c') + '<strong> 2' + env.t('gems') + ' </strong>' + env.t('friendText3c')
           tr
             td
               a.label.label-contributor-8(ng-click='toggleUserTier($event)')=env.t('heroicBadge')
diff --git a/views/shared/header/menu.jade b/views/shared/header/menu.jade
index 1546a4fe35..6933ffbe98 100644
--- a/views/shared/header/menu.jade
+++ b/views/shared/header/menu.jade
@@ -19,7 +19,7 @@
         li 
           a.task-action-btn.tile.solid(href="https://vimeo.com/57654086", target='_blank')
             i.icon.icon-film
-            =env.t('Tutorials')
+            =env.t('tutorials')
         li
           a.task-action-btn.tile.solid(ng-click='User.sync()')
             i.icon.icon-refresh
diff --git a/views/shared/modals/rebirth.jade b/views/shared/modals/rebirth.jade
index c8c49b4785..bbc79630cf 100644
--- a/views/shared/modals/rebirth.jade
+++ b/views/shared/modals/rebirth.jade
@@ -41,4 +41,6 @@ div(modal='modals.rebirth')
             span.gem-cost=env.t('notEnoughGems')
         span(ng-if='user.balance >= 2', ng-controller='SettingsCtrl')
             a.btn.btn-danger.btn-large(ng-click='rebirth()')=env.t('beReborn')
-            span.gem-cost=env.t('cost8Gems')
+            span.gem-cost
+                | 8&nbsp;
+                =env.t('gems')
diff --git a/views/shared/modals/reroll.jade b/views/shared/modals/reroll.jade
index 4d03c5de97..24dba8d7ff 100644
--- a/views/shared/modals/reroll.jade
+++ b/views/shared/modals/reroll.jade
@@ -13,5 +13,7 @@ div(modal='modals.reroll')
       span.gem-cost=env.t('notEnoughGems')
     span(ng-if='user.balance >= 1', ng-controller='SettingsCtrl')
       a.btn.btn-danger.btn-large(ng-click='reroll()')=env.t('fortify')
-      span.gem-cost=env.t('cost4Gems')
+      span.gem-cost
+        | 4&nbsp;
+        = env.t('gems')