diff --git a/src/www/css/admin.css b/src/www/css/admin.css
index 5094be6..e032fb1 100644
--- a/src/www/css/admin.css
+++ b/src/www/css/admin.css
@@ -1,20 +1,34 @@
 /*
     Bongo web administration interface (aka Hawkeye) stylesheet
     (c) 2007 Alexander Hixon <hixon.alexander@mediati.org> - see COPYING for details
-    Last modified: Sunday May 6, 2007
+    Last modified: Sunday May 13, 2007
+
+    =======[ Global Styles ]=======
 */
 
 body {
     background-color: #eeeeec;
     font-size: 12px;
-    font-family: Verdana, Arial, Helvetica, SunSans-Regular, Sans-Serif;
-    color:#2e3436;
-    padding:0px;
-    margin:0px;
-    
-    height: 100%;   /* Blasted IE! */
+    font-family: luxi sans, trebuchet ms, bitstream vera sans, sans-serif;
+    color: #2e3436;
+    padding: 0px;
+    margin: 0px;
 }
 
+#body-override {
+    font-size: 16px;
+    background: url('/img/bg.png');
+    background-repeat: repeat-x;
+    background-color: #fff;
+    margin-top: 25px;
+    margin-left: 60px;
+    margin-right: 60px;
+}
+
+/*
+    =======[ Login Styles ]=======
+*/
+
 #login { 	
     position:absolute;
     height:200px; 
@@ -30,26 +44,36 @@ body {
     overflow: none;
 }
 
-form {
+#login form {
     padding: 16px;
     padding-top: 6.5em;
 }
 
 .inputbox {
+    width: 178px;   /* 200px - 22px */
     margin-bottom: 2px;
 }
 
+#login select {
+    width: 202px;
+}
+
 .submit {
-    padding-top: 2em;
+    padding-top: 1em;
     padding-bottom: 0px;
     margin-bottom: 0px;
 }
 
-input {
+input, select {
     color: #555753;
+    background-color: #eeeeec;
     border: 1px solid #2e3436;
 }
 
+.lang {
+    background-image: url('../img/locale.png');
+}
+
 .username {
     background-image: url('../img/user.png');
 }
@@ -58,9 +82,200 @@ input {
     background-image: url('../img/locked.png');
 }
 
-.password, .username {
+.password, .username, .lang {
     padding-left: 22px;
     min-height: 18px;
-    background-color: #eeeeec;
     background-repeat: no-repeat;
 }
+
+/*
+    =======[ Main Styles ]=======
+*/
+
+#userinfo {
+    padding-top: 20px;
+    font-size: 80%;
+    float: right;
+}
+
+#logo {
+    margin-bottom: 60px;
+}
+
+p {
+    font-size: 90%;
+    color: #2e3436;  /* Tango DARK-GREY */
+}
+
+#page {
+    background: url('/img/cbg.png');
+    background-repeat: repeat-x;
+    background-color: #eeeeec;  /* Tango GREY */			
+    margin-left: 155px; /* Push across width of sidebar, minus 10px, for bg behind round corner */
+	padding-left: 20px; /* Prints BG for 10px, now flush with sidebar */
+	padding-top: 6px;
+    min-height: 500px;
+    
+    -moz-border-radius-bottomright: 20px;
+    -khtml-border-radius-bottomright: 20px;
+    border-radius-bottomright: 20px;
+}
+
+#content {
+    padding-left: 12px;
+    padding-right: 12px;
+}
+
+.breadcrumb {
+    font-size: 75%;
+}
+
+.floaty {
+    float: right;
+    padding-left: 16px;
+    padding-right: 16px;
+    display: block;
+}
+
+/*
+    =======[ Sidebar Styles ]=======
+*/
+
+#sidebar {
+    color: #eeeeec; /* Tango WHITE */
+    background: url('/img/sbg.png');
+    background-repeat: no-repeat;
+    background-color: #2e3436;  /* Tango DARK-GREY */
+    float: left;
+    min-height: 500px;
+    width: 175px;
+
+    text-align: right;
+    margin-right: 0px;
+    padding-right: 0px;
+    padding-bottom: 6px;
+
+    -moz-border-radius-bottomleft: 20px;
+    -khtml-border-radius-bottomleft: 20px;
+    border-radius-bottomleft: 20px;
+
+    -moz-border-radius-bottomright: 20px;
+    -khtml-border-radius-bottomright: 20px;
+    border-radius-bottomright: 20px;
+}
+
+.helpitem {
+    /* FIXME! */
+}
+
+.selecteditem {
+    background-image: url('/img/sel.png');
+    width: 175px;
+    background-repeat: no-repeat;
+    color: #2e3436;
+}
+
+ul.nav,
+.nav ul{
+    margin-right: 0px;
+    padding-left: 4px;
+    margin-left: 6px;
+    padding-right: 0px;
+	list-style-type: none;
+}
+
+a.nav,
+.nav a{
+    color: #eeeeec;
+    text-decoration:none;
+}
+
+a.selecteditem,
+.selecteditem a:link,
+.selecteditem a:visited {
+    color: #2e3436;
+    text-decoration:none;
+}
+
+li.nav,
+.nav li{
+    display: block;
+	font-size: 115%; /* Bold maybe?  */
+    min-height: 35px;
+	text-align: left;
+	
+	padding-left: 15%;
+    padding-right: 15px;
+    margin-bottom: 15px;
+    text-decoration:none;
+    margin-top: 5px;
+	width: 95%;
+}
+
+img.icon {
+    margin-right: 6px;
+	vertical-align:middle;
+}
+
+ul.nav{
+	width: 100%;
+}
+
+/*
+    =======[ Table Styles ]=======
+*/
+
+.htable {
+    border: 3px solid #729fcf;
+    -moz-border-radius: 10px;
+}
+
+.hrow {
+    color: #d3d7cf;
+    font-weight: bold;
+    padding-left: 4px;
+}
+
+.highlight, .highlight0 {
+    color: #d3d7cf;
+    background-color: #204a87;
+}
+
+.highlight1 {
+    color: #d3d7cf;
+    background-color: #3465a4;
+}
+
+.drow {
+    color: #d3d7cf;
+}
+
+/*
+    =======[ Message Notification Styles ]=======
+*/
+
+.error, .info {
+    -moz-border-radius: 5px;
+
+    margin-right: 12px;
+    min-height:18px; /* Icon size - total padding (top & bottom) */
+    padding-top: 8px;
+    padding-bottom: 8px;
+
+    padding-left: 36px;
+    background-repeat: no-repeat;
+}
+
+.error {
+    background-image: url('/img/dialog-error-32.png');
+    background-color: #a40000;
+    color: #eeeeec;
+    border: 3px solid #cc0000;
+}
+
+.info {
+    background-image: url('/img/dialog-information-32.png');
+    background-color: #3465a4;
+    color: #eeeeec;
+    border: 3px solid #204a85;
+}
diff --git a/src/www/css/hawkeye.css b/src/www/css/hawkeye.css
deleted file mode 100644
index 185d8eb..0000000
--- a/src/www/css/hawkeye.css
+++ /dev/null
@@ -1,212 +0,0 @@
-   /*  body and font definitions */
-body {
-  background: url('/img/bg.png');
-  background-repeat: repeat-x;
-  background-color: #fff;
-  margin-top: 25px;
-  margin-left: 60px;
-  margin-right: 60px;
- 
-}
-
-html>body {
-	font-family: luxi sans, trebuchet ms, bitstream vera sans, sans-serif;
-}
-
-#userinfo {
-padding-top: 20px;
-font-size: 80%;
-float: right;
-}
-#logo {
-margin-bottom: 60px;
-}
-p {
-/*padding-left: 12px;
-padding-right: 12px;*/
-font-size: 90%;
-color: #2e3436;  /* Tango DARK-GREY */
-}
-
-#page {
-    background: url('/img/cbg.png');
-    background-repeat: repeat-x;
-    background-color: #eeeeec;  /* Tango GREY */
-/*        float: left;*/
-/*            width: 100% - 175px;*/
-/*			margin: 0px;*/
-			
-			margin-left: 165px; /* Push across width of sidebar, minus 10px, for bg behind round corner */
-			padding-left: 10px; /* Prints BG for 10px, now flush with sidebar */
-			
-			padding-top: 6px;
-			
-/*			z-index: -1;*/
-			
-/*			padding-right: 8px; */
-/*			padding-left: 16px;*/
-/*        margin-left: 280px;*/
-min-height: 500px;
-}
-#content {
-    padding-left: 12px;
-    padding-right: 12px;
-}
-
-#sidebar {
-color: #eeeeec; /* Tango WHITE */
-    background: url('/img/sbg.png');
-    background-repeat: repeat-x;
-    background-color: #2e3436;  /* Tango DARK-GREY */
-float: left;
-min-height: 500px;
-width: 175px;
-
-text-align: right;
-margin-right: 0px;
-padding-right: 0px;
-padding-bottom: 6px;
-
--moz-border-radius-bottomleft: 20px;
--khtml-border-radius-bottomleft: 20px;
-border-radius-bottomleft: 20px;
-
--moz-border-radius-bottomright: 20px;
--khtml-border-radius-bottomright: 20px;
-border-radius-bottomright: 20px;
-
-/*-moz-border-radius: 15px;*/
-}
-.helpitem {
-/* FIXME! */
-}
-.selecteditem {
-background-image: url('/img/sel.png');
-width: 175px;
-background-repeat: repeat-none;
-color: #2e3436;
-}
-
-
-ul.nav,
-.nav ul{
-/*Remove all spacings from the list items*/
-/*float: right;*/
-/*display: block; */
-margin-right: 0px;
-padding-left: 4px;
-margin-left: 6px;
-/*padding-left: 0px; /* Use this instead of margin? */
-padding-right: 0px;
-/*	cursor: default;*/
-	list-style-type: none;
-}
-a.nav,
-.nav a{
-color: #eeeeec;
-text-decoration:none;
-}
-
-a.selecteditem,
-.selecteditem a,
-.selecteditem a:link,
-.selecteditem a:visited {
-color: #2e3436;
-text-decoration:none;
-}
-
-li.nav,
-.nav li{
-    display: block;
-	font-size: 115%; /* Bold maybe?  */
-    min-height: 35px;
-/*    color: #eeeeec;*/
-	text-align: left;
-	
-	padding-left: 15%;
-	
-    padding-right: 15px;
-    margin-bottom: 15px;
-text-decoration:none;
-    margin-top: 5px;
-	width: 95%;
-}
-
-img.icon {
-    margin-right: 6px;
-	vertical-align:middle;
-}
-
-.breadcrumb {
-    font-size: 75%;
-}
-ul.nav{
-	width: 100%;
-}
-.htable {
-border: 3px solid #729fcf;
-/*font-size: 110%;*/
--moz-border-radius: 10px;
-}
-
-
-.hrow {
-color: #d3d7cf;
- font-weight: bold;
-padding-left: 4px;
-}
-
-.highlight, .highlight0 {
-color: #d3d7cf;
-background-color: #204a87;
-}
-
-.highlight1 {
-color: #d3d7cf;
-background-color: #3465a4;
-}
-
-.drow {
-color: #d3d7cf;
-}
-
-.error, .info {
--moz-border-radius: 5px;
-
-margin-right: 12px;
-min-height:18px; /* Icon size - total padding (top & bottom) */
-padding-top: 8px;
-padding-bottom: 8px;
-
-
-padding-left: 36px;
-background-repeat: no-repeat;
-}
-
-.error {
-background-image: url('/img/dialog-error-32.png');
-background-color: #a40000;
-color: #eeeeec;
-border: 3px solid #cc0000;
-}
-
-.info {
-background-image: url('/img/dialog-information-32.png');
-background-color: #3465a4;
-color: #eeeeec;
-border: 3px solid #204a85;
-}
-
-.tlist {
-padding-bottom: 3px;
-padding-top: 3px;
-font-size: 80%;
-padding-left: 16px;
-}
-
-.floaty {
-float: right;
-padding-left: 16px;
-padding-right: 16px;
-display: block;
-}
diff --git a/src/www/hawkeye/header.tpl b/src/www/hawkeye/header.tpl
index 416fa8d..fd6186a 100644
--- a/src/www/hawkeye/header.tpl
+++ b/src/www/hawkeye/header.tpl
@@ -8,12 +8,13 @@
 	<link rel="icon" href="/img/bongo-favicon.ico" type="image/ico">
 	<link rel="icon" href="/img/bongo-favicon.png" type="image/png">
 	<style type="text/css" media="screen">
-        @import url(/css/hawkeye.css);
+        @import url(/css/admin.css);
 	</style>
 </head>
-<body>
+<body id="body-override">
 <div id="userinfo">Logged in as: <i>admin</i> [<a href="%(url|/)slogout">logout</a>]</div>
 <div id="logo"><img src="/img/Bongo-logo.png" alt="Bongo" /></div>
+
 <div id="sidebar">
 <ul class="nav">
 <li tal:attributes="class dsktab"><a href="%(url|/)s"><img src="/img/user-desktop.png" border="0" alt="" class="icon" /> Desktop</a></li>
diff --git a/src/www/hawkeye/root/login.tpl b/src/www/hawkeye/root/login.tpl
index de4eba3..4e64f33 100644
--- a/src/www/hawkeye/root/login.tpl
+++ b/src/www/hawkeye/root/login.tpl
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-    <title>Bongo Web Administration &rsaquo; Login</title>
+    <title>Bongo Web Administration » Login</title>
 	<link rel="icon" href="/img/bongo-favicon.ico" type="image/ico">
 	<link rel="icon" href="/img/bongo-favicon.png" type="image/png">
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -12,10 +12,14 @@
 <body onload="document.forms[0].elements[0].focus();">
 <div id="login">
     <form method="post">
-        <input type="text" name="bongo-username" class="username inputbox" />
-        <input type="password" name="bongo-password" class="password inputbox"/>
+        <input type="text" name="bongo-username" class="username inputbox" /><br />
+        <input type="password" name="bongo-password" class="password inputbox"/><br />
+        <select name="lang" class="lang">
+            <option value="en">English</option>
+            <option value="fr">Français</option>
+        </select>
         <div class="submit"><input type="submit" value="Log in"></div>
     </form>
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/www/hawkeye/server/index.tpl b/src/www/hawkeye/server/index.tpl
index 69554a9..0cd03bc 100644
--- a/src/www/hawkeye/server/index.tpl
+++ b/src/www/hawkeye/server/index.tpl
@@ -1,5 +1,8 @@
 %(include|header.tpl)s
 
+<p>This page enables you to enable and disable specific agents during runtime for change at next restart.</p>
+<p>Please note that you <strong>must restart <c>bongo-manager</c></strong> for these changes to take effect, since they're only to do with the agent list at startup, not dynamic starting and stopping.</p>
+
 <p>
 
 <div tal:condition="success" style="text-align: center;">
diff --git a/src/www/img/login-pane.png b/src/www/img/login-pane.png
index 0c2c049..92b83f0 100644
Binary files a/src/www/img/login-pane.png and b/src/www/img/login-pane.png differ
diff --git a/src/www/img/sel.png b/src/www/img/sel.png
index ee4defd..9596486 100755
Binary files a/src/www/img/sel.png and b/src/www/img/sel.png differ