JJ: update link colors and finish organizing CSS