Design updates

More tweaks to button styles, style labels/badges, color and type tweaks
Merge branch 'refs/heads/master' into gh-pages