Add badges and minor tweaks