admin-ui: Correct W3C HTML validation errors
Merge branch 'feature-admin-fixes' into feature-admin