diff --git a/app/js/app.js b/app/js/app.js
index e3c9f7b8..5cfdeedf 100644
--- a/app/js/app.js
+++ b/app/js/app.js
@@ -17,9 +17,10 @@ angular.module('app', ['ngRoute','shipyard','ngLodash','app.templates'])
   $rootScope.ships = DB.ships;
 
   // Formatters
-  $rootScope.credits = d3.format(',.0f');
-  $rootScope.power = d3.format(',.2f');
-  $rootScope.percent = d3.format(',.2%');
+  $rootScope.fCrd = d3.format(',.0f');
+  $rootScope.fPwr = d3.format(',.2f');
+  $rootScope.fMass = d3.format(',.2r');
+  $rootScope.fPct = d3.format(',.2%');
 
   $rootScope.calcJumpRange = function(mass, fsd, fuel) {
     return Math.pow( (fuel || fsd.maxfuel) / fds.fuelmul, 1 / fsd.fuelpower ) * fsd.optmass / mass;
diff --git a/app/views/costs.html b/app/views/costs.html
index c1d25e54..538ea19c 100644
--- a/app/views/costs.html
+++ b/app/views/costs.html
@@ -1,18 +1,18 @@
 <div class="list-item" ng-class="{enabled:ship.incCost}" ng-click="toggle(ship)">
-  <div class="lbl">{{ship.name}}</div><div class="val">{{$r.credits(ship.cost)}}</div>
+  <div class="lbl">{{ship.name}}</div><div class="val">{{$r.fCrd(ship.cost)}}</div>
 </div>
 <div class="list-item" ng-class="{enabled:ship.bulkheads.incCost}" ng-click="toggle(ship.bulkheads)" ng-if="ship.bulkheads.c.cost">
-  <div class="lbl">{{ship.bulkheads.c.name}}</div><div class="val">{{$r.credits(ship.bulkheads.c.cost)}}</div>
+  <div class="lbl">{{ship.bulkheads.c.name}}</div><div class="val">{{$r.fCrd(ship.bulkheads.c.cost)}}</div>
 </div>
 <div ng-repeat="c in ship.common" ng-if="c.c.cost" class="list-item common" ng-class="{enabled:c.incCost}" ng-click="toggle(c)">
-  <div class="lbl">{{c.c.class}}{{c.c.rating}} {{$r.CArr[$index]}}</div><div class="val">{{$r.credits(c.c.cost)}}</div>
+  <div class="lbl">{{c.c.class}}{{c.c.rating}} {{$r.CArr[$index]}}</div><div class="val">{{$r.fCrd(c.c.cost)}}</div>
 </div>
 <div ng-repeat="c in ship.hardpoints" ng-if="c.c.cost" class="list-item hardpoints" ng-class="{enabled:c.incCost}" ng-click="toggle(c)">
-  <div class="lbl">{{c.c.class}}{{c.c.rating}} {{c.c.name}}</div><div class="val">{{$r.credits(c.c.cost)}}</div>
+  <div class="lbl">{{c.c.class}}{{c.c.rating}} {{c.c.name}}</div><div class="val">{{$r.fCrd(c.c.cost)}}</div>
 </div>
 <div ng-repeat="c in ship.internal" ng-if="c.c.cost" class="list-item internal" ng-class="{enabled:c.incCost}" ng-click="toggle(c)">
-  <div class="lbl">{{c.c.class}}{{c.c.rating}} {{c.c.name || $r.igMap[c.c.group]}}</div><div class="val">{{$r.credits(c.c.cost)}}</div>
+  <div class="lbl">{{c.c.class}}{{c.c.rating}} {{c.c.name || $r.igMap[c.c.group]}}</div><div class="val">{{$r.fCrd(c.c.cost)}}</div>
 </div>
 <div class="list-item">
-  <div class="lbl">Total</div><div class="val">{{$r.credits(ship.totalCost)}}</div>
+  <div class="lbl">Total</div><div class="val">{{$r.fCrd(ship.totalCost)}}</div>
 </div>
diff --git a/app/views/power.html b/app/views/power.html
index 84d2f584..0db276a8 100644
--- a/app/views/power.html
+++ b/app/views/power.html
@@ -1,20 +1,20 @@
 <div ng-if="ship.common[0].c.pGen" class="list-item common enabled">
-  <div class="lbl">{{ship.common[0].c.class}}{{ship.common[0].c.rating}} {{$r.CArr[0]}}</div><div class="val">{{$r.power(ship.common[0].c.pGen)}}</div>
+  <div class="lbl">{{ship.common[0].c.class}}{{ship.common[0].c.rating}} {{$r.CArr[0]}}</div><div class="val">{{$r.fPwr(ship.common[0].c.pGen)}}</div>
 </div>
 <div ng-repeat="c in ship.common" ng-if="c.c.power" class="list-item common" ng-class="{enabled:c.enabled, consumer:c.c.power}" ng-click="toggle(c)">
-  <div class="lbl">{{c.c.class}}{{c.c.rating}} {{$r.CArr[$index]}}</div><div class="val">{{$r.power(c.c.power)}}</div>
+  <div class="lbl">{{c.c.class}}{{c.c.rating}} {{$r.CArr[$index]}}</div><div class="val">{{$r.fPwr(c.c.power)}}</div>
 </div>
 <div class="list-item common consumer" ng-class="{enabled:ship.cargoScoop.enabled}" ng-click="toggle(ship.cargoScoop)">
-  <div class="lbl">1H Cargo Scoop</div><div class="val">{{$r.power(ship.cargoScoop.c.power)}}</div>
+  <div class="lbl">1H Cargo Scoop</div><div class="val">{{$r.fPwr(ship.cargoScoop.c.power)}}</div>
 </div>
 
 <div ng-repeat="c in ship.hardpoints" ng-if="c.c.power" class="list-item hardpoints" ng-class="{enabled:c.enabled, consumer:c.c.power}" ng-click="toggle(c)">
-  <div class="lbl">{{c.c.class}}{{c.c.rating}} {{c.c.name}}</div><div class="val">{{$r.power(c.c.power)}}</div>
+  <div class="lbl">{{c.c.class}}{{c.c.rating}} {{c.c.name}}</div><div class="val">{{$r.fPwr(c.c.power)}}</div>
 </div>
 
 <div ng-repeat="c in ship.internal" ng-if="c.c.power" class="list-item internal" ng-class="{enabled:c.enabled, consumer:c.c.power}" ng-click="toggle(c)">
-  <div class="lbl">{{c.c.class}}{{c.c.rating}} {{c.c.name || $r.igMap[c.c.group]}}</div><div class="val">{{$r.power(c.c.power)}}</div>
+  <div class="lbl">{{c.c.class}}{{c.c.rating}} {{c.c.name || $r.igMap[c.c.group]}}</div><div class="val">{{$r.fPwr(c.c.power)}}</div>
 </div>
 
-<div>Retracted: {{$r.power(ship.powerRetracted)}} ({{$r.percent(ship.powerRetracted/ship.powerAvailable)}})</div>
-<div>Deployed: {{$r.power(ship.powerDeployed)}} ({{$r.percent(ship.powerDeployed/ship.powerAvailable)}})</div>
+<div>Retracted: {{$r.fPwr(ship.powerRetracted)}} ({{$r.percent(ship.powerRetracted/ship.powerAvailable)}})</div>
+<div>Deployed: {{$r.fPwr(ship.powerDeployed)}} ({{$r.percent(ship.powerDeployed/ship.powerAvailable)}})</div>
diff --git a/app/views/ship.html b/app/views/ship.html
index 4abf0360..111e9126 100644
--- a/app/views/ship.html
+++ b/app/views/ship.html
@@ -1,8 +1,8 @@
 
 <fieldset id="overview">
   <legend>{{ship.name}}</legend>
-  <div>Class: {{ship.class}}</div>
-  <div>Mass: {{ship.unladenMass}} - {{ship.ladenMass}} [{{ship.mass}}]T</div>
+  <div>Class: {{ship.class)}</div>
+  <div>Mass: {{fMass(ship.unladenMass)}} - {{fMass(ship.ladenMass)}} [{{ship.mass}}]T</div>
   <div>Speed: {{ship.speed}} <span class="boost">[{{ship.boost}}] M/s</span></div>
   <div>Agility: {{ship.agility}}</div>
   <div>Shields: {{ship.shields}}</div>