working on finalizing edit screen