Improved layout and CSS