admin-ui: Minor html modifications
admin-ui: Adjust the functionality of the table to new json form
Merge branch 'feature-admin-ui' into feature-admin