Guess what? Even more UI stuff, amongst various - Possibly unecessarry -- tweaks