New checkout field layout Closes #2120.