Updated layout
Updated layout