CSS adjustments
Merge branch 'kellybranch'