Work on fixing CSS conflicts