Fixes for link colors & layout changes