move buttons to the next row and make them small (buttons on the same row as text field makes the field text barely readable)
don't pass goalToEdit when hitting Manage button (having to manage means we need a new goal, and only very rarely we need to edit an existing one, which should not be encouraged by UI as a default action)
before
after