Card view controller refactored