Added card layout support