simplify rspec specs
Finish layouts and routes