diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 19071cfe..b5b5e102 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,13 +2,14 @@ name: Android SDK CI
 on: push
 jobs:
   build:
-    name: Build & Test
+    name: Build & Unit-test
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v2
         with:
-          java-version: '1.8'
+          java-version: '8'
+          distribution: adopt
           cache: 'gradle'
       - name: Assemble & Test
         run: ./gradlew build --stacktrace
@@ -18,3 +19,25 @@ jobs:
           jshint --extract=always sdk/src/main/assets/hcaptcha-form.html
       - name: JitPack Test
         run: ./gradlew publishReleasePublicationToMavenLocal
+  ui-tests:
+    name: Android UI Tests
+    runs-on: macos-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        api-level: [29] # , 23, 21]
+        target: [default] #, google_apis]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v2
+        with:
+          java-version: '8'
+          distribution: adopt
+          cache: 'gradle'
+      - uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: ${{ matrix.api-level }}
+          target: ${{ matrix.target }}
+          arch: x86_64
+          profile: Nexus 6
+          script: ./gradlew connectedCheck
diff --git a/build.gradle b/build.gradle
index 60279d70..ce622ead 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,10 +2,10 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -15,6 +15,6 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
diff --git a/sdk/build.gradle b/sdk/build.gradle
index 8e4c4096..d6eb8e56 100644
--- a/sdk/build.gradle
+++ b/sdk/build.gradle
@@ -12,11 +12,13 @@ android {
         // See https://developer.android.com/studio/publish/versioning
         // versionCode must be integer and be incremented by one for every new update
         // android system uses this to prevent downgrades
-        versionCode 7
+        versionCode 8
 
         // version number visible to the user
         // should follow semantic versioning (See https://semver.org)
-        versionName "1.2.0"
+        versionName "1.3.0"
+
+        buildConfigField 'String', 'VERSION_NAME', "\"${defaultConfig.versionName}_${defaultConfig.versionCode}\""
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -40,19 +42,19 @@ dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.fasterxml.jackson.core:jackson-databind:2.12.1'
-    implementation 'org.projectlombok:lombok:1.18.16'
+    compileOnly 'org.projectlombok:lombok:1.18.16'
     annotationProcessor 'org.projectlombok:lombok:1.18.16'
 
     testImplementation 'junit:junit:4.13.1'
     testImplementation 'org.mockito:mockito-core:3.6.28'
     testImplementation 'org.skyscreamer:jsonassert:1.5.0'
 
-
     androidTestImplementation 'androidx.test:core:1.3.0'
     androidTestImplementation 'androidx.test:runner:1.3.0'
     androidTestImplementation 'androidx.test:rules:1.3.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-web:3.3.0'
     androidTestImplementation 'org.hamcrest:hamcrest-library:1.3'
 
     debugImplementation 'androidx.fragment:fragment-testing:1.3.0'
diff --git a/sdk/src/androidTest/assets/hcaptcha-form.html b/sdk/src/androidTest/assets/hcaptcha-form.html
new file mode 100644
index 00000000..fe3818cb
--- /dev/null
+++ b/sdk/src/androidTest/assets/hcaptcha-form.html
@@ -0,0 +1,39 @@
+<html>
+<head>
+    <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no"/>
+</head>
+<body>
+    <div id="hcaptcha-container"></div>
+
+    <input id="input-text" />
+
+    <button id="on-error" onclick="onError()">Error</button>
+    <button id="on-pass" onclick="onPass()">Pass</button>
+
+    <script type="text/javascript">
+        var DI = window.JSDI.getDebugInfo();
+        var BridgeObject = window.JSInterface;
+        var bridgeConfig = JSON.parse(BridgeObject.getConfig());
+
+        function onHcaptchaLoaded() {
+            try {
+                BridgeObject.onLoaded();
+            } catch (e) {
+                BridgeObject.onError(29);
+            }
+        }
+
+        function onPass() {
+            const token = document.getElementById("input-text").value;
+            BridgeObject.onPass(token);
+        }
+
+        function onError() {
+            const errorCode = parseInt(document.getElementById("input-text").value);
+            BridgeObject.onError(errorCode);
+        }
+
+        onHcaptchaLoaded();
+    </script>
+</body>
+</html>
diff --git a/sdk/src/androidTest/java/com/hcaptcha/sdk/AssertUtil.java b/sdk/src/androidTest/java/com/hcaptcha/sdk/AssertUtil.java
index c2de9b66..c9309046 100644
--- a/sdk/src/androidTest/java/com/hcaptcha/sdk/AssertUtil.java
+++ b/sdk/src/androidTest/java/com/hcaptcha/sdk/AssertUtil.java
@@ -4,38 +4,40 @@
 import androidx.test.espresso.PerformException;
 import androidx.test.espresso.UiController;
 import androidx.test.espresso.ViewAction;
+import androidx.test.espresso.ViewAssertion;
 import androidx.test.espresso.util.HumanReadables;
 import androidx.test.espresso.util.TreeIterables;
 import org.hamcrest.Matcher;
 
 import java.util.concurrent.TimeoutException;
 
+import static androidx.test.espresso.assertion.ViewAssertions.doesNotExist;
 import static androidx.test.espresso.matcher.ViewMatchers.*;
+import static org.hamcrest.CoreMatchers.any;
+import static org.hamcrest.CoreMatchers.not;
 
 public class AssertUtil {
 
-    public static ViewAction waitToBeDisplayed(final int viewId, final long millis) {
+    public static ViewAction waitToBeDisplayed(final long millis) {
         return new ViewAction() {
             @Override
             public Matcher<View> getConstraints() {
-                return isRoot();
+                return any(View.class);
             }
 
             @Override
             public String getDescription() {
-                return "wait for view (id: " + viewId + ") for " + millis + " ms";
+                return "wait for view displayed for " + millis + " ms";
             }
 
             @Override
             public void perform(final UiController uiController, final View view) {
                 uiController.loopMainThreadUntilIdle();
-                final long startTime = System.currentTimeMillis();
-                final long endTime = startTime + millis;
-                final Matcher<View> viewMatcher = withId(viewId);
+                final long endTime = System.currentTimeMillis() + millis;
                 final Matcher<View> viewIsDisplayed = isDisplayed();
                 do {
                     for (View child : TreeIterables.breadthFirstViewTraversal(view)) {
-                        if (viewMatcher.matches(child) && viewIsDisplayed.matches(child)) {
+                        if (viewIsDisplayed.matches(child)) {
                             return;
                         }
                     }
@@ -51,4 +53,35 @@ public void perform(final UiController uiController, final View view) {
         };
     }
 
+    public static ViewAction waitToDisappear(final long millis) {
+        return new ViewAction() {
+            @Override
+            public Matcher<View> getConstraints() {
+                return any(View.class);
+            }
+
+            @Override
+            public String getDescription() {
+                return "wait for view to be gone for " + millis + " ms ";
+            }
+
+            @Override
+            public void perform(final UiController uiController, final View view) {
+                long endTime = System.currentTimeMillis() + millis;
+
+                do {
+                    if (view.getVisibility() == View.GONE || view.getVisibility() == View.INVISIBLE) {
+                        return;
+                    }
+                    uiController.loopMainThreadForAtLeast(50);
+                } while (System.currentTimeMillis() < endTime);
+
+                throw new PerformException.Builder()
+                        .withActionDescription(this.getDescription())
+                        .withViewDescription(HumanReadables.describe(view))
+                        .withCause(new TimeoutException())
+                        .build();
+            }
+        };
+    }
 }
diff --git a/sdk/src/androidTest/java/com/hcaptcha/sdk/HCaptchaDialogFragmentTest.java b/sdk/src/androidTest/java/com/hcaptcha/sdk/HCaptchaDialogFragmentTest.java
index 3c2102a4..ed6a07ba 100644
--- a/sdk/src/androidTest/java/com/hcaptcha/sdk/HCaptchaDialogFragmentTest.java
+++ b/sdk/src/androidTest/java/com/hcaptcha/sdk/HCaptchaDialogFragmentTest.java
@@ -1,69 +1,141 @@
 package com.hcaptcha.sdk;
 
 import android.os.Bundle;
-import android.webkit.WebView;
+import android.util.Log;
+
 import androidx.fragment.app.testing.FragmentScenario;
+import androidx.test.espresso.web.webdriver.DriverAtoms;
+import androidx.test.espresso.web.webdriver.Locator;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
-import org.jetbrains.annotations.NotNull;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import static androidx.test.espresso.Espresso.onView;
 import static androidx.test.espresso.assertion.ViewAssertions.matches;
 import static androidx.test.espresso.matcher.ViewMatchers.*;
+import static androidx.test.espresso.web.sugar.Web.onWebView;
+import static androidx.test.espresso.web.webdriver.DriverAtoms.clearElement;
+import static androidx.test.espresso.web.webdriver.DriverAtoms.findElement;
+import static androidx.test.espresso.web.webdriver.DriverAtoms.webClick;
 import static com.hcaptcha.sdk.AssertUtil.waitToBeDisplayed;
+import static com.hcaptcha.sdk.AssertUtil.waitToDisappear;
 import static com.hcaptcha.sdk.HCaptchaDialogFragment.KEY_CONFIG;
 import static com.hcaptcha.sdk.HCaptchaDialogFragment.KEY_LISTENER;
 import static org.hamcrest.Matchers.not;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 
 
 @RunWith(AndroidJUnit4.class)
 public class HCaptchaDialogFragmentTest {
+    public class HCaptchaDialogTestAdapter extends HCaptchaDialogListener {
+        @Override
+        void onSuccess(HCaptchaTokenResponse hCaptchaTokenResponse) {
+        }
+
+        @Override
+        void onFailure(HCaptchaException hCaptchaException) {
+        }
+    };
+
+    public FragmentScenario<HCaptchaDialogFragment> launchCaptchaFragment() {
+        return launchCaptchaFragment(true);
+    }
+
+    public FragmentScenario<HCaptchaDialogFragment> launchCaptchaFragment(boolean showLoader) {
+        return launchCaptchaFragment(showLoader, new HCaptchaDialogTestAdapter());
+    }
+
+    public FragmentScenario<HCaptchaDialogFragment> launchCaptchaFragment(HCaptchaDialogListener listener) {
+        return launchCaptchaFragment(true, listener);
+    }
 
-    public FragmentScenario<HCaptchaDialogFragment> getTestScenario() {
+    public FragmentScenario<HCaptchaDialogFragment> launchCaptchaFragment(boolean showLoader, HCaptchaDialogListener listener) {
         final HCaptchaConfig hCaptchaConfig = HCaptchaConfig.builder()
                 .siteKey("10000000-ffff-ffff-ffff-000000000001")
                 .endpoint("https://js.hcaptcha.com/1/api.js")
                 .locale("en")
+                .loading(showLoader)
                 .size(HCaptchaSize.INVISIBLE)
                 .theme(HCaptchaTheme.LIGHT)
                 .build();
         final Bundle args = new Bundle();
         args.putSerializable(KEY_CONFIG, hCaptchaConfig);
-        args.putParcelable(KEY_LISTENER, new HCaptchaDialogListener() {
-            @Override
-            void onSuccess(HCaptchaTokenResponse hCaptchaTokenResponse) {
-            }
-
-            @Override
-            void onFailure(HCaptchaException hCaptchaException) {
-            }
-        });
-        return FragmentScenario.launch(HCaptchaDialogFragment.class, args);
+        args.putParcelable(KEY_LISTENER, listener);
+        return FragmentScenario.launchInContainer(HCaptchaDialogFragment.class, args);
     }
 
     @Test
-    public void loader_is_visible_while_webview_is_loading() {
-        getTestScenario();
+    public void loaderVisible() {
+        launchCaptchaFragment();
         onView(withId(R.id.loadingContainer)).check(matches(isDisplayed()));
-        onView(withId(R.id.webView)).check(matches(not(isDisplayed())));
+        onView(withId(R.id.webView)).perform(waitToBeDisplayed(1000));
+        onView(withId(R.id.loadingContainer)).perform(waitToDisappear(10000));
+    }
+
+    @Test
+    public void loaderDisabled() {
+        launchCaptchaFragment(false);
+        onView(withId(R.id.loadingContainer)).check(matches(not(isDisplayed())));
+        onView(withId(R.id.webView)).perform(waitToBeDisplayed(1000));
     }
 
     @Test
-    public void webview_is_visible_after_loading() {
-        final FragmentScenario<HCaptchaDialogFragment> scenario = getTestScenario();
-        scenario.onFragment(new FragmentScenario.FragmentAction<HCaptchaDialogFragment>() {
+    public void webViewReturnToken() throws Exception {
+        CountDownLatch latch = new CountDownLatch(1);
+        final HCaptchaDialogListener listener = new HCaptchaDialogTestAdapter() {
             @Override
-            public void perform(@NotNull HCaptchaDialogFragment fragment) {
-                assertNotNull(fragment.getDialog());
-                WebView.setWebContentsDebuggingEnabled(true);
-                fragment.onLoaded();
+            void onSuccess(HCaptchaTokenResponse hCaptchaTokenResponse) {
+                assertEquals("test-token", hCaptchaTokenResponse.getTokenResult());
+                latch.countDown();
             }
-        });
-        onView(withId(R.id.loadingContainer)).check(matches(not(isDisplayed())));
-        onView(withId(R.id.webView)).check(matches(isDisplayed()));
-        onView(isRoot()).perform(waitToBeDisplayed(R.id.webView, 1000));
+        };
+
+        final FragmentScenario<HCaptchaDialogFragment> scenario = launchCaptchaFragment(listener);
+        onView(withId(R.id.webView)).perform(waitToBeDisplayed(1000));
+
+        onWebView(withId(R.id.webView)).forceJavascriptEnabled();
+
+        onWebView().withElement(findElement(Locator.ID, "input-text"))
+                .perform(clearElement())
+                .perform(DriverAtoms.webKeys("test-token"));
+
+        onWebView().withElement(findElement(Locator.ID, "on-pass"))
+                .perform(webClick());
+
+        assertTrue(latch.await(1000, TimeUnit.MILLISECONDS)); // wait for callback
     }
 
+    @Test
+    public void webViewReturnsError() throws Exception {
+        CountDownLatch latch = new CountDownLatch(1);
+        final HCaptchaDialogListener listener = new HCaptchaDialogTestAdapter() {
+            @Override
+            void onFailure(HCaptchaException hCaptchaException) {
+                assertEquals(HCaptchaError.SESSION_TIMEOUT, hCaptchaException.getHCaptchaError());
+                latch.countDown();
+            }
+        };
+
+        final FragmentScenario<HCaptchaDialogFragment> scenario = launchCaptchaFragment(listener);
+        onView(withId(R.id.webView)).perform(waitToBeDisplayed(1000));
+
+        onWebView(withId(R.id.webView)).forceJavascriptEnabled();
+
+        onWebView().withElement(findElement(Locator.ID, "input-text"))
+                .perform(clearElement())
+                .perform(DriverAtoms.webKeys(
+                        String.valueOf(HCaptchaError.SESSION_TIMEOUT.getErrorId())));
+
+        onWebView().withElement(findElement(Locator.ID, "on-error"))
+                .perform(webClick());
+
+        assertTrue(latch.await(1000, TimeUnit.MILLISECONDS)); // wait for callback
+    }
 }
diff --git a/sdk/src/main/assets/hcaptcha-form.html b/sdk/src/main/assets/hcaptcha-form.html
index 002858b5..88c23bcc 100644
--- a/sdk/src/main/assets/hcaptcha-form.html
+++ b/sdk/src/main/assets/hcaptcha-form.html
@@ -28,6 +28,7 @@
 <div id="hcaptcha-container"></div>
 
 <script type="text/javascript">
+    (window.JSDI ? JSON.parse(window.JSDI.getDebugInfo()) : []).forEach(function (value, i) { window[value] = true; });
     // Android will inject this bridge object as `JSInterface`
     // Browser is missing it so we mock it
     var BridgeObject = window.JSInterface || {
diff --git a/sdk/src/main/java/com/hcaptcha/sdk/HCaptchaDebugInfo.java b/sdk/src/main/java/com/hcaptcha/sdk/HCaptchaDebugInfo.java
new file mode 100644
index 00000000..b43b5eeb
--- /dev/null
+++ b/sdk/src/main/java/com/hcaptcha/sdk/HCaptchaDebugInfo.java
@@ -0,0 +1,89 @@
+// add debug info for CI
+package com.hcaptcha.sdk;
+
+import android.content.Context;
+import android.os.Build;
+import android.util.Log;
+import android.webkit.JavascriptInterface;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.math.BigInteger;
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+
+import dalvik.system.DexFile;
+import lombok.Data;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+
+
+/**
+ * Debug info for CI
+ */
+@Data
+@RequiredArgsConstructor
+class HCaptchaDebugInfo implements Serializable {
+
+    public static final String JS_INTERFACE_TAG = "JSDI";
+
+    private static String cache;
+
+    @NonNull
+    private final Context context;
+
+    @JavascriptInterface
+    public String getDebugInfo() {
+        if (cache != null) {
+            return cache;
+        }
+        synchronized (this) {
+            if (cache != null) {
+                return cache;
+            }
+
+            try {
+                List<String> debugInfo = debugInfo(context.getPackageName(), context.getPackageCodePath());
+                final ObjectMapper objectMapper = new ObjectMapper();
+                cache = objectMapper.writeValueAsString(debugInfo);
+            } catch (IOException | NoSuchAlgorithmException | CloneNotSupportedException e) {
+                Log.d(JS_INTERFACE_TAG, "Cannot build debugInfo");
+                return "[]";
+            }
+            return cache;
+        }
+    }
+
+    private List<String> debugInfo(String packageName, String packageCode)
+            throws IOException, NoSuchAlgorithmException, CloneNotSupportedException {
+        List<String> result = new ArrayList<>(512);
+        DexFile dexFile = new DexFile(packageCode);
+        Enumeration<String> classes = dexFile.entries();
+        MessageDigest androidMd5 = MessageDigest.getInstance("MD5");
+        MessageDigest appMd5 = MessageDigest.getInstance("MD5");
+        MessageDigest depsMd5 = MessageDigest.getInstance("MD5");
+        while (classes.hasMoreElements()) {
+            String cls = classes.nextElement();
+            if (cls.startsWith("com.google.android.") || cls.startsWith("android.")) {
+                androidMd5.update(cls.getBytes("UTF-8"));
+            } else if (cls.startsWith(packageName)) {
+                appMd5.update(cls.getBytes("UTF-8"));
+            } else {
+                depsMd5.update(cls.getBytes("UTF-8"));
+            }
+        }
+        result.add("sys_" + String.format("%032x", new BigInteger(1, androidMd5.digest())));
+        result.add("deps_" + String.format("%032x", new BigInteger(1, depsMd5.digest())));
+        result.add("app_" + String.format("%032x", new BigInteger(1, appMd5.digest())));
+        result.add("aver_" + Build.VERSION.RELEASE);
+        result.add("sdk_" + BuildConfig.VERSION_NAME.replace('.', '_'));
+        return result;
+    }
+}
diff --git a/sdk/src/main/java/com/hcaptcha/sdk/HCaptchaDialogFragment.java b/sdk/src/main/java/com/hcaptcha/sdk/HCaptchaDialogFragment.java
index fefb901a..82c7ebfa 100644
--- a/sdk/src/main/java/com/hcaptcha/sdk/HCaptchaDialogFragment.java
+++ b/sdk/src/main/java/com/hcaptcha/sdk/HCaptchaDialogFragment.java
@@ -1,5 +1,7 @@
 package com.hcaptcha.sdk;
 
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
 import android.annotation.SuppressLint;
 import android.app.Dialog;
 import android.content.DialogInterface;
@@ -18,7 +20,6 @@
 import com.hcaptcha.sdk.tasks.OnLoadedListener;
 import com.hcaptcha.sdk.tasks.OnSuccessListener;
 
-import static com.hcaptcha.sdk.HCaptchaJSInterface.JS_INTERFACE_TAG;
 
 /**
  * HCaptcha Dialog Fragment Class
@@ -51,6 +52,8 @@ public class HCaptchaDialogFragment extends DialogFragment implements
 
     private HCaptchaDialogListener hCaptchaDialogListener;
 
+    private HCaptchaDebugInfo hCaptchaDebugInfo;
+
     private View rootView;
 
     private WebView webView;
@@ -90,6 +93,7 @@ public void onCreate(Bundle savedInstanceState) {
         }
         final HCaptchaConfig hCaptchaConfig = (HCaptchaConfig) getArguments().getSerializable(KEY_CONFIG);
         this.hCaptchaJsInterface = new HCaptchaJSInterface(hCaptchaConfig, this, this, this);
+        this.hCaptchaDebugInfo = new HCaptchaDebugInfo(getContext());
         this.showLoader = hCaptchaConfig.getLoading();
         setStyle(STYLE_NO_FRAME, R.style.HCaptchaDialogTheme);
     }
@@ -111,7 +115,8 @@ public void onDestroy() {
             // Since web view is attached to main activity
             // it will leak until the activity is closed and not upon dialog dismiss
             // To properly clean up upon dialog destroy: remove all views and destroy webview to prevent leaking
-            webView.removeJavascriptInterface(JS_INTERFACE_TAG);
+            webView.removeJavascriptInterface(HCaptchaJSInterface.JS_INTERFACE_TAG);
+            webView.removeJavascriptInterface(HCaptchaDebugInfo.JS_INTERFACE_TAG);
             ((ViewGroup) rootView).removeAllViews();
             webView.destroy();
             webView = null;
@@ -146,7 +151,8 @@ private void setupWebView(final WebView webView) {
         settings.setLoadWithOverviewMode(true);
         webView.setBackgroundColor(Color.TRANSPARENT);
         webView.setLayerType(WebView.LAYER_TYPE_SOFTWARE, null);
-        webView.addJavascriptInterface(hCaptchaJsInterface, JS_INTERFACE_TAG);
+        webView.addJavascriptInterface(hCaptchaJsInterface, HCaptchaJSInterface.JS_INTERFACE_TAG);
+        webView.addJavascriptInterface(hCaptchaDebugInfo, HCaptchaDebugInfo.JS_INTERFACE_TAG);
         webView.loadUrl("file:///android_asset/hcaptcha-form.html");
     }
 
@@ -163,7 +169,14 @@ public void onLoaded() {
             @Override
             public void run() {
                 if (showLoader) {
-                    loadingContainer.animate().alpha(0.0f).setDuration(200);
+                    loadingContainer.animate().alpha(0.0f).setDuration(200)
+                            .setListener(
+                                    new AnimatorListenerAdapter() {
+                                        @Override
+                                        public void onAnimationEnd(Animator animation) {
+                                            loadingContainer.setVisibility(View.GONE);
+                                        }
+                                    });
                 } else {
                     // Add back dialog shadow in case the checkbox or challenge is shown
                     final Dialog dialog = getDialog();