diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 00000000..36dd3e24
Binary files /dev/null and b/.DS_Store differ
diff --git a/js/.DS_Store b/js/.DS_Store
new file mode 100644
index 00000000..8f654243
Binary files /dev/null and b/js/.DS_Store differ
diff --git a/js/components/.DS_Store b/js/components/.DS_Store
new file mode 100644
index 00000000..a817a720
Binary files /dev/null and b/js/components/.DS_Store differ
diff --git a/js/components/ascribe_table/.DS_Store b/js/components/ascribe_table/.DS_Store
new file mode 100644
index 00000000..5008ddfc
Binary files /dev/null and b/js/components/ascribe_table/.DS_Store differ
diff --git a/js/components/ascribe_table/table_header.js b/js/components/ascribe_table/table_header.js
index 564f7725..a4e68879 100644
--- a/js/components/ascribe_table/table_header.js
+++ b/js/components/ascribe_table/table_header.js
@@ -12,9 +12,9 @@ let TableHeader = React.createClass({
     propTypes: {
         columnList: React.PropTypes.arrayOf(React.PropTypes.instanceOf(TableColumnContentModel)),
         itemList: React.PropTypes.array.isRequired,
-        changeOrder: React.PropTypes.func.isRequired,
-        orderAsc: React.PropTypes.bool.isRequired,
-        orderBy: React.PropTypes.string.isRequired
+        changeOrder: React.PropTypes.func,
+        orderAsc: React.PropTypes.bool,
+        orderBy: React.PropTypes.string
     },
 
     render() {
diff --git a/js/components/ascribe_table/table_header_item.js b/js/components/ascribe_table/table_header_item.js
index fef82f34..dce2261e 100644
--- a/js/components/ascribe_table/table_header_item.js
+++ b/js/components/ascribe_table/table_header_item.js
@@ -8,10 +8,10 @@ let TableHeaderItem = React.createClass({
         columnClasses: React.PropTypes.string.isRequired,
         displayName: React.PropTypes.string.isRequired,
         columnName: React.PropTypes.string.isRequired,
-        canBeOrdered: React.PropTypes.bool.isRequired,
-        changeOrder: React.PropTypes.func.isRequired,
-        orderAsc: React.PropTypes.bool.isRequired,
-        orderBy: React.PropTypes.string.isRequired
+        canBeOrdered: React.PropTypes.bool,
+        changeOrder: React.PropTypes.func,
+        orderAsc: React.PropTypes.bool,
+        orderBy: React.PropTypes.string
     },
 
     changeOrder() {
@@ -19,7 +19,7 @@ let TableHeaderItem = React.createClass({
     },
 
     render() {
-        if(this.props.canBeOrdered) {
+        if(this.props.canBeOrdered && this.props.changeOrder && this.props.orderAsc != null && this.props.orderBy) {
             if(this.props.columnName === this.props.orderBy) {
                 return (
                     <div 
diff --git a/js/components/ascribe_table/table_item_subtable.js b/js/components/ascribe_table/table_item_subtable.js
index 0b0fd2ac..70f8fbee 100644
--- a/js/components/ascribe_table/table_item_subtable.js
+++ b/js/components/ascribe_table/table_item_subtable.js
@@ -1,6 +1,7 @@
 import React from 'react';
 
 import TableColumnContentModel from '../../models/table_column_content_model';
+import TableColumnMixin from '../../mixins/table_column_mixin';
 
 import EditionListStore from '../../stores/edition_list_store';
 import EditionListActions from '../../actions/edition_list_actions';
@@ -15,6 +16,7 @@ import TableItemSubtableButton from './table_item_subtable_button';
 
 
 let TableItemSubtable = React.createClass({
+    mixins: [TableColumnMixin],
     propTypes: {
         columnList: React.PropTypes.arrayOf(React.PropTypes.instanceOf(TableColumnContentModel)),
         columnContent: React.PropTypes.object
@@ -48,19 +50,6 @@ let TableItemSubtable = React.createClass({
         }
     },
 
-    calcColumnClasses(list, i) {
-        let bootstrapClasses = ['col-xs-', 'col-sm-', 'col-md-', 'col-lg-'];
-        
-        let listOfRowValues = list.map((column) => column.rowWidth );
-        let numOfColumns = GeneralUtils.sumNumList(listOfRowValues);
-
-        if(numOfColumns > 10) {
-            throw new Error('Bootstrap has only 12 columns to assign. You defined ' + numOfColumns + '. Change this in the columnMap you\'re passing to the table.')
-        } else {
-            return bootstrapClasses.join( listOfRowValues[i] + ' ') + listOfRowValues[i];
-        }
-    },
-
     render() {
 
         let calcColumnElementContent = () => {