Revert "UI improvements"

This reverts commit 8ca45e34f4c6e89a64144c420eaa1c671ee22740.