Finished off new export UI support