UI updates
Merge branch 'master' into grunted
grunted