Fix some UI problem