Removed old code
Updated to latest dev version of card layout