ui: misc fixes