Added first snapshot of new layout