Overlay dialog, cleanup of imports and such