Added better logic for showing last week's goals.