Persist Button, bug fixes