admin-ui: Enhance tables
Merge branch 'feature-admin-ui' into feature-admin