Working on energy-systems ui