fixed edit screen
bug fixes