Update 6/12
Added layouts