Updated design diagrams
Updated ActionCard class skeletons
Fixed conflict