Layout to Dev

MErgin some new stuff