edit screen, UI cleanup