v1236 Card layout rework