Updated controllers and added new views