updated layout, fixed some rspec'ing configs