Define Variable screen: added Class type and re-arranged the layout
Merge branch 'master' of https://github.com/digitalabs/DatasetImporter