New layout and beginning of cleaning.