Fixing an issues around saving pages and creating new pages