Style changes
Merge branch 'master' into LogoFix
Merge pull request #5 from NathanDeMaria/UIFixes

Ui fixes