added cardView and Resource, small changes otherwise