Added watt icon and included total_fat calories, except in import overview

total_fat_calories may be undefined in import overview