Updated layout and CSS