Fix some UI problems