diff --git a/docs/dist/sri.json b/docs/dist/sri.json
index d33dc6e09..419864dca 100644
--- a/docs/dist/sri.json
+++ b/docs/dist/sri.json
@@ -1,9 +1,9 @@
 {
   "@js": {
     "hashes": {
-      "sha384": "L4X+4/5HGlLrMbKJqTM06rFY1taYxR8dFczwdPJD2mSBYcIqC9ZGlj1xf3e4D+uB"
+      "sha384": "PoG8Ac13kZvHgPLWk2gYvkEWrQbDu8vCSuVGIy8fx3qNSLoQ7kjDEPzDyEKBSjea"
     },
-    "integrity": "sha384-L4X+4/5HGlLrMbKJqTM06rFY1taYxR8dFczwdPJD2mSBYcIqC9ZGlj1xf3e4D+uB",
+    "integrity": "sha384-PoG8Ac13kZvHgPLWk2gYvkEWrQbDu8vCSuVGIy8fx3qNSLoQ7kjDEPzDyEKBSjea",
     "path": "public/ts-10.0.21.min.js"
   },
   "@css": {
diff --git a/spec/runtime/edbml/functions/ts.ui.tablecheck.edbml.spec.js b/spec/runtime/edbml/functions/ts.ui.tablecheck.edbml.spec.js
index 97450df0d..0f1a38290 100644
--- a/spec/runtime/edbml/functions/ts.ui.tablecheck.edbml.spec.js
+++ b/spec/runtime/edbml/functions/ts.ui.tablecheck.edbml.spec.js
@@ -8,8 +8,8 @@ describe('ts.ui.tablecheck.edbml', function likethis() {
 			row = {},
 			fixed = true;
 		expect(gethtml(table, row, fixed)).toContain('ts-table-checkbox');
-		expect(gethtml(table, row, fixed)).toContain('<div class="ts-table-cell">');
-		expect(gethtml(table, row, fixed)).toContain('<button class="ts-table-checkbox-button"');
+		expect(gethtml(table, row, fixed)).toContain('ts-table-cell');
+		expect(gethtml(table, row, fixed)).toContain('ts-table-checkbox-button');
 	});
 
 	it('should contain ts-icon-checkboxon', function() {
diff --git a/spec/runtime/edbml/functions/ts.ui.tablerows.edbml.spec.js b/spec/runtime/edbml/functions/ts.ui.tablerows.edbml.spec.js
index bdf117649..550bc41e9 100644
--- a/spec/runtime/edbml/functions/ts.ui.tablerows.edbml.spec.js
+++ b/spec/runtime/edbml/functions/ts.ui.tablerows.edbml.spec.js
@@ -8,7 +8,7 @@ describe('ts.ui.tablerows.edbml.js', function likethis() {
 			rows = [{ cells: [{}] }],
 			cols = [new ts.ui.TableColModel()];
 		expect(gethtml(table, rows, cols)).toContain('<tr data-index=');
-		expect(gethtml(table, rows, cols)).toContain('<div class="ts-table-cell">');
+		expect(gethtml(table, rows, cols)).toContain('ts-table-cell');
 	});
 
 	it('should contain ts-table-checkbox', function() {
diff --git a/spec/runtime/edbml/scripts/ts.ui.TableSpirit.edbml.spec.js b/spec/runtime/edbml/scripts/ts.ui.TableSpirit.edbml.spec.js
index 6aa6ece87..fbc5aa5c3 100644
--- a/spec/runtime/edbml/scripts/ts.ui.TableSpirit.edbml.spec.js
+++ b/spec/runtime/edbml/scripts/ts.ui.TableSpirit.edbml.spec.js
@@ -27,16 +27,6 @@ describe('ts.ui.TableSpirit.edbml', function likethis() {
 		});
 	});
 
-	it('should contain gutter', function(done) {
-		getspirit().then(function(spirit) {
-			spirit.selectable().rows([{ cells: ['A', 'D', 'G'], selected: true }]);
-			sometime(function later() {
-				expect(spirit.element.innerHTML).toContain('ts-table-gutter');
-				done();
-			});
-		});
-	});
-
 	it('should contain a footer', function(done) {
 		getspirit().then(function(spirit) {
 			spirit.configbutton();
diff --git a/src/runtime/edbml/functions/ts.ui.tablecheck.edbml b/src/runtime/edbml/functions/ts.ui.tablecheck.edbml
index 0e05961e2..c122ccd4e 100644
--- a/src/runtime/edbml/functions/ts.ui.tablecheck.edbml
+++ b/src/runtime/edbml/functions/ts.ui.tablecheck.edbml
@@ -3,17 +3,21 @@
 	<?param name="table" type="ts.ui.TableModel"?>
 	<?param name="row" type="ts.ui.TableRowModel"?>
 	<?param name="fixed" type="boolean"?>
+	<?param name="shown" type="boolean"?>
 	
 	@class = 'ts-table-addition ts-table-checkbox ';
 	@class +=  row.selected ? 'ts-checked' : '';
 	
 	<td @class>
 		@id =  table.$instanceid + (fixed ? '-fixed-' : '-floating-') + row.$index;
-		@class = row.selected ? 'ts-icon-checkboxon' : 'ts-icon-checkbox';
+		@class = 'ts-table-checkbox-button ' + (fixed ? 'ts-fixed' : 'ts-floating');
 		<div class="ts-table-cell">
-			<button class="ts-table-checkbox-button" @id data-index="${row.$index}" tabindex="-1">
-				<i @class></i>
-			</button>
+			if(shown !== false) {
+				<button @class @id data-index="${row.$index}" tabindex="-1">
+					@class = row.selected ? 'ts-icon-checkboxon' : 'ts-icon-checkbox';
+					<i @class></i>
+				</button>
+			}
 		</div>
 	</td>
 
diff --git a/src/runtime/edbml/functions/ts.ui.tablehilt.edbml b/src/runtime/edbml/functions/ts.ui.tablehilt.edbml
index ce641746e..7f4b2e483 100644
--- a/src/runtime/edbml/functions/ts.ui.tablehilt.edbml
+++ b/src/runtime/edbml/functions/ts.ui.tablehilt.edbml
@@ -3,16 +3,19 @@
 	<?param name="table" type="ts.ui.TableModel"?>
 	<?param name="row" type="ts.ui.TableRowModel"?>
 	<?param name="icon" type="String"?> //todo(leo) we will support icon later
+	<?param name="shown" type="boolean"?>
 	
 	<td class="ts-table-addition ts-table-hilt">
 		@id =  table.$instanceid + icon + row.$index;
 		@class = icon ? 'icon' : '';
 		<div class="ts-table-cell">
-			<button @id data-index="${row.$index}" tabindex="-1">
-				if(icon) {
-					<i @class></i>
-				}
-			</button>
+			if(shown) {
+				<button @id data-index="${row.$index}" tabindex="-1">
+					if(icon) {
+						<i @class></i>
+					}
+				</button>
+			}
 		</div>
 	</td>
 
diff --git a/src/runtime/edbml/functions/ts.ui.tablerows.edbml b/src/runtime/edbml/functions/ts.ui.tablerows.edbml
index 9ebd06caa..90f69f167 100644
--- a/src/runtime/edbml/functions/ts.ui.tablerows.edbml
+++ b/src/runtime/edbml/functions/ts.ui.tablerows.edbml
@@ -32,9 +32,10 @@
 			if(table.selectable) {
 				if(selectable) {
 					var simulated = true;
-					renderCheck(table, row, simulated);
+					var show4real = !table.floatinggutter;
+					renderCheck(table, row, simulated, show4real);
 				} else {
-					renderHilt(table, row);	
+					renderHilt(table, row, null, show4real);
 				}
 			}
 			row.cells.forEach(function(cell, i) {
diff --git a/src/runtime/edbml/scripts/ts.ui.TableSpirit.edbml b/src/runtime/edbml/scripts/ts.ui.TableSpirit.edbml
index c73a0c792..73049e772 100644
--- a/src/runtime/edbml/scripts/ts.ui.TableSpirit.edbml
+++ b/src/runtime/edbml/scripts/ts.ui.TableSpirit.edbml
@@ -33,7 +33,7 @@
 				</tbody>
 			</table>
 		</main>
-		if(table.selectable) {
+		if(table.floatinggutter) {
 			<aside data-ts="Spirit" id="${guid}-gutter" class="ts-table-gutter">
 				<table>
 					<tbody>
diff --git a/src/runtime/js/ts.ui/forms/forms-gui@tradeshift.com/spirits/ts.ui.SwitchSpirit.ANGULAR15.js b/src/runtime/js/ts.ui/forms/forms-gui@tradeshift.com/spirits/ts.ui.SwitchSpirit.ANGULAR15.js
new file mode 100644
index 000000000..d63173a79
--- /dev/null
+++ b/src/runtime/js/ts.ui/forms/forms-gui@tradeshift.com/spirits/ts.ui.SwitchSpirit.ANGULAR15.js
@@ -0,0 +1,141 @@
+/**
+ * REVISION OF THE SWITCH FOR ANGULAR 1.5, SEEMS IT BREAKS IN ANGULAR 1.3 THOUGH
+ * TODO (jmo@): Support swipe gestures on that switch!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ * @extends {ts.ui.FieldSpirit}
+ * @using {string} tick
+ * @using {string} time
+ */
+ts.ui.SwitchSpirit = (function using(tick, time) {
+	return ts.ui.FieldSpirit.extend({
+		/**
+		 * Setup the stuff.
+		 */
+		onenter: function() {
+			this.super.onenter();
+			this._confirmbasic(this.element.localName, this.element.type);
+		},
+
+		/**
+		 * Attaching to the DOM.
+		 */
+		onattach: function() {
+			this.super.onattach();
+			this.event.add('change');
+			this._createswitch();
+			this._synchronize(true);
+			this.tick.add(tick).start(tick, time);
+			this.css.add([ts.ui.CLASS_SWITCHBOX, ts.ui.CLASS_ENGINE]);
+		},
+
+		/**
+		 * Detaching from the DOM.
+		 */
+		ondetach: function() {
+			this.super.ondetach();
+			this.tick.remove(tick);
+		},
+
+		/**
+		 * Handle event.
+		 * @param {Event} e
+		 */
+		onevent: function(e) {
+			this.super.onevent(e);
+			switch (e.type) {
+				case 'change':
+					this._synchronize();
+					break;
+			}
+		},
+
+		/**
+		 * Handle tick.
+		 * @param {gui.Tick} t
+		 */
+		ontick: function(t) {
+			this.super.ontick(t);
+			if (t.type === tick) {
+				this._synchronize();
+			}
+		},
+
+		// Privileged ..............................................................
+
+		/**
+		 * Style the containing form elements.
+		 */
+		$updatestyling: function() {
+			this.super.$updatestyling();
+			this._label(function(label) {
+				label.$switch();
+			});
+			this._fieldset(function(fieldset) {
+				fieldset.$options();
+			});
+		},
+
+		// Private .................................................................
+
+		/**
+		 * Snapshot checked status so that we know when it changes.
+		 * @type {boolean|null}
+		 */
+		_snapshot: null,
+
+		/**
+		 * Fetch the switch element (and potentially create it).
+		 * @param {boolean} [create] - Create switch if it doesn't exist?
+		 * @returns {HTMLDivElement}
+		 */
+		_switch: function(create) {
+			if (create && !this._switch()) {
+				return this._createswitch();
+			} else {
+				var elm = this.dom.following(ts.ui.Spirit)[0];
+				return elm && elm.css.contains('ts-switcher') ? elm : null;
+			}
+		},
+
+		/**
+		 * Inject the switch. Let's remove any potential existing 
+		 * switch, accounting for strange Angular quantum effects.
+		 * @returns {ts.ui.Spirit}
+		 */
+		_createswitch: function() {
+			var html = ts.ui.switchonly.edbml();
+			this._switch() ? this._switch().dom.remove() : void 0;
+			return ts.ui.get(this.dom.after(this.dom.parseToNode(html)));
+		},
+
+		/**
+		 * Match switch to checkbox. Note that we do
+		 * this on an interval just to make sure...
+		 * @param @optional {boolean} init Don't dispatch action on init
+		 */
+		_synchronize: function(init) {
+			var checked = this.element.checked;
+			if (init || checked !== this._snapshot) {
+				this._switch(true).css.shift(checked, ts.ui.CLASS_CHECKED);
+				this._snapshot = checked;
+				if (!init) {
+					this.action.dispatch(ts.ui.ACTION_SWITCH, checked);
+				}
+			}
+		},
+
+		/**
+		 * Confirm that you're not doing it wrong.
+		 * TODO: handle this via some advanced superclass boilerplate.
+		 */
+		_confirmbasic: function(name, type) {
+			var elm = this.element;
+			if (gui.debug) {
+				if (name !== 'input') {
+					throw new Error(this + ' must attach to an input field', elm);
+				} else if (type !== 'checkbox' && type !== 'radio') {
+					throw new Error(this + ' must attach to a checkbox or radio', elm);
+				}
+			}
+		}
+	});
+})(ts.ui.FieldSpirit.TICK_SYNC, ts.ui.FieldSpirit.TICK_TIME);
diff --git a/src/runtime/js/ts.ui/forms/forms-gui@tradeshift.com/spirits/ts.ui.SwitchSpirit.js b/src/runtime/js/ts.ui/forms/forms-gui@tradeshift.com/spirits/ts.ui.SwitchSpirit.js
index b792127f0..32568cde9 100644
--- a/src/runtime/js/ts.ui/forms/forms-gui@tradeshift.com/spirits/ts.ui.SwitchSpirit.js
+++ b/src/runtime/js/ts.ui/forms/forms-gui@tradeshift.com/spirits/ts.ui.SwitchSpirit.js
@@ -16,23 +16,27 @@ ts.ui.SwitchSpirit = (function using(tick, time) {
 		},
 
 		/**
-		 * Attaching to the DOM.
+		 * Attach to the DOM.
 		 */
 		onattach: function() {
 			this.super.onattach();
 			this.event.add('change');
-			this._createswitch();
+			this.css.add([
+				// TODO: update these classnames what with the new stylee!
+				ts.ui.CLASS_SWITCHBOX,
+				ts.ui.CLASS_ENGINE
+			]);
+			this._switch = this._createswitch();
 			this._synchronize(true);
-			this.tick.add(tick).start(tick, time);
-			this.css.add([ts.ui.CLASS_SWITCHBOX, ts.ui.CLASS_ENGINE]);
 		},
 
 		/**
-		 * Detaching from the DOM.
+		 * Syncrhonize on an interval so that we don't have to anticipate
+		 * all the strange stuff that Angular might do with our elements.
 		 */
-		ondetach: function() {
-			this.super.ondetach();
-			this.tick.remove(tick);
+		onready: function() {
+			this.super.onready();
+			this.tick.add(tick).start(tick, time);
 		},
 
 		/**
@@ -77,34 +81,27 @@ ts.ui.SwitchSpirit = (function using(tick, time) {
 		// Private .................................................................
 
 		/**
-		 * Snapshot checked status so that we know when it changes.
-		 * @type {boolean|null}
+		 * The switch DHTML thing.
+		 * @type {HTMLDivElement}
 		 */
-		_snapshot: null,
+		_switch: null,
 
 		/**
-		 * Fetch the switch element (and potentially create it).
-		 * @param {boolean} [create] - Create switch if it doesn't exist?
-		 * @returns {HTMLDivElement}
+		 * Snapshot checked status so that we know when it changes.
+		 * @type {boolean|null}
 		 */
-		_switch: function(create) {
-			if (create && !this._switch()) {
-				return this._createswitch();
-			} else {
-				var elm = this.dom.following(ts.ui.Spirit)[0];
-				return elm && elm.css.contains('ts-switcher') ? elm : null;
-			}
-		},
+		_snapshot: null,
 
 		/**
-		 * Inject the switch. Let's remove any potential existing 
-		 * switch, accounting for strange Angular quantum effects.
+		 * Inject the switch while accounting for strange Angular quantum effects.
 		 * @returns {ts.ui.Spirit}
 		 */
 		_createswitch: function() {
-			var html = ts.ui.switchonly.edbml();
-			this._switch() ? this._switch().dom.remove() : void 0;
-			return ts.ui.get(this.dom.after(this.dom.parseToNode(html)));
+			var oldswitch = this.dom.following(ts.ui.Spirit)[0];
+			if (oldswitch && oldswitch.css.contains('ts-switcher')) {
+				oldswitch.dom.remove();
+			}
+			return ts.ui.get(this.dom.after(this.dom.parseToNode(ts.ui.switchonly.edbml())));
 		},
 
 		/**
@@ -115,7 +112,7 @@ ts.ui.SwitchSpirit = (function using(tick, time) {
 		_synchronize: function(init) {
 			var checked = this.element.checked;
 			if (init || checked !== this._snapshot) {
-				this._switch(true).css.shift(checked, ts.ui.CLASS_CHECKED);
+				this._switch.css.shift(checked, ts.ui.CLASS_CHECKED);
 				this._snapshot = checked;
 				if (!init) {
 					this.action.dispatch(ts.ui.ACTION_SWITCH, checked);
diff --git a/src/runtime/js/ts.ui/tables/tables-api@tradeshift.com/models/ts.ui.TableModel.js b/src/runtime/js/ts.ui/tables/tables-api@tradeshift.com/models/ts.ui.TableModel.js
index 1cd923601..35f87a34f 100644
--- a/src/runtime/js/ts.ui/tables/tables-api@tradeshift.com/models/ts.ui.TableModel.js
+++ b/src/runtime/js/ts.ui/tables/tables-api@tradeshift.com/models/ts.ui.TableModel.js
@@ -266,6 +266,11 @@ ts.ui.TableModel = (function using(RowCollection, Type, Model) {
 		 */
 		tempdirtyflag: -1,
 
+		/**
+		 * @type {boolean}
+		 */
+		floatinggutter: false,
+
 		/**
 		 * Render toolbar as a statusbar (multiline in mobile view).
 		 */
diff --git a/src/runtime/js/ts.ui/tables/tables-gui@tradeshift.com/plugins/ts.ui.TableLayoutPlugin.js b/src/runtime/js/ts.ui/tables/tables-gui@tradeshift.com/plugins/ts.ui.TableLayoutPlugin.js
index ab6999a51..74943b216 100644
--- a/src/runtime/js/ts.ui/tables/tables-gui@tradeshift.com/plugins/ts.ui.TableLayoutPlugin.js
+++ b/src/runtime/js/ts.ui/tables/tables-gui@tradeshift.com/plugins/ts.ui.TableLayoutPlugin.js
@@ -275,7 +275,7 @@ ts.ui.TableLayoutPlugin = (function using(Client, Tick) {
 		 * @param {ts.ui.TableModel} model
 		 */
 		_vfix: function(spirit, model) {
-			var floats = spirit._floatgutter();
+			var floats = spirit.$floatgutter();
 			var edits = model.editable;
 			var plug = spirit.queryplugin;
 			if (floats || edits) {
@@ -320,7 +320,7 @@ ts.ui.TableLayoutPlugin = (function using(Client, Tick) {
 				})
 				.forEach(function writeheight(height, index) {
 					var row = rows[index];
-					if (floats) {
+					if (floats && guts) {
 						setheight(guts[index], height);
 					}
 					if (edits) {
diff --git a/src/runtime/js/ts.ui/tables/tables-gui@tradeshift.com/spirits/ts.ui.TableSpirit.js b/src/runtime/js/ts.ui/tables/tables-gui@tradeshift.com/spirits/ts.ui.TableSpirit.js
index 0ba12d53e..252875424 100644
--- a/src/runtime/js/ts.ui/tables/tables-gui@tradeshift.com/spirits/ts.ui.TableSpirit.js
+++ b/src/runtime/js/ts.ui/tables/tables-gui@tradeshift.com/spirits/ts.ui.TableSpirit.js
@@ -1185,6 +1185,16 @@ ts.ui.TableSpirit = (function using(
 			}
 		},
 
+		/**
+		 * The Table should or does show a "floating gutter" that stys 
+		 * fixed on horizontal scrolling (to make row selection easier)?
+		 * Note that `ts-scroll-x` was added by the {TableLayoutPlugin}.
+		 * @returns {boolean}
+		 */
+		$floatgutter: function() {
+			return this._model.selectable && this.css.contains('ts-scroll-x');
+		},
+
 		// Private .................................................................
 
 		/**
@@ -1308,6 +1318,21 @@ ts.ui.TableSpirit = (function using(
 			}
 			this._flush();
 			this._cnames(model, model.cols, model.rows, model.toolbar);
+			this._togglegutter(model);
+		},
+
+		/**
+		 * The Table needs to render *before* we can determine if the floating 
+		 * gutter needs to be displayed  (because this all depends on the final 
+		 * computed size of the table columns and stuff). If we can determine 
+		 * that is should be shown or hidden, and if this is different from 
+		 * the previous rendering, we will now trigger another re-rendering :/
+		 * but at least now, we will not render extra checkboxes that might 
+		 * confuse Selenium tests even though they are invisible to the user.
+		 * @param {ts.ui.TableModel} model
+		 */
+		_togglegutter: function(model) {
+			model.floatinggutter = this.$floatgutter();
 		},
 
 		/**
@@ -1390,7 +1415,7 @@ ts.ui.TableSpirit = (function using(
 			var path = '.ts-table-checkbox button';
 			var guts = this.queryplugin.getguts(true);
 			var menu = this.queryplugin.getmenu(true);
-			var buts = guts.dom.qall(path);
+			var buts = guts ? guts.dom.qall(path) : [];
 			var butt = menu.dom.qall(path);
 			buts
 				.concat(butt)
@@ -1943,15 +1968,6 @@ ts.ui.TableSpirit = (function using(
 			return rowslimit;
 		},
 
-		/**
-		 * The Table should show a "floating gutter" that stys fixed
-		 * on horizontal scrolling (to make row selection easier)?
-		 * @returns {boolean}
-		 */
-		_floatgutter: function() {
-			return this._model.selectable && this.css.contains('ts-scroll-x');
-		},
-
 		/**
 		 * Flush the action queue. This apparently
 		 * needs a tick for the screen to repaint.