Refactor main list of issues