diff --git a/dashboard/index.html b/dashboard/index.html
index 350e284..3c31bec 100644
--- a/dashboard/index.html
+++ b/dashboard/index.html
@@ -15,7 +15,7 @@
 
     <!-- jQuery -->
    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.1/jquery.min.js" type="text/javascript"></script>
-    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.jss" type="text/javascript"></script>
+    <!--<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.jss" type="text/javascript"></script>-->
     <script src="https://cdnjs.cloudflare.com/ajax/libs/bootbox.js/4.4.0/bootbox.min.js" type="text/javascript"></script>
 
     <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
@@ -58,7 +58,7 @@
       <form class="navbar-form navbar-right">
 	<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">
+	  <input type="text" class="form-control" placeholder="api-url.or.ip" value="sonata-emulator.cs.upb.de:5001" id="text_api_host" data-provide="typeahead" size="30">
 	</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>
@@ -72,23 +72,9 @@
 
 <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>
+  <div class="panel-heading"><span>Emulated Datacenters</span>&nbsp;&nbsp;<span class="badge" id="lbl_datacenter_count">0</span><span class="pull-right" id="lbl_lateness_datacenter">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 class="table table-striped table-hover" id="table_datacenter">
   </table>
 </div>
 
@@ -96,33 +82,11 @@
  
 <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>
+  <div class="panel-heading"><span>Running Containers</span>&nbsp;&nbsp;<span class="badge" id="lbl_container_count">0</span><span class="pull-right" id="lbl_lateness_container">Lateness: -</span></div>
   <!-- Table -->
-  <table class="table table-striped table-hover" id="table_messages">
-    <tr class="tbl-head">
-      <td>Datacenter</td>
-      <td>Container</td>
-      <td>Image</td>
-      <td>docker0</td>
-      <td>Status</td>
-    </tr>
-    <tr>
-      <td>sonata-pop1</td>
-      <td>vnf1</td>
-      <td>mpeuster/firewall</td>
-      <td><code>172.10.4.12</code></td>
-      <td><span class="label label-success">running</span></td>
-    </tr>
-     <tr>
-      <td>sonata-pop2</td>
-      <td>vnf3</td>
-      <td>mpeuster/l4_fw</td>
-      <td><code>172.10.4.13</code></td>
-      <td><span class="label label-success">running</span></td>
-    </tr>
+  <table class="table table-striped table-hover" id="table_container">
   </table>
 </div>
-
 </div>
 
 <footer class="footer text-center small">(c) 2017 by SONATA Consortium and Paderborn University</footer>