Styling Updates 1/21

Last major set of changes prior to pushing live.
Merge pull request #5 from Grizzard/Style-Updates-1/15

Styling Updates 1/21