change to android-studio format, changes to ui for scanner