Fix inconsistent issues in UI

[Rupeshiya]

The changes required can be found in this thread.
Expected:
Please have a look: https://codeuino.slack.com/archives/CAZ1KR0HM/p1596471692090800?thread_ts=1596471398.088500&cid=CAZ1KR0HM

After changes:
Add screenshots.