Rejigger import form order