Ensure button colors stay correct as well as link text-decorations
Merge pull request #2407 from darkwing/fix-link-structure

ensure button colors stay correct as well as link text-decorations