diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index 21afef33566..05af5754fa8 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -158,7 +158,7 @@ body.openerp {
 }
 
 ul.db_options li {
-	padding: 10px 0 10px 5px;
+	padding: 5px 0 10px 5px;
 	background: #949292; /* Old browsers */
 	background: -moz-linear-gradient(top, #949292 30%, #6d6b6b 95%, #282828 100%); /* FF3.6+ */
 	background: -webkit-gradient(linear, left top, left bottom, color-stop(30%,#949292), color-stop(95%,#6d6b6b), color-stop(100%,#282828)); /* Chrome,Safari4+ */
@@ -178,13 +178,22 @@ ul.db_options li {
 	margin: 1px;
 	color: #EEEEEE;
 	cursor: pointer;
+	width: 196px;
+}
+
+.db_option_table {
+	border: 1px solid #5A5858;
+	padding: 5px;
+	-moz-border-radius: 10px;
 }
 
 .option_string {
 	font-weight: bold; 
 	color: #555; 
 	width: 100%; 
-	text-align: left;	
+	text-align: center;
+	padding-top: 5px;
+	font-size: large;
 }
 
 /* Main*/
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index d01c5441064..68125b84920 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -34,7 +34,7 @@
             <div id="oe_database" class="database"></div>
         </td>
         <td valign="top">
-        	<div id="oe_db_options" style="height: 100%; padding-top: 10px;"></div>
+        	<div id="oe_db_options"></div>
         </td>
     </tr>
     <tr>
@@ -59,7 +59,7 @@
     Loading...
 </t>
 <t t-name="Database">
-	<ul class="db_options" style="padding: 0px;">
+	<ul class="db_options" style="padding: 0px; display: inline;">
 		<li id="db-create">Create</li>
 		<li id="db-drop">Drop</li>
 		<li id="db-backup">Backup</li>
@@ -69,16 +69,47 @@
 	</ul>
 </t>
 <t t-name="CreateDB">
-	<table align="center" width="100%">
+	<table width="100%">
 		<tr>
-			<td valign="top">
-				<img src="/base/static/src/img/db.png" alt="" />
-			</td>
 			<td class="option_string">
 				<t t-esc="db_string"/>
 			</td>
 		</tr>
 	</table>
+	<table align="center" class="db_option_table">
+		<tr>
+			<td><label for="super_admin_pwd">Super admin password:</label></td>
+			<td><input type="text" name="super_admin_pwd" autofocus="true"/></td>
+		</tr>
+		<tr>
+			<td><label for="db_name">New database name:</label></td>
+			<td><input type="text" name="db_name"/></td>
+		</tr>
+		<tr>
+			<td><label for="demo_data">Load Demonstration data:</label></td>
+			<td><input type="checkbox" name="demo_data"/></td>
+		</tr>
+		<tr>
+			<td><label for="db_lang">Default language:</label></td>
+			<td>
+				<select name="db">
+	                
+	            </select>
+	    	</td>
+		</tr>
+		<tr>
+			<td><label for="admin_pwd">Super admin password:</label></td>
+			<td><input type="text" name="super_admin_pwd"/></td>
+		</tr>
+		<tr>
+			<td><label for="confirm_pwd">Super admin password:</label></td>
+			<td><input type="text" name="confirm_pwd"/></td>
+		</tr>
+		<tr>
+			<td colspan="2" align="right"><button type="button">Submit</button></td>
+		</tr>
+	</table>
+	
 </t>
 <t t-name="Login">
     <form>