Some small UI Tweaks