diff --git a/Start/Client/Components/BookmarkContainer.razor b/Start/Client/Components/BookmarkContainer.razor
new file mode 100644
index 0000000..7fbb2ef
--- /dev/null
+++ b/Start/Client/Components/BookmarkContainer.razor
@@ -0,0 +1,35 @@
+@using Start.Shared
+
+<div class="activeBookmarkContainer">
+    @if (this.Container == null)
+    {
+        <div class="empty">
+            <div class="empty-icon">
+                <div class="loading loading-icon"></div>
+            </div>
+            <p class="empty-title h5">Loading Bookmarks</p>
+        </div>
+        <p class="text-center">Loading Bookmarks</p>
+    }
+    else if (!this.Container.BookmarkGroups?.Any() ?? true)
+    {
+        <div class="empty">
+            <div class="empty-icon">
+                <i class="icon icon-3x icon-bookmark"></i>
+            </div>
+            <p class="empty-title h5">No Bookmark Groups</p>
+        </div>
+    }
+    else
+    {
+        foreach (BookmarkGroupDto group in this.Container.BookmarkGroups!)
+        {
+            <BookmarkGroup Group="group" />
+        }
+    }
+</div>
+
+@code {
+    [Parameter]
+    public BookmarkContainerDto? Container { get; set; }
+}
diff --git a/Start/Client/Pages/Index.razor b/Start/Client/Pages/Index.razor
index 5f217c4..6f6c51e 100644
--- a/Start/Client/Pages/Index.razor
+++ b/Start/Client/Pages/Index.razor
@@ -47,34 +47,7 @@ else
         </li>
     </ul>
 
-    <div class="activeBookmarkContainer">
-        @if (this.selectedBookmarkContainer == null)
-        {
-            <div class="empty">
-                <div class="empty-icon">
-                    <div class="loading loading-icon"></div>
-                </div>
-                <p class="empty-title h5">Loading Bookmarks</p>
-            </div>
-            <p class="text-center">Loading Bookmarks</p>
-        }
-        else if (!this.selectedBookmarkContainer.BookmarkGroups?.Any() ?? true)
-        {
-            <div class="empty">
-                <div class="empty-icon">
-                    <i class="icon icon-3x icon-bookmark"></i>
-                </div>
-                <p class="empty-title h5">No Bookmark Groups</p>
-            </div>
-        }
-        else
-        {
-            @foreach (BookmarkGroupDto group in this.selectedBookmarkContainer.BookmarkGroups!)
-            {
-                <BookmarkGroup Group="group" />
-            }
-        }
-    </div>
+    <BookmarkContainer Container="this.selectedBookmarkContainer" />
 
     <CreateContainer IsOpen="showCreateContainerForm" OnClose="this.OnCloseCreateContainer"
                      OnCreated="this.OnContainerCreated" />