worked on new UI
Merge pull request #105 from HoltMaki/master

worked on new UI