Generic Styling Improvements
Merge pull request #419 from christopherleckie/master

Begining Generic Styling Improvements