Revert "UI improvements"

This reverts commit 06bd88aa6cd00c2740146457ca337d83aabf5987.