various fixes across ui
Merge pull request #46 from vishal0071/master

various fixes across ui