Also the initial query for the goals, should be for the current week. Currently it fetches the data for some other week initially and then updates to the current week, which looks confusing.