diff --git a/learning_log/settings.py b/learning_log/settings.py
index 97da305..2dc9e65 100644
--- a/learning_log/settings.py
+++ b/learning_log/settings.py
@@ -40,6 +40,7 @@
 
     #myapps
     'learning_logs',
+    'users',
 ]
 
 MIDDLEWARE = [
diff --git a/learning_log/urls.py b/learning_log/urls.py
index 389de9b..60f2525 100644
--- a/learning_log/urls.py
+++ b/learning_log/urls.py
@@ -18,5 +18,6 @@
 
 urlpatterns = [
     url(r'', include('learning_logs.urls', namespace = 'learning_logs')),
+    url(r'^users/', include('users.urls', namespace='users')),
     url(r'^admin/', admin.site.urls),
 ]
diff --git a/learning_logs/templates/learning_logs/base.html b/learning_logs/templates/learning_logs/base.html
index 840cb61..fa1678f 100644
--- a/learning_logs/templates/learning_logs/base.html
+++ b/learning_logs/templates/learning_logs/base.html
@@ -2,6 +2,15 @@ <h1>
     <a href="{% url 'learning_logs:index' %}">Learning Log</a> -
     <a href="{% url 'learning_logs:topics' %}">Topics</a>
 </h1>
+    <p>
+        {% if user.is_authenticated %}
+        Hello, {{ user.username }}
+        <a href="{% url 'users:logout' %}">log out</a>
+        {% else %}
+        <a href="{% url 'users:login' %}">log in</a>
+        {% endif %}
+    </p>
+
 
 
 {% block content %}{% endblock content %}
\ No newline at end of file
diff --git a/learning_logs/templates/learning_logs/edit_entry.html b/learning_logs/templates/learning_logs/edit_entry.html
index 566549b..d390add 100644
--- a/learning_logs/templates/learning_logs/edit_entry.html
+++ b/learning_logs/templates/learning_logs/edit_entry.html
@@ -1,10 +1,14 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Title</title>
-</head>
-<body>
-
-</body>
-</html>
\ No newline at end of file
+{% extends 'learning_logs/base.html' %}
+
+{% block content %}
+    <p><a href="{% url 'learning_logs:topic' topic.id %}">{{ topic }}</a></p>
+
+    <p>Edit entry:</p>
+
+    <form action="{% url 'learning_logs:edit_entry' entry.id %}" method="post">
+        {% csrf_token %}
+        {{ form.as_p }}
+        <button type="submit">save changes</button>
+    </form>
+
+{% endblock content %}
\ No newline at end of file
diff --git a/learning_logs/templates/learning_logs/topic.html b/learning_logs/templates/learning_logs/topic.html
index d22da31..bad490d 100644
--- a/learning_logs/templates/learning_logs/topic.html
+++ b/learning_logs/templates/learning_logs/topic.html
@@ -13,6 +13,9 @@
             <li>
                 <p>{{ entry.date_added|date:'M d, Y H:i' }}</p>
                 <p>{{ entry.text|linebreaks }}</p>
+                <p>
+                    <a href="{% url 'learning_logs:edit_entry' entry.id %}">edit entry</a>
+                </p>
             </li>
         {% empty %}
             <li>
diff --git a/users/templates/users/login.html b/users/templates/users/login.html
new file mode 100644
index 0000000..c60ca02
--- /dev/null
+++ b/users/templates/users/login.html
@@ -0,0 +1,17 @@
+{% extends "learning_logs/base.html" %}
+
+{% block content %}
+
+    {% if form.errors %}
+        <p>Your username and password didnt match.Please try again</p>
+    {% endif %}
+
+    <form method="post" action="{% url 'users:login' %}">
+        {% csrf_token %}
+        {{ form.as_p }}
+        <button type="submit">log in</button>
+
+        <input type="hidden" name="next" value="{% url 'learning_logs:index' %}"/>
+    </form>
+
+{% endblock content %}
\ No newline at end of file
diff --git a/users/urls.py b/users/urls.py
new file mode 100644
index 0000000..c752157
--- /dev/null
+++ b/users/urls.py
@@ -0,0 +1,13 @@
+"""Defines url patterns for users"""
+
+from django.conf.urls import url
+from django.contrib.auth.views import login
+
+from . import views
+
+urlpatterns = [
+    #login page
+    url(r'^login/$', login, {'template_name': 'users/login.html'},
+        name='login'),
+    url(r'^logout/$', views.logout_view, name='logout'),
+]
\ No newline at end of file
