Energy updates

Quite a few fixes that make the energy page much nicer