diff --git a/templates/Sparkle/admin/configfiles/wizard.tpl b/templates/Sparkle/admin/configfiles/wizard.tpl
index c0746287..280c9958 100644
--- a/templates/Sparkle/admin/configfiles/wizard.tpl
+++ b/templates/Sparkle/admin/configfiles/wizard.tpl
@@ -10,29 +10,31 @@ $header
 
 		<section class="tinyform bradius">
 			<form action="$filename" method="get" enctype="application/x-www-form-urlencoded">
-			<fieldset>
+				<fieldset>
 					<legend>Froxlor&nbsp;-&nbsp;Wizard</legend>
-						<input type="hidden" name="s" value="$s" />
-						<input type="hidden" name="page" value="$page" />
+					<input type="hidden" name="s" value="$s" />
+					<input type="hidden" name="page" value="$page" />
 
-						<table class="formtable">
-							<tr>
-								<td><b>{$lng['admin']['configfiles']['distribution']}:</b></td>
-								<td><if $distribution != ''><input type="hidden" name="distribution" value="$distribution"/><a href="{$linker->getLink(array('section' => 'configfiles', 'page' => $page))}">{$configfiles[$distribution]['label']}</a><else><select id="config_distribution" name="distribution"><option value="choose">{$lng['admin']['configfiles']['choosedistribution']}</option>{$distributions_select}</select></if></td>
-							</tr>
-							<tr>
-								<td><b>{$lng['admin']['configfiles']['service']}:</b></td>
-								<td><if $service != ''><input type="hidden" name="service" value="$service"/><a href="{$linker->getLink(array('section' => 'configfiles', 'page' => $page, 'distribution' => $distribution))}">{$configfiles[$distribution]['services'][$service]['label']}</a><else><select id="config_service" name="service"><option value="choose">{$lng['admin']['configfiles']['chooseservice']}</option>{$services_select}</select></if></td>
-							</tr>
-							<tr>
-								<td><b>{$lng['admin']['configfiles']['daemon']}:</b></td>
-								<td><select id="config_daemon" name="daemon"><option value="choose">{$lng['admin']['configfiles']['choosedaemon']}</option>{$daemons_select}</select></td>
-							</tr>
+					<table class="formtable">
+						<tr>
+							<td><b>{$lng['admin']['configfiles']['distribution']}:</b></td>
+							<td><if $distribution != ''><input type="hidden" name="distribution" value="$distribution"/><a href="{$linker->getLink(array('section' => 'configfiles', 'page' => $page))}">{$configfiles[$distribution]['label']}</a><else><select id="config_distribution" name="distribution"><option value="choose">{$lng['admin']['configfiles']['choosedistribution']}</option>{$distributions_select}</select></if></td>
+						</tr>
+						<tr>
+							<td><b>{$lng['admin']['configfiles']['service']}:</b></td>
+							<td><if $service != ''><input type="hidden" name="service" value="$service"/><a href="{$linker->getLink(array('section' => 'configfiles', 'page' => $page, 'distribution' => $distribution))}">{$configfiles[$distribution]['services'][$service]['label']}</a><else><select id="config_service" name="service"><option value="choose">{$lng['admin']['configfiles']['chooseservice']}</option>{$services_select}</select></if></td>
+						</tr>
+						<tr>
+							<td><b>{$lng['admin']['configfiles']['daemon']}:</b></td>
+							<td><select id="config_daemon" name="daemon"><option value="choose">{$lng['admin']['configfiles']['choosedaemon']}</option>{$daemons_select}</select></td>
+						</tr>
+						<tfoot>
 							<tr>
 								<td colspan="2" align="center"><input class="bottom" type="submit" value="{$lng['panel']['next']}" /></td>
 							</tr>
-						</table>
-			</fieldset>
+						</tfoot>
+					</table>
+				</fieldset>	
 			</form>
 		</section>
 	</article>
diff --git a/templates/Sparkle/admin/customers/customers_customer.tpl b/templates/Sparkle/admin/customers/customers_customer.tpl
index aee1176b..96326a53 100644
--- a/templates/Sparkle/admin/customers/customers_customer.tpl
+++ b/templates/Sparkle/admin/customers/customers_customer.tpl
@@ -2,13 +2,13 @@
 	<td>
 		<if $row['company'] != '' && $row['name'] != ''>
 			{$row['company']}<br />
-			<small>{$row['name']}&nbsp;{$row['firstname']}</small>
+			<small>{$row['name']}, {$row['firstname']}</small>
 		</if>
 		<if $row['company'] != '' && $row['name'] == ''>
 			{$row['company']}
 		</if>
 		<if $row['company'] == ''>
-			{$row['name']}&nbsp;{$row['firstname']}
+			{$row['name']}, {$row['firstname']}
 		</if>
 	</td>
 	<td>
@@ -36,7 +36,7 @@
 					</if>
 				<else>
 					<div class="progress">
-							<div class="bar" style="width: 0px"></div>
+							<div class="bar" style="width: 50%"></div>
 					</div>
 				</if>
 			</span>
@@ -54,7 +54,7 @@
 					</if>
 				<else>
 					<div class="progress">
-						<div class="bar" style="width: 0%"></div>
+						<div class="bar" style="width: 50%"></div>
 					</div>
 				</if>
 			</span>
diff --git a/templates/Sparkle/admin/message/message.tpl b/templates/Sparkle/admin/message/message.tpl
index b31593f9..65a1e6be 100644
--- a/templates/Sparkle/admin/message/message.tpl
+++ b/templates/Sparkle/admin/message/message.tpl
@@ -17,27 +17,34 @@ $header
 			</if>
 
 			<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
+				<input type="hidden" name="s" value="$s"/>
+				<input type="hidden" name="page" value="$page"/>
+				<input type="hidden" name="action" value="$action"/>
+				<input type="hidden" name="send" value="send"/>
+				
 				<fieldset>
 				<legend>Froxlor&nbsp;-&nbsp;{$lng['admin']['message']}</legend>
-				<p>
-					<label for="receipient">{$lng['admin']['receipient']}</label>&nbsp;
-					<select name="receipient" id="receipient">$receipients</select>
-				</p>
-				<p>
-					<label for="subject">{$lng['admin']['subject']}</label>&nbsp;
-					<input type="text" name="subject" id="subject" value="{$lng['admin']['nosubject']}"/>
-				</p>
-				<p>
-					<label for="message">{$lng['admin']['text']}</label>&nbsp;
-					<textarea rows="12" name="message" id="message"></textarea>
-				</p>
-				<p class="submit">
-					<input type="hidden" name="s" value="$s"/>
-					<input type="hidden" name="page" value="$page"/>
-					<input type="hidden" name="action" value="$action"/>
-					<input type="hidden" name="send" value="send"/>
-					<input type="submit" value="{$lng['panel']['send']}" />
-				</p>
+				<table class="formtable">
+					<tr>
+						<td><label for="receipient">{$lng['admin']['receipient']}</label></td>
+						<td><select name="receipient" id="receipient">$receipients</select></td>
+					</tr>
+					<tr>
+						<td><label for="subject">{$lng['admin']['subject']}</label></td>
+						<td><input type="text" name="subject" id="subject" value="{$lng['admin']['nosubject']}"/></td>
+					</tr>
+					<tr>
+						<td><label for="message">{$lng['admin']['text']}</label></td>
+						<td><textarea rows="12" name="message" id="message"></textarea></td>
+					</tr>
+					<tfoot>
+						<tr>
+							<td align="right" colspan="2">
+								<input type="submit" value="{$lng['panel']['send']}" />
+							</td>
+						</tr>
+					</tfoot>
+				</table>
 				</fieldset>
 			</form>
 
diff --git a/templates/Sparkle/admin/tickets/archive.tpl b/templates/Sparkle/admin/tickets/archive.tpl
index 8b8d746b..68605dfd 100644
--- a/templates/Sparkle/admin/tickets/archive.tpl
+++ b/templates/Sparkle/admin/tickets/archive.tpl
@@ -31,12 +31,6 @@ $header
 	<br />
 	<br />
 	<article>
-		<header>
-			<h3>
-				{$lng['ticket']['search']}
-			</h3>
-		</header>
-
 		<section class="fullform bradius">
 
 			<form action="{$linker->getLink(array('section' => 'tickets'))}" method="post" enctype="application/x-www-form-urlencoded">
@@ -46,6 +40,11 @@ $header
 			<input type="hidden" name="send" value="send" />
 	
 			<table class="formtable">
+			<thead>
+				<tr>
+					<th colspan="2">{$lng['ticket']['search']}</th>
+				</tr>
+			</thead>
 			<tr>
 				<td>{$lng['ticket']['subject']}:</td>
 				<td ><input type="text" name="subject" /></td>
@@ -60,10 +59,10 @@ $header
  			</tr>
  			<tr>
 				<td>{$lng['ticket']['lastchange']}:</td>
-				<td><label for="fromdate">{$lng['ticket']['lastchange_from']}</label>
-					<input type="text" id="fromdate" name="fromdate" /><br /><br />
-					<label for="todate">{$lng['ticket']['lastchange_to']}</label>
-					<input type="text" id="todate" name="todate" /></td>
+				<td>
+					<label for="fromdate">{$lng['ticket']['lastchange_from']}<br /><input type="text" id="fromdate" name="fromdate" /></label>
+					<label for="todate">{$lng['ticket']['lastchange_to']}<br /><input type="text" id="todate" name="todate" /></label>
+				</td>
  			</tr>
 			<tr>
 				<td>{$lng['ticket']['message']}:</td>
@@ -73,9 +72,11 @@ $header
 				<td>{$lng['ticket']['customer']}:</td>
 				<td><select name="customer">$customers</select></td>
  			</tr>
-			<tr>
-				<td class="main_field_confirm" colspan="2"><input type="hidden" name="send" value="send" /><input type="submit" class="bottom" value="{$lng['panel']['search']}" /></td>
-			</tr>
+ 			<tfoot>
+				<tr>
+					<td class="main_field_confirm" colspan="2" align="right"><input type="hidden" name="send" value="send" /><input type="submit" class="bottom" value="{$lng['panel']['search']}" /></td>
+				</tr>
+ 			</tfoot>
 			</table>
 
 			</form>
diff --git a/templates/Sparkle/assets/css/main.css b/templates/Sparkle/assets/css/main.css
index 97827f2d..64909218 100644
--- a/templates/Sparkle/assets/css/main.css
+++ b/templates/Sparkle/assets/css/main.css
@@ -222,6 +222,9 @@ footer img {
 	padding:10px 0;
 	text-align:center;
 }
+.tinyform {
+	padding: 0;
+}
 
 .fullform {
 	width:100%;
@@ -235,6 +238,9 @@ footer img {
 	padding:10px 0;
 	text-align:left;
 }
+.midform {
+	padding: 0;
+}
 
 .tinyform,.loginsec form {
 	width:400px;
@@ -616,6 +622,7 @@ table tfoot td {
 	height:25px;
 	border-top: 1px solid #d1d5d8;
 	background-color: #f2f8fa;
+	padding-right: 0px;
 }
 
 .tfootleft {
diff --git a/templates/Sparkle/misc/form/table_row.tpl b/templates/Sparkle/misc/form/table_row.tpl
index 9115adf2..04a4a586 100644
--- a/templates/Sparkle/misc/form/table_row.tpl
+++ b/templates/Sparkle/misc/form/table_row.tpl
@@ -1,5 +1,5 @@
 <tr>
-	<td{$style} class="formlabeltd">
+	<td{$style} class="formlabeltd" style="width:50%">
 		<label for="{$fieldname}">{$label}{$mandatory}:
 		<if $desc != ''>
 			<br /><span style="font-size:85%;">{$desc}</span>