CSS/UI changes and rspec updates