Fixed some UI errors