UI Fixes
Merge branch 'steve'