make bg/border colors consistent, tweek link text