Copy layout from previous project merge

Copy layout from previous project