Revert "UI changes"

This reverts commit d426ad794495985f9e24ef4b8533f9a2eeb77233.