Fix some UI bugs