Finish layout and routes
removed index