fixed views and links
fixed views, nav links, tweaked the rspec tests I added to