Finish layout and routes
Almost there