diff --git a/assignments/session07/mysite/manage.py b/assignments/session07/mysite/manage.py
old mode 100755
new mode 100644
diff --git a/assignments/session07/mysite/myblog/admin.py b/assignments/session07/mysite/myblog/admin.py
index 67aec2d6..56cd070f 100644
--- a/assignments/session07/mysite/myblog/admin.py
+++ b/assignments/session07/mysite/myblog/admin.py
@@ -1,6 +1,25 @@
 from django.contrib import admin
-from myblog.models import Post
-from myblog.models import Category
+from myblog.models import Post, Category
 
-admin.site.register(Post)
-admin.site.register(Category)
+
+class CategoryInline(admin.TabularInline):
+    model = Category.posts.through
+
+
+class PostAdmin(admin.ModelAdmin):
+    readonly_fields = ('created_date', 'modified_date', )
+    list_display = ('title', 'created_date', 'modified_date', 'published_date', 'author', )
+    list_display_links = ('title', )
+    fields = ('title', 'created_date', 'modified_date', 'published_date', 'author')
+    inlines = [CategoryInline, ]
+    list_filter = ('published_date', 'author')
+    search_fields = ['title', ]
+
+
+class CategoryAdmin(admin.ModelAdmin):
+    exclude = ('posts', )
+    list_display = ('name','description', )
+
+
+admin.site.register(Post, PostAdmin)
+admin.site.register(Category, CategoryAdmin)
\ No newline at end of file
diff --git a/assignments/session07/mysite/myblog/models.py b/assignments/session07/mysite/myblog/models.py
index 29b851c7..5abc2edb 100644
--- a/assignments/session07/mysite/myblog/models.py
+++ b/assignments/session07/mysite/myblog/models.py
@@ -1,6 +1,7 @@
 from django.db import models
 from django.contrib.auth.models import User
 
+
 class Post(models.Model):
 	title = models.CharField(max_length=128)
 	text = models.TextField(blank=True)
@@ -12,6 +13,7 @@ class Post(models.Model):
 	def __unicode__(self):
 		return self.title
 
+
 class Category(models.Model):
     name = models.CharField(max_length=128)
     description = models.TextField(blank=True)
@@ -19,4 +21,7 @@ class Category(models.Model):
                                    related_name='categories')
 
     def __unicode__(self):
-        return self.name
\ No newline at end of file
+        return self.name
+
+    class Meta:
+        verbose_name_plural = "categories"
diff --git a/assignments/session07/mysite/mysite.db b/assignments/session07/mysite/mysite.db
index 63c9e9a5..fac26f8f 100644
Binary files a/assignments/session07/mysite/mysite.db and b/assignments/session07/mysite/mysite.db differ