Refactor router and card-list