Added more routing, more views and more controllers