Add missing buttons on CSV import popups

It would be nice to have a Cancel button on the CSV import popup. Although not absolutely necessary, it would be more user-friendly than clicking the x to close the window and it would be consistent with the "Import a file" popup.

It would also be nice to have a "Close" or "Finish" button on the Import complete popup, next to the "Start a new import" button.