Added page skeleton selection and state saving in save