Refactoring spec
Finish layout and routes