Implementing schilit's recommended fixes
Merge pull request #48 from matthewsibigtroth/ui_cleanup

Implemented schilit's recommended fixes