diff --git a/Client/App.razor b/Client/App.razor
index b77445f..5440bcf 100644
--- a/Client/App.razor
+++ b/Client/App.razor
@@ -4,15 +4,16 @@
 <Router AppAssembly="@typeof(Program).Assembly" OnNavigateAsync="@OnNavigateAsync">
     <Found Context="routeData">
         <CascadingValue Value="@routeData">
-            <RouteView RouteData="@routeData" DefaultLayout="@typeof(Page)" />
+            <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
         </CascadingValue>
     </Found>
     <NotFound>
-        <LayoutView Layout="@typeof(Page)">
+        <LayoutView Layout="@typeof(MainLayout)">
             <p>Sorry, there's nothing at this address.</p>
         </LayoutView>
     </NotFound>
 </Router>
+
 @code {
     private async Task OnNavigateAsync(NavigationContext args)
     {
@@ -30,4 +31,4 @@
             Console.WriteLine(ex);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Client/Pages/Index.razor b/Client/Pages/Index.razor
index d903161..b9527c7 100644
--- a/Client/Pages/Index.razor
+++ b/Client/Pages/Index.razor
@@ -1,7 +1,10 @@
 @page "/"
 @page "/notebook/{Id}"
 
-<Cells @key="@NotebookId" NotebookId="@NotebookId" />
+<div class="page">
+    <MainToolbar />
+    <Cells @key="@NotebookId" NotebookId="@NotebookId" />
+</div>
 
 @code {
     [Parameter]
diff --git a/Client/Pages/Notebooks.razor b/Client/Pages/Notebooks.razor
index a8b171f..7712f83 100644
--- a/Client/Pages/Notebooks.razor
+++ b/Client/Pages/Notebooks.razor
@@ -3,16 +3,20 @@
 @inject NavigationManager navigation
 @inject NotebookService content
 
-<Table TableItem="blazoract.Shared.Notebook" Items="notebooks" RowClickAction="ShowNotebook">
-    <Column TableItem="blazoract.Shared.Notebook" Title="Id" Field="@(x => x.NotebookId)" Sortable="true"
-        Filterable="true" Width="25%" />
-    <Column TableItem="blazoract.Shared.Notebook" Title="Title" Field="@(x => x.Title)" Sortable="true"
-        Filterable="true" Width="25%" />                 
-    <Column TableItem="blazoract.Shared.Notebook" Title="Created At" Field="@(x => x.Created)" Sortable="true"
-        Width="25%" />
-    <Column TableItem="blazoract.Shared.Notebook" Title="Updated At" Field="@(x => x.Updated)" Sortable="true"
-        Width="25%" />
-</Table>
+<div class="page">
+    <MainToolbar />
+
+    <Table TableItem="blazoract.Shared.Notebook" Items="notebooks" RowClickAction="ShowNotebook">
+        <Column TableItem="blazoract.Shared.Notebook" Title="Id" Field="@(x => x.NotebookId)" Sortable="true"
+            Filterable="true" Width="25%" />
+        <Column TableItem="blazoract.Shared.Notebook" Title="Title" Field="@(x => x.Title)" Sortable="true"
+            Filterable="true" Width="25%" />                 
+        <Column TableItem="blazoract.Shared.Notebook" Title="Created At" Field="@(x => x.Created)" Sortable="true"
+            Width="25%" />
+        <Column TableItem="blazoract.Shared.Notebook" Title="Updated At" Field="@(x => x.Updated)" Sortable="true"
+            Width="25%" />
+    </Table>
+</div>
 
 @code {
     private IEnumerable<blazoract.Shared.Notebook> notebooks;
diff --git a/Client/Shared/MainLayout.razor b/Client/Shared/MainLayout.razor
new file mode 100644
index 0000000..4f3f76d
--- /dev/null
+++ b/Client/Shared/MainLayout.razor
@@ -0,0 +1,3 @@
+@inherits LayoutComponentBase
+
+@Body
diff --git a/Client/Shared/Page.razor b/Client/Shared/Page.razor
deleted file mode 100644
index c3c3f81..0000000
--- a/Client/Shared/Page.razor
+++ /dev/null
@@ -1,6 +0,0 @@
-@inherits LayoutComponentBase
-
-<div class="page">
-    <MainToolbar />
-    @Body
-</div>
\ No newline at end of file
diff --git a/Client/Shared/Page.razor.css b/Client/Shared/Page.razor.css
deleted file mode 100644
index 9d729a0..0000000
--- a/Client/Shared/Page.razor.css
+++ /dev/null
@@ -1,5 +0,0 @@
-.page {
-    position: relative;
-    display: flex;
-    flex-direction: column;
-}
\ No newline at end of file
diff --git a/Client/wwwroot/css/app.css b/Client/wwwroot/css/app.css
index 1b396d9..4af91e5 100644
--- a/Client/wwwroot/css/app.css
+++ b/Client/wwwroot/css/app.css
@@ -13,6 +13,12 @@ body {
     display: none;
 }
 
+.page {
+    position: relative;
+    display: flex;
+    flex-direction: column;
+}
+
 body .table-hover tbody tr:hover {
     cursor: pointer;
     background-color: #fea;