Layout semi-finalized

The layout is semi finalized