Fixed menu type for Primitives, updated tooltips