Update CSS and HTML for better layout