Finish layout and routes; but still need to clean up rspec