Continued dev - fixing bugs for main search; modals now finished