reworked the toggle on/off expanding