UI rehaul, fixes #16
Merge pull request #19 from elyas-bhy/issue-16

UI rehaul, fixes #16