diff --git a/web_app/templates/index.html b/web_app/templates/index.html
index ba32405..3b37939 100644
--- a/web_app/templates/index.html
+++ b/web_app/templates/index.html
@@ -10,15 +10,24 @@
     <h1>Tests</h1>
     {% block body %}
     <div>
-        <ol>
+        <table>
+            <th>Build name</th>
+            <th> Date </th>
             {% for test in tests %}
-            <li>
-                       <h2>
-                           <a href="{{ test.url }} ">{{ test.name }}</a>
-                        </h2>
-            </li>
+            <tr>
+                <td>
+                           <h2>
+                               <a href="{{ test.url }} ">{{ test.name }}</a>
+                            </h2>
+                </td>
+                <td>
+                    <h3>
+                        {{ test.date }}
+                    </h3>
+                </td>
+            </tr>
             {% endfor %}
-        </ol>
+        </table>
     </div>
     {% endblock %}
 </body>
diff --git a/web_app/templates/lab_main.html b/web_app/templates/lab_main.html
index a4800d7..6ae0a7f 100644
--- a/web_app/templates/lab_main.html
+++ b/web_app/templates/lab_main.html
@@ -14,23 +14,23 @@
         </tr>
         <tr>
             <td>Ceph version</td>
-            <td> 1.0</td>
+            <td> 0.80.7</td>
         </tr>
         <tr>
             <td>Nodes count</td>
             <td>{{ lab_meta.nodes_count }}</td>
         </tr>
         <tr>
-            <td>Processors count</td>
+            <td>Cores count</td>
             <td>{{ lab_meta.processor_count }}</td>
         </tr>
         <tr>
             <td>Total memory</td>
-            <td>{{ lab_meta.total_memory }}</td>
+            <td>{{ lab_meta.total_memory }} Gb</td>
         </tr>
         <tr>
             <td>Total disk</td>
-            <td>{{ lab_meta.total_disk }}</td>
+            <td>{{ lab_meta.total_disk }} Gb</td>
         </tr>
     </table>
 </div>
\ No newline at end of file
diff --git a/web_app/templates/table.html b/web_app/templates/table.html
index 2a1f84f..c15b61c 100644
--- a/web_app/templates/table.html
+++ b/web_app/templates/table.html
@@ -13,6 +13,11 @@
     {% block body %}
     <h1 align="center">Lab name goes here:-)</h1>
         <table class="table" width="600">
+            {% for header in headers %}
+                <th>
+                    {{ header }}
+                </th>
+            {%  endfor %}
             {% for row in table %}
             <tr>
                 {% for data in row %}
diff --git a/web_app/templates/test.html b/web_app/templates/test.html
index 2426cdb..d3b233f 100644
--- a/web_app/templates/test.html
+++ b/web_app/templates/test.html
@@ -46,9 +46,14 @@
         {% endfor %}
         </table>
     </div>
-    <h2 align="center">
-        <a href="{{ table_url }}">Details</a>
-    </h2>
+    <div>
+        <h2 align="center">
+            <a href="{{ index_url }}">Index page</a>
+        </h2>
+        <h2 align="center">
+            <a href="{{ table_url }}">Details</a>
+        </h2>
+    </div>
     {% endblock %}
 </body>
 </html>
\ No newline at end of file