2nd round of adding CSS