UI Tweaks, typo fixes,