Cleaned up views, added calendar view and search view. Still need to be implemented.