Changed edit page and related validation logic