Updated script menus and fixed menu handling