Moved a bunch of tests to the controller spec.  Made some changes to the graps show page.