Update for UI elements...
Merge pull request #6 from sonal71/master

Update for UI elements