Revert "Ashwin/Baba | #2582 | UI fixes."

This reverts commit 268606e46e766dc8d9ded349fa5cc575eb3ba9b7.
ashwin | #2582 | UI fixes