Cleaned up views, added calendar view and search view. 

Search and Calendar still need to be implemented.