Need to fix issue with percentages consumed and goals and fix NaN issue with non-numeric values