Added save state for button, other edits