Added more views, updated routes