Some graphics changes and typechanges - also Energypercentage pre implementation