Some CSS and layout improvements