LOTS OF CHANGES

Most of these changes for the styling revisions made by Jon. While I
was in adding his suggestion I added some new graphical changes myself
Merge branch 'dev'