ImportSave toggle/cancel + style improvements