diff --git a/bbssite/urls.py b/bbssite/urls.py
index cb1d76d..098821f 100755
--- a/bbssite/urls.py
+++ b/bbssite/urls.py
@@ -1,7 +1,9 @@
 from django.conf import settings
 from django.conf.urls import include, url
 from django.contrib import admin
+from django.contrib.auth.views import LoginView, LogoutView
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
+from django.contrib.staticfiles.views import serve
 
 from main import urls as main_urls
 
@@ -10,8 +12,8 @@ admin.autodiscover()
 
 urlpatterns = [
     url(r'', include(main_urls)),
-    url(r'^accounts/login/$', 'django.contrib.auth.views.login', name='login'),
-    url(r'^accounts/logout/$', 'django.contrib.auth.views.logout', name='logout'),
+    url(r'^accounts/login/$', LoginView.as_view(), name='django.contrib.auth.views.login'),
+    url(r'^accounts/logout/$', LogoutView.as_view(), name='django.contrib.auth.views.logout'),
 
     url(r'^admin/', include(admin.site.urls)),
 ]
@@ -19,7 +21,7 @@ urlpatterns += staticfiles_urlpatterns()
 
 if settings.DEBUG:
     urlpatterns += [
-        url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {
+        url(r'^media/(?P<path>.*)$', serve, {
             'document_root': settings.MEDIA_ROOT,
         })
     ]
diff --git a/main/urls.py b/main/urls.py
index bdf83c4..de9561e 100644
--- a/main/urls.py
+++ b/main/urls.py
@@ -1,7 +1,9 @@
-from django.conf.urls import url, patterns
+from django.conf.urls import url
+from django.contrib.staticfiles.views import serve
+
 from main.api.views import ProductViewSet
-from main.views.stats import stats_list, stats_products_realtime, stats_products_per_user, \
-    OrdersHourlyView, OrdersDailyView, OrdersMonthlyView, OrdersYearlyView
+from main.views.stats import (stats_list, stats_products_realtime, stats_products_per_user,
+                              OrdersHourlyView, OrdersDailyView, OrdersMonthlyView, OrdersYearlyView)
 from main.views.general import register, deposit, log
 from main.views.reports import inventory, inventory_add, report
 from main.views.users import create_user, profile
@@ -13,9 +15,11 @@ urlpatterns = [
     url(r'^deposit/$', deposit, name='deposit'),
     url(r'^log/$', log, name='log'),
     url(r'^log/all$', log, kwargs={'limit': None}, name='log-all'),
+
     # Users
     url(r'^user/create/$', create_user, name='create-user'),
     url(r'^profile/$', profile, name='profile'),
+
     # Reports
     url(r'^inventory/$', inventory, name='inventory'),
     url(r'^inventory/add/$', inventory_add, name='inventory-add'),
@@ -33,10 +37,9 @@ urlpatterns += [
     url(r'^stats/products/by_user/(?P<user_id>[0-9]+)/$', stats_products_per_user, name='stats-products-per-user'),
 ]
 # Root level service-worker.js
-urlpatterns += patterns(
-    'django.contrib.staticfiles.views',
-    url(r'^service-worker\.js$', 'serve', kwargs={'path': 'dist/service-worker.js'})
-)
+urlpatterns += [
+    url(r'^service-worker\.js$', serve, kwargs={'path': 'dist/service-worker.js'})
+]
 
 # API
 router = DefaultRouter()
diff --git a/templates/base.html b/templates/base.html
index 09206c5..f0662b9 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -33,7 +33,7 @@
                 </ul>
                 <ul class="nav navbar-nav navbar-right">
                     {% if not user.is_authenticated %}
-                    <li><a href="{% url 'login' %}">Logg inn</a></li>
+                    <li><a href="{% url 'django.contrib.auth.views.login' %}">Logg inn</a></li>
                     {% else %}
                     <li class="dropdown">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown"><img src="{{ user.profile.profile_image_url }}" /><span class="name">{{ user.first_name }}</span> <b class="caret"></b></a>
@@ -44,7 +44,7 @@
                             {% if user.is_superuser %}<li class="{% block active_inventory %}{% endblock %}"><a href="{% url 'inventory' %}"><i class="glyphicon glyphicon-briefcase"></i> Varebeholdning</a></li>{% endif %}
                             {% if user.is_superuser %}<li class="{% block active_report %}{% endblock %}"><a href="{% url 'report' %}"><i class="glyphicon glyphicon-briefcase"></i> Rapport</a></li>{% endif %}
                             <li class="divider"></li>
-                            <li><a href="{% url 'logout' %}"><i class="glyphicon glyphicon-log-out"></i> Logg ut</a></li>
+                            <li><a href="{% url 'django.contrib.auth.views.logout' %}"><i class="glyphicon glyphicon-log-out"></i> Logg ut</a></li>
                         </ul>
                     </li>
                     {% endif %}