Main menu behavior fixes