admin-ui: Modify notifications
Merge branch 'feature-admin-ui-new' into feature-admin