Revert "Fix a few minor UI bugs"

This reverts commit 2dd45e28af2482f6b29ab824499de97ba3d899b3.