Refactor listing fragment