Merge new layout with master