Clean up and initial layout