Reorder states

-- Move first_name and surname ahead of cheque_number