more ui updates
Merge branch 'jon' into develop