Regular CleanUp
Improved import file screen