Tweaked the UI slightly