New layout complete and Main Form cleaning