reorganized shape menu