Some UI sugar

This will revert some changes from previous push unfortunately. But
considering it was minor, it should be okay. Creating branches from now
on....