Updated rspec and layouts
Finished layout and routes