Merge pull request #428 from lpachols/cards

Card tabs are back and stronger than every before!