management menu adjusted
Merge branch 'master' into develop