Revert "UI changes"

This reverts commit 2fd6e701a979c62918586929b6a88b2f7500d033.
Revert "Revert "UI changes""

This reverts commit 453a21adca325d90baf6ca3390f88cd24c39a881.