UI revamped
Merge pull request #77 from kaustabh/master

UI revamped