fixed the tab text color as well as the margin that it caused
Merge branch 'design' into gh-pages