CSS and layout fix