Improved calorie and macronutrient tracker