layout  + delete fix