edit page and other changes