Moved the report details, tidied up the import function