New UI
Merge pull request #2 from genteelknight/develop

New UI