Fixed some card arrangement issues, some bugs still.