diff --git a/modules/webadmin/skins/default/Channel.tmpl b/modules/webadmin/skins/default/Channel.tmpl
index 2ccda26e..1b4bbad5 100644
--- a/modules/webadmin/skins/default/Channel.tmpl
+++ b/modules/webadmin/skins/default/Channel.tmpl
@@ -4,50 +4,53 @@
 	<div class="section">
 		<input type="hidden" name="submitted" value="1" />
 		<input type="hidden" name="user" value="<? VAR User ESC=HTML ?>" />
+		<? IF Edit ?><input type="hidden" name="name" value="<? VAR ChanName ESC=HTML ?>" /><? ENDIF ?>
 
-		<div class="sectiontitle">Channel Info</div>
+		<h3>Channel Info</h3>
 		<div class="sectionbg">
 			<div class="sectionbody">
-				<div class="subsection">
+				<? IF !Edit ?>
+				<div class="subsection half">
 					<div class="inputlabel">Channel Name:</div>
-				<? IF Edit ?>
-					<input type="hidden" name="name" value="<? VAR ChanName ESC=HTML ?>" />
-					<? VAR ChanName ESC=HTML ?>
-				<? ELSE ?>
-					<div><input type="text" name="name" value="" size="32" /></div>
-				<? ENDIF ?>
+					<div><input type="text" name="name" value="" /></div>
+					<br /><span class="info">If the channel has a key and you want to save the key, type: #CHAN KEY</span>
 				</div>
+				<? ENDIF ?>
 
 				<div class="subsection">
 					<div class="inputlabel">Buffer Count:</div>
-					<div><input type="text" name="buffercount" value="<? VAR BufferCount ESC=HTML ?>" size="8" /></div>
+					<div><input type="text" name="buffercount" value="<? VAR BufferCount ESC=HTML ?>" size="10" /></div>
 				</div>
 
 				<div class="subsection">
 					<div class="inputlabel">Default Modes:</div>
-					<div><input type="text" name="defmodes" value="<? VAR DefModes ESC=HTML ?>" size="16" /></div>
+					<div><input type="text" name="defmodes" value="<? VAR DefModes ESC=HTML ?>" size="10" /></div>
 				</div>
 
-				<div style="clear: both;"></div>
-
-				<div class="subsection">
-					<div class="inputlabel">Save:</div>
-					<div><input type="checkbox" name="save" id="save" value="true"<? IF InConfig ?> checked="checked"<? ENDIF ?> /><label for="save"> Save to config</label></div>
-				</div>
-
-				<div class="subsection">
-					<div class="inputlabel">Options:</div>
-					<? LOOP OptionLoop ?>
-					<input type="checkbox" name="<? VAR Name ESC=HTML ?>" id="opt_<? VAR Name ESC=HTML ?>" value="true"<? IF Checked ?> checked="checked"<? ENDIF ?><? IF Disabled ?> disabled="disabled"<? ENDIF ?> /><label for="opt_<? VAR Name ESC=HTML ?>"> <? VAR DisplayName ESC=HTML ?></label>
-					<? ENDLOOP ?>
-				</div>
-
-				<div style="clear: both;"></div>
 			</div>
 		</div>
 	</div>
 
-	<div>
+	<div class="section">
+		<h3>Flags</h3>
+		<div class="sectionbg">
+			<div class="sectionbody lotsofcheckboxes">
+				<span class="checkboxandlabel">
+					<input type="checkbox" name="save" id="save" value="true"<? IF InConfig ?> checked="checked"<? ENDIF ?> />
+					<label for="save">Save to config</label>
+				</span>
+				<? LOOP OptionLoop ?>
+				<span class="checkboxandlabel">
+					<input type="checkbox" name="<? VAR Name ESC=HTML ?>" id="opt_<? VAR Name ESC=HTML ?>" value="true"<? IF Checked ?> checked="checked"<? ENDIF ?><? IF Disabled ?> disabled="disabled"<? ENDIF ?> />
+					<label for="opt_<? VAR Name ESC=HTML ?>"><? VAR DisplayName ESC=HTML ?></label>
+				</span>
+				<? ENDLOOP ?>
+				<div style="clear:both;"></div>
+			</div>
+		</div>
+	</div>
+
+	<div class="submitline">
 		<input type="submit" value="<? IF Edit ?>Save<? ELSE ?>Add Channel<? ENDIF ?>" />
 	</div>
 </form>
diff --git a/modules/webadmin/skins/default/Footer.tmpl b/modules/webadmin/skins/default/Footer.tmpl
index eda86358..aa2a8eb9 100644
--- a/modules/webadmin/skins/default/Footer.tmpl
+++ b/modules/webadmin/skins/default/Footer.tmpl
@@ -1,3 +1,5 @@
+		</div>
 	</div>
+	<div id="tag"><?VAR Tag ESC=HTML ?></div>
 </body>
 </html>
diff --git a/modules/webadmin/skins/default/Header.tmpl b/modules/webadmin/skins/default/Header.tmpl
index 4759a5a8..510395b1 100644
--- a/modules/webadmin/skins/default/Header.tmpl
+++ b/modules/webadmin/skins/default/Header.tmpl
@@ -1,31 +1,30 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 	<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
 	<title>ZNC - <?VAR Title ESC=HTML?></title>
 	<link rel="stylesheet" type="text/css" href="<?VAR Skin ESC=URL?>/main.css" />
 </head>
-
 <body>
-	<div id="banner">
-		<h2><?VAR Title ESC=HTML?></h2>
+	<div id="container">
+		<div id="navbar">
+			<h1>ZNC</h1>
+			<ul class="nav">
+				<li><a href="home">Home</a></li>
+			<? IF IsAdmin ?>
+				<li><a href="settings">Settings</a></li>
+				<li><a href="adduser">Add User</a></li>
+				<li><a href="listusers">Edit Users</a></li>
+			<? ELSE ?>
+				<li><a href="edituser">My Settings</a></li>
+			<? ENDIF ?>
+				<li><a href="switchuser">Switch User</a></li>
+			</ul>
+		</div>
+
 		<div id="ident"><?VAR SessionUser ESC=HTML?> (from: <?VAR SessionIP ESC=HTML?>)</div>
-		<div id="tag"><?VAR Tag ESC=HTML ?></div>
-	</div>
 
-	<div id="sidebar">
-		<ul class="nav">
-			<li><a href="home">Home</a></li>
-		<? IF IsAdmin ?>
-			<li><a href="settings">Settings</a></li>
-			<li><a href="adduser">Add User</a></li>
-			<li><a href="listusers">Edit Users</a></li>
-		<? ELSE ?>
-			<li><a href="edituser">My Settings</a></li>
-		<? ENDIF ?>
-			<li><a href="switchuser">Switch User</a></li>
-		</ul>
-	</div>
-
-	<div id="main">
+		<div id="main">
+			<h2><?VAR Title ESC=HTML?></h2>
 
diff --git a/modules/webadmin/skins/default/ListUsers.tmpl b/modules/webadmin/skins/default/ListUsers.tmpl
index 4fbdcb2d..fab9def8 100644
--- a/modules/webadmin/skins/default/ListUsers.tmpl
+++ b/modules/webadmin/skins/default/ListUsers.tmpl
@@ -13,6 +13,7 @@
 					</tr>
 					</thead>
 
+					<tbody>
 			<?LOOP UserLoop?>
 					<tr class="<?IF __EVEN__?>evenrow<?ELSE?>oddrow<?ENDIF?>">
 						<td>
@@ -27,6 +28,7 @@
 						<td><? VAR IRCNick ESC=HTML ?></td>
 					</tr>
 			<?ENDLOOP?>
+					</tbody>
 				</table>
 		<?ENDIF?>
 <? INC Footer.tmpl ?>
diff --git a/modules/webadmin/skins/default/Settings.tmpl b/modules/webadmin/skins/default/Settings.tmpl
index 67e1a362..458cd6c1 100644
--- a/modules/webadmin/skins/default/Settings.tmpl
+++ b/modules/webadmin/skins/default/Settings.tmpl
@@ -4,7 +4,7 @@
 	<div class="section">
 		<input type="hidden" name="submitted" value="1" />
 
-		<div class="sectiontitle">Listen Port(s)</div>
+		<h3>Listen Port(s)</h3>
 		<div class="sectionbg">
 			<div class="sectionbody">
 				<div class="subsection">
@@ -18,14 +18,16 @@
 									<td>IPv6</td>
 								</tr>
 							</thead>
+							<tbody>
 							<? LOOP ListenLoop ?>
 								<tr class="<? IF __EVEN__ ?>evenrow<? ELSE ?>oddrow<? ENDIF ?>">
 									<td><? VAR Port ESC=HTML ?></td>
 									<td><? VAR BindHost ESC=HTML DEFAULT=** ?></td>
-									<td><? IF IsSSL ?>True<? ENDIF ?></td>
-									<td><? IF IsIPV6 ?>True<? ENDIF ?></td>
+									<td><? IF IsSSL ?>Yes<? ELSE ?>No<? ENDIF ?></td>
+									<td><? IF IsIPV6 ?>Yes<? ELSE ?>No<? ENDIF ?></td>
 								</tr>
 							<? ENDLOOP ?>
+							</tbody>
 						</table>
 					</div>
 				</div>
@@ -35,7 +37,7 @@
 	</div>
 
 	<div class="section">
-		<div class="sectiontitle">Settings</div>
+		<h3>Settings</h3>
 		<div class="sectionbg">
 			<div class="sectionbody">
 				<div class="subsection">
@@ -50,35 +52,39 @@
 				</div>
 				<div style="clear: both;"></div>
 
-				<div class="subsection">
+				<div class="subsection third">
 					<div class="inputlabel">Status Prefix:</div>
-					<div><input type="text" name="statusprefix" value="<? VAR StatusPrefix ESC=HTML ?>" size="32" maxlength="128" /></div>
+					<div><input type="text" name="statusprefix" value="<? VAR StatusPrefix ESC=HTML ?>" /></div>
+					<br /><span class="info">Default for new users only.</span>
 				</div>
 				<div style="clear: both;"></div>
 
-				<div class="subsection">
+				<div class="subsection half">
 					<div class="inputlabel">ISpoofFile:</div>
-					<div><input type="text" name="ispooffile" value="<? VAR ISpoofFile ESC=HTML ?>" size="32" maxlength="128" /></div>
+					<div><input type="text" name="ispooffile" value="<? VAR ISpoofFile ESC=HTML ?>" /></div>
+					<br /><span class="info">Example: ~/.oidentd.conf</span>
 				</div>
 
-				<div class="subsection">
+				<div class="subsection half">
 					<div class="inputlabel">ISpoofFormat:</div>
-					<div><input type="text" name="ispoofformat" value="<? VAR ISpoofFormat ESC=HTML ?>" size="32" maxlength="128" /></div>
+					<div><input type="text" name="ispoofformat" value="<? VAR ISpoofFormat ESC=HTML ?>" /></div>
 				</div>
 				<div style="clear: both;"></div>
 
-				<div class="subsection">
+				<div class="subsection twothird">
 					<div class="inputlabel">MOTD:</div>
 					<div><textarea name="motd" cols="70" rows="5"><? LOOP MOTDLoop ?><? VAR Line ESC=HTML ?>
 <? ENDLOOP ?>
 </textarea></div>
+					<br /><span class="info">"Message of the Day", sent to all ZNC users on connect.</span>
 				</div>
 
-				<div class="subsection">
+				<div class="subsection twothird">
 					<div class="inputlabel">VHosts:</div>
 					<div><textarea name="vhosts" cols="70" rows="8"><? LOOP VHostLoop ?><? VAR VHost ESC=HTML ?>
 <? ENDLOOP ?>
 </textarea></div>
+					<br /><span class="info">One host name or IP entry per line.</span>
 				</div>
 				<div style="clear: both;"></div>
 			</div>
@@ -86,7 +92,7 @@
 	</div>
 
 	<div class="section">
-		<div class="sectiontitle">Global Modules</div>
+		<h3>Global Modules</h3>
 		<div class="sectionbg">
 			<div class="sectionbody">
 				<table>
@@ -97,20 +103,22 @@
 						<td>Description</td>
 					</tr>
 					</thead>
+					<tbody>
 					<? LOOP ModuleLoop ?>
-					<tr class="background: <? IF __EVEN__ ?>evenrow<? ELSE ?>oddrow<? ENDIF ?>">
-						<td><input type="checkbox" name="loadmod" id="lm_<? VAR Name ESC=HTML ?>" value="<? VAR Name ESC=HTML ?>"<? IF Checked ?> checked="checked"<? ENDIF ?><? IF Disabled ?> disabled="disabled"<? ENDIF ?> /><label for="lm_<? VAR Name ESC=HTML ?>"> <? VAR Name ESC=HTML ?></label></td>
-						<td><input type="text" name="modargs_<? VAR Name ESC=HTML ?>" value="<? VAR Args ESC=HTML ?>" /></td>
-						<td><? VAR Description ESC=HTML ?></td>
+					<tr class="<? IF __EVEN__ ?>evenrow<? ELSE ?>oddrow<? ENDIF ?>">
+						<td class="mod_name"><input type="checkbox" name="loadmod" id="lm_<? VAR Name ESC=HTML ?>" value="<? VAR Name ESC=HTML ?>"<? IF Checked ?> checked="checked"<? ENDIF ?><? IF Disabled ?> disabled="disabled"<? ENDIF ?> /><label for="lm_<? VAR Name ESC=HTML ?>"> <? VAR Name ESC=HTML ?></label></td>
+						<td class="mod_args"><input type="text" name="modargs_<? VAR Name ESC=HTML ?>" value="<? VAR Args ESC=HTML ?>" /></td>
+						<td class="mod_descr"><? VAR Description ESC=HTML ?></td>
 					</tr>
 					<? ENDLOOP ?>
+					</tbody>
 				</table>
 			</div>
 		</div>
 	</div>
 
-	<div>
-		<input type="submit" value="Submit" />
+	<div class="submitline">
+		<input type="submit" value="Save" />
 	</div>
 </form>
 
diff --git a/modules/webadmin/skins/default/UserPage.tmpl b/modules/webadmin/skins/default/UserPage.tmpl
index db9f80d1..25a7e72a 100644
--- a/modules/webadmin/skins/default/UserPage.tmpl
+++ b/modules/webadmin/skins/default/UserPage.tmpl
@@ -4,7 +4,7 @@
 	<div class="section">
 		<input type="hidden" name="submitted" value="1" />
 
-		<div class="sectiontitle">Authentication</div>
+		<h3>Authentication</h3>
 		<div class="sectionbg">
 			<div class="sectionbody">
 				<div class="subsection">
@@ -17,22 +17,22 @@
 						<input type="text" name="user" value="<? VAR Username ESC=HTML ?>" class="half" maxlength="128" />
 						<? ENDIF ?>
 					</div>
-
+				</div>
+				<div class="subsection">
 					<div class="inputlabel">Password:</div>
 					<div><input type="password" name="password" class="half" /></div>
+				</div>
+				<div class="subsection">
 					<div class="inputlabel">Confirm Password:</div>
 					<div><input type="password" name="password2" class="half" /></div>
 				</div>
-				<div>
+				<div class="subsection half">
 					<div class="inputlabel">Allowed IPs:</div>
-					<textarea name="allowedips" class="half"><? LOOP AllowedHostLoop ?><? VAR Host ESC=HTML ?>
+					<textarea name="allowedips" cols="70" rows="5"><? LOOP AllowedHostLoop ?><? VAR Host ESC=HTML ?>
 <? ENDLOOP ?>
 </textarea>
-					<? IF OwnIP ?>
-						<div class="subsection">
-							<span style="white-space: nowrap;"><input type="checkbox" name="ownip" id="ownip" value="<? VAR OwnIP ESC=HTML ?>" checked="checked" /><label for="ownip"> <? VAR OwnIP ESC=HTML ?> (your current ip)</label></span>&nbsp;&nbsp;
-						</div>
-					<? ENDIF ?>
+					<br /><span class="info">Leave empty to allow connections from all IPs.<br />
+					Otherwise, one entry per line, wildcards * and ? are available.</span>
 				</div>
 				<div style="clear: both;"></div>
 			</div>
@@ -40,7 +40,10 @@
 	</div>
 
 	<div class="section">
-		<div class="sectiontitle">IRC Information</div>
+		<h3>IRC Information</h3>
+		<? IF !Edit ?>
+		<span class="info">Nick, AltNick, Ident, RealName and QuitMsg can be left empty to use default values.</span>
+		<? ENDIF ?>
 		<div class="sectionbg">
 			<div class="sectionbody">
 				<div class="subsection">
@@ -84,11 +87,12 @@
 				</div>
 				<div style="clear: both;"></div>
 
-				<div class="subsection">
+				<div class="subsection half">
 					<div class="inputlabel">Servers:</div>
-					<div><textarea name="servers" class="half"><? LOOP ServerLoop ?><? VAR Server ESC=HTML ?>
+					<div><textarea name="servers" cols="70" rows="5"><? LOOP ServerLoop ?><? VAR Server ESC=HTML ?>
 <? ENDLOOP ?>
 </textarea></div>
+					<br /><span class="info">One server per line, host [+]port[ password]</span>
 				</div>
 				<div style="clear: both;"></div>
 			</div>
@@ -96,7 +100,7 @@
 	</div>
 
 	<div class="section">
-		<div class="sectiontitle">Modules</div>
+		<h3>Modules</h3>
 		<div class="sectionbg">
 			<div class="sectionbody">
 				<table>
@@ -107,35 +111,33 @@
 						<td>Description</td>
 					</tr>
 					</thead>
+					<tbody>
 
 				<? LOOP ModuleLoop ?>
 					<tr class="<? IF __EVEN__ ?>evenrow<? ELSE ?>oddrow<? ENDIF ?>">
-						<td>
+						<td class="mod_name">
 							<input type="checkbox" name="loadmod" id="lm_<? VAR Name ESC=HTML ?>" value="<? VAR Name ESC=HTML ?>"<? IF Checked ?> checked="checked"<? ENDIF ?><? IF Disabled ?> disabled="disabled"<? ENDIF ?> /><label for="lm_<? VAR Name ESC=HTML ?>"> <? VAR Name ESC=HTML ?></label>
 						</td>
-						<td>
+						<td class="mod_args">
 							<? IF Disabled ?><? VAR Args ESC=HTML ?><? ELSE ?><input class="third" type="text" name="modargs_<? VAR Name ESC=HTML ?>" value="<? VAR Args ESC=HTML ?>" /><? ENDIF ?>
 						</td>
-						<td><? VAR Description ESC=HTML ?></td>
+						<td class="mod_descr"><? VAR Description ESC=HTML ?></td>
 					</tr>
 				<? ENDLOOP ?>
 
+					</tbody>
 				</table>
 			</div>
 		</div>
 	</div>
 
 	<div class="section">
-		<div class="sectiontitle">Channels</div>
+		<h3>Channels</h3>
+		<? IF !Edit ?>
+		<span class="info">You will be able to add + modify channels here after you created the user.</span><br />
+		<? ELSE ?>
 		<div class="sectionbg">
 			<div class="sectionbody">
-				<div class="subsection">
-					<div class="inputlabel">Default Modes:</div>
-					<div><input type="text" name="chanmodes" value="<? VAR DefaultChanModes ESC=HTML ?>" class="third" maxlength="32" /></div>
-				</div>
-				<div style="clear: both;"></div>
-
-			<? IF Edit ?>
 				<table>
 					<thead>
 					<tr>
@@ -153,6 +155,7 @@
 					</tr>
 					</thead>
 
+					<tbody>
 			<? LOOP ChannelLoop ?>
 					<tr class="<? IF __EVEN__ ?>evenrow<? ELSE ?>oddrow<? ENDIF ?>">
 						<td>
@@ -167,26 +170,57 @@
 						<td><? VAR Options ESC=HTML ?></td>
 					</tr>
 			<? ENDLOOP ?>
+					</tbody>
 				</table>
-			<? ENDIF ?>
+			</div>
+		</div>
+		<? ENDIF ?>
+	</div>
+
+	<div class="section">
+		<h3>Default Channel Settings</h3>
+		<div class="sectionbg">
+			<div class="sectionbody">
+				<div class="subsection third">
+					<div class="inputlabel">Modes:</div>
+					<div><input type="text" name="chanmodes" value="<? VAR DefaultChanModes ESC=HTML ?>" maxlength="32" /></div>
+					<br /><span class="info">Empty = use standard value</span>
+				</div>
+				<div class="subsection third">
+					<div class="inputlabel">Buffer Size:</div>
+					<div><input type="text" name="bufsize" value="<? VAR BufferCount ESC=HTML ?>" maxlength="9" /></div>
+					<br /><span class="info">Empty = use standard value</span>
+				</div>
 			</div>
 		</div>
 	</div>
 
 	<div class="section">
-		<div class="sectiontitle">ZNC Behavior</div>
+		<h3>Flags</h3>
+		<div class="sectionbg">
+			<div class="sectionbody lotsofcheckboxes">
+				<? LOOP OptionLoop ?>
+				<span class="checkboxandlabel">
+					<input type="checkbox" name="<? VAR Name ESC=HTML?>" id="opt_<? VAR Name ESC=HTML ?>" value="1"<? IF Checked ?> checked="checked"<? ENDIF ?><? IF Disabled ?> disabled="disabled"<? ENDIF ?> />
+					<label for="opt_<? VAR Name ESC=HTML ?>"><? VAR DisplayName ESC=HTML ?></label>
+				</span>
+				<? ENDLOOP ?>
+				<div style="clear:both;"></div>
+			</div>
+		</div>
+	</div>
+
+	<div class="section">
+		<h3>ZNC Behavior</h3>
+		<span class="info">Any of the following text boxes can be left empty to use their default value.</span>
 		<div class="sectionbg">
 			<div class="sectionbody">
 				<div class="subsection">
 					<div class="inputlabel">Timestamp Format:</div>
-					<div><input type="text" name="timestampformat" value="<? VAR TimestampFormat ESC=HTML ?>" class="full" /></div>
+					<div><input type="text" name="timestampformat" value="<? VAR TimestampFormat ESC=HTML ?>" class="half" /></div>
 				</div>
 				<div class="subsection">
-					<div class="inputlabel">Playback Buffer Size:</div>
-					<div><input type="text" name="bufsize" value="<? VAR BufferCount ESC=HTML ?>" class="third" maxlength="9" /></div>
-				</div>
-				<div class="subsection">
-					<div class="inputlabel">Timezone offset:</div>
+					<div class="inputlabel">Timezone Offset:</div>
 					<div><input type="text" name="timezoneoffset" value="<? VAR TimezoneOffset ESC=HTML ?>" class="third" /></div>
 				</div>
 				<div class="subsection">
@@ -197,28 +231,20 @@
 					<div class="inputlabel">Max Joins:</div>
 					<div><input type="text" name="maxjoins" value="<? VAR MaxJoins ESC=HTML ?>" class="third" /></div>
 				</div>
-				<div style="clear: both;"></div>
-
-				<div style="margin-bottom: 10px;">
-					<div class="inputlabel">Options:</div>
-					<? LOOP OptionLoop ?>
-					<span style="white-space: nowrap;"><input type="checkbox" name="<? VAR Name ESC=HTML?>" id="opt_<? VAR Name ESC=HTML ?>" value="1"<? IF Checked ?> checked="checked"<? ENDIF ?><? IF Disabled ?> disabled="disabled"<? ENDIF ?> /><label for="opt_<? VAR Name ESC=HTML ?>"><? VAR DisplayName ESC=HTML ?></label></span>&nbsp;&nbsp;
-					<? ENDLOOP ?>
-				</div>
-
-				<div class="subsection">
+				<div class="subsection half">
 					<div class="inputlabel">CTCP Replies:</div>
-					<div><textarea name="ctcpreplies" class="half"><? LOOP CTCPLoop ?><? VAR CTCP ESC=HTML ?>
+					<div><textarea name="ctcpreplies" cols="70" rows="3"><? LOOP CTCPLoop ?><? VAR CTCP ESC=HTML ?>
 <? ENDLOOP ?>
 </textarea></div>
+					<br /><span class="info">One reply per line. Example: TIME Buy a watch!</span>
 				</div>
 				<div style="clear: both;"></div>
 			</div>
 		</div>
 	</div>
 
-	<div>
-		<input type="submit" value="Submit" />
+	<div class="submitline">
+		<input type="submit" value="<? IF Edit ?>Save<? ELSE ?>Create<? ENDIF ?>" />
 	</div>
 </form>
 
diff --git a/modules/webadmin/skins/default/data/favicon.ico b/modules/webadmin/skins/default/data/favicon.ico
index c69891c0..5e28bcf0 100644
Binary files a/modules/webadmin/skins/default/data/favicon.ico and b/modules/webadmin/skins/default/data/favicon.ico differ
diff --git a/modules/webadmin/skins/default/data/main.css b/modules/webadmin/skins/default/data/main.css
index 0a5e7a0a..bb9ac82d 100644
--- a/modules/webadmin/skins/default/data/main.css
+++ b/modules/webadmin/skins/default/data/main.css
@@ -1,138 +1,249 @@
+@charset "UTF-8";
+
+* {
+	margin: 0;
+	padding: 0;
+}
+
+html {
+	height: 100%;
+}
+
 body {
+	height: 100%;
 	background-color: #fff;
 	color: #000;
+	font-family: Tahoma, sans-serif;
+}
+
+a, a:link, a:active, a:visited, a:focus {
+	color: #00008B;
+	text-decoration: none;
+	outline: none;
+}
+
+a:hover {
+	text-decoration: underline;
+}
+
+#main a:visited {
+	color: #99008B;
+}
+
+#container {
+	background-color: #eee;
+	min-height: 80%;
+	overflow: hidden;
+	margin: 0 auto;
 	width: 800px;
+
+	border: 1px solid #ccc;
+	border-top: none;
+	-moz-box-shadow: 0 0 1em #666;
+	-webkit-box-shadow: 0 0 1em #666;
 }
 
-a:visited { color: #000; }
-a:hover { color: #000; }
-a, a:active { color: #000; }
-
-.nowrap { white-space: nowrap; }
-.clear { clear: both; }
-
-table a, table a:visited, table a:hover, table a:active { color: #000; }
-
-table {
-	color: #000;
-	border-collapse: collapse;
-	border: 2px solid #000;
-	padding: 0px;
-	margin: 0px;
+#tag {
+	height: 4em;
+	line-height: 4em;
+	text-align: center;
+	font-size: 70%;
+	color: #aaa;
 }
 
-table td {
-	border: 1px solid #000;
+#navbar {
+	display: block;
+	height: 45px;
+	background-color: #ccc;
+}
+
+#navbar h1 {
+	float: left;
+	line-height: 45px;
+	padding: 0 0.9em 0 0.6em;
+	font-style: italic;
+	background-color: #aaa;
+	font-size: 100%;
+	font-weight: normal;
+}
+
+ul.nav {
+	float: left;
+	margin-left: 20px;
+}
+
+ul.nav li {
+	list-style: none;
+	float: left;
+	margin-right: 55px;
+}
+
+ul.nav li a {
+	line-height: 45px;
+	height: 45px;
+	display: inline-block;
+}
+
+#ident {
+	text-align: right;
 	padding: 4px;
-	margin: 0px;
+	font-size: 70%;
+	color: #888;
 }
 
-table thead {
-	border-bottom: 2px solid #000;
-	background-color: #ff9;
-	font-weight: bold;
+ul.nav li:before {
+	content: "» ";
 }
 
-input.full, textarea.full {
-	width: 620px;
+#main {
+	clear: both;
+	padding: 0 20px 20px 20px;
+
+	font-size: 90%;
 }
 
-input.half, textarea.half {
-	width: 300px;
+h2 {
+	margin-bottom: 0.4em;
 }
 
-input.third, textarea.third {
-	width: 150px;
+h3 {
+	margin-top: 1.2em;
+	margin-bottom: 0.4em;
+}
+
+.section {
+	clear: both;
+}
+
+.sectionbody {
+	margin-left: 1em;
+}
+
+.sectionbody input, textarea, select {
+	border: 2px solid #ccc;
+	font-family: Tahoma, sans-serif;
+	padding: 3px;
+	font-size: 14px;
+}
+
+input:focus, textarea:focus, select:focus {
+	-moz-box-shadow: 0 0 0.4em #aaa;
+	-webkit-box-shadow: 0 0 0.4em #aaa;
 }
 
 textarea {
 	height: 90px;
 }
 
-#banner {
-	border-bottom: 2px solid #000;
-	text-align: center;
+.submitline input {
+	width: 200px;
+	height: 2.2em;
 }
 
-#ident {
-	float: left;
-	font-weight: bold;
-	text-align: right;
+input.full, textarea.full,
+.full input, .full textarea {
+	width: 600px;
 }
 
-#sidebar {
-	border-right: 1px solid #000;
-	height: 500px;
-	width: 100px;
-	float: left;
+input.twothird, textarea.twothird,
+.twothird input, .twothird textarea {
+	width: 450px;
 }
 
-#main {
-	margin: 5px 0px 20px 5px;
-	float: left;
-	width: 670px;
+input.half, textarea.half,
+.half input, .half textarea {
+	width: 300px;
 }
 
-#tag {
-	font-weight: bold;
-	text-align: right;
+input.third, textarea.third,
+.third input, .third textarea {
+	width: 150px;
 }
 
-.oddrow {
-	background-color: #ffc;
+table {
+	border: 1px solid #ccc;
 }
 
-.evenrow {
-	background-color: #cc9;
+td {
+	padding: 5px 10px;
+	min-width: 80px;
 }
 
-.inputlabel {
-	font-size: small;
-	font-weight: bold;
-	color: #000;
+thead td {
+	background-color: #a0a0a0;
 }
 
-ul.nav, ul.nav ul {
-	cursor: default;
-	margin: 0px 0px 0px 0px;
-	padding: 5px 5px 5px 5px;
+tbody td {
+	background-color: #cecece;
 }
 
-ul.nav li {
-	list-style-type: none;
-	padding: 0px 2px 1px 2px;
-	margin: 2px 0px 2px 0px;
+tr.evenrow td {
+	background-color: #dadada;
 }
 
-.section {
-	padding-bottom: 20px;
+div.submitline {
+	margin: 1em;
+}
+
+.info {
+	font-style: italic;
+	font-size: 80%;
 }
 
 .subsection {
-	float: left;
-	margin-right: 10px;
-	margin-bottom: 10px;
-}
-
-.sectiontitle {
-	float: left;
-	white-space: nowrap;
-	background-color: #ff9;
-	color: #000;
-	font-weight: bold;
-	border: 1px solid #000;
-	padding: 0px 5px 0px 5px;
-	margin: 0px 15px -10px 8px;
-}
-
-.sectionbg {
 	clear: both;
-	background-color: #cc9;
-	color: #000;
-	border: 2px solid #000;
-	padding: 0px;
+	margin: 0;
 }
 
-.sectionbody {
-	margin: 15px 5px 5px 15px;
+.subsection div {
+	float: left;
+}
+
+.subsection .inputlabel {
+	width: 120px;
+	text-align: right;
+	padding: 10px 5px 0 0;
+}
+
+.subsection input, .subsection select, .subsection textarea {
+	margin: 5px 0 5px 0;
+	vertical-align: middle;
+}
+
+.section .info {
+	margin-bottom: 5px;
+	display: block;
+}
+
+.subsection .info {
+	text-align: right;
+}
+
+.half .info {
+	width: 435px;
+}
+
+.third .info {
+	width: 285px;
+}
+
+.twothird .info {
+	width: 585px;
+}
+
+td.mod_descr,
+td.mod_name,
+td.mod_args input {
+	font-size: 80%;
+}
+
+.checkboxandlabel {
+	white-space: nowrap;
+}
+
+.lotsofcheckboxes .checkboxandlabel {
+	display: block;
+	float: left;
+	width: 200px;
+	margin-top: 0.5em;
 }
