Finished layouts and cleaned up Rspec tests