diff --git a/modules/gridTable.jsx.js b/modules/gridTable.jsx.js
index 4cfead26..510b9674 100644
--- a/modules/gridTable.jsx.js
+++ b/modules/gridTable.jsx.js
@@ -270,10 +270,10 @@ var GridTable = React.createClass({
         tableStyle.tableLayout = "fixed";
       }
 
-      return React.createElement('div', null, React.createElement('table', { className: this.props.className, style: this.props.useGriddleStyles && tableStyle || null }, tableHeading), React.createElement('div', { ref: 'scrollable', onScroll: this.gridScroll, style: gridStyle }, React.createElement('table', { className: this.props.className, style: this.props.useGriddleStyles && tableStyle || null }, nodes, loadingContent, pagingContent)));
+      return React.createElement('div', {className: 'table-responsive'}, React.createElement('table', { className: this.props.className, style: this.props.useGriddleStyles && tableStyle || null }, tableHeading), React.createElement('div', { className: 'table-responsive', ref: 'scrollable', onScroll: this.gridScroll, style: gridStyle }, React.createElement('table', { className: this.props.className, style: this.props.useGriddleStyles && tableStyle || null }, nodes, loadingContent, pagingContent)));
     }
 
-    return React.createElement('div', { ref: 'scrollable', onScroll: this.gridScroll, style: gridStyle }, React.createElement('table', { className: this.props.className, style: this.props.useGriddleStyles && tableStyle || null }, tableHeading, nodes, loadingContent, pagingContent));
+    return React.createElement('div', { className: 'table-responsive', ref: 'scrollable', onScroll: this.gridScroll, style: gridStyle }, React.createElement('table', { className: this.props.className, style: this.props.useGriddleStyles && tableStyle || null }, tableHeading, nodes, loadingContent, pagingContent));
   }
 });
 
diff --git a/modules/griddle.jsx.js b/modules/griddle.jsx.js
index 1e22a78a..8fd52e92 100644
--- a/modules/griddle.jsx.js
+++ b/modules/griddle.jsx.js
@@ -41,6 +41,7 @@ var initial = require('lodash/initial');
 var intersection = require('lodash/intersection');
 var isArray = require('lodash/isArray');
 var isEmpty = require('lodash/isEmpty');
+var isEqual = require('lodash.isequal');
 var isNull = require('lodash/isNull');
 var isUndefined = require('lodash/isUndefined');
 var omit = require('lodash/omit');
@@ -405,7 +406,9 @@ var Griddle = React.createClass({
         } else if (this.columnSettings.allColumns.length > 0) {
             this.columnSettings.allColumns = [];
         }
-
+        if ( !isEqual(this.props.columns.slice().sort() , nextProps.columns.slice().sort())){
+            this.setColumns(nextProps.columns);
+        }
         if (nextProps.selectedRowIds) {
             var visibleRows = this.getDataForRender(this.getCurrentResults(nextProps.results), this.columnSettings.getColumns(), true);