Fix some UI issues