fixed controllers and views to display all in one