fix up for actions and edit form