Commit by Shailesh.

Commit on some UI related minor changes.