CSS and layout fixes