Added activity stuff
Try to create more pretty labels
For activitys