diff --git a/mate.sqlite3 b/mate.sqlite3
index d25b15c..1b49a2a 100644
Binary files a/mate.sqlite3 and b/mate.sqlite3 differ
diff --git a/matecnt/urls.py b/matecnt/urls.py
index d851b1c..19f877c 100644
--- a/matecnt/urls.py
+++ b/matecnt/urls.py
@@ -1,16 +1,19 @@
 from django.conf.urls import patterns, include, url
+from matecnt import views as cnt_views
 
 urlpatterns = patterns('',
     # Examples:
     # url(r'^$', 'matemat.views.home', name='home'),
     # url(r'^blog/', include('blog.urls')),
 
-    #(r'.*$', 'matecnt.views.overview'),
-    (r'index$', 'matecnt.views.index'),
-    (r'users/.*$', 'matecnt.views.users'),
-    (r'user/(?P<code>\w+)$', 'matecnt.views.user'),
-    (r'drinks/.*$', 'matecnt.views.drinks'),
-    (r'drink/(?P<code>\w+)$', 'matecnt.views.drink'),
-    (r'checkout', 'matecnt.views.checkout'),
-    (r'charge', 'matecnt.views.charge')
+    url(r'index$', cnt_views.index),
+
+    url(r'users/.*$', cnt_views.users),
+    url(r'user/(?P<code>\w+)$', cnt_views.user),
+
+    url(r'drinks/.*$', cnt_views.drinks),
+    url(r'drink/(?P<code>\w+)$', cnt_views.drink),
+
+    url(r'checkout', cnt_views.checkout),
+    url(r'charge', cnt_views.charge)
 )
diff --git a/matemat/urls.py b/matemat/urls.py
index b07ade5..04f1382 100644
--- a/matemat/urls.py
+++ b/matemat/urls.py
@@ -8,5 +8,5 @@ from matecnt import urls as matecnt_urls
 urlpatterns = patterns('',
     url(r'^mate/', include(matecnt_urls)),
     url(r'^admin/', include(admin.site.urls)),
-    (r'^.*$', RedirectView.as_view(url='/mate/index')),
+    url(r'^.*$', RedirectView.as_view(url='/mate/index')),
 )