Few improvements on UI
Merge pull request #39 from Reservit/omar

Few improvements on UI