diff --git a/Start/Client/Components/BookmarkGroup.razor b/Start/Client/Components/BookmarkGroup.razor
index 07e9e41..eb4613a 100644
--- a/Start/Client/Components/BookmarkGroup.razor
+++ b/Start/Client/Components/BookmarkGroup.razor
@@ -22,7 +22,7 @@
                         <div class="empty-icon">
                             <i class="icon icon-bookmark"></i>
                         </div>
-                        <p class="empty-title h5">No Bookmarks</p>
+                        <p class="empty-title h6">No Bookmarks</p>
                         <div class="empty-action">
                             <button type="button" class="btn btn-primary">
                                 <i class="icon icon-plus"></i> Create Bookmark
diff --git a/Start/Client/Components/Sidebar.razor b/Start/Client/Components/Sidebar.razor
index 9f36ced..1fe841e 100644
--- a/Start/Client/Components/Sidebar.razor
+++ b/Start/Client/Components/Sidebar.razor
@@ -39,7 +39,7 @@
             <AuthorizeView>
                 <Authorized>
                     <li class="nav-item accountName">
-                        <figure class="avatar">
+                        <figure class="avatar mr-1">
                             <i class="icon icon-people ml-2 mt-2"></i>
                         </figure>
                             @context.User.Identity?.Name
diff --git a/Start/Client/Pages/Index.razor b/Start/Client/Pages/Index.razor
index 6290e04..1a601cf 100644
--- a/Start/Client/Pages/Index.razor
+++ b/Start/Client/Pages/Index.razor
@@ -37,8 +37,7 @@
 else
 {
     <Sidebar>
-
-        <div id="containerTabStrip">
+        <div id="containerTabStrip" class="px-2">
             <button id="menuButton" class="btn btn-link" @onclick="this.ShowSidebar">
                 <i class="icon icon-menu"></i>
             </button>
diff --git a/Start/Client/Shared/MainLayout.razor b/Start/Client/Shared/MainLayout.razor
index 3179cb7..655f150 100644
--- a/Start/Client/Shared/MainLayout.razor
+++ b/Start/Client/Shared/MainLayout.razor
@@ -2,7 +2,7 @@
 
 <div class="page">
     <div class="main">
-        <div class="content px-4">
+        <div class="content">
             @Body
         </div>
     </div>
diff --git a/Start/Client/Shared/MainLayout.razor.css b/Start/Client/Shared/MainLayout.razor.css
deleted file mode 100644
index 43c355a..0000000
--- a/Start/Client/Shared/MainLayout.razor.css
+++ /dev/null
@@ -1,70 +0,0 @@
-.page {
-    position: relative;
-    display: flex;
-    flex-direction: column;
-}
-
-.main {
-    flex: 1;
-}
-
-.sidebar {
-    background-image: linear-gradient(180deg, rgb(5, 39, 103) 0%, #3a0647 70%);
-}
-
-.top-row {
-    background-color: #f7f7f7;
-    border-bottom: 1px solid #d6d5d5;
-    justify-content: flex-end;
-    height: 3.5rem;
-    display: flex;
-    align-items: center;
-}
-
-    .top-row ::deep a, .top-row .btn-link {
-        white-space: nowrap;
-        margin-left: 1.5rem;
-    }
-
-    .top-row a:first-child {
-        overflow: hidden;
-        text-overflow: ellipsis;
-    }
-
-@media (max-width: 640.98px) {
-    .top-row:not(.auth) {
-        display: none;
-    }
-
-    .top-row.auth {
-        justify-content: space-between;
-    }
-
-    .top-row a, .top-row .btn-link {
-        margin-left: 0;
-    }
-}
-
-@media (min-width: 641px) {
-    .page {
-        flex-direction: row;
-    }
-
-    .sidebar {
-        width: 250px;
-        height: 100vh;
-        position: sticky;
-        top: 0;
-    }
-
-    .top-row {
-        position: sticky;
-        top: 0;
-        z-index: 1;
-    }
-
-    .main > div {
-        padding-left: 2rem !important;
-        padding-right: 1.5rem !important;
-    }
-}
diff --git a/Start/Client/wwwroot/css/app.css b/Start/Client/wwwroot/css/app.css
index 2ef044a..d7bc4d1 100644
--- a/Start/Client/wwwroot/css/app.css
+++ b/Start/Client/wwwroot/css/app.css
@@ -87,8 +87,8 @@
 	padding: 0;
 }
 
-#menubutton .icon {
-	transform: scale(1.5);
+#menuButton .icon {
+	transform: scale(1.2);
 }
 
 #containerTabStrip {
@@ -100,12 +100,17 @@
 #containerTabStrip #menuButton {
 	flex: 0 0 auto;
 	margin-right: 1em;
+	margin-left: 1em;
 }
 
 #containerTabStrip .containerList {
 	flex: 1 0 0;
 }
 
+#containerTabStrip .containerList .tab-item a {
+	padding: .6rem .4rem .6rem .4rem;
+}
+
 #bookmarkGroups {
 	margin-top: 1em;
 	margin-left: auto;
@@ -126,14 +131,14 @@
 @media screen and (min-width: 960px) {
 	#bookmarkGroups {
 		grid-template-columns: repeat(2, 1fr);
-		width: 70%;
+		width: 60%;
 	}
 }
 
 @media screen and (min-width: 1440) {
 	#bookmarkGroups {
 		grid-template-columns: repeat(3, 1fr);
-		width: 70%;
+		width: 60%;
 	}
 }