Updated layout and CSS for better style