Fixed removing layout