Some CSS and clean up