Refactoring list page, wip