CSS fixes/cleanup