Refactoring x-list.html