Added Card View Factory and card views specific to card type
Fixed some broken logic in the Card View Factory