Refactoring specs
Finish layout and routes