Consolidating no badges message into a partial

Queuing this up, but NO MERGEY until @brianloveswords has his image data stuff in place to be safe.