Updated layout and grid