Merged Filling in Layout to master