Fixed some UI elements