Fixes for pages editing