Improved UI
Merge pull request #79 from marc-roopchand/master

Improved UI