diff --git a/app/Http/Controllers/BookmarksController.php b/app/Http/Controllers/BookmarksController.php
index ef17150f..72112d9b 100644
--- a/app/Http/Controllers/BookmarksController.php
+++ b/app/Http/Controllers/BookmarksController.php
@@ -8,7 +8,7 @@ class BookmarksController extends Controller
 {
     public function index()
     {
-        $bookmarks = Bookmark::paginate(10);
+        $bookmarks = Bookmark::with('tags')->latest()->paginate(10);
 
         return view('bookmarks.index', compact('bookmarks'));
     }
diff --git a/resources/views/bookmarks/index.blade.php b/resources/views/bookmarks/index.blade.php
index 125c63c5..8ec6c01d 100644
--- a/resources/views/bookmarks/index.blade.php
+++ b/resources/views/bookmarks/index.blade.php
@@ -17,7 +17,19 @@ Bookmarks «
         {{ $bookmark->url }}
       @endempty
     </a> &nbsp; <a href="/bookmarks/{{ $bookmark->id }}">🔗</a>
+    @isset($bookmark->content)
+    <p>{{ $bookmark->content }}</p>
+    @endisset
+    @if(count($bookmark->tags()->get()) > 0)
+    <ul>
+      @foreach($bookmark->tags as $tag)
+      <li><a href="/bookmarks/tagged/{{ $tag->tag }}">{{ $tag->tag }}</a></li>
+      @endforeach
+    </ul>
+    @endif
   </div>
 @endforeach
 </div>
+
+{{ $bookmarks->links() }}
 @stop
diff --git a/resources/views/bookmarks/show.blade.php b/resources/views/bookmarks/show.blade.php
index a9497bd6..1d186fa2 100644
--- a/resources/views/bookmarks/show.blade.php
+++ b/resources/views/bookmarks/show.blade.php
@@ -15,5 +15,15 @@ Bookmark «
       {{ $bookmark->url }}
     @endempty
   </a>
+  @isset($bookmark->content)
+  <p>{{ $bookmark->content }}</p>
+  @endisset
+  @if(count($bookmark->tags()->get()) > 0)
+    <ul>
+      @foreach($bookmark->tags as $tag)
+      <li><a href="/bookmarks/tagged/{{ $tag->tag }}">{{ $tag->tag }}</a></li>
+      @endforeach
+    </ul>
+    @endif
 </div>
 @stop