More UI updates
Merge branch 'steve'