diff --git a/bookmarks/templates/bookmarks/archive.html b/bookmarks/templates/bookmarks/archive.html
new file mode 100644
index 0000000..9f4f0e8
--- /dev/null
+++ b/bookmarks/templates/bookmarks/archive.html
@@ -0,0 +1,34 @@
+{% extends "bookmarks/layout.html" %}
+{% load static %}
+{% load shared %}
+{% load bookmarks %}
+
+{% block content %}
+
+
+ {# Bookmark list #}
+
+
+
+ {% if empty %}
+ {% include 'bookmarks/empty_bookmarks.html' %}
+ {% else %}
+ {% bookmark_list bookmarks return_url %}
+ {% endif %}
+
+
+ {# Tag list #}
+
+
+ {% tag_cloud tags %}
+
+
+
+
+{% endblock %}
diff --git a/bookmarks/templates/bookmarks/index.html b/bookmarks/templates/bookmarks/index.html
index 8c0ff03..efb3683 100644
--- a/bookmarks/templates/bookmarks/index.html
+++ b/bookmarks/templates/bookmarks/index.html
@@ -11,17 +11,7 @@
{% if empty %}
@@ -40,24 +30,5 @@
- {# Replace search input with auto-complete component #}
-
{% endblock %}
diff --git a/bookmarks/templates/bookmarks/nav_menu.html b/bookmarks/templates/bookmarks/nav_menu.html
index 4cb5a28..aa4922a 100644
--- a/bookmarks/templates/bookmarks/nav_menu.html
+++ b/bookmarks/templates/bookmarks/nav_menu.html
@@ -1,6 +1,7 @@
{# Basic menu list #}