Some CSS and visual improvement