Tweaked UI a bit, still WIP