diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
index b091e4f..507b0ad 100644
--- a/.idea/dataSources.xml
+++ b/.idea/dataSources.xml
@@ -18,22 +18,5 @@
         </library>
       </libraries>
     </data-source>
-    <data-source source="LOCAL" name="db [2]" uuid="037e6f47-0871-42e5-8f52-6fdef1f306f2">
-      <driver-ref>sqlite.xerial</driver-ref>
-      <synchronize>true</synchronize>
-      <jdbc-driver>org.sqlite.JDBC</jdbc-driver>
-      <jdbc-url>jdbc:sqlite:$PROJECT_DIR$/data/db.sqlite3</jdbc-url>
-      <driver-properties>
-        <property name="enable_load_extension" value="true" />
-      </driver-properties>
-      <libraries>
-        <library>
-          <url>file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/Xerial SQLiteJDBC/3.25.1/sqlite-jdbc-3.25.1.jar</url>
-        </library>
-        <library>
-          <url>file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/Xerial SQLiteJDBC/3.25.1/license.txt</url>
-        </library>
-      </libraries>
-    </data-source>
   </component>
 </project>
\ No newline at end of file
diff --git a/bookmarks/templates/bookmarks/bookmark_list.html b/bookmarks/templates/bookmarks/bookmark_list.html
index d8d93d9..b9578bb 100644
--- a/bookmarks/templates/bookmarks/bookmark_list.html
+++ b/bookmarks/templates/bookmarks/bookmark_list.html
@@ -1,3 +1,5 @@
+{% load shared %}
+
 <ul class="bookmark-list">
     {% for bookmark in bookmarks %}
         <li>
diff --git a/bookmarks/templates/bookmarks/empty_bookmarks.html b/bookmarks/templates/bookmarks/empty_bookmarks.html
new file mode 100644
index 0000000..d97a88f
--- /dev/null
+++ b/bookmarks/templates/bookmarks/empty_bookmarks.html
@@ -0,0 +1,8 @@
+<div class="empty">
+    <p class="empty-title h5">You have no bookmarks yet</p>
+    <p class="empty-subtitle">
+        You can get started by <a href="{% url 'bookmarks:new' %}">adding</a> bookmarks, <a
+            href="{% url 'bookmarks:settings.index' %}">importing</a> your existing bookmarks or <a
+            href="{% url 'bookmarks:bookmarklet' %}">configuring</a> the bookmarklet.
+    </p>
+</div>
diff --git a/bookmarks/templates/bookmarks/index.html b/bookmarks/templates/bookmarks/index.html
index e0a8f10..01ecf59 100644
--- a/bookmarks/templates/bookmarks/index.html
+++ b/bookmarks/templates/bookmarks/index.html
@@ -20,7 +20,9 @@
                 </div>
             </div>
 
-            {% if bookmarks.paginator.num_pages > 0 %}
+            {% if empty %}
+                {% include 'bookmarks/empty_bookmarks.html' %}
+            {% else %}
                 {% bookmark_list bookmarks %}
             {% endif %}
         </section>
diff --git a/bookmarks/views/bookmarks.py b/bookmarks/views/bookmarks.py
index 581109c..411c53c 100644
--- a/bookmarks/views/bookmarks.py
+++ b/bookmarks/views/bookmarks.py
@@ -29,6 +29,7 @@ def index(request):
         'bookmarks': bookmarks,
         'tags': tags,
         'query': query_string if query_string else '',
+        'empty': paginator.count == 0
     }
     return render(request, 'bookmarks/index.html', context)