Even more UI tweaks, hooray!