Add wait for changing display name, change edit page inheritance