refactor spec
changed titles
finished layout
Finish layout and routes