Refactoring card select screen