Fix CSS conflicts, remove unused CSS