Merge branch 'ui-fixes'