A new admin menu
Fix: Cherry-pick from 2.0