Added activities in controllers
Refactoring etc.
Fixed sample data