Card layout added and a few tests