Finish layout and routes
Merge