PIM-1113: Clean UI to be homogeneous between import and export