diff --git a/bookmarks/templates/bookmarks/detail.html b/bookmarks/templates/bookmarks/detail.html
deleted file mode 100644
index fc9203e..0000000
--- a/bookmarks/templates/bookmarks/detail.html
+++ /dev/null
@@ -1 +0,0 @@
-<h2>Edit bookmark {{ bookmark.id }}</h2>
diff --git a/bookmarks/templates/bookmarks/edit.html b/bookmarks/templates/bookmarks/edit.html
new file mode 100644
index 0000000..7de25ad
--- /dev/null
+++ b/bookmarks/templates/bookmarks/edit.html
@@ -0,0 +1,5 @@
+{% extends "bookmarks/layout.html" %}
+
+{% block content %}
+    <h2>Edit bookmark</h2>
+{% endblock %}
diff --git a/bookmarks/templates/bookmarks/index.html b/bookmarks/templates/bookmarks/index.html
index 5018909..4774953 100644
--- a/bookmarks/templates/bookmarks/index.html
+++ b/bookmarks/templates/bookmarks/index.html
@@ -1,7 +1,10 @@
 {% extends "bookmarks/layout.html" %}
 
 {% block content %}
-    <h2>Bookmarks</h2>
+    <div>
+        <h2>Bookmarks</h2>
+        <a href="{% url 'bookmarks:new' %}">Add</a>
+    </div>
     <ul class="bookmark-list">
         {% for bookmark in bookmarks %}
             <li>
@@ -12,7 +15,7 @@
                     <p>{{ bookmark.description }}</p>
                 {% endif %}
                 <p>
-                    <a href="{% url 'bookmarks:detail' bookmark.id %}">Edit</a>
+                    <a href="{% url 'bookmarks:edit' bookmark.id %}">Edit</a>
                     <a href="{% url 'bookmarks:remove' bookmark.id %}"
                        onclick="return confirm('Do you really want to delete this bookmark?')">Remove</a>
                 </p>
diff --git a/bookmarks/templates/bookmarks/new.html b/bookmarks/templates/bookmarks/new.html
new file mode 100644
index 0000000..87bec1b
--- /dev/null
+++ b/bookmarks/templates/bookmarks/new.html
@@ -0,0 +1,5 @@
+{% extends "bookmarks/layout.html" %}
+
+{% block content %}
+    <h2>New bookmark</h2>
+{% endblock %}
diff --git a/bookmarks/urls.py b/bookmarks/urls.py
index 3ee10ac..7ed5ce2 100644
--- a/bookmarks/urls.py
+++ b/bookmarks/urls.py
@@ -1,10 +1,17 @@
+from django.conf.urls import url
 from django.urls import path
+from django.views.generic import RedirectView
 
 from . import views
 
 app_name = 'bookmarks'
 urlpatterns = [
-    path('', views.index, name='index'),
-    path('bookmark/<int:bookmark_id>', views.detail, name='detail'),
-    path('bookmark/<int:bookmark_id>/remove', views.remove, name='remove'),
+    # Redirect root to bookmarks index
+    url(r'^$', RedirectView.as_view(pattern_name='bookmarks:index', permanent=False)),
+    path('bookmarks', views.index, name='index'),
+    path('bookmarks/new', views.new, name='new'),
+    # path('bookmarks/create', views.create, name='create'),
+    path('bookmarks/<int:bookmark_id>/edit', views.edit, name='edit'),
+    # path('bookmarks/<int:bookmark_id>/update', views.update, name='edit'),
+    path('bookmarks/<int:bookmark_id>/remove', views.remove, name='remove'),
 ]
diff --git a/bookmarks/views.py b/bookmarks/views.py
index 38c29a9..ad18152 100644
--- a/bookmarks/views.py
+++ b/bookmarks/views.py
@@ -1,6 +1,5 @@
 from django.http import HttpResponse, HttpResponseRedirect
 from django.shortcuts import render
-
 # Create your views here.
 from django.urls import reverse
 
@@ -18,11 +17,15 @@ def create(request):
     return HttpResponse('OK')
 
 
-def detail(request, bookmark_id):
+def new(request):
+    return render(request, 'bookmarks/new.html')
+
+
+def edit(request, bookmark_id):
     context = {
-        'bookmark': Bookmark.objects.get(bookmark_id)
+        'bookmark': Bookmark.objects.get(pk=bookmark_id)
     }
-    return render(request, 'bookmarks/detail.html', context)
+    return render(request, 'bookmarks/edit.html', context)
 
 
 def remove(request, bookmark_id: int):
diff --git a/siteroot/urls.py b/siteroot/urls.py
index cf3b1d8..7029fe7 100644
--- a/siteroot/urls.py
+++ b/siteroot/urls.py
@@ -17,6 +17,6 @@ from django.contrib import admin
 from django.urls import path, include
 
 urlpatterns = [
-    path('bookmarks/', include('bookmarks.urls')),
     path('admin/', admin.site.urls),
+    path('', include('bookmarks.urls')),
 ]