Bringing in edit page unification - squashed from unify_edit_v2