Persistence Update

updated peristence behavior to handle the drag-expand handles