added ODK launcher intent, some refactoring