Cleaned up controllers and added more views