Update layout
Merge with remote