Better CP menu handling