Design updates

More tweaks to button styles, style labels/badges, color and type tweaks