admin menu fixes
Revert "admin menu fixes"

This reverts commit c15ae0b487577f1e5b7cc0e7b4efd7dcc0236e41.
Revert "Revert "admin menu fixes""

This reverts commit 11bc8e22feda8e56523d00847bf3d952e4dbc6c0.