refactored search and instruction modals