spec tidy
Finish layout and routes