diff --git a/greenmine/scrum/admin.py b/greenmine/scrum/admin.py
index 60f760b0..442ac762 100644
--- a/greenmine/scrum/admin.py
+++ b/greenmine/scrum/admin.py
@@ -39,7 +39,8 @@ admin.site.register(models.Milestone, MilestoneAdmin)
 
 
 class UserStoryAdmin(reversion.VersionAdmin):
-    list_display = ["ref", "milestone", "project", "owner", 'status', 'is_closed']
+    list_display = ["id", "ref", "milestone", "project", "owner", 'status', 'is_closed']
+    list_filter = ["milestone", "project"]
 
 admin.site.register(models.UserStory, UserStoryAdmin)
 
@@ -57,7 +58,11 @@ admin.site.register(models.ChangeAttachment, ChangeAttachmentAdmin)
 
 
 class TaskAdmin(reversion.VersionAdmin):
-    list_display = ["subject", "user_story"]
+    list_display = ["subject", "user_story", "milestone", "project", "user_story_id"]
+    list_filter = ["user_story", "milestone", "project"]
+
+    def user_story_id(self, instance):
+        return instance.user_story.id
 
 
 class IssueAdmin(reversion.VersionAdmin):
diff --git a/greenmine/scrum/serializers.py b/greenmine/scrum/serializers.py
index eef2b442..d3246f0d 100644
--- a/greenmine/scrum/serializers.py
+++ b/greenmine/scrum/serializers.py
@@ -16,6 +16,12 @@ class PickleField(serializers.WritableField):
         return data
 
 
+class PointsSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Points
+        fields = ()
+
+
 class ProjectSerializer(serializers.ModelSerializer):
     tags = PickleField()
 
@@ -111,7 +117,3 @@ class IssueTypeSerializer(serializers.ModelSerializer):
         fields = ()
 
 
-class PointsSerializer(serializers.ModelSerializer):
-    class Meta:
-        model = Points
-        fields = ()
diff --git a/greenmine/settings/__init__.py b/greenmine/settings/__init__.py
index 2201e479..da0350a5 100644
--- a/greenmine/settings/__init__.py
+++ b/greenmine/settings/__init__.py
@@ -3,15 +3,9 @@
 from __future__ import absolute_import
 import os
 
-if "GREENMINE_ENVIRON" in os.environ:
-    if os.environ["GREENMINE_ENVIRON"] in ('production', 'development', 'local'):
-        print "importing %s" % os.environ["GREENMINE_ENVIRON"]
-        eval("from .%s import *" % (os.environ["GREENMINE_ENVIRON"]))
-
-else:
-    try:
-        print "Trying import local.py settings..."
-        from .local import *
-    except ImportError:
-        print "Trying import development.py settings..."
-        from .development import *
+try:
+    print "Trying import local.py settings..."
+    from .local import *
+except ImportError:
+    print "Trying import development.py settings..."
+    from .development import *
diff --git a/greenmine/urls.py b/greenmine/urls.py
index 4136a7e7..cdf74ee0 100644
--- a/greenmine/urls.py
+++ b/greenmine/urls.py
@@ -1,4 +1,6 @@
+# -*- coding: utf-8 -*-
 from django.conf.urls import patterns, include, url
+from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 
 from django.contrib import admin
 admin.autodiscover()
@@ -13,3 +15,4 @@ urlpatterns = patterns('',
     url(r'^grappelli/', include('grappelli.urls')),
 )
 
+urlpatterns += staticfiles_urlpatterns()