misc layout and importer changes