fix goal widgets and confirmation message for goals