Edit screen bug