Fixed and updated the Core Menu Service