diff --git a/etemplate/templates/default/editor.xet b/etemplate/templates/default/editor.xet
index ba02d7a326..33d58a420a 100644
--- a/etemplate/templates/default/editor.xet
+++ b/etemplate/templates/default/editor.xet
@@ -17,7 +17,7 @@
 			</row>
 		</rows>
 	</grid>
-	<grid id="etemplate.editor.edit-buttons" template="" lang="" group="0" version="0.9.15.002">
+	<grid id="etemplate.editor.options" template="" lang="" group="0" version="0.9.15.001">
 		<columns>
 			<column/>
 			<column/>
@@ -26,20 +26,18 @@
 			<column/>
 			<column/>
 			<column/>
-			<column/>
-			<column/>
 		</columns>
 		<rows>
 			<row>
-				<button label="Read" id="read" statustext="read eTemplate from database (for the keys above)"/>
-				<button label="Show (no save)" id="show" statustext="shows/displays eTemplate for testing, does NOT save it before"/>
-				<button label="Save" id="save" statustext="save the eTemplate under the above keys (name, ...), change them for a SaveAs"/>
-				<button label="Delete" id="delete" statustext="deletes the eTemplate spez. above"/>
-				<button label="Dump4Setup" id="dump" statustext="writes a 'etemplates.inc.php' file (for application in Name) in the setup-dir of the app"/>
-				<button label="Write Langfile" id="langfile" statustext="creates an english ('en') langfile from label and helptexts (for application in Name)"/>
-				<button label="Export XML" id="export_xml" statustext="export the loaded eTemplate into a xml-file"/>
-				<button label="Import XML" id="import_xml" statustext="import an eTemplate from a xml-file"/>
-				<file id="file" statustext="xml-file to import"/>
+				<textbox size="8" label="Width" id="width" statustext="Width of the table in % or pixels for the table-tag and (optional) div"/>
+				<textbox size="8" label="Height" id="height" statustext="Height of the table in % or pixels for the table-tag and (optional) div"/>
+				<menulist>
+					<menupopup label="Overflow" no_lang="1" id="overflow" statustext="what happens with overflowing content: visible (default), hidden, scroll, auto (browser decides)"/>
+				</menulist>
+				<int label="Border" id="border" statustext="Border-line-thickness for the table-tag"/>
+				<textbox size="12" label="Class" id="class" statustext="CSS class for the table-tag"/>
+				<int label="Spacing" id="spacing" statustext="Cellspacing for the table-tag"/>
+				<int label="Padding" id="padding" statustext="Cellpadding for the table-tag"/>
 			</row>
 		</rows>
 	</grid>
@@ -135,7 +133,7 @@
 			</row>
 		</rows>
 	</grid>
-	<grid id="etemplate.editor.edit" template="" lang="" group="0" version="0.9.15.002" border="1" class="editorEdit">
+	<grid id="etemplate.editor.edit" template="" lang="" group="0" version="0.9.15.003" border="1" class="editorEdit">
 		<columns>
 			<column/>
 			<column/>
@@ -145,7 +143,7 @@
 				<image align="center" src="navbar.gif"/>
 				<grid content="Col$col," id="etemplate.editor.col_header"/>
 			</row>
-			<row>
+			<row valign="top">
 				<grid content="Row$row," class="th" id="etemplate.editor.row_header"/>
 				<grid content="$col$row" id="etemplate.editor.cell"/>
 			</row>
@@ -154,7 +152,7 @@
 			.editorEdit { border-color: black }
 		</styles>
 	</grid>
-	<grid id="etemplate.editor" template="" lang="" group="" version="0.9.15.002" width="100%">
+	<grid id="etemplate.editor" template="" lang="" group="" version="0.9.15.004" width="100%" height="100%">
 		<columns>
 			<column/>
 			<column/>
@@ -171,10 +169,20 @@
 				<grid span="all" id="etemplate.editor.keys"/>
 			</row>
 			<row>
-				<grid span="all" id="etemplate.editor.edit-buttons"/>
+				<hbox span="all">
+					<button label="Read" id="read" statustext="read eTemplate from database (for the keys above)"/>
+					<button label="Show (no save)" id="show" statustext="shows/displays eTemplate for testing, does NOT save it before"/>
+					<button label="Save" id="save" statustext="save the eTemplate under the above keys (name, ...), change them for a SaveAs"/>
+					<button label="Delete" id="delete" statustext="deletes the eTemplate spez. above"/>
+					<button label="Dump4Setup" id="dump" statustext="writes a 'etemplates.inc.php' file (for application in Name) in the setup-dir of the app"/>
+					<button label="Write Langfile" id="langfile" statustext="creates an english ('en') langfile from label and helptexts (for application in Name)"/>
+					<button label="Export XML" id="export_xml" statustext="export the loaded eTemplate into a xml-file"/>
+					<button label="Import XML" id="import_xml" statustext="import an eTemplate from a xml-file"/>
+					<file id="file" statustext="xml-file to import"/>
+				</hbox>
 			</row>
 			<row>
-				<textbox span="all" label="Width, Height, Border, class, Spacing, Padding" id="size" statustext="width, height, border-line-thickness, CSS-class name, Celspaceing, Cellpadding (for TABLE tag)"/>
+				<grid content="options" span="all" id="etemplate.editor.options"/>
 			</row>
 			<row>
 				<grid span="all" id="etemplate.editor.edit"/>
diff --git a/infolog/templates/default/edit.xet b/infolog/templates/default/edit.xet
index a0ed4ccaa0..44cd656e72 100644
--- a/infolog/templates/default/edit.xet
+++ b/infolog/templates/default/edit.xet
@@ -71,7 +71,7 @@
 			</row>
 		</rows>
 	</grid>
-	<grid id="infolog.edit" template="" lang="" group="" version="0.9.15.001" width="100%">
+	<grid id="infolog.edit" template="" lang="" group="" version="0.9.15.002" width="100%">
 		<columns>
 			<column width="103"/>
 			<column width="300"/>
@@ -131,7 +131,10 @@
 			</row>
 			<row class="row">
 				<description value="Startdate"/>
-				<date id="info_startdate" statustext="when should the ToDo or Phonecall be started, it shows up from that date in the filter open or own open (startpage)"/>
+				<hbox options="0,0">
+					<date id="info_startdate" statustext="when should the ToDo or Phonecall be started, it shows up from that date in the filter open or own open (startpage)"/>
+					<checkbox label="%s Today" id="set_today" statustext="check to set startday"/>
+				</hbox>
 				<description value="Enddate"/>
 				<date id="info_enddate" statustext="til when should the ToDo or Phonecall be finished"/>
 			</row>
diff --git a/infolog/templates/default/index.xet b/infolog/templates/default/index.xet
index 7a1cc15b31..322791e2fe 100644
--- a/infolog/templates/default/index.xet
+++ b/infolog/templates/default/index.xet
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!-- $Id$ -->
 <overlay>
-	<grid id="infolog.index.rows" template="" lang="" group="0" version="0.9.15.002">
+	<grid id="infolog.index.rows" template="" lang="" group="0" version="0.9.15.003">
 		<columns>
 			<column width="2%"/>
 			<column width="4%"/>
@@ -27,15 +27,16 @@
 				<image label="$row_cont[info_type]" align="center" src="${row}[info_type]"/>
 				<image label="$row_cont[info_status]" align="center" src="${row}[info_status]"/>
 				<vbox options="0,0">
-					<html no_lang="1" id="${row}[subject]"/>
+					<description options="b,@${row}[info_link_view]" value="%s $row_cont[info_addr]" no_lang="1" id="${row}[info_from]" statustext="view this linked entry in its application"/>
+					<description class="$row_cont[sub_class]" no_lang="1" id="${row}[info_subject]"/>
 					<description no_lang="1" id="${row}[info_des]"/>
 					<html id="${row}[filelinks]"/>
 				</vbox>
 				<vbox options="0,0">
 					<date id="${row}[info_startdate]" readonly="true"/>
-					<html id="${row}[enddate]" readonly="true"/>
+					<date class="$row_cont[end_class]" id="${row}[info_enddate]" readonly="true"/>
 				</vbox>
-				<vbox options="0,0" class="$row_cont[info_access]">
+				<vbox options="0,0">
 					<menulist>
 						<menupopup type="select-account" options=",,0" id="${row}[info_owner]" readonly="true"/>
 					</menulist>
@@ -43,7 +44,12 @@
 						<menupopup type="select-account" options=",,0" id="${row}[info_responsible]" readonly="true"/>
 					</menulist>
 				</vbox>
-				<date id="${row}[info_datemodified]" readonly="true"/>
+				<vbox options="0,0">
+					<date id="${row}[info_datemodified]" readonly="true"/>
+					<menulist>
+						<menupopup type="select-account" options=",,0" id="${row}[info_modifier]" readonly="true"/>
+					</menulist>
+				</vbox>
 				<vbox options="0,0" align="center">
 					<button image="new.gif" label="Add sub" align="center" id="sp[$row_cont[info_id]]" statustext="Add a new sub-task, -note, -call to this entry"/>
 					<button image="view.gif" label="View subs" align="center" id="view[$row_cont[info_id]]" statustext="View all subs of this entry"/>
@@ -57,20 +63,18 @@
 			</row>
 		</rows>
 		<styles>
-			.low,.pri_low_done { color:#606060; }
-.normal,.pri_normal_done { color:black }
-.high { color:#cc0000; } .high_done { color:#800000; }
-.urgent { color:#ff00ff; } .urgent_done { color:#800080; }
+			.low,.low_done,.normal,.normal_done,.high,.high_done,.urgent,.urgent_done { font-weight: bold; }
+.low,.low_done { color:#606060; }
+.normal,.normal_done { color:black }
+.high { color:#cc0000; } 
+.high_done { color:#800000; }
+.urgent { color:#ff00ff; } 
+.urgent_done { color:#800080; }
 .overdue { color:#cc0000; font-weight:bold; }
 .private { font-style:italic; }
-.note { color:#808080; font-style:italic; }
 
 		</styles>
 	</grid>
-	<grid id="infolog.index.rows,1" template="" lang="" group="0" version="">
-		<columns/>
-		<rows/>
-	</grid>
 	<grid id="infolog.index" template="" lang="" group="" version="0.9.15.003" width="100%" border="0" spacing="0" padding="0">
 		<columns>
 			<column width="95%"/>
@@ -94,7 +98,7 @@
 				<grid content="main" span="all" id="infolog.index.rows"/>
 			</row>
 			<row>
-				<nextmatch options="infolog.index.rows,1" span="all" id="nm"/>
+				<nextmatch options="infolog.index.rows" span="all" id="nm"/>
 			</row>
 			<row>
 				<hbox span="all">