Removed extra links from views -- when links are already in header.
Flash messaging edits
Refactoring/indentation,etc
Merge branch 'master' into Jen