Rearrange card input screen and fixed some bugs