listing page and bug fixes