update labels
ui updates
Merge branch 'feature-ui' into wip