Last edit to ensure cancel button works properly on both New and Edit page.