Large sweeping UI Refactors.
UI Refactor complete.
Merge pull request #1 from larrybeall/UI-Refactor

Ui refactor