incorporated changes based UX comments
Merge pull request #390 from Nayan/UXfixs

incorporated changes based UX comments