Attempt to fix show order for page menu items on create/update

Fixes #1120
Fixes #1193