Listing page + other changes