Improvement on the import tools and add border generator