Index: stylesheet.css
===================================================================
--- stylesheet.css	(revision 3859)
+++ stylesheet.css	(working copy)
@@ -206,6 +206,7 @@
 body#ext-tsconfig-help-mod1-index-php,
 body#ext-lowlevel-dbint-index-php,
 body#ext-lowlevel-config-index-php,
+body#ext-indexed-search-mod-index-php,
 body#ext-cms-layout-db-new-content-el-php {
 	padding: 0;
 	margin: 0;
Index: templates/indexed_search.html
===================================================================
--- templates/indexed_search.html	(revision 0)
+++ templates/indexed_search.html	(revision 0)
@@ -0,0 +1,35 @@
+<!-- ###FULLDOC### begin -->
+<div class="typo3-fullDoc">
+	<!-- Page header with buttons, path details and csh -->
+	<div id="typo3-docheader">
+		<div id="typo3-docheader-row1">
+			<div class="buttonsleft">###BUTTONLIST_LEFT###</div>
+			<div class="buttonsright">###BUTTONLIST_RIGHT###</div>
+		</div>
+		<div id="typo3-docheader-row2">
+			<div class="docheader-row2-left"><div class="docheader-funcmenu">###FUNC_MENU###</div></div>
+			<div class="docheader-row2-right"></div>
+		</div>
+	</div>
+	<!-- Content of module, for instance listing, info or editing -->
+	<div id="typo3-docbody">
+		<div id="typo3-inner-docbody">
+			###CONTENT###
+		</div>
+	</div>
+</div>
+<!-- ###FULLDOC### end -->
+
+<!-- Grouping the icons on top -->
+
+<!-- ###BUTTON_GROUP_WRAP### -->
+	<div class="buttongroup">###BUTTONS###</div>
+<!-- ###BUTTON_GROUP_WRAP### -->
+
+<!-- ###BUTTON_GROUPS_LEFT### -->
+<!-- ###BUTTON_GROUP1### --><!-- ###BUTTON_GROUP1### -->
+<!-- ###BUTTON_GROUPS_LEFT### -->
+
+<!-- ###BUTTON_GROUPS_RIGHT### -->
+<!-- ###BUTTON_GROUP1### -->###SHORTCUT###<!-- ###BUTTON_GROUP1### -->
+<!-- ###BUTTON_GROUPS_RIGHT### -->
Index: sysext/indexed_search/mod/index.php
===================================================================
--- sysext/indexed_search/mod/index.php	(revision 3859)
+++ sysext/indexed_search/mod/index.php	(working copy)
@@ -106,9 +106,12 @@
 
 		$this->menuConfig();
 
-		$this->doc = t3lib_div::makeInstance("noDoc");
-		$this->doc->form='<form action="" method="POST">';
+		$this->doc = t3lib_div::makeInstance('template');
+		$this->doc->form = '<form action="" method="post">';
 		$this->doc->backPath = $BACK_PATH;
+		$this->doc->setModuleTemplate('templates/indexed_search.html');
+		$this->doc->docType = 'xhtml_trans';
+		
 				// JavaScript
 		$this->doc->JScode = '
 		<script language="javascript" type="text/javascript">
@@ -121,7 +124,7 @@
 		$this->doc->tableLayout = Array (
 			"defRow" => Array (
 				"0" => Array('<td valign="top" nowrap>','</td>'),
-				"defCol" => Array('<TD><img src="'.$this->doc->backPath.'clear.gif" width=10 height=1></td><td valign="top" nowrap>','</td>')
+				"defCol" => Array('<td><img src="'.$this->doc->backPath.'clear.gif" width=10 height=1></td><td valign="top" nowrap>','</td>')
 			)
 		);
 
@@ -163,13 +166,9 @@
 		global $BE_USER,$LANG,$BACK_PATH,$TCA_DESCR,$TCA,$CLIENT,$TYPO3_CONF_VARS;
 
 		$this->content="";
-		$this->content.=$this->doc->startPage("Indexing Engine Statistics");
 
-		$menu=t3lib_BEfunc::getFuncMenu(0,"SET[function]",$this->MOD_SETTINGS["function"],$this->MOD_MENU["function"]);
-
 		$this->content.=$this->doc->header("Indexing Engine Statistics");
 		$this->content.=$this->doc->spacer(5);
-		$this->content.=$this->doc->section('',$menu);
 
 		switch($this->MOD_SETTINGS["function"])	{
 			case "stat":
@@ -189,19 +188,46 @@
 				$this->content.=$this->doc->spacer(15);
 			break;
 		}
+		
+		$docHeaderButtons = $this->getButtons();
+		$markers = array(
+			'CSH' => $docHeaderButtons['csh'],
+			'FUNC_MENU' => t3lib_BEfunc::getFuncMenu(0, 'SET[function]', $this->MOD_SETTINGS['function'], $this->MOD_MENU['function']), 
+			'CONTENT' => $this->content
+		);	
+		
+		$this->content=$this->doc->startPage('Indexing Engine Statistics');
+		$this->content.= $this->doc->moduleBody($this->pageinfo, $docHeaderButtons, $markers);
+		$this->content.=$this->doc->endPage();
+		$this->content = $this->doc->insertStylesAndJS($this->content);
 	}
 
 	/**
-	 * [Describe function...]
+	 * Print content
 	 *
-	 * @return	[type]		...
+	 * @return void
 	 */
 	function printContent()	{
-		$this->content.=$this->doc->endPage();
 		echo $this->content;
 	}
 
+	/**
+	 * Create the panel of buttons for submitting the form or otherwise perform operations.
+	 *
+	 * @return array all available buttons as an assoc. array
+	 */
+	protected function getButtons() {
+		$buttons = array(
+			'csh' => '',
+			'shortcut' => ''
+		);
 
+		// Shortcut
+		if ($GLOBALS['BE_USER']->mayMakeShortcut()) {
+			$buttons['shortcut'] = $this->doc->makeShortcutIcon('','function',$this->MCONF['name']);
+		}
+		return $buttons;
+	}
 
 
 
@@ -563,4 +589,4 @@
 $SOBE->init();
 $SOBE->main();
 $SOBE->printContent();
-?>
\ No newline at end of file
+?>