Updated layout and style