made some changes to controllers and some views
lets hope this works
Merge pull request #12 from kevincol54/master

hopefully these changes work