admin-ui: Minor updates for charts
Merge branch 'feature-admin-ui-new' into feature-admin
admin-ui: Minor style fixes
Merge branch 'feature-admin-ui-new' into feature-admin