improved edit screen ui