Revert "UI changes"

This reverts commit 444290dc96e178dd3c73e25b29ceb98b3544f5e4.
Revert "Revert "UI changes""

This reverts commit 672c653c2deaa5293e19f1e48284efde9db4a34e.