fixed some code conflicts including work page hover color