diff --git a/osinaweb/osinacore/admin.py b/osinaweb/osinacore/admin.py
index 8bff995b..9cc9f225 100644
--- a/osinaweb/osinacore/admin.py
+++ b/osinaweb/osinacore/admin.py
@@ -19,6 +19,19 @@ class PointAdmin(admin.ModelAdmin):
         return obj.task.assigned_to if obj.task else ''
 
 
+class TaskAdmin(admin.ModelAdmin):
+    list_display = ('name', 'get_project_name', 'get_milestone_name')
+    list_filter = ('project', 'milestone')  # Enables sidebar filtering
+
+    def get_project_name(self, obj):
+        return obj.project.name if obj.project else '-'
+    get_project_name.short_description = 'Project'
+
+    def get_milestone_name(self, obj):
+        return obj.milestone.name if obj.milestone else '-'
+    get_milestone_name.short_description = 'Milestone'
+
+
 admin.site.register(Reference)
 admin.site.register(Business)
 admin.site.register(CustomerProfile)
@@ -32,7 +45,7 @@ admin.site.register(ProjectStatus)
 admin.site.register(PinnedProject)
 admin.site.register(Epic)
 admin.site.register(Note)
-admin.site.register(Task)
+admin.site.register(Task, TaskAdmin)
 admin.site.register(Status)
 admin.site.register(Tag)
 admin.site.register(Point, PointAdmin)