Fixed layout issue when importing MANY files