diff --git a/pkg/storygraph/client.go b/pkg/storygraph/client.go
index 6ba3396..5bc4393 100644
--- a/pkg/storygraph/client.go
+++ b/pkg/storygraph/client.go
@@ -38,11 +38,13 @@ func init() {
 }
 
 func GetLatestBooks() (map[string]*Book, error) {
+	fmt.Println("Fetching latest book recommendations...")
 	links := []Book{}
 
 	page := 0
 	for {
 		page++
+		fmt.Println("Fetching page", page)
 
 		resp, err := c.Get(fmt.Sprintf("https://app.thestorygraph.com/to-read/averagemarcus?page=%d", page))
 		if err != nil {
@@ -100,6 +102,7 @@ func GetLatestBooks() (map[string]*Book, error) {
 		"Business":    nextByTag(links, "Business"),
 		"Technology":  nextByTag(links, "Technology"),
 		"Sci-Fi":      nextByTag(links, "Sci-Fi"),
+		"Fantasy":     nextByTag(links, "Fantasy"),
 		"Comics":      nextByTag(links, "Comics"),
 	}, nil
 }
@@ -192,6 +195,8 @@ func getTags(decs iter.Seq[*html.Node]) []string {
 										tags["Technology"] = true
 									case "science fiction":
 										tags["Sci-Fi"] = true
+									case "fantasy":
+										tags["Fantasy"] = true
 									case "comics":
 										tags["Comics"] = true
 									}
diff --git a/templates/index.html b/templates/index.html
index 8b1e386..b59e74e 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -19,7 +19,8 @@
 
     main {
       display: grid;
-      grid-template-columns: repeat(6, 1fr);
+      grid-template-columns: repeat(12, 1fr);
+      margin: 8px 16px;
     }
 
     .category {
@@ -54,12 +55,43 @@
     <h1>Next Book</h1>
     <p>Suggestions for the next book to read from your Storygraph to-read pile</p>
   </header>
-  <div class="container">
+  <main>
+    {{ $cat := "Fiction" }}
+    {{ $book := index . $cat }}
+    <div class="category" style="grid-column: span 4;">
+      <h3>{{ $cat }}</h3>
+      <a href="{{ $book.Link }}" target="_blank">
+        <img src="{{ $book.Image }}" alt="{{ $book.Name }} cover" style="height: 250px;" />
+      </a>
+      <a href="{{ $book.Link }}" target="_blank">{{ $book.Name }}</a>
+      <div class="rating">⭐ {{ $book.Rating }}</div>
+    </div>
+    {{ $cat := "Non-Fiction" }}
+    {{ $book := index . $cat }}
+    <div class="category" style="grid-column: span 4;">
+      <h3>{{ $cat }}</h3>
+      <a href="{{ $book.Link }}" target="_blank">
+        <img src="{{ $book.Image }}" alt="{{ $book.Name }} cover" style="height: 250px;" />
+      </a>
+      <a href="{{ $book.Link }}" target="_blank">{{ $book.Name }}</a>
+      <div class="rating">⭐ {{ $book.Rating }}</div>
+    </div>
+    {{ $cat := "Comics" }}
+    {{ $book := index . $cat }}
+    <div class="category" style="grid-column: span 4;">
+      <h3>{{ $cat }}</h3>
+      <a href="{{ $book.Link }}" target="_blank">
+        <img src="{{ $book.Image }}" alt="{{ $book.Name }} cover" style="height: 250px;" />
+      </a>
+      <a href="{{ $book.Link }}" target="_blank">{{ $book.Name }}</a>
+      <div class="rating">⭐ {{ $book.Rating }}</div>
+    </div>
 
-    <main>
-      {{ $cat := "Fiction" }}
-      {{ $book := index . $cat }}
-      <div class="category" style="grid-column: span 3;">
+    {{ range $cat, $book := .}}
+    {{ if or (eq $cat "Fiction") (eq $cat "Non-Fiction") (eq $cat "Comics") }}
+      {{ continue }}
+    {{ end }}
+      <div class="category">
         <h3>{{ $cat }}</h3>
         <a href="{{ $book.Link }}" target="_blank">
           <img src="{{ $book.Image }}" alt="{{ $book.Name }} cover" style="height: 250px;" />
@@ -67,34 +99,7 @@
         <a href="{{ $book.Link }}" target="_blank">{{ $book.Name }}</a>
         <div class="rating">⭐ {{ $book.Rating }}</div>
       </div>
-      {{ $cat := "Non-Fiction" }}
-      {{ $book := index . $cat }}
-      <div class="category" style="grid-column: span 3;">
-        <h3>{{ $cat }}</h3>
-        <a href="{{ $book.Link }}" target="_blank">
-          <img src="{{ $book.Image }}" alt="{{ $book.Name }} cover" style="height: 250px;" />
-        </a>
-        <a href="{{ $book.Link }}" target="_blank">{{ $book.Name }}</a>
-        <div class="rating">⭐ {{ $book.Rating }}</div>
-      </div>
-
-
-      {{ range $cat, $book := .}}
-      {{ if or (eq $cat "Fiction") (eq $cat "Non-Fiction") }}
-        {{ continue }}
-      {{ end }}
-        <div class="category">
-          <h3>{{ $cat }}</h3>
-          <a href="{{ $book.Link }}" target="_blank">
-            <img src="{{ $book.Image }}" alt="{{ $book.Name }} cover" style="height: 250px;" />
-          </a>
-          <a href="{{ $book.Link }}" target="_blank">{{ $book.Name }}</a>
-          <div class="rating">⭐ {{ $book.Rating }}</div>
-        </div>
-      {{ end }}
-    </main>
-
-  </div>
-
+    {{ end }}
+  </main>
 </body>
 </html>