cleanup & multipage layout change