Layout and resources cleanup