Added kWh/p/d
Added a way of excluding some results from display
Added a yellow highlight option