Updated layout and css