Layout modifications
Merge
Merge
Updated layout