Updated lay out2