Layout/style merge

Merge between Layout and Style