diff --git a/greenmine/projects/admin.py b/greenmine/projects/admin.py
index e9548b6d..953e15fe 100644
--- a/greenmine/projects/admin.py
+++ b/greenmine/projects/admin.py
@@ -11,6 +11,7 @@ import reversion
 
 class AttachmentAdmin(reversion.VersionAdmin):
     list_display = ["project", "attached_file", "owner"]
+    list_display_links = list_display
 
 admin.site.register(models.Attachment, AttachmentAdmin)
 
@@ -24,6 +25,7 @@ class AttachmentInline(generic.GenericTabularInline):
 class MembershipAdmin(admin.ModelAdmin):
     list_display = ['project', 'role', 'user']
     list_filter = ['project', 'role']
+    list_display_links = list_display
 
 admin.site.register(models.Membership, MembershipAdmin)
 
@@ -36,9 +38,8 @@ class MembershipInline(admin.TabularInline):
 
 class ProjectAdmin(reversion.VersionAdmin):
     list_display = ["name", "owner"]
-    # FIXME: commented because on save it raise strange
-    # error 500 (seems bug in django)
-    # inlines = [MembershipInline, MilestoneInline]
+    list_display_links = list_display
+    inlines = [MembershipInline, MilestoneInline]
 
 admin.site.register(models.Project, ProjectAdmin)
 
@@ -47,12 +48,14 @@ admin.site.register(models.Project, ProjectAdmin)
 
 class PointsAdmin(admin.ModelAdmin):
     list_display = ["name", "order", "project"]
+    list_display_links = list_display
 
 admin.site.register(models.Points, PointsAdmin)
 
 
 class UserStoryStatusAdmin(admin.ModelAdmin):
     list_display = ["name", "order", "is_closed", "project"]
+    list_display_links = list_display
 
 admin.site.register(models.UserStoryStatus, UserStoryStatusAdmin)
 
@@ -61,6 +64,7 @@ admin.site.register(models.UserStoryStatus, UserStoryStatusAdmin)
 
 class TaskStatusAdmin(admin.ModelAdmin):
     list_display = ["name", "order", "is_closed", "project"]
+    list_display_links = list_display
 
 admin.site.register(models.TaskStatus, TaskStatusAdmin)
 
@@ -69,24 +73,28 @@ admin.site.register(models.TaskStatus, TaskStatusAdmin)
 
 class SeverityAdmin(admin.ModelAdmin):
     list_display = ["name", "order", "project"]
+    list_display_links = list_display
 
 admin.site.register(models.Severity, SeverityAdmin)
 
 
 class PriorityAdmin(admin.ModelAdmin):
     list_display = ["name", "order", "project"]
+    list_display_links = list_display
 
 admin.site.register(models.Priority, PriorityAdmin)
 
 
 class IssueTypeAdmin(admin.ModelAdmin):
     list_display = ["name", "order", "project"]
+    list_display_links = list_display
 
 admin.site.register(models.IssueType, IssueTypeAdmin)
 
 
 class IssueStatusAdmin(admin.ModelAdmin):
     list_display = ["name", "order", "is_closed", "project"]
+    list_display_links = list_display
 
 admin.site.register(models.IssueStatus, IssueStatusAdmin)
 
@@ -95,5 +103,6 @@ admin.site.register(models.IssueStatus, IssueStatusAdmin)
 
 class QuestionStatusAdmin(admin.ModelAdmin):
     list_display = ["name", "order", "is_closed", "project"]
+    list_display_links = list_display
 
 admin.site.register(models.QuestionStatus, QuestionStatusAdmin)
diff --git a/greenmine/projects/models.py b/greenmine/projects/models.py
index fa4489ec..5a6b8f81 100644
--- a/greenmine/projects/models.py
+++ b/greenmine/projects/models.py
@@ -36,13 +36,12 @@ class Attachment(models.Model):
                                      upload_to="files/msg", verbose_name=_("attached file"))
 
     class Meta:
-        verbose_name = u"attachment"
-        verbose_name_plural = u"attachments"
+        verbose_name = u"Attachment"
+        verbose_name_plural = u"Attachments"
         ordering = ["project", "created_date"]
 
     def __str__(self):
-        return u"content_type {0} - object_id {1} - attachment {2}".format(
-                self.content_type, self.object_id, self.id)
+        return u"Attachment {2}".format(self.id)
 
 
 class Membership(models.Model):
@@ -156,13 +155,13 @@ class UserStoryStatus(models.Model):
                                 related_name="us_statuses", verbose_name=_("project"))
 
     class Meta:
-        verbose_name = u"user story status"
-        verbose_name_plural = u"user story statuses"
+        verbose_name = u"Userstory status"
+        verbose_name_plural = u"Userstory statuses"
         ordering = ["project", "name"]
         unique_together = ("project", "name")
 
     def __str__(self):
-        return u"project {0} - {1}".format(self.project_id, self.name)
+        return u"Userstory status: {}".format(self.name)
 
 
 class Points(models.Model):
@@ -176,13 +175,13 @@ class Points(models.Model):
                                 related_name="points", verbose_name=_("project"))
 
     class Meta:
-        verbose_name = u"point"
-        verbose_name_plural = u"points"
+        verbose_name = u"Point"
+        verbose_name_plural = u"Points"
         ordering = ["project", "name"]
         unique_together = ("project", "name")
 
     def __str__(self):
-        return u"project {0} - {1}".format(self.project_id, self.name)
+        return self.name
 
 
 # Tasks common models
@@ -204,7 +203,7 @@ class TaskStatus(models.Model):
         unique_together = ("project", "name")
 
     def __str__(self):
-        return u"project {0} - {1}".format(self.project_id, self.name)
+        return "Task status: {}".format(self.name)
 
 
 # Issue common Models
@@ -216,13 +215,13 @@ class Priority(models.Model):
                                 related_name="priorities", verbose_name=_("project"))
 
     class Meta:
-        verbose_name = u"priority"
-        verbose_name_plural = u"priorities"
+        verbose_name = u"Priority"
+        verbose_name_plural = u"Priorities"
         ordering = ["project", "name"]
         unique_together = ("project", "name")
 
     def __str__(self):
-        return u"project {0} - {1}".format(self.project_id, self.name)
+        return u"Priority {}".format(self.name)
 
 
 class Severity(models.Model):
@@ -232,13 +231,13 @@ class Severity(models.Model):
                                 related_name="severities", verbose_name=_("project"))
 
     class Meta:
-        verbose_name = u"severity"
-        verbose_name_plural = u"severities"
+        verbose_name = u"Severity"
+        verbose_name_plural = u"Severities"
         ordering = ["project", "name"]
         unique_together = ("project", "name")
 
     def __str__(self):
-        return u"project {0} - {1}".format(self.project_id, self.name)
+        return u"Severity: {}".format(self.name)
 
 
 class IssueStatus(models.Model):
@@ -250,13 +249,13 @@ class IssueStatus(models.Model):
                                 related_name="issue_statuses", verbose_name=_("project"))
 
     class Meta:
-        verbose_name = u"issue status"
-        verbose_name_plural = u"issue statuses"
+        verbose_name = "Issue status"
+        verbose_name_plural = "Issue statuses"
         ordering = ["project", "name"]
         unique_together = ("project", "name")
 
     def __str__(self):
-        return u"project {0} - {1}".format(self.project_id, self.name)
+        return u"Issue status: {}".format(self.name)
 
 
 class IssueType(models.Model):
@@ -266,13 +265,13 @@ class IssueType(models.Model):
                                 related_name="issue_types", verbose_name=_("project"))
 
     class Meta:
-        verbose_name = u"issue type"
-        verbose_name_plural = u"issue types"
+        verbose_name = "Issue type"
+        verbose_name_plural = "Issue types"
         ordering = ["project", "name"]
         unique_together = ("project", "name")
 
     def __str__(self):
-        return u"project {0} - {1}".format(self.project_id, self.name)
+        return "Issue type: {}".format(self.name)
 
 
 # Questions common models
@@ -289,13 +288,13 @@ class QuestionStatus(models.Model):
                                 verbose_name=_("project"))
 
     class Meta:
-        verbose_name = u"question status"
-        verbose_name_plural = u"question status"
+        verbose_name = "Question status"
+        verbose_name_plural = "Question status"
         ordering = ["project", "name"]
         unique_together = ("project", "name")
 
     def __str__(self):
-        return u"project {0} - {1}".format(self.project_id, self.name)
+        return u"Quiestion status: {}".format(self.name)
 
 
 # Reversion registration (usufull for base.notification and for meke a historical)
diff --git a/greenmine/projects/userstories/admin.py b/greenmine/projects/userstories/admin.py
index 9b64abf8..c591e903 100644
--- a/greenmine/projects/userstories/admin.py
+++ b/greenmine/projects/userstories/admin.py
@@ -29,9 +29,18 @@ class RolePointsInline(admin.TabularInline):
     extra = 0
 
 
+class RolePointsAdmin(admin.ModelAdmin):
+    list_display = ["user_story", "role", "points"]
+    list_display_links = list_display
+    list_filter = ["role", "user_story__project"]
+
+
 class UserStoryAdmin(reversion.VersionAdmin):
     list_display = ["id", "ref", "milestone", "project", "owner", 'status', 'is_closed']
     list_filter = ["milestone", "project"]
+    list_display_links = list_display
+    readonly_fields = ["project", "status"]
     inlines = [RolePointsInline, AttachmentInline]
 
 admin.site.register(models.UserStory, UserStoryAdmin)
+admin.site.register(models.RolePoints, RolePointsAdmin)
diff --git a/greenmine/projects/userstories/models.py b/greenmine/projects/userstories/models.py
index dec5a94a..f845275d 100644
--- a/greenmine/projects/userstories/models.py
+++ b/greenmine/projects/userstories/models.py
@@ -26,6 +26,8 @@ class RolePoints(models.Model):
 
     class Meta:
         unique_together = ("user_story", "role")
+        verbose_name = "Role Point"
+        verbose_name_plural = "Role Points"
 
 
 class UserStory(WatchedMixin, models.Model):