cleanup labels from modals and import-export cleanup
Merge pull request #582 from reciprocity/feature/label-cleanup

cleanup labels from modals and import-export cleanup