minor view logic edits and lots of rspec