Tweaked the UI