Fix some UI stuff