card layout switches properly after epi/switch poke
fixed merge conflict