More improvements to edit page