Merge pull request #1275 from SurabhiSeetharam/dev-branch

Dev branch
UI changes