diff --git a/views/options/profile.jade b/views/options/profile.jade
index 9b03a44da9..b2fc20b894 100644
--- a/views/options/profile.jade
+++ b/views/options/profile.jade
@@ -38,8 +38,9 @@ script(id='partials/options.profile.avatar.html', type='text/ng-template')
 
           // Special Events
           li.customize-menu.well.limited-edition
-            .label.label-info.pull-right(popover='Available for purchase until January 31st (but permanently in your options if purchased).', popover-title='Limited Edition', popover-placement='right', popover-trigger='mouseenter')
+            .label.label-info.pull-right(popover=env.t('limited31Jan'), popover-title=env.t('limitededition'), popover-placement='right', popover-trigger='mouseenter')
               =env.t('limitededition')
+              | 
               i.icon.icon-question-sign
             menu(label=env.t('wintercolors'))
               each color in ['candycane','frost','winternight','holly']
@@ -117,17 +118,17 @@ script(id='partials/options.profile.stats.html', type='text/ng-template')
     .span4.border-right.allocate-stats(ng-if='user.flags.classSelected && !user.preferences.disableClasses')
       h3=env.t('characterbuild')
       h4
-        =env.t('class') + ':'
-        span {{ {warrior:'Warrior',wizard:'Mage',healer:'Healer',rogue:'Rogue'}[user.stats.class] }} 
+        =env.t('class') + ': '
+        span {{ {warrior:'Warrior',wizard:'Mage',healer:'Healer',rogue:'Rogue'}[user.stats.class] }} 
         a.btn.btn-danger.btn-mini(ng-click='changeClass(null)')=env.t('changeclass')
         small 3 <span class="Pet_Currency_Gem1x inline-gems"/>
       table.table.table-striped
         tr
           td
             strong
-              {{user.stats.points}}&nbsp;
+              {{user.stats.points}} 
               =env.t('unallocated')
-            &nbsp;
+              | 
             i.icon-question-sign(popover-trigger='mouseenter', popover-placement='right', popover=env.t('levelpopover'))
           td
         tr
@@ -136,23 +137,19 @@ script(id='partials/options.profile.stats.html', type='text/ng-template')
               label.checkbox
                 input(type='checkbox', ng-model='user.preferences.automaticAllocation', ng-change='set({"preferences.automaticAllocation": user.preferences.automaticAllocation?true: false})', ng-click='set({"preferences.allocationMode":"taskbased"})')
                 =env.t('automaticallocation')
-                &nbsp;
                 i.icon-question-sign(popover-trigger='mouseenter', popover-placement='right', popover=env.t('automaticallocationpopover'))
               form(ng-show='user.preferences.automaticAllocation',style='margin-left:1em')
                 label.radio
                   input(type='radio', name='allocationMode', value='flat', ng-model='user.preferences.allocationMode', ng-change='set({"preferences.allocationMode": "flat"})')
                   =env.t('evenallocation')
-                  &nbsp;
                   i.icon-question-sign(popover-trigger='mouseenter', popover-placement='right', popover=env.t('evenallocationpopover'))
                 label.radio
                   input(type='radio', name='allocationMode', value='classbased', ng-model='user.preferences.allocationMode', ng-change='set({"preferences.allocationMode": "classbased"})')
                   =env.t('classallocation')
-                  &nbsp;
                   i.icon-question-sign(popover-trigger='mouseenter', popover-placement='right', popover=env.t('classallocationpopover'))
                 label.radio
                   input(type='radio', name='allocationMode', value='taskbased', ng-model='user.preferences.allocationMode', ng-change='set({"preferences.allocationMode": "taskbased"})')
                   =env.t('taskallocation')
-                  &nbsp;
                   i.icon-question-sign(popover-trigger='mouseenter', popover-placement='right', popover=env.t('taskallocationpopover'))
         tr
           td= env.t('allocatestr') + ' {{user.stats.str}}'
diff --git a/views/options/social/challenge-box.jade b/views/options/social/challenge-box.jade
index d5534095fe..5b7254bbc7 100644
--- a/views/options/social/challenge-box.jade
+++ b/views/options/social/challenge-box.jade
@@ -11,5 +11,8 @@
           td
             a(ui-sref='options.social.challenges.detail({cid:challenge._id})') {{challenge.name}}
     div(ng-if='group.challenges.length == 0')
-      p
-        =env.t('noChallenges') + " <a class='label' ui-sref='options.social.challenges'><i class=icon-bullhorn></i> " + env.t('challenges') + "</a> " + env.t('toCreate')
+      p=env.t('noChallenges')
+        a(class='label' ui-sref='options.social.challenges')
+          i.icon-bullhorn
+          =env.t('challenges')
+        =env.t('toCreate')
diff --git a/views/options/social/tavern.jade b/views/options/social/tavern.jade
index 1574538a99..6413b3a7b3 100644
--- a/views/options/social/tavern.jade
+++ b/views/options/social/tavern.jade
@@ -71,7 +71,7 @@
                   != '<span class="achievement achievement-firefox"></span> ' + env.t('friendText') + '<strong> ' + env.t('first') + '</strong> ' + env.t('friend1Text') + '<strong> ' + env.t('2gems') + '</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>' + env.t('2gems') + '</strong>.'
           tr
             td
               a.label.label-contributor-3(ng-click='toggleUserTier($event)')=env.t('eliteBadge')