CodeMerge-3

Missed Layout and Layoutheader updated