refactoring of goals into table and modal