Updated layout
Merge