diff --git a/mkdocs_print_site_plugin/css/print-site.css b/mkdocs_print_site_plugin/css/print-site.css
index 1770ff8..a4f749b 100644
--- a/mkdocs_print_site_plugin/css/print-site.css
+++ b/mkdocs_print_site_plugin/css/print-site.css
@@ -192,6 +192,9 @@ div.print-site-add-full-url section.print-page a[href^="http"]::after{
 #print-site-page h6:target {
     animation: highlight 1.5s ease;
 }
+#print-site-page .print-page:target h1 {
+    animation: highlight 1.5s ease;
+}
 @keyframes highlight {
     from { color: orange; }
     to { color: none; }
diff --git a/mkdocs_print_site_plugin/renderer.py b/mkdocs_print_site_plugin/renderer.py
index dc1552b..74376b8 100644
--- a/mkdocs_print_site_plugin/renderer.py
+++ b/mkdocs_print_site_plugin/renderer.py
@@ -178,12 +178,11 @@ def get_toc_sidebar(self) -> TableOfContents:
 
         for item in self._get_items():
             if item.is_page:
-                # Take the first item of the page's ToC
-                # Which will be the heading 1
-                p = item.toc.items[0]
                 page_key = get_page_key(item.url)
-
-                toc.append(AnchorLink(title=p.title, id=f"{page_key}-{p.id}", level=0))
+                # navigate to top of page if page is homepage
+                if page_key == "index":
+                    page_key = ""
+                toc.append(AnchorLink(title=item.title, id=f"{page_key}", level=0))
             if item.is_section:
 
                 section_link = AnchorLink(title=item.title, id=f"section-{to_snake_case(item.title)}", level=0)
@@ -191,8 +190,7 @@ def get_toc_sidebar(self) -> TableOfContents:
                 subpages = [p for p in item.children if p.is_page]
                 for page in subpages:
                     page_key = get_page_key(page.url)
-                    p = page.toc.items[0]
-                    section_link.children.append(AnchorLink(title=p.title, id=f"{page_key}-{p.id}", level=1))
+                    section_link.children.append(AnchorLink(title=page.title, id=f"{page_key}", level=1))
 
                 toc.append(section_link)
 
diff --git a/mkdocs_print_site_plugin/templates/cover_page.tpl b/mkdocs_print_site_plugin/templates/cover_page.tpl
index 64f7bd8..af282cb 100644
--- a/mkdocs_print_site_plugin/templates/cover_page.tpl
+++ b/mkdocs_print_site_plugin/templates/cover_page.tpl
@@ -37,7 +37,7 @@
         <td>{{ config.copyright }}</td>
     </tr>
     {% endif %}
-</dl>
+
 </table>