Fixed some UI quirks