More fixes for import item layout