Fixed menu creation