style fixes
Merge branch 'ui_fixes'