Finish layout and routes
Merged with basic-css layout brance