diff --git a/app/src/main/java/ch/nevis/exampleapp/ui/credential/CredentialFragment.kt b/app/src/main/java/ch/nevis/exampleapp/ui/credential/CredentialFragment.kt
index 05c55c6..4c03524 100644
--- a/app/src/main/java/ch/nevis/exampleapp/ui/credential/CredentialFragment.kt
+++ b/app/src/main/java/ch/nevis/exampleapp/ui/credential/CredentialFragment.kt
@@ -1,7 +1,7 @@
 /**
  * Nevis Mobile Authentication SDK Example App
  *
- * Copyright © 2023. Nevis Security AG. All rights reserved.
+ * Copyright © 2023-2024. Nevis Security AG. All rights reserved.
  */
 
 package ch.nevis.exampleapp.ui.credential
@@ -232,6 +232,7 @@ class CredentialFragment : BaseFragment() {
             override fun onFinish() {
                 setViewState(true)
                 updateMessage(credentialType, remainingRetries, 0)
+                timer = null
             }
         }.start()
     }
diff --git a/app/src/main/res/layout/item_account.xml b/app/src/main/res/layout/item_account.xml
index d3c3b08..6cf0fdd 100644
--- a/app/src/main/res/layout/item_account.xml
+++ b/app/src/main/res/layout/item_account.xml
@@ -16,16 +16,14 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="?android:selectableItemBackground"
+        android:padding="16dp"
         android:onClick="@{() -> accountSelectedListener.onAccountSelected(account)}">
 
         <TextView
             android:id="@+id/usernameTextView"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginBottom="16dp"
             android:text="@{account.username()}"
             android:textSize="16sp"
             android:textStyle="bold"
@@ -34,4 +32,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/item_authenticator.xml b/app/src/main/res/layout/item_authenticator.xml
index 4cfb76c..c0dbd2c 100644
--- a/app/src/main/res/layout/item_authenticator.xml
+++ b/app/src/main/res/layout/item_authenticator.xml
@@ -29,15 +29,14 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="?android:selectableItemBackground"
+        android:padding="16dp"
         android:onClick="@{() -> authenticatorSelectedListener.onAuthenticatorSelected(aaid)}">
 
         <TextView
             android:id="@+id/titleTextView"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginEnd="16dp"
             android:enabled="@{isEnabled}"
             android:text="@{titleResId}"
             android:textSize="16sp"
@@ -50,10 +49,7 @@
             android:id="@+id/messageTextView"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
             android:layout_marginTop="8dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginBottom="16dp"
             android:enabled="@{isEnabled}"
             android:text='@{message ?? ""}'
             android:textSize="14sp"
@@ -64,4 +60,4 @@
             app:layout_constraintTop_toBottomOf="@id/titleTextView" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</layout>