Restructure define layout