Fix toggle button not saving between sessions