Fixed some UI widgets