Tweaked UI a little more