fixed some UI issues