UI changes
Merge pull request #1276 from SurabhiSeetharam/dev-branch

Minor UI and text changes