Tweaked UI a bit