update UI
Merge branch 'steve'