Merge pull request #93 from KyleW/uiTweaks

Ui tweaks
Merge branch 'master' into uiTweaks