Fixed toggling and saving content