Info box cleanup

Yo, some cleanup.

Markup is a mess, we need to address it soon.

cc @ThisIsJohnBrown