diff --git a/index.js b/index.js
index 2eed628f8..a69e25e13 100644
--- a/index.js
+++ b/index.js
@@ -632,7 +632,6 @@ define(function (require) {
 					dataSource: function (options, callback) {
 						list(options, callback);
 					},
-					list_selectable: 'multi'
 				},
 				'thumbnail': {
 					dataSource: function (options, callback) {
@@ -750,6 +749,7 @@ define(function (require) {
 		repeaterActions.repeater({
 			list_noItemsHTML: '<span>foo</span>',
 			list_highlightSortedColumn: true,
+			list_selectable: 'multi',
 			list_actions:  {
 				width: 37,
 				items: [
diff --git a/js/repeater-list.js b/js/repeater-list.js
index a1d13fbc4..b62c63303 100755
--- a/js/repeater-list.js
+++ b/js/repeater-list.js
@@ -264,6 +264,8 @@
 				// Dont show actions dropdown in header if not multi select
 				if (this.viewOptions.list_selectable === 'multi') {
 					$actionsColumn.find('thead tr').html('<th><div class="repeater-list-heading">' + selectlist + '</div></th>');
+					//disable the header dropdown until an item is selected
+					$actionsColumn.find('thead .btn').attr('disabled', 'disabled');
 				}
 				else {
 					var label = this.viewOptions.list_actions.label || '<span class="actions-hidden">a</span>';
@@ -287,32 +289,55 @@
 				.css('width', this.list_actions_width);
 
 			this.$element.find('.repeater-list .actions-column-wrapper th .repeater-list-heading').css('width', this.list_actions_width + 1 + 'px');*/
-
-			this.$element.find('.repeater-list table.table-actions tr').each(function (i, elem) {
-				$(this).height($table.find('tr:eq(' + i + ')').height());
+			this.$element.find('.repeater-list table.table-actions thead tr th').outerHeight($table.find('thead tr th').outerHeight());
+			this.$element.find('.repeater-list table.table-actions tbody tr td:first-child').each(function (i, elem) {
+				$(this).outerHeight($table.find('tbody tr:eq(' + i + ') td').outerHeight());
 			});
 
-			this.$element.find('.table-actions .action-item').on('click', function() {
+
+			//row level actions click
+			this.$element.find('.table-actions tbody .action-item').on('click', function() {
 				var actionName = $(this).data('action');
 				var row = $(this).data('row');
-				self.list_getActionItems(actionName,row);
+				var selected = {
+					actionName: actionName,
+					rows: [row]
+				};
+				self.list_getActionItems(selected);
 			});
+			// bulk actions click
+			this.$element.find('.table-actions thead .action-item').on('click', function() {
+				var actionName = $(this).data('action');
+				var selected = {
+					actionName: actionName,
+					rows: []
+				};
+				self.$element.find('.repeater-list-wrapper > table .selected').each(function() {
+					var index = $(this).index();
+					index = index + 1;
+					selected.rows.push(index);
+				});
 
+				self.list_getActionItems(selected);
+			});
 		};
 
-		$.fn.repeater.Constructor.prototype.list_getActionItems = function (actionName, row) {
-
-			var clickedRow = this.$canvas.find('.repeater-list-wrapper > table tbody tr:nth-child('+ row +')');
-
+		$.fn.repeater.Constructor.prototype.list_getActionItems = function (selected) {
+			var i;
+			var selectedObj = [];
 			var actionObj = $.grep(this.viewOptions.list_actions.items, function(actions){
-				return actions.name === actionName;
+				return actions.name === selected.actionName;
 			})[0];
-
-			if (actionObj.clickAction) {
-				actionObj.clickAction({
+			for (i = 0; i < selected.rows.length; i++) {
+				var clickedRow = this.$canvas.find('.repeater-list-wrapper > table tbody tr:nth-child('+ selected.rows[i] +')');
+				selectedObj.push({
 					item: clickedRow,
 					rowData: clickedRow.data('item_data')
-				}, function () {});
+				});
+			}
+
+			if (actionObj.clickAction) {
+				actionObj.clickAction(selectedObj, function () {});
 			}
 		};
 
@@ -322,35 +347,46 @@
 			$actionsTableHeading.outerHeight($table.find('thead th .repeater-list-heading').outerHeight());
 		};
 
-		$.fn.repeater.Constructor.prototype.list_multiSelectInitialize = function () {
+		$.fn.repeater.Constructor.prototype.list_frozenOptionsInitialize = function () {
 			var self = this;
+			var isFrozen = this.viewOptions.list_frozenColumns;
+			var isActions = this.viewOptions.list_actions;
+			var isMulti = this.viewOptions.list_selectable === 'multi';
+
+			var $checkboxes = this.$element.find('.frozen-column-wrapper .checkbox-inline');
+
+			var $everyTable = this.$element.find('.repeater-list table');
+
 
-			var $checkboxes = self.$element.find('.frozen-column-wrapper .checkbox-inline');
 
 			//Make sure if row is hovered that it is shown in frozen column as well
 			this.$element.find('tr.selectable').on('mouseover mouseleave', function(e) {
 				var index = $(this).index();
 				index = index + 1;
 				if (e.type === 'mouseover'){
-					self.$element.find('.repeater-list-wrapper > table tbody tr:nth-child('+ index +'), ' +
-						'.frozen-column-wrapper tbody tr:nth-child('+ index +')').addClass('hovered');
+					$everyTable.find('tbody tr:nth-child('+ index +')').addClass('hovered');
 				}
 				else {
-					self.$element.find('.repeater-list-wrapper > table tbody tr:nth-child('+ index +'), ' +
-						'.frozen-column-wrapper tbody tr:nth-child('+ index +')').removeClass('hovered');
+					$everyTable.find('tbody tr:nth-child('+ index +')').removeClass('hovered');
 				}
 			});
 
 			$checkboxes.checkbox();
 
+			this.$element.find('.table-frozen tbody .checkbox-inline').on('change', function(e) {
+				e.preventDefault();
+				var row = $(this).attr('data-row');
+				row = parseInt(row) + 1;
+				self.$element.find('.repeater-list-wrapper > table tbody tr:nth-child('+ row +')').click();
+			});
+
 			this.$element.find('.frozen-thead-wrapper thead .checkbox-inline').on('change', function () {
-				var $checkboxes = self.$element.find('.frozen-column-wrapper .checkbox-inline');
 				if ($(this).checkbox('isChecked')){
-					$checkboxes.checkbox('check');
+					self.$element.find('.repeater-list-wrapper > table tbody tr:not(.selected)').click();
 					self.$element.trigger('selected.fu.repeaterList', $checkboxes);
 				}
 				else {
-					$checkboxes.checkbox('uncheck');
+					self.$element.find('.repeater-list-wrapper > table tbody tr.selected').click();
 					self.$element.trigger('deselected.fu.repeaterList', $checkboxes);
 				}
 			});
@@ -456,10 +492,7 @@
 
 				if (this.viewOptions.list_frozenColumns || this.viewOptions.list_actions || this.viewOptions.list_selectable === 'multi') {
 					this.list_positionColumns();
-				}
-
-				if (this.viewOptions.list_selectable === 'multi') {
-					this.list_multiSelectInitialize();
+					this.list_frozenOptionsInitialize();
 				}
 
 				if (this.viewOptions.list_columnSyncing) {
@@ -498,16 +531,10 @@
 		$row.append($col);
 
 		if (this.viewOptions.list_selectable === 'multi' && columns[columnIndex].property === '@_CHECKBOX_@') {
-			var checkBoxMarkup = '<label class="checkbox-custom checkbox-inline body-checkbox">' +
+			var checkBoxMarkup = '<label data-row="'+ rowIndex +'" class="checkbox-custom checkbox-inline body-checkbox">' +
 				'<input class="sr-only" type="checkbox"></label>';
 
 			$col.html(checkBoxMarkup);
-
-			//Prevent default click action on the actual click of the checkbox because already handled
-			//with any click anywhere in the row
-			$col.find('.checkbox-custom').on('click', function(e) {
-				e.preventDefault();
-			});
 		}
 
 		if (this.viewOptions.list_columnRendered) {
@@ -614,6 +641,7 @@
 		var self = this;
 		var i, l;
 		var isMulti = this.viewOptions.list_selectable === 'multi';
+		var isActions = this.viewOptions.list_actions;
 
 		if (this.viewOptions.list_selectable) {
 			$row.addClass('selectable');
@@ -625,12 +653,17 @@
 				var index = $(this).index();
 				index = index + 1;
 				var $frozenRow = self.$element.find('.frozen-column-wrapper tr:nth-child('+ index +')');
+				var $actionsRow = self.$element.find('.actions-column-wrapper tr:nth-child('+ index +')');
 				var $checkBox = self.$element.find('.frozen-column-wrapper tr:nth-child('+ index +') .checkbox-inline');
+
 				if ($item.is('.selected')) {
 					$item.removeClass('selected');
 					if (isMulti){
 						$checkBox.checkbox('uncheck');
 						$frozenRow.removeClass('selected');
+						if (isActions) {
+							$actionsRow.removeClass('selected');
+						}
 					}
 					else {
 						$item.find('.repeater-list-check').remove();
@@ -646,16 +679,27 @@
 						});
 						$item.find('td:first').prepend('<div class="repeater-list-check"><span class="glyphicon glyphicon-ok"></span></div>');
 						$item.addClass('selected');
+						$frozenRow.addClass('selected');
 					}
 					else {
 						$checkBox.checkbox('check');
 						$item.addClass('selected');
 						$frozenRow.addClass('selected');
+						if (isActions) {
+							$actionsRow.addClass('selected');
+						}
 					}
-
-
 					self.$element.trigger('selected.fu.repeaterList', $item);
 				}
+				var $selected = self.$canvas.find('.repeater-list-wrapper > table .selected');
+				var $actionsColumn = self.$element.find('.table-actions');
+
+				if ($selected.length > 0) {
+					$actionsColumn.find('thead .btn').removeAttr('disabled');
+				}
+				else {
+					$actionsColumn.find('thead .btn').attr('disabled', 'disabled');
+				}
 			});
 
 			// allow selection via enter key
@@ -772,22 +816,7 @@
 					return column.property === '@_CHECKBOX_@';
 				})[0];
 				selectColumn.width = checkboxWidth;
-
-				$table.find('.header-checkbox input').on('change', function() {
-					var checked = $(this).is(':checked') ? true : false;
-					var bodyCheckboxes = $table.find('.body-checkbox');
-
-					if (checked){
-						bodyCheckboxes.checkbox('check');
-						bodyCheckboxes.closest('tr').addClass('selected');
-					}
-					else {
-						bodyCheckboxes.checkbox('uncheck');
-						bodyCheckboxes.closest('tr').removeClass('selected');
-					}
-				});
 			}
-
 			sizeColumns.call(this, $tr);
 		}
 	}
@@ -850,6 +879,10 @@
 		}
 	}
 
+	function hoverClick() {
+
+	}
+
 	function specialBrowserClass() {
 		var ua = window.navigator.userAgent;
 		var msie = ua.indexOf("MSIE ");
diff --git a/less/repeater-list.less b/less/repeater-list.less
index 51f4bbcb5..05329e36a 100755
--- a/less/repeater-list.less
+++ b/less/repeater-list.less
@@ -1,4 +1,26 @@
 @mutli-select-enabled-width: 37px;
+.selectable() {
+	&.selectable {
+		&:hover td, &.hovered td {
+			background: @selectableHover;
+			cursor: pointer;
+		}
+		.checkbox-custom:before {
+			margin-top: -4px;
+			top: 0
+		}
+	}
+	&.selected {
+		td {
+			background: @selected;
+			color: @gray20;
+
+			&:first-child {
+				padding-left: 30px;
+			}
+		}
+	}
+}
 
 .fuelux {
 	.repeater[data-viewtype="list"] {
@@ -58,31 +80,7 @@
 								}
 							}
 
-							&.selectable {
-								&:hover td, &.hovered {
-									background: @selectableHover;
-									cursor: pointer;
-								}
-								.checkbox-custom:before {
-									margin-top: -4px;
-									top: 0
-								}
-							}
-
-							&.selected {
-								&:hover td {
-									background: @selectedHover;
-								}
-
-								td {
-									background: @selected;
-									color: @gray20;
-
-									&:first-child {
-										padding-left: 30px;
-									}
-								}
-							}
+							.selectable();
 						}
 					}
 
@@ -99,6 +97,9 @@
 
 						&:first-child {
 							border-left: none;
+							.header-checkbox {
+								width: @mutli-select-enabled-width;
+							}
 						}
 
 						&.sortable {
@@ -202,7 +203,7 @@
 						z-index: 2;
 						left: 0;
 						th, td {
-							position: relative;
+							//position: relative;
 						}
 					}
 					.frozen-thead-wrapper {
@@ -210,6 +211,9 @@
 						top: 0;
 						left: 0;
 						z-index: 3;
+						table {
+							border-right: 1px solid @gray87;
+						}
 					}
 					table {
 						table-layout: fixed;
@@ -260,7 +264,6 @@
 								float: right;
 								tr {
 									border-left: 1px solid @gray87;
-									background: @true-white;
 									&.empty-heading {
 										background: transparent;
 										border-left: 1px solid transparent;
@@ -269,20 +272,39 @@
 											padding-left: 0;
 										}
 									}
+									td {
+										background: @true-white;
+									}
+									.selectable();
+
 									td, th {
 										border-collapse: collapse;
 										word-wrap: break-word;
-										position: relative;
-										padding-bottom: 6px;
+										padding-bottom: 5px;
+										.btn-group {
+											width: 100%;
+											text-align: center;
+											.btn {
+												float: none;
+											}
+										}
+									}
+									&.selected td:first-child {
+										padding-left: 8px;
 									}
 									th {
 										border-bottom: 1px solid @gray87;
-										padding-bottom: 8px;
+										padding-bottom: 7px;
 										.repeater-list-heading {
 											padding: 8px 0 7px;
 											border-left: 1px solid @gray98;
-											margin-left: -1px;
+											margin-left: -9px;
 											width: 100%;
+											.glyphicon {
+												display: inline-block;
+												float: none;
+												margin-top: 0;
+											}
 										}
 									}
 								}
@@ -319,11 +341,7 @@
 							table {
 								&.table-actions {
 									td {
-										.btn-group {
-											.btn-xs {
-												line-height: 1.4;
-											}
-										}
+
 									}
 								}
 							}
@@ -358,14 +376,12 @@
 				.repeater-list {
 					thead {
 						tr:first-child {
-							.repeater-list-heading {
-								width: @mutli-select-enabled-width;
-							}
 							.header-checkbox {
 								width: @mutli-select-enabled-width;
 								label {
 									top: -10px;
 									left: 4px;
+									padding-left: 0;
 								}
 							}
 						}
@@ -389,6 +405,12 @@
 					}
 				}
 			}
+
+			&.multi-select-enabled.actions-enabled {
+				.repeater-list .actions-column-wrapper table.table-actions tr th .repeater-list-heading {
+					border-left: 1px solid @gray87
+				}
+			}
 		}
 
 		.repeater-loader {
diff --git a/test/repeater-list-test.js b/test/repeater-list-test.js
index cebd2733c..7597f1e26 100644
--- a/test/repeater-list-test.js
+++ b/test/repeater-list-test.js
@@ -67,8 +67,8 @@ define(function(require){
 			this.$markup = $(html);
 			this.$markup.find('.repeater-views').append('' +
 				'<label class="btn btn-default active">' +
-					'<input name="repeaterViews" type="radio" value="list">' +
-					'<span class="glyphicon glyphicon-list"></span>' +
+				'<input name="repeaterViews" type="radio" value="list">' +
+				'<span class="glyphicon glyphicon-list"></span>' +
 				'</label>');
 		}
 	});
@@ -157,7 +157,7 @@ define(function(require){
 
 		$repeater.on('loaded.fu.repeater', function(e, options){
 			count++;
-			
+
 			switch(count){
 				case 1:
 					$first = $repeater.find('.repeater-list thead .repeater-list-heading:first');
@@ -198,7 +198,7 @@ define(function(require){
 
 		$repeater.on('loaded.fu.repeater', function(){
 			count++;
-			
+
 			switch(count){
 				case 1:
 					$repeater.find('.repeater-list thead th:nth-child(1) .repeater-list-heading').click();
@@ -296,7 +296,7 @@ define(function(require){
 
 			$firstRow.click();
 			$lastRow.click();
-			
+
 			setTimeout(function(){
 				start();
 				$repeater.repeater('list_clearSelectedItems');
@@ -321,7 +321,7 @@ define(function(require){
 
 			$firstRow.click();
 			$lastRow.click();
-			
+
 			setTimeout(function(){
 				start();
 				selected = $repeater.repeater('list_getSelectedItems');
@@ -345,15 +345,15 @@ define(function(require){
 
 			setTimeout(function(){
 				start();
-	
+
 				$repeater.repeater('list_setSelectedItems', [{ index: 0 }]);
 				equal($repeater.repeater('list_getSelectedItems').length, 1, 'correct number of items selected');
 				equal($items.find('tr:first').hasClass('selected'), true, 'correct row selected by index');
-	
+
 				$repeater.repeater('list_setSelectedItems', [{ property: 'commonName', value: 'pig' }]);
 				equal($repeater.repeater('list_getSelectedItems').length, 1, 'correct number of items selected');
 				equal($items.find('tr:nth-child(5)').hasClass('selected'), true, 'correct row selected by property/value');
-	
+
 				$repeater.repeater('list_setSelectedItems', [{ index: 0 }, { property: 'commonName', value: 'dog' }], true);
 				equal($repeater.repeater('list_getSelectedItems').length, 4, 'correct number of items selected when using force');
 			}, 0);
@@ -413,16 +413,15 @@ define(function(require){
 				ok($actionsTable.find('tbody tr:first-child .btn-group').hasClass('open'), 'Actions dropdown opens on click');
 
 				$actionItem.click();
-
 			}, 0);
 
 		});
 
 		function testClickAction(helpers) {
-			equal((typeof helpers === 'object' && helpers.item.length > 0), true, 'Items in row were returned after action click');
+			equal((typeof helpers === 'object' && helpers.length > 0), true, 'Items in row were returned after action click');
 			var count = 0;
-			for (var k in helpers.rowData) {
-				if (helpers.rowData.hasOwnProperty(k)) {
+			for (var k in helpers[0].rowData) {
+				if (helpers[0].rowData.hasOwnProperty(k)) {
 					++count;
 				}
 			}