diff --git a/dashboard/css/main.css b/dashboard/css/main.css
index 6e409e0..d33299a 100644
--- a/dashboard/css/main.css
+++ b/dashboard/css/main.css
@@ -18,3 +18,6 @@
     background-color: #1a242f;
 }
 
+.spacer {
+    height: 20px;
+}
diff --git a/dashboard/index.html b/dashboard/index.html
index a6d3199..350e284 100644
--- a/dashboard/index.html
+++ b/dashboard/index.html
@@ -33,7 +33,7 @@
   <div id="page-top">
     <div class="row">
       <div class="col-sm-8"><h1>MeDICINE Dashboard</h1></div>
-      <div class="col-sm-4" id="logo"><img src="img/SONATA_new.png" alt="SONATA Logo" width="252" height="70"></div>
+      <div class="col-sm-4" id="logo"><a href="http://sonata-nfv.eu" target="_blank"><img src="img/SONATA_new.png" alt="SONATA Logo" width="252" height="70"></a></div>
     </div>
 
 <nav class="navbar navbar-default">
@@ -51,18 +51,49 @@
     <!-- Collect the nav links, forms, and other content for toggling -->
     <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
       <div class="navbar-form navbar- navbar-btn btn-group" role="group" aria-label="category">
-          <button type="button" class="btn btn-default active" id="btn_tab_pop">Datacenter List</button>
-          <button type="button" class="btn btn-default" id="btn_tab_container">Container List</button>
+          <!--<button type="button" class="btn btn-default active" id="btn_tab_pop">Datacenter List</button>-->
+          <!--<button type="button" class="btn btn-default" id="btn_tab_container">Container List</button>-->
           <!--<button type="button" class="btn btn-default" id="btn_tab_other">Other</button> -->
       </div>
       <form class="navbar-form navbar-right">
-        <button type="button" class="btn btn-default active" id="btn_autorefresh">Auto-refresh</button>
-      </form>
+	<div class="input-group">
+          <span class="input-group-addon">http://</span>
+	  <input type="text" class="form-control" placeholder="api-url.or.ip" value="127.0.0.1:5001" id="text_api_host" data-provide="typeahead">
+	</div>
+	<button type="button" class="btn btn-success" id="btn_connect">Connect &nbsp;<span class="glyphicon glyphicon-play-circle"></span></button>
+	<button type="button" class="btn btn-danger disabled" id="btn_disconnect">Disconnect &nbsp;<span class="glyphicon glyphicon-off"></span></button>
+		</form>	
     </div><!-- /.navbar-collapse -->
   </div><!-- /.container-fluid -->
 </nav>
 </div>
-<div id="content">
+  <div id="content">
+
+
+<div class="panel panel-primary">
+  <!-- Default panel contents -->
+  <div class="panel-heading"><span>Emulated Datacenters</span> <span class="badge" id="lbl_msg_count">0</span><span class="pull-right" id="lbl_lateness">Lateness: -</span></div>
+  <!-- Table -->
+  <table class="table table-striped table-hover" id="table_messages">
+    <tr class="tbl-head">
+      <td>Label</td>
+      <td>Int. Name</td>
+      <td>Switch</td>
+      <td>Num. Containers</td>
+      <td>Metadata Items</td>
+    </tr>
+    <tr>
+      <td>sonata-pop1</td>
+      <td>dc1</td>
+      <td>dc1.s1</td>
+      <td><span class="badge">2</span></td>
+      <td><span class="badge">0</span></td>
+    </tr>
+  </table>
+</div>
+
+<div class="spacer">&nbsp;</div>
+ 
 <div class="panel panel-primary">
   <!-- Default panel contents -->
   <div class="panel-heading"><span>Running Containers</span> <span class="badge" id="lbl_msg_count">0</span><span class="pull-right" id="lbl_lateness">Lateness: -</span></div>
@@ -90,28 +121,11 @@
       <td><span class="label label-success">running</span></td>
     </tr>
   </table>
-
-  <table class="table table-striped table-hover" id="table_messages">
-    <tr class="tbl-head">
-      <td>Label</td>
-      <td>Int. Name</td>
-      <td>Switch</td>
-      <td>Num. Containers</td>
-      <td>Metadata Items</td>
-    </tr>
-    <tr>
-      <td>sonata-pop1</td>
-      <td>dc1</td>
-      <td>dc1.s1</td>
-      <td><span class="badge">2</span></td>
-      <td><span class="badge">0</span></td>
-    </tr>
-  </table>
 </div>
 
 </div>
 
-<footer class="footer text-center small">(c) 2017 by Paderborn University and Manuel Peuster (manuel.peuster [at] upb.de)</footer>
+<footer class="footer text-center small">(c) 2017 by SONATA Consortium and Paderborn University</footer>
 
 
 </body>