Improving on the admin menu system - now uses less code