remake joints and toggle buttons