Refactor spec file
Finish layout and routes