Add/Edit Nutrition Plan minigoals logic adjusted