Clean up, Fix CSS