Finish layout and routes
github merge fix