Fix some UI controls