Added some more UI Tweaks