Simplify and move things.
Merge newcardctrl into cardlistctrl