UI improvements
Merge pull request #24 from chinna007/20057

#20057 UI improvements