working on edit screen navigation