diff --git a/website/views/shared/profiles/stats.jade b/website/views/shared/profiles/stats.jade
index 686e070965..aa7aed8028 100644
--- a/website/views/shared/profiles/stats.jade
+++ b/website/views/shared/profiles/stats.jade
@@ -31,30 +31,30 @@ unless mobile
 
 h4(class=mobile?'item item-divider':'')=env.t('attributes')
 table.table.table-striped
-  each v,k in { str: {title:"strength",popover:'strengthText'},int: {title:"intelligence",popover:'intText'},con: {title:"constitution",popover:'conText'},per: {title:"perception",popover:'perText'} }
-    tr
-      td
-        span.hint(popover-title=env.t(v.title), popover-placement='right', popover=env.t(v.popover), popover-trigger='mouseenter', style='margin-right:3px')
-          strong=env.t(v.title)
-        span
-          strong : {{profile._statsComputed.#{k}}}
-      td
-        ul.list-unstyled(ng-init='g=Content.gear.flat;e=profile.items.gear.equipped')
-          li(ng-show='profile.stats.lvl > 1')
-            span.hint(popover-title=env.t('levelBonus'), popover-trigger='mouseenter', popover-placement='top', popover=env.t('levelBonusText'))=env.t('level')
-            |: {{Math.ceil((Math.min(profile.stats.lvl - 1, 100)) / 2)}} 
-          li(ng-show='g[e.weapon].#{k} + g[e.armor].#{k} + g[e.head].#{k} + g[e.shield].#{k} > 0')
-            span.hint(popover-title=env.t('equipment'), popover-trigger='mouseenter', popover-placement='top', popover=env.t('equipmentBonusText'))=env.t('equipment')
-            |: {{g[e.weapon].#{k} + g[e.armor].#{k} + g[e.head].#{k} + g[e.shield].#{k} || 0}} 
-          li(ng-show='profile._statsComputed.#{k} - profile.stats.buffs.#{k} - Math.ceil((Math.min(profile.stats.lvl - 1, 100)) / 2) - g[e.weapon].#{k} - g[e.armor].#{k} - g[e.head].#{k} - g[e.shield].#{k} - profile.stats.#{k} > 0')
-            span.hint(popover-title=env.t('classBonus'), popover-trigger='mouseenter', popover-placement='top', popover=env.t('classBonusText'))=env.t('classEquipBonus')
-            |: {{profile._statsComputed.#{k} - profile.stats.buffs.#{k} - Math.ceil((Math.min(profile.stats.lvl - 1,100)) / 2) - g[e.weapon].#{k} - g[e.armor].#{k} - g[e.head].#{k} - g[e.shield].#{k} - profile.stats.#{k}}} 
-          li(ng-show='profile.stats.#{k} > 0')
-            span.hint(popover-title=env.t('allocatedPoints'), popover-trigger='mouseenter', popover-placement='top', popover=env.t('allocatedPointsText'))=env.t('allocated')
-            |: {{profile.stats.#{k} || 0}} 
-          li(ng-show='profile.stats.buffs.#{k} > 0')
-            span.hint(popover-title=env.t('buffs'), popover-trigger='mouseenter', popover-placement='top', popover=env.t('buffsText'))=env.t('buffs')
-            |: {{profile.stats.buffs.#{k} || 0}} 
+  //each v,k in { str: {title:"strength",popover:'strengthText'},int: {title:"intelligence",popover:'intText'},con: {title:"constitution",popover:'conText'},per: {title:"perception",popover:'perText'} }
+  tr(ng-repeat='(k,v) in { str: {title:"strength",popover:"strengthText"},int: {title:"intelligence",popover:"intText"},con: {title:"constitution",popover:"conText"},per: {title:"perception",popover:"perText"} }', ng-init='g=Content.gear.flat;e=profile.items.gear.equipped')
+    td
+      span.hint(popover-title=env.t('{{v.title}}'), popover-placement='right', popover=env.t('{{v.popover}}'), popover-trigger='mouseenter', style='margin-right:3px')
+        strong=env.t('{{v.title}}')
+      span
+        strong : {{profile._statsComputed.k}}
+    td
+      ul.list-unstyled
+        li(ng-show='profile.stats.lvl > 1')
+          span.hint(popover-title=env.t('levelBonus'), popover-trigger='mouseenter', popover-placement='top', popover=env.t('levelBonusText'))=env.t('level')
+          |: {{Math.ceil((Math.min(profile.stats.lvl - 1, 100)) / 2)}} 
+        li(ng-show='Content.gear.flat[profile.items.equipped.weapon].k + g[e.armor].k + g[e.head].k + g[e.shield].k > 0')
+          span.hint(popover-title=env.t('equipment'), popover-trigger='mouseenter', popover-placement='top', popover=env.t('equipmentBonusText'))=env.t('equipment')
+          |: {{g[e.weapon].k + g[e.armor].k + g[e.head].k + g[e.shield].k || 0}} 
+        li(ng-show='profile._statsComputed.k - profile.stats.buffs.k - Math.ceil((Math.min(profile.stats.lvl - 1, 100)) / 2) - g[e.weapon].k - g[e.armor].k - g[e.head].k - g[e.shield].k - profile.stats.k > 0')
+          span.hint(popover-title=env.t('classBonus'), popover-trigger='mouseenter', popover-placement='top', popover=env.t('classBonusText'))=env.t('classEquipBonus')
+          |: {{profile._statsComputed.k - profile.stats.buffs.k - Math.ceil((Math.min(profile.stats.lvl - 1,100)) / 2) - g[e.weapon].k - g[e.armor].k - g[e.head].k - g[e.shield].k - profile.stats.k}} 
+        li(ng-show='profile.stats.k > 0')
+          span.hint(popover-title=env.t('allocatedPoints'), popover-trigger='mouseenter', popover-placement='top', popover=env.t('allocatedPointsText'))=env.t('allocated')
+          |: {{profile.stats.k || 0}} 
+        li(ng-show='profile.stats.buffs.k > 0')
+          span.hint(popover-title=env.t('buffs'), popover-trigger='mouseenter', popover-placement='top', popover=env.t('buffsText'))=env.t('buffs')
+          |: {{profile.stats.buffs.k || 0}} 
   tr(ng-if='profile.stats.buffs.stealth')
     td
       span.hint(popover-title=env.t('stealth'), popover-trigger='mouseenter', popover-placement='right', popover=env.t('stealthNewDay'))