Fixed issues with page save