Updated routing, controllers to use new composite view files