Fixed some UI issues