diff --git a/src/app/pages/alert/alert-page.component.html b/src/app/pages/alert/alert-page.component.html
index 7062196..86a475d 100644
--- a/src/app/pages/alert/alert-page.component.html
+++ b/src/app/pages/alert/alert-page.component.html
@@ -1 +1,9 @@
-<div>alert page</div>
\ No newline at end of file
+<div class="ui-fluid">
+    <div class="ui-g">
+        <div class="ui-g-12">
+            <div class="card no-margin">
+                <h1>Alert</h1>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/app/pages/dashboard/dashboard-page.component.html b/src/app/pages/dashboard/dashboard-page.component.html
index 97f9e07..5f6619b 100644
--- a/src/app/pages/dashboard/dashboard-page.component.html
+++ b/src/app/pages/dashboard/dashboard-page.component.html
@@ -1 +1,9 @@
-<div>dashboard-page</div>
\ No newline at end of file
+<div class="ui-fluid">
+    <div class="ui-g">
+        <div class="ui-g-12">
+            <div class="card no-margin">
+                <h1>Dashboard</h1>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/app/pages/home/home-page.component.html b/src/app/pages/home/home-page.component.html
index 1b92d67..711aa4c 100644
--- a/src/app/pages/home/home-page.component.html
+++ b/src/app/pages/home/home-page.component.html
@@ -4,7 +4,6 @@
                 <div class="card no-margin">
                     <h1>Home works</h1>
 
-
                     <p-dialog header="Discovery" [style]="{width: '400px'}" [(visible)]="display">
                         <of-discovery-setting></of-discovery-setting>
                     </p-dialog>
diff --git a/src/app/pages/log/log-page.component.html b/src/app/pages/log/log-page.component.html
index 2cacd87..0636edd 100644
--- a/src/app/pages/log/log-page.component.html
+++ b/src/app/pages/log/log-page.component.html
@@ -1 +1,9 @@
-<div>log page</div>
\ No newline at end of file
+<div class="ui-fluid">
+    <div class="ui-g">
+        <div class="ui-g-12">
+            <div class="card no-margin">
+                <h1>Log page</h1>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/app/pages/overview/overview-page.component.html b/src/app/pages/overview/overview-page.component.html
index d6f1e69..793b15c 100644
--- a/src/app/pages/overview/overview-page.component.html
+++ b/src/app/pages/overview/overview-page.component.html
@@ -2,7 +2,7 @@
     <div class="ui-g">
         <div class="ui-g-12">
             <div class="card no-margin">
-                overview-page
+                <h1>Overview</h1>
             </div>
         </div>
     </div>
diff --git a/src/app/pages/report/report-page.component.html b/src/app/pages/report/report-page.component.html
index b72d7dd..509bf5a 100644
--- a/src/app/pages/report/report-page.component.html
+++ b/src/app/pages/report/report-page.component.html
@@ -1 +1,9 @@
-<div>report page</div>
\ No newline at end of file
+<div class="ui-fluid">
+    <div class="ui-g">
+        <div class="ui-g-12">
+            <div class="card no-margin">
+                <h1>Report</h1>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/app/pages/sensor/sensor-page.component.html b/src/app/pages/sensor/sensor-page.component.html
index 975a544..52f223f 100644
--- a/src/app/pages/sensor/sensor-page.component.html
+++ b/src/app/pages/sensor/sensor-page.component.html
@@ -1,6 +1,14 @@
-<div>
-  <of-sub-menubar [tabs]="tabs"></of-sub-menubar>
-  <div style="padding: 15px">
-    <router-outlet></router-outlet>
-  </div>
+<div class="ui-fluid">
+    <div class="ui-g">
+        <div class="ui-g-12">
+            <div class="card no-margin">
+                <h1>Sensors</h1>
+
+                <of-sub-menubar [tabs]="tabs"></of-sub-menubar>
+                <div style="padding: 15px">
+                  <router-outlet></router-outlet>
+                </div>
+            </div>
+        </div>
+    </div>
 </div>
\ No newline at end of file
diff --git a/src/app/pages/sensors/sensors-page.component.html b/src/app/pages/sensors/sensors-page.component.html
index 6844dda..63ec980 100644
--- a/src/app/pages/sensors/sensors-page.component.html
+++ b/src/app/pages/sensors/sensors-page.component.html
@@ -1 +1,10 @@
-<of-sensor-list></of-sensor-list>
\ No newline at end of file
+<div class="ui-fluid">
+    <div class="ui-g">
+        <div class="ui-g-12">
+            <div class="card no-margin">
+                <h1>Sensors</h1>
+                <of-sensor-list></of-sensor-list>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/app/pages/targets/targets-page.component.html b/src/app/pages/targets/targets-page.component.html
index 3511189..78adba6 100644
--- a/src/app/pages/targets/targets-page.component.html
+++ b/src/app/pages/targets/targets-page.component.html
@@ -1,2 +1,10 @@
-<div>targets page</div>
-<!-- <of-target-list></of-target-list> -->
\ No newline at end of file
+<div class="ui-fluid">
+    <div class="ui-g">
+        <div class="ui-g-12">
+            <div class="card no-margin">
+                <h1>Targets</h1>
+                <!-- <of-target-list></of-target-list> -->
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file