diff --git a/app/js/controllers/controller-ship.js b/app/js/controllers/controller-ship.js
index 5a8b1a40..352b4df6 100644
--- a/app/js/controllers/controller-ship.js
+++ b/app/js/controllers/controller-ship.js
@@ -4,7 +4,6 @@ angular.module('app')
   $scope.ship = ShipFactory($scope.shipId, DB.ships[$scope.shipId]);
   $scope.availCS = Components.forShip($scope.shipId);
 
-
   // for debugging
   window.ship = $scope.ship;
   window.availcs = $scope.availCS;
diff --git a/app/js/directives/directive-component-details.js b/app/js/directives/directive-component-details.js
deleted file mode 100644
index 72a4f7a6..00000000
--- a/app/js/directives/directive-component-details.js
+++ /dev/null
@@ -1,11 +0,0 @@
-angular.module('app').directive('componentDetails', [function () {
-  return {
-    restrict: 'E',
-    scope:{
-      c: '=',
-      lbl: '=',
-      opts: '='
-    },
-    templateUrl: 'views/component.html'
- };
-}]);
\ No newline at end of file
diff --git a/app/js/directives/directive--list-cost.js b/app/js/directives/directive-list-cost.js
similarity index 100%
rename from app/js/directives/directive--list-cost.js
rename to app/js/directives/directive-list-cost.js
diff --git a/app/js/directives/directive-list-power.js b/app/js/directives/directive-list-power.js
index 02fa42ea..5d187f27 100644
--- a/app/js/directives/directive-list-power.js
+++ b/app/js/directives/directive-list-power.js
@@ -9,8 +9,8 @@ angular.module('app')
       link: function (scope, element, attributes) {
         scope.$r = $r;
 
-        scope.toggle = function(component) {
-          component.enabled = !component.enabled;
+        scope.toggle = function(slot) {
+          slot.enabled = !slot.enabled;
           scope.ship.updateTotals();
         }
       }
diff --git a/app/js/directives/directive-slot-details.js b/app/js/directives/directive-slot-details.js
new file mode 100644
index 00000000..5759c0c3
--- /dev/null
+++ b/app/js/directives/directive-slot-details.js
@@ -0,0 +1,11 @@
+angular.module('app').directive('slotDetails', function () {
+  return {
+    restrict: 'A',
+    scope:{
+      c: '=',
+      lbl: '=',
+      opts: '='
+    },
+    templateUrl: 'views/slot.html'
+ };
+});
\ No newline at end of file
diff --git a/app/js/shipyard/factory-components.js b/app/js/shipyard/factory-components.js
index 52d8e529..1415bd61 100644
--- a/app/js/shipyard/factory-components.js
+++ b/app/js/shipyard/factory-components.js
@@ -1,29 +1,30 @@
-angular.module('shipyard').factory('components', ['lodash', 'commonMap','commonArray', function (_, CMap) {
+angular.module('shipyard').factory('components', ['lodash', function (_) {
   var C = DB.components;
 
   function ComponentSet(shipId) {
     var ship = DB.ships[shipId];
-    var maxInternal = ship.componentCapacity.internal[0];
+    var maxInternal = ship.slotCap.internal[0];
 
     this.mass = ship.mass;
     this.common = {};
     this.internal = {};
-    this.hardpoints = filter(C.hardpoints, ship.componentCapacity.hardpoints[0], 0, ship.mass);
+    this.hardpoints = filter(C.hardpoints, ship.slotCap.hardpoints[0], 0, ship.mass);
     this.bulkheads = C.bulkheads[shipId];
     this.hpClass = {};
     this.intClass = {};
 
     for (var i = 0; i < C.common.length; i ++) {
-      var max = ship.componentCapacity.common[i];
+      var max = ship.slotCap.common[i];
       switch (i) {
+        // Slots where component class must be equal to slot class
         case 3: // Life Support
         case 5: // Sensors
           this.common[i] = filter(C.common[i], max, max, ship.mass);
           break;
+        // Other slots can have a component of class lower than the slot class
         default:
           this.common[i] = filter(C.common[i], max, 0, ship.mass);
       }
-
     }
 
     for(var g in C.internal) {
@@ -54,9 +55,7 @@ angular.module('shipyard').factory('components', ['lodash', 'commonMap','commonA
   function filter (data, maxClass, minClass, mass) {
     var set = {};
     _.forEach(data, function (c,id) {
-      if (c.class <= maxClass && c.class >= minClass
-          && (c.maxmass === undefined || mass <= c.maxmass) ) {
-          //&& (c.minmass === undefined || mass  >= c.minmass) ) { // Min mass needs fixed
+      if (c.class <= maxClass && c.class >= minClass && (c.maxmass === undefined || mass <= c.maxmass) ) {
         set[id] = c;
       }
     });
diff --git a/app/js/shipyard/factory-ship.js b/app/js/shipyard/factory-ship.js
index 6365aa7b..fdb700f1 100644
--- a/app/js/shipyard/factory-ship.js
+++ b/app/js/shipyard/factory-ship.js
@@ -15,7 +15,7 @@ angular.module('shipyard').factory('ShipFactory', ['components', 'lodash', funct
     angular.forEach(shipData,function(o,k){
       if(typeof o != 'object') {
         this[k] = o;
-      } else if (k == 'componentCapacity') {
+      } else if (k == 'slotCap') {
         angular.forEach(o,function(arr,g){
           this[g] = [];
           for(var i = 0; i < arr.length; i++){
diff --git a/app/less/components.less b/app/less/components.less
index b5888c8d..6c085187 100644
--- a/app/less/components.less
+++ b/app/less/components.less
@@ -1,5 +1,5 @@
 
-.component-group {
+.slot-group {
   border: 2px solid @border;
   .border-radius(5px);
   margin: 5px;
@@ -16,7 +16,7 @@
     color: @warning;
   }
 
-  .component {
+  .slot {
     text-transform: uppercase;
     float: left;
     margin: 1%;
@@ -24,7 +24,7 @@
     .border-radius(2px);
     width: 250px;
     position: relative;
-    padding-top: 3px;
+    padding: 3px;
 
     color: #BBB;
     font-size: 0.8em;
@@ -35,12 +35,10 @@
 
     .lbl {
       float: left;
-      margin-left: 5px;
     }
 
     .cla {
       float: right;
-      margin-right: 5px;
     }
 
     .clear {
diff --git a/app/less/list.less b/app/less/list.less
index 4a090b68..658b1f53 100644
--- a/app/less/list.less
+++ b/app/less/list.less
@@ -6,7 +6,7 @@
   float: left;
 
   .list-item {
-    cursor: pointer;
+
     clear: both;
     overflow: hidden;
     margin: 3px 0px;
@@ -28,6 +28,10 @@
   color: grey;
   width: 300px;
 
+  .list-item {
+    cursor: pointer;
+  }
+
   .enabled {
     color: #FFF;
   }
@@ -42,6 +46,10 @@
     color: #FFF;
   }
 
+  .consumer {
+    cursor: pointer;
+  }
+
   .consumer.enabled {
     color: @fg;
   }
diff --git a/app/less/ship.less b/app/less/ship.less
index fa75592d..5c854a0a 100644
--- a/app/less/ship.less
+++ b/app/less/ship.less
@@ -18,7 +18,7 @@
 }
 
 #standard {
-  width: 260px;
+  width: 265px;
 }
 
 #internal {
diff --git a/app/views/power.html b/app/views/power.html
index 6b7c9945..84d2f584 100644
--- a/app/views/power.html
+++ b/app/views/power.html
@@ -1,5 +1,8 @@
-<div ng-repeat="c in ship.common" ng-if="c.c.power || c.c.pGen" 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 || c.c.pGen)}}</div>
+<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>
+<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>
 <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>
diff --git a/app/views/ship.html b/app/views/ship.html
index 6a7c09e5..4abf0360 100644
--- a/app/views/ship.html
+++ b/app/views/ship.html
@@ -13,9 +13,9 @@
   <div>Pad Size: {{['','Small','Medium','Large'][ship.class]}}</div>
 </fieldset>
 
-<fieldset id="standard" class="component-group">
+<fieldset id="standard" class="slot-group">
   <legend>Standard</legend>
-  <div class="component">
+  <div class="slot">
     <div class="lbl">Bulkheads</div>
     <div class="clear">{{ship.bulkheads.c.name}}
       <div class="cla">{{ship.bulkheads.c.mass}}T</div>
@@ -24,24 +24,24 @@
       <div class="c" ng-repeat="b in availCS.bulkheads" ng-click="ship.use(ship.bulkheads,$index,b)">{{b.name}}</div>
     </div>
   </div>
-  <div  class="component" ng-repeat="c in ship.common">
-    <component-details c="c" lbl="CArr[$index]"></component-details>
+  <div  class="slot" ng-repeat="c in ship.common">
+    <div slot-details c="c" lbl="CArr[$index]"></div>
     <div component-select class="select" c="c" ship="ship" opts="availCS.common[$index]"></div>
   </div>
 </fieldset>
 
-<fieldset id="hardpoints" class="component-group">
+<fieldset id="hardpoints" class="slot-group">
   <legend>HardPoints</legend>
-  <div class="component" ng-repeat="h in ship.hardpoints">
-    <component-details c="h" lbl="HPC[h.maxClass]"></component-details>
+  <div class="slot" ng-repeat="h in ship.hardpoints">
+    <div slot-details c="h" lbl="HPC[h.maxClass]"></div>
     <div component-select class="select" c="h" ship="ship" opts="availCS.getHps(h.maxClass)"></div>
   </div>
 </fieldset>
 
-<fieldset id="internal" class="component-group">
+<fieldset id="internal" class="slot-group">
   <legend>Internal Compartments</legend>
-  <div class="component" ng-repeat="i in ship.internal">
-    <component-details c="i" lbl="'FIX'"></component-details>
+  <div class="slot" ng-repeat="i in ship.internal">
+    <div slot-details c="i" lbl="'FIX'"></div>
     <div class="select">
       <div  ng-repeat="(grp, data) in availCS.getInts(i.maxClass)">
         <div class="select-group">{{grp}}</div>
diff --git a/app/views/component.html b/app/views/slot.html
similarity index 65%
rename from app/views/component.html
rename to app/views/slot.html
index f7e2f524..775187c3 100644
--- a/app/views/component.html
+++ b/app/views/slot.html
@@ -2,5 +2,5 @@
 <div class="cla">{{c.maxClass}}</div>
 <div class="clear">
   {{c.c.class}}{{c.c.rating}}
-  <div class="cla">{{c.c.mass || c.c.capacity}}T</div>
+  <div class="cla" ng-if="c.c">{{c.c.mass || c.c.capacity}}T</div>
 </div>
\ No newline at end of file
diff --git a/data/ships/adder.json b/data/ships/adder.json
index 95d4852e..269dce0f 100644
--- a/data/ships/adder.json
+++ b/data/ships/adder.json
@@ -11,7 +11,7 @@
     "shields": 60,
     "armour": 90,
     "fuelcost": 50,
-    "componentCapacity": {
+    "slotCap": {
       "common": [
         3,
         3,
diff --git a/data/ships/anaconda.json b/data/ships/anaconda.json
index cc8c99ee..58655655 100644
--- a/data/ships/anaconda.json
+++ b/data/ships/anaconda.json
@@ -11,7 +11,7 @@
     "shields": 350,
     "armour": 525,
     "fuelcost": 50,
-    "componentCapacity": {
+    "slotCap": {
       "common": [
         8,
         7,
diff --git a/data/ships/asp.json b/data/ships/asp.json
index f8049067..7bf0baa3 100644
--- a/data/ships/asp.json
+++ b/data/ships/asp.json
@@ -11,7 +11,7 @@
     "shields": 140,
     "armour": 210,
     "fuelcost": 50,
-    "componentCapacity": {
+    "slotCap": {
       "common": [
         5,
         5,
diff --git a/data/ships/cobra_mk_iii.json b/data/ships/cobra_mk_iii.json
index d03c1d5a..6348a4fc 100644
--- a/data/ships/cobra_mk_iii.json
+++ b/data/ships/cobra_mk_iii.json
@@ -11,7 +11,7 @@
     "shields": 80,
     "armour": 120,
     "fuelcost": 50,
-    "componentCapacity": {
+    "slotCap": {
       "common": [
         4,
         4,
diff --git a/data/ships/eagle.json b/data/ships/eagle.json
index 465ffa8d..d50900f1 100644
--- a/data/ships/eagle.json
+++ b/data/ships/eagle.json
@@ -11,7 +11,7 @@
     "shields": 60,
     "armour": 40,
     "fuelcost": 50,
-    "componentCapacity": {
+    "slotCap": {
       "common": [
         2,
         3,
diff --git a/data/ships/federal_dropship.json b/data/ships/federal_dropship.json
index 287daa5c..0a990c4a 100644
--- a/data/ships/federal_dropship.json
+++ b/data/ships/federal_dropship.json
@@ -11,7 +11,7 @@
     "shields": 200,
     "armour": 300,
     "fuelcost": 50,
-    "componentCapacity": {
+    "slotCap": {
       "common": [
         6,
         6,
diff --git a/data/ships/fer_de_lance.json b/data/ships/fer_de_lance.json
index 6f2828b0..152be082 100644
--- a/data/ships/fer_de_lance.json
+++ b/data/ships/fer_de_lance.json
@@ -11,7 +11,7 @@
     "shields": 300,
     "armour": 225,
     "fuelcost": 50,
-    "componentCapacity": {
+    "slotCap": {
       "common": [
         5,
         5,
diff --git a/data/ships/hauler.json b/data/ships/hauler.json
index c7bc45cc..ba3355e0 100644
--- a/data/ships/hauler.json
+++ b/data/ships/hauler.json
@@ -11,7 +11,7 @@
     "shields": 50,
     "armour": 50,
     "fuelcost": 50,
-    "componentCapacity": {
+    "slotCap": {
       "common": [
         2,
         2,
diff --git a/data/ships/imperial_clipper.json b/data/ships/imperial_clipper.json
index d3fd3f7a..023dae07 100644
--- a/data/ships/imperial_clipper.json
+++ b/data/ships/imperial_clipper.json
@@ -11,7 +11,7 @@
     "shields": 180,
     "armour": 270,
     "fuelcost": 50,
-    "componentCapacity": {
+    "slotCap": {
       "common": [
         6,
         6,
diff --git a/data/ships/orca.json b/data/ships/orca.json
index 1606e61b..08a0e912 100644
--- a/data/ships/orca.json
+++ b/data/ships/orca.json
@@ -11,7 +11,7 @@
     "shields": 220,
     "armour": 220,
     "fuelcost": 50,
-    "componentCapacity": {
+    "slotCap": {
       "common": [
         5,
         6,
diff --git a/data/ships/python.json b/data/ships/python.json
index 9fb78c0d..434def4a 100644
--- a/data/ships/python.json
+++ b/data/ships/python.json
@@ -11,7 +11,7 @@
     "shields": 260,
     "armour": 260,
     "fuelcost": 50,
-    "componentCapacity": {
+    "slotCap": {
       "common": [
         7,
         6,
diff --git a/data/ships/sidewinder.json b/data/ships/sidewinder.json
index 6390ef6b..d7816a7c 100644
--- a/data/ships/sidewinder.json
+++ b/data/ships/sidewinder.json
@@ -11,7 +11,7 @@
     "shields": 40,
     "armour": 60,
     "fuelcost": 50,
-    "componentCapacity": {
+    "slotCap": {
       "common": [
         2,
         2,
diff --git a/data/ships/type_6_transporter.json b/data/ships/type_6_transporter.json
index b94793c1..50ec7281 100644
--- a/data/ships/type_6_transporter.json
+++ b/data/ships/type_6_transporter.json
@@ -11,7 +11,7 @@
     "shields": 90,
     "armour": 90,
     "fuelcost": 50,
-    "componentCapacity": {
+    "slotCap": {
       "common": [
         3,
         4,
diff --git a/data/ships/type_7_transport.json b/data/ships/type_7_transport.json
index 5fe03f1a..304a67bd 100644
--- a/data/ships/type_7_transport.json
+++ b/data/ships/type_7_transport.json
@@ -11,7 +11,7 @@
     "shields": 120,
     "armour": 120,
     "fuelcost": 50,
-    "componentCapacity": {
+    "slotCap": {
       "common": [
         4,
         5,
diff --git a/data/ships/type_9_heavy.json b/data/ships/type_9_heavy.json
index 5585a20c..562f0852 100644
--- a/data/ships/type_9_heavy.json
+++ b/data/ships/type_9_heavy.json
@@ -11,7 +11,7 @@
     "shields": 240,
     "armour": 240,
     "fuelcost": 50,
-    "componentCapacity": {
+    "slotCap": {
       "common": [
         6,
         7,
diff --git a/data/ships/viper.json b/data/ships/viper.json
index ffa5eda3..a8192282 100644
--- a/data/ships/viper.json
+++ b/data/ships/viper.json
@@ -11,7 +11,7 @@
     "shields": 105,
     "armour": 70,
     "fuelcost": 50,
-    "componentCapacity": {
+    "slotCap": {
       "common": [
         3,
         3,
diff --git a/data/ships/vulture.json b/data/ships/vulture.json
index 10b59c4a..e75ff6c3 100644
--- a/data/ships/vulture.json
+++ b/data/ships/vulture.json
@@ -11,7 +11,7 @@
     "shields": 240,
     "armour": 160,
     "fuelcost": 50,
-    "componentCapacity": {
+    "slotCap": {
       "common": [
         4,
         5,