Minor fixes for Edit page custom layouts