diff --git a/timepiece/migrations/0035_billable_to_develop.py b/timepiece/migrations/0035_billable_to_develop.py
index <HASH>..<HASH> 100644
--- a/timepiece/migrations/0035_billable_to_develop.py
+++ b/timepiece/migrations/0035_billable_to_develop.py
@@ -7,6 +7,7 @@ from django.db import models
 class Migration(DataMigration):
 
     def forwards(self, orm):
+        orm.Activity.objects.update(billable=False)
         dev, created = orm.Activity.objects.get_or_create(
             code='dev',
             defaults= {
diff --git a/timepiece/models.py b/timepiece/models.py
index <HASH>..<HASH> 100644
--- a/timepiece/models.py
+++ b/timepiece/models.py
@@ -175,7 +175,11 @@ class Activity(models.Model):
     billable = models.BooleanField(default=True)
     
     def __unicode__(self):
-        return self.name
+        if self.billable:
+            billable = 'billable'
+        else:
+            billable = 'non-billable'    
+        return '%s (%s)' % (self.name, billable)
 
     class Meta:
         ordering = ('name',)
@@ -206,8 +210,8 @@ class Entry(models.Model):
     project = models.ForeignKey(Project, related_name='entries')
     activity = models.ForeignKey(
         Activity,
-        blank=True,
-        null=True,
+        blank=False,
+        null=False,
         related_name='entries',
     )
     location = models.ForeignKey(
updated data migration so that all other activities are non-billable

--HG--
branch : feature/billable