Clean up the CSS and controller