Refixes the menu; DojoMenu now uses the right menu type; all other fixes rolled back