working on listing. removed modals