fix menu #25
Merge remote-tracking branch 'origin/feature/user-admin' into feature/user-admin