fix some UI issues