Merge layout into master