More formula tweaks, small alignment fixes to the stat text/icons