make style and refactoring spec
Finish layout and routes