diff --git a/mayan/apps/common/urls.py b/mayan/apps/common/urls.py
index 79195b4f70..a64d5873ad 100644
--- a/mayan/apps/common/urls.py
+++ b/mayan/apps/common/urls.py
@@ -4,11 +4,11 @@ from django.conf.urls import patterns, url
 from django.contrib.staticfiles.templatetags.staticfiles import static
 from django.views.generic import RedirectView
 
-from .views import AboutView, ToolsListView
+from .views import AboutView, HomeView, SetupListView, ToolsListView
 
 
 urlpatterns = patterns('common.views',
-    url(r'^$', 'home', (), 'home'),
+    url(r'^$', HomeView.as_view(), name='home'),
     url(r'^maintenance_menu/$', 'maintenance_menu', (), 'maintenance_menu'),
 
     url(r'^about/$', AboutView.as_view(), name='about_view'),
@@ -21,7 +21,7 @@ urlpatterns = patterns('common.views',
     url(r'^user/locale/$', 'current_user_locale_profile_details', (), name='current_user_locale_profile_details'),
     url(r'^user/locale/edit/$', 'current_user_locale_profile_edit', (), name='current_user_locale_profile_edit'),
 
-    url(r'^setup/$', 'setup_list', (), 'setup_list'),
+    url(r'^setup/$', SetupListView.as_view(), name='setup_list'),
     url(r'^tools/$', ToolsListView.as_view(), name='tools_list'),
 )
 
diff --git a/mayan/apps/common/views.py b/mayan/apps/common/views.py
index ce73d5c8c8..a16f8eea79 100644
--- a/mayan/apps/common/views.py
+++ b/mayan/apps/common/views.py
@@ -419,14 +419,16 @@ class MultiFormView(FormView):
             return self.forms_invalid(forms)
 
 
-def setup_list(request):
-    context = {
-        'object_navigation_links': menu_setup.resolve(context=RequestContext(request)),
-        'title': _('Setup items'),
-    }
+class SetupListView(TemplateView):
+    template_name = 'appearance/generic_list_horizontal.html'
 
-    return render_to_response('appearance/generic_list_horizontal.html', context,
-                              context_instance=RequestContext(request))
+    def get_context_data(self, **kwargs):
+        data = super(SetupListView, self).get_context_data(**kwargs)
+        data.update({
+            'object_navigation_links': menu_setup.resolve(context=RequestContext(self.request)),
+            'title': _('Setup items'),
+        })
+        return data
 
 
 class ToolsListView(TemplateView):
@@ -441,18 +443,23 @@ class ToolsListView(TemplateView):
         return data
 
 
-def home(request):
-    document_search = SearchModel.get('documents.Document')
+class HomeView(TemplateView):
+    template_name = 'appearance/home.html'
 
-    context = {
-        'query_string': request.GET,
-        'hide_links': True,
-        'search_results_limit': 100,
-        'missing_list': [item for item in MissingItem.get_all() if item.condition()],
-    }
+    def get_context_data(self, **kwargs):
+        data = super(HomeView, self).get_context_data(**kwargs)
+        data.update({
+            'search_terms': self.request.GET.get('q'),
+            'hide_links': True,
+            'search_results_limit': 100,
+            'missing_list': [item for item in MissingItem.get_all() if item.condition()],
+        })
+        return data
 
-    if request.GET:
-        queryset, ids, timedelta = document_search.search(request.GET, request.user)
+    def get(self, request, *args, **kwargs):
+        context = self.get_context_data(**kwargs)
+
+        queryset, ids, timedelta = SearchModel.get('documents.Document').search(request.GET, request.user)
 
         # Update the context with the search results
         context.update({
@@ -461,7 +468,7 @@ def home(request):
             'title': _('Results'),
         })
 
-    return render_to_response('appearance/home.html', context, context_instance=RequestContext(request))
+        return self.render_to_response(context)
 
 
 def maintenance_menu(request):