diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/css/style.css b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/css/style.css
index a211afa2e80fa0093e589bf8d9eee3e928727a0d..6cb795d003f40c2ccae1816eb9c3284b3483ad19 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/css/style.css
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/css/style.css
@@ -18,17 +18,6 @@
  * General Overrides
  */
 
-.table {
-  table-layout:fixed;
-}
-
-.table td {
-/*   white-space: nowrap;
-   	overflow: hidden;
-	text-overflow: ellipsis; */
-  word-wrap: break-word;
-}
-
 .form-group {
     margin-bottom: 5px;
 }
@@ -378,100 +367,6 @@ body,
 	border : none;
 }
 
-/*
- * Inspector
- */
-.inspectorsContainer {
-	width:100%;
-	margin-top: 20px;
-	margin-left: 20px;
-}
-
-.inspectorsContainer div {
-	float:left;
-}
-
-.inspectorLabel {
-	white-space: nowrap;
-}
-.inspectorLineBreak {
-	word-wrap: break-word;
-	overflow: hidden;
-	overflow-x: auto;
-	width:300px;
-}
-
-div.inspectorWhiteFont {
-	color: white !important;	
-}
-
-div.inspector {
-	width: 500px;
-	text-decoration: none;
-	color: #000;
-	display: block;
-	overflow: hidden;
-	padding: 20px;
-	border-radius: 10px;
-}
-
-div.inspector > .table th,
-div.inspector > .table td {
-	border-top: none;
-	line-height: 12px;
-}
-
-.inspectorExtra {
-	margin-left: 0px !important;
-}
-
-.inspectorExtra svg {
-	margin-left: auto;
-	margin-right: auto;
-}
-
-.property {
-  font-size: 12px;
-  font-weight: normal;
-}
-
-.properties {
-  padding-top:10px;
-  width: 100%;	
-}
-
-.properties td:nth-child(odd) {
-  /* background-color:#DDDDDD; */
-  width:25%;
-}
-
-.properties td:nth-child(even) {
-  /* background-color:#fbfbfb; */
-  width:75%;
-}
-
-.inspectorToolbar {
-opacity: 0.5;
-}
-
-.inspectorToolbar:hover {
-opacity: 0.8;
-}
-
-.downloads {
-	color: black;
-	background-color:#DDDDDD;;
-}
-
-table.downloads {
-  font-family: "Trebuchet MS", sans-serif;
-	font-size: 14px;
-	table-layout: fixed;
-	border-collapse: collapse;
-	margin: 0px;
-	padding: 0px;
-}
-
 /* 
  * Inspector - Glow Effect
  */
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/grid/js/Grid.html b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/grid/js/Grid.html
index a35a29f9f691195d2c1bb838ec1d0c1771fefa46..615bccb7176347be1408a07862030b784d183af4 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/grid/js/Grid.html
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/grid/js/Grid.html
@@ -85,7 +85,6 @@
 						<li data-value="10"><a href="#">10</a></li>
 						<li data-value="20"><a href="#">20</a></li>
 						<li data-value="50"><a href="#">50</a></li>
-						<li data-value="100"><a href="#">100</a></li>
 					</ul>
 					<input class="hidden hidden-field" name="itemsPerPage" readonly="readonly" aria-hidden="true" type="text" />
 				</div>
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/grid/js/Grid.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/grid/js/Grid.js
index a45a3099c7678c32261516176169f42fbdb77d39..6a4f71479b6855bc01fa7b786ba93e361124a32c 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/grid/js/Grid.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/grid/js/Grid.js
@@ -418,16 +418,28 @@ $.extend(Grid.prototype, {
 		var columns = [];
 
 		var columnsModel = {};
+		var maxColumns = 15;
+		var enabledColumns = 0;
 		
 		_this.getAllColumns().forEach(function(column) {
 			var checkBoxForColumn = _this.panel.find(".columnDropdown").find("[value='" + column.property + "']");
 			var isChecked = (checkBoxForColumn.length === 1 && checkBoxForColumn[0] && checkBoxForColumn[0].checked)?true:false;
 			if(column.showByDefault || isChecked) {
-				columns.push(column);
-				columnsModel[column.property] = true;
+				if(enabledColumns > maxColumns) {
+					// Ignore
+				} else {
+					columns.push(column);
+					columnsModel[column.property] = true;
+					enabledColumns++;
+				}
 			}
+			
 		});
 
+		if(enabledColumns > maxColumns) {
+			Util.showError("Only the first " + maxColumns + " selected columns will be shown.", function(){}, true);
+		}
+		
 		if(this.onChangeState) {
 			if(this.tableSettings.columns) {
 				for(key in columnsModel) {