UI improvements
more UI Tweaks