new screen and fixed edit