Fix old layouts. Lint errors caused by me