Change Layouts to be cards
Merge