Further improve export form