Finish layout and routes
Cleanup and simplify routing specs