Adding categories and refactoring views
Fixing categories