Cleanup and add a few UI elements to make the health/energy bars more obvious