Some changes on Export window
and minor fix