Index: typo3/sysext/t3skin/stylesheets/visual/module_web_page.css
===================================================================
--- typo3/sysext/t3skin/stylesheets/visual/module_web_page.css	(revision 8452)
+++ typo3/sysext/t3skin/stylesheets/visual/module_web_page.css	(revision )
@@ -82,3 +82,43 @@
 table.typo3-page-buttons td {
 	padding-right: 10px;
 }
+
+td.t3-gridCell-restricted  {
+    background-color: #e8e0e0;
+}
+
+td.t3-gridCell-unassigned  {
+    background-color: #e5e5e5;
+}
+
+td.t3-gridCell-restricted div.t3-row-header, td.t3-gridCell-unassigned div.t3-row-header {
+    -moz-opacity: 0.4;
+    opacity: .40;
+    filter: alpha(opacity=40);
+}
+
+td.t3-gridCell-restricted div.t3-row-header div, td.t3-gridCell-unassigned div.t3-row-header div {
+    -moz-opacity: 0.6;
+    opacity: .60;
+    filter: alpha(opacity=60);
+}
+
+td.t3-gridCell-restricted  {
+    background-color: #e8e0e0;
+}
+
+td.t3-gridCell-unassigned  {
+    background-color: #e5e5e5;
+}
+
+td.t3-gridCell-restricted div.t3-row-header, td.t3-gridCell-unassigned div.t3-row-header {
+    -moz-opacity: 0.4;
+    opacity: .40;
+    filter: alpha(opacity=40);
+}
+
+td.t3-gridCell-restricted div.t3-row-header div, td.t3-gridCell-unassigned div.t3-row-header div {
+    -moz-opacity: 0.6;
+    opacity: .60;
+    filter: alpha(opacity=60);
+}
\ No newline at end of file
Index: typo3/sysext/cms/layout/class.tx_cms_layout.php
===================================================================
--- typo3/sysext/cms/layout/class.tx_cms_layout.php	(revision 9758)
+++ typo3/sysext/cms/layout/class.tx_cms_layout.php	(revision )
@@ -537,14 +537,14 @@
 				// For EACH column, fit the rendered content into a table cell:
 				$out = '';
 
-				if ($this->tt_contentConfig['showAsGrid']) {
-					$backendLayoutUid = $this->getSelectedBackendLayoutUid($id);
-					$backendLayoutRecord = t3lib_BEfunc::getRecord('be_layouts', intval($backendLayoutUid));
-					if (empty($backendLayoutRecord['config'])) {
+				$backendLayoutUid = $this->getSelectedBackendLayoutUid($id);
+				$backendLayoutRecord = t3lib_BEfunc::getRecord('be_layouts', intval($backendLayoutUid));
+				if (empty($backendLayoutRecord['config'])) {
-						// TODO: show a message that no layout was found
-						$this->tt_contentConfig['showAsGrid'] = 0;
+                    $this->tt_contentConfig['showAsGrid'] = 0;
+				} else {
+                    $this->tt_contentConfig['showAsGrid'] = 1;
+
-					}
+                }
-				}
 
 				if (!$this->tt_contentConfig['showAsGrid']) {
 					foreach ($cList as $k => $key) {
@@ -620,17 +620,20 @@
 									(isset($columnConfig['colspan']) ? ' colspan="' . $columnConfig['colspan'] . '"' : '') .
 									(isset($columnConfig['rowspan']) ? ' rowspan="' . $columnConfig['rowspan'] . '"' : '') .
 									' class="t3-gridCell t3-page-column t3-page-column-' . $columnKey .
-									(!isset($columnConfig['colPos']) ? ' t3-gridCell-disabled' : '') .
+                                     (!isset($columnConfig['colPos']) ? ' t3-gridCell-unassigned' : '') .
+                                     ((isset($columnConfig['colPos']) && ! $head[$columnKey]) ? ' t3-gridCell-restricted' : '') .
 									(isset($columnConfig['colspan']) ? ' t3-gridCell-width' . $columnConfig['colspan'] : '') .
 									(isset($columnConfig['rowspan']) ? ' t3-gridCell-height' . $columnConfig['rowspan'] : '') . '">';
 
 							// Draw the pre-generated header with edit and new buttons if a colPos is assigned.
 							// If not, a new header without any buttons will be generated.
-							if (isset($columnConfig['colPos'])) {
+							if (isset($columnConfig['colPos']) && $head[$columnKey]) {
 								$grid .= $head[$columnKey] . $content[$columnKey];
+							} else if ($head[$columnKey]) {
+								$grid .= $this->tt_content_drawColHeader($GLOBALS['LANG']->getLL('notAssigned'), '', '');
 							} else {
-								$grid .= $this->tt_content_drawColHeader($columnConfig['name'], '', '');
+								$grid .= $this->tt_content_drawColHeader($GLOBALS['LANG']->getLL('noAccess'), '', '');
-						}
+							}
 
 							$grid .= '</td>';
 						}
Index: typo3/sysext/cms/layout/locallang.xml
===================================================================
--- typo3/sysext/cms/layout/locallang.xml	(revision 9429)
+++ typo3/sysext/cms/layout/locallang.xml	(revision )
@@ -44,8 +44,9 @@
 			<label index="CEonThisPage">Content elements on this page:</label>
 			<label index="newPage">Create new page</label>
 			<label index="newPage2">New page</label>
-			<label index="noAccess">No edit access</label>
+            <label index="noAccess">No edit access</label>
 			<label index="noAccess_msg">You do not have access to edit the requested record.</label>
+            <label index="notAssigned">Not assigned</label>
 			<label index="undoLastChange">Undo/Redo last change (%s ago)</label>
 			<label index="recordHistory">View record change history</label>
 			<label index="viewContent">Viewing content of</label>
@@ -87,4 +88,4 @@
 			<label index="goToListModuleMessage">The current page is of the type "Sysfolder". Sysfolders usually don't contain content elements but are used for collecting other types of records in a single folder.</label>
 		</languageKey>
 	</data>
-</T3locallang>
\ No newline at end of file
+</T3locallang>
Index: typo3/sysext/t3skin/stylesheets/structure/module_web_page.css
===================================================================
--- typo3/sysext/t3skin/stylesheets/structure/module_web_page.css	(revision 7937)
+++ typo3/sysext/t3skin/stylesheets/structure/module_web_page.css	(revision )
@@ -85,3 +85,11 @@
 table.typo3-page-stdlist tr td div.typo3-DBctrl {
 	padding: 2px;
 }
+
+td.t3-gridCell div.t3-page-ce {
+    padding: 1px 5px 5px 5px;
+}
+
+td.t3-gridCell div.t3-page-ce {
+    padding: 1px 5px 5px 5px;
+}
\ No newline at end of file
Index: typo3/sysext/cms/layout/db_layout.php
===================================================================
--- typo3/sysext/cms/layout/db_layout.php	(revision 9821)
+++ typo3/sysext/cms/layout/db_layout.php	(revision )
@@ -323,7 +323,6 @@
 				1 => $LANG->getLL('m_function_1'),
 				2 => $LANG->getLL('m_function_2'),
 				3 => $LANG->getLL('pageInformation'),
-				4 => $LANG->getLL('gridView')
 			),
 			'language' => array(
 				0 => $LANG->getLL('m_default')