Small UI improvements

Note that I wasn't able to test this to the current mix of merged/unmerged code currently running on my machine :/