Plot now determines point shapes on correct groups