Index: mod1/index.php
===================================================================
--- mod1/index.php	(revision 28000)
+++ mod1/index.php	(working copy)
@@ -846,9 +846,9 @@
 
 			// Finally assemble the table:
 		$finalContent = '
-			<table cellpadding="0" cellspacing="0" style="width: 100%; border: 1px solid black; margin-bottom:5px;" class="' . $elementClass . '">
+			<table cellpadding="0" cellspacing="0" class="' . $elementClass . '">
 				<tr class="sortable_handle ' . $elementTitlebarClass .'">
-					<td style="vertical-align:top;">' .
+					<td class="tpm-element-title">' .
 						'<span class="nobr">' .
 						$languageIcon .
 						$titleBarLeftButtons .
@@ -856,7 +856,7 @@
 						'</span>' .
 						$warnings .
 					'</td>
-					<td nowrap="nowrap" style="text-align:right; vertical-align:top;">' .
+					<td nowrap="nowrap" class="tpm-element-control">' .
 						$titleBarRightButtons .
 					'</td>
 				</tr>
@@ -1041,7 +1041,7 @@
 				if ($flagRenderBeLayout==TRUE) {
 					$beTemplateCell = '<table width="100%" class="beTemplateCell">
 					<tr>
-						<td class="bgColor4 tpm-title-cell">' . $LANG->sL($fieldContent['meta']['title'], 1) . '</td>
+						<td class="bgColor6 tpm-title-cell">' . $LANG->sL($fieldContent['meta']['title'], 1) . '</td>
 					</tr>
 					<tr>
 						<td ' . $cellIdStr . ' class="tpm-content-cell">' . $cellContent . '</td>
@@ -1051,7 +1051,7 @@
 				} else {
 							// Add cell content to registers:
 					$width = round(100 / count($elementContentTreeArr['sub'][$sheet][$lKey]));
-					$headerCells[]='<td width="' . $width . '%" class="bgColor4 tpm-title-cell">' .
+					$headerCells[]='<td width="' . $width . '%" class="bgColor6 tpm-title-cell">' .
 						$LANG->sL($fieldContent['meta']['title'], 1) . '</td>';
 					$cells[]='<td '.$cellIdStr.' width="' . $width . '%" class="tpm-content-cell">' .
 						$cellContent.'</td>';
@@ -1818,7 +1818,7 @@
 						return '<a class="tpm-pageedit" href="index.php?'.$this->link_getParameters().'&amp;editPageLanguageOverlay='.$this->currentLanguageUid.'">'.$label.'</a>';
 					} else {
 						$onClick = t3lib_BEfunc::editOnClick('&edit['.$table.']['.$uid.']=edit', $this->doc->backPath);
-						return '<a class="tpm-edit" style="text-decoration: none;" href="#" onclick="'.htmlspecialchars($onClick).'">'.$label.'</a>';
+						return '<a class="tpm-edit" href="#" onclick="'.htmlspecialchars($onClick).'">'.$label.'</a>';
 					}
 				} else {
 					return $label;
Index: mod1/pagemodule.css
===================================================================
--- mod1/pagemodule.css	(revision 27997)
+++ mod1/pagemodule.css	(working copy)
@@ -31,8 +31,10 @@
 	padding: 5px;
 	border: 1px dashed #000;
 }
-.beTemplateCell .tpm-content-cell {
-	border: none;
+.tpm-container-element {
+	width: 100%; 
+	border: 1px solid black; 
+	margin-bottom:5px;
 }
 .tpm-container-element tr.tpm-titlebar-page {
 	background-color: #B8BEC9;
@@ -55,6 +57,14 @@
 	padding-right: 3px;
 }
 
+.tpm-element-control {
+	text-align: right; 
+	vertical-align:top;
+}
+.tpm-element-title {
+	vertical-align:top;
+}
+
 /* non-used elements */
 .tpm-nonused-element {