Updated layout and styling