diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..afac36e
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,12 @@
+PROJECT_PATH=$(CURDIR)
+VENV_PATH=$(PROJECT_PATH)/venv
+
+
+.PHONY: venv
+venv: ## create venv for this Django Project
+	python3.5 -m venv --clear $(VENV_PATH)
+	( \
+		source $(VENV_PATH)/bin/activate; \
+		pip --upgrade pip; \
+		pip install -r $(PROJECT_PATH)/requirements/development.txt; \
+    )
diff --git a/bin/sync.sh b/bin/sync.sh
index 7a78c0d..270c117 100755
--- a/bin/sync.sh
+++ b/bin/sync.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-SSH_LOGIN="kasu@s21.wservices.ch"
+SSH_LOGIN="kasu@kasu.at"
 SYNC_ASSESTS="requirements static"
 SYNC_SOURCECODE="src"
 EXCLUDE_FILES="*.pyc"
diff --git a/bin/testserver.sh b/bin/testserver.sh
index 994595d..4bbe565 100755
--- a/bin/testserver.sh
+++ b/bin/testserver.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 export DJANGO_SETTINGS_MODULE=kasu.settings
-source .virtualenv/bin/activate
+source venv/bin/activate
 ./manage.py runserver 0.0.0.0:8000
 
diff --git a/src/events/views.py b/src/events/views.py
index bdf7e63..058221e 100644
--- a/src/events/views.py
+++ b/src/events/views.py
@@ -75,14 +75,17 @@ class EventForm(PermissionRequiredMixin, mixins.EventDetailMixin,
 class EventGallery(generic.ListView):
     """Display a overview of all event photo albums."""
     template_name = 'events/photo_gallery.html'
-    queryset = models.Event.objects.filter(
-        start__lt=timezone.now(),
-        event_series__isnull=True,
-        photo_count__gt=0
-    )
-    queryset = queryset.order_by('-start')
     paginate_by = 24
 
+    def get_queryset(self):
+        queryset = models.Event.objects.filter(
+            start__lt=timezone.now(),
+            event_series__isnull=True,
+            photo_count__gt=0
+        )
+        queryset = queryset.order_by('-start')
+        return queryset
+
 
 class EventListIcal(generic.View):
     """Generates an returns an iCal File with all upcoming events."""
@@ -177,10 +180,9 @@ class EventSeriesForm(mixins.EventDetailMixin, PermissionRequiredMixin,
                       InlineFormSetView):
     model = models.Event
     inline_model = models.Event
-    fk_name = 'event_series'
     fields = ('start', 'end')
     form_class = forms.EventForm
-    extra = 3
+    factory_kwargs = {'extra': 3, 'fk_name': 'event_series'}
     permission_required = 'events.add_event'
     template_name = 'events/eventseries_form.html'
 
@@ -192,5 +194,7 @@ class EventSeriesForm(mixins.EventDetailMixin, PermissionRequiredMixin,
 
 
 class UpcomingEvents(generic.ListView):
-    queryset = models.Event.objects.upcoming(limit=None)
     paginate_by = 16
+
+    def get_queryset(self):
+        return models.Event.objects.upcoming(limit=None)