20070310 edit-page: Let's fix the bones before they break