UI Fixes

Also some organization and commenting, much more to come...
Merge pull request #11 from zdhoward/UI-Fixes

UI Fixes