CardView refactoring