Fixed CSS conflicts