Added cards listing, refactoring