fix up spec tests
Finish layout and routes