Revert "UI fixes"

This reverts commit 511d9587ca3e8364f8eb29c6c820c5c27cf192f4.