Improve CSS and layout