Mostly UI Tweaks. see commit messages for details