diff --git a/.github/workflows/build-release-candidate.yml b/.github/workflows/build-release-candidate.yml
new file mode 100644
index 0000000000..df7609ec4a
--- /dev/null
+++ b/.github/workflows/build-release-candidate.yml
@@ -0,0 +1,65 @@
+# This is a basic workflow that is manually triggered
+
+name: Build Release Candidate
+
+env:
+  # The name of the main module repository
+  main_project_module: app
+
+# Controls when the action will run. Workflow runs when manually triggered using the UI
+# or API.
+on:
+  workflow_dispatch:
+  
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "greet"
+  greet:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+    # Runs a single command using the runners shell
+    - uses: actions/checkout@v3
+
+    # Set Repository Name As Env Variable
+    - name: Set repository name as env variable
+      run: echo "repository_name=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
+
+    - name: Set Up JDK
+      uses: actions/setup-java@v3
+      with:
+        distribution: 'zulu' # See 'Supported distributions' for available options
+        java-version: '17'
+        cache: 'gradle'
+
+    - name: Change wrapper permissions
+      run: chmod +x ./gradlew
+      
+    - name: Decode Keystore
+      id: decode_keystore
+      uses: timheuer/base64-to-file@v1
+      with:
+        fileName: 'dhis_keystore.jks'
+        encodedString: ${{ secrets.KEYSTORE }}
+    - name: build prod
+      run: ./gradlew app:assembleDhisRelease
+      env:
+        SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
+        SIGNING_KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
+        SIGNING_KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
+        SIGNING_STORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
+        SIGNING_KEYSTORE_PATH: ${{ steps.decode_keystore.outputs.filePath }}
+
+    - name: Read version name from file
+      working-directory: ./gradle
+      id: read-version
+      run: echo "::set-output name=vName::$(grep 'vName' libs.versions.toml | awk -F' = ' '{print $2}' | tr -d '"')"
+
+    # Upload Artifact Build
+    - name: Upload Android artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: ${{ env.repository_name }} - Android APK
+        path: ${{ env.main_project_module }}/build/outputs/apk/dhis/release/dhis2-v${{ steps.read-version.outputs.vName }}-dhis-release.apk
diff --git a/.github/workflows/publish-libraries.yml b/.github/workflows/publish-libraries.yml
new file mode 100644
index 0000000000..94b5ccb317
--- /dev/null
+++ b/.github/workflows/publish-libraries.yml
@@ -0,0 +1,32 @@
+# This is a basic workflow that is manually triggered
+
+name: Publish libraries
+
+# Controls when the action will run. Workflow runs when manually triggered using the UI
+# or API.
+on:
+  workflow_dispatch:
+    # Inputs the workflow accepts.
+    inputs:
+      name:
+        # Friendly description to be shown in the UI instead of 'name'
+        description: 'Person to greet'
+        # Default value if no value is explicitly provided
+        default: 'World'
+        # Input has to be provided for the workflow to run
+        required: true
+        # The data type of the input
+        type: string
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "greet"
+  greet:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+    # Runs a single command using the runners shell
+    - name: Send greeting
+      run: echo "Hello ${{ inputs.name }}"
diff --git a/Jenkinsfile b/Jenkinsfile
index c9ac08f86d..5c8ba67d08 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -55,6 +55,7 @@ pipeline {
                             BROWSERSTACK = credentials('android-browserstack')
                             form_apk = sh(returnStdout: true, script: 'find form/build/outputs -iname "*.apk" | sed -n 1p')
                             form_apk_path = "${env.WORKSPACE}/${form_apk}"
+                            buildTag = "${env.GIT_BRANCH} - form"
                         }
                         steps {
                             dir("${env.WORKSPACE}/scripts"){
@@ -71,6 +72,7 @@ pipeline {
                         BROWSERSTACK = credentials('android-browserstack')
                         compose_table_apk = sh(returnStdout: true, script: 'find compose-table/build/outputs -iname "*.apk" | sed -n 1p')
                         compose_table_apk_path = "${env.WORKSPACE}/${compose_table_apk}"
+                        buildTag = "${env.GIT_BRANCH} - table"
                     }
                     steps {
                         dir("${env.WORKSPACE}/scripts"){
@@ -89,6 +91,7 @@ pipeline {
                         test_apk = sh(returnStdout: true, script: 'find app/build/outputs -iname "*.apk" | sed -n 2p')
                         app_apk_path = "${env.WORKSPACE}/${app_apk}"
                         test_apk_path = "${env.WORKSPACE}/${test_apk}"
+                        buildTag = "${env.GIT_BRANCH}"
                     }
                     steps {
                         dir("${env.WORKSPACE}/scripts"){
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 80f3d81242..535bb1ac95 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -35,6 +35,17 @@ android {
         }
     }
 
+    signingConfigs {
+        create("release"){
+            keyAlias = System.getenv("SIGNING_KEY_ALIAS")
+            keyPassword = System.getenv("SIGNING_KEY_PASSWORD")
+            System.getenv("SIGNING_KEYSTORE_PATH")?.let {path->
+                storeFile = file(path)
+            }
+            storePassword = System.getenv("SIGNING_STORE_PASSWORD")
+        }
+    }
+
     testOptions {
         execution = "ANDROIDX_TEST_ORCHESTRATOR"
         unitTests {
@@ -143,6 +154,7 @@ android {
                 getDefaultProguardFile("proguard-android.txt"),
                 "proguard-rules.pro"
             )
+            signingConfig = signingConfigs.getByName("release")
             buildConfigField("int", "MATOMO_ID", "1")
             buildConfigField("String", "BUILD_DATE", "\"" + getBuildDate() + "\"")
             buildConfigField("String", "GIT_SHA", "\"" + getCommitHash() + "\"")
@@ -307,4 +319,4 @@ dependencies {
     androidTestImplementation(libs.test.compose.ui.test)
     androidTestImplementation(libs.test.hamcrest)
     androidTestImplementation(libs.dispatcher.dispatchEspresso)
-}
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/org/dhis2/usescases/event/EventRegistrationRobot.kt b/app/src/androidTest/java/org/dhis2/usescases/event/EventRegistrationRobot.kt
index 1d91242e67..c13f41c502 100644
--- a/app/src/androidTest/java/org/dhis2/usescases/event/EventRegistrationRobot.kt
+++ b/app/src/androidTest/java/org/dhis2/usescases/event/EventRegistrationRobot.kt
@@ -3,6 +3,7 @@ package org.dhis2.usescases.event
 import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.junit4.ComposeTestRule
 import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performScrollTo
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.assertion.ViewAssertions.matches
@@ -30,6 +31,7 @@ class EventRegistrationRobot : BaseRobot() {
 
     fun checkEventDataEntryIsOpened(completion: Int, email: String, composeTestRule: ComposeTestRule) {
         onView(withId(R.id.completion)).check(matches(hasCompletedPercentage(completion)))
+        composeTestRule.onNodeWithText(email).performScrollTo()
         composeTestRule.onNodeWithText(email).assertIsDisplayed()
     }
 
diff --git a/app/src/androidTest/java/org/dhis2/usescases/filters/FilterTest.kt b/app/src/androidTest/java/org/dhis2/usescases/filters/FilterTest.kt
index 28e714eab8..966881f270 100644
--- a/app/src/androidTest/java/org/dhis2/usescases/filters/FilterTest.kt
+++ b/app/src/androidTest/java/org/dhis2/usescases/filters/FilterTest.kt
@@ -146,7 +146,7 @@ class FilterTest : BaseTest() {
         eventWithoutRegistrationRobot(composeTestRule) {
             clickOnEventAtPosition(0)
         }
-        formRobot {
+        formRobot(composeTestRule) {
             clickOnSelectOption(1, 1)
             pressBack()
             pressBack()
diff --git a/app/src/androidTest/java/org/dhis2/usescases/flow/syncFlow/SyncFlowTest.kt b/app/src/androidTest/java/org/dhis2/usescases/flow/syncFlow/SyncFlowTest.kt
index 9d0f2001df..458845c14f 100644
--- a/app/src/androidTest/java/org/dhis2/usescases/flow/syncFlow/SyncFlowTest.kt
+++ b/app/src/androidTest/java/org/dhis2/usescases/flow/syncFlow/SyncFlowTest.kt
@@ -144,6 +144,7 @@ class SyncFlowTest : BaseTest() {
         prepareFacilityDataSetIntentAndLaunchActivity(ruleDataSet)
 
         dataSetRobot {
+            composeTestRule.waitForIdle()
             clickOnDataSetAtPosition(0)
         }
 
@@ -166,7 +167,10 @@ class SyncFlowTest : BaseTest() {
             clickOnDataSetToSync(0)
             clickOnSyncButton()
             workInfoStatusLiveData.postValue(arrayListOf(mockedGranularWorkInfo(WorkInfo.State.RUNNING)))
+            composeTestRule.waitForIdle()
             workInfoStatusLiveData.postValue(arrayListOf(mockedGranularWorkInfo(WorkInfo.State.SUCCEEDED)))
+            composeTestRule.waitForIdle()
+            waitToDebounce(3000)
             checkSyncWasSuccessfully() //sync failed
         }
         cleanLocalDatabase()
diff --git a/app/src/androidTest/java/org/dhis2/usescases/form/FormRobot.kt b/app/src/androidTest/java/org/dhis2/usescases/form/FormRobot.kt
index 35e309b349..e42dfdab16 100644
--- a/app/src/androidTest/java/org/dhis2/usescases/form/FormRobot.kt
+++ b/app/src/androidTest/java/org/dhis2/usescases/form/FormRobot.kt
@@ -2,9 +2,11 @@ package org.dhis2.usescases.form
 
 import android.app.Activity
 import android.view.MenuItem
+import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.junit4.ComposeTestRule
 import androidx.compose.ui.test.onAllNodesWithTag
 import androidx.compose.ui.test.onFirst
+import androidx.compose.ui.test.onNodeWithText
 import androidx.test.espresso.Espresso.onData
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.click
@@ -32,13 +34,16 @@ import org.hamcrest.CoreMatchers.`is`
 import org.hamcrest.CoreMatchers.not
 
 
-fun formRobot(formRobot: FormRobot.() -> Unit) {
-    FormRobot().apply {
+fun formRobot(
+    composeTestRule: ComposeTestRule,
+    formRobot: FormRobot.() -> Unit
+) {
+    FormRobot(composeTestRule).apply {
         formRobot()
     }
 }
 
-class FormRobot : BaseRobot() {
+class FormRobot(val composeTestRule: ComposeTestRule) : BaseRobot() {
 
     fun clickOnASpecificSection(sectionLabel: String) {
         onView(withText(sectionLabel)).perform(click())
@@ -104,10 +109,8 @@ class FormRobot : BaseRobot() {
     }
 
     fun checkIndicatorIsDisplayed(name: String, value: String) {
-        onView(withId(R.id.indicator_name))
-            .check(matches(allOf(isDisplayed(), withText(name))))
-        onView(withId(R.id.indicator_value))
-            .check(matches(allOf(isDisplayed(), withText(value))))
+        composeTestRule.onNodeWithText(name).assertIsDisplayed()
+        composeTestRule.onNodeWithText(value).assertIsDisplayed()
     }
 
     fun checkLabel(label: String, position: Int) {
diff --git a/app/src/androidTest/java/org/dhis2/usescases/form/FormTest.kt b/app/src/androidTest/java/org/dhis2/usescases/form/FormTest.kt
index a02c59542e..06c74900a8 100644
--- a/app/src/androidTest/java/org/dhis2/usescases/form/FormTest.kt
+++ b/app/src/androidTest/java/org/dhis2/usescases/form/FormTest.kt
@@ -32,7 +32,7 @@ class FormTest : BaseTest() {
     fun shouldApplyProgramRules() {
         prepareIntentAndLaunchEventActivity(ruleEvent)
 
-        formRobot {
+        formRobot(composeTestRule) {
             clickOnASpecificSection("Gamma Rules A")
         }
         applyHideField()
@@ -51,7 +51,7 @@ class FormTest : BaseTest() {
     }
 
     private fun applyHideField() {
-        formRobot {
+        formRobot(composeTestRule) {
             clickOnSelectOption(
                 firstSectionPosition,
                 HIDE_FIELD_POSITION
@@ -61,7 +61,7 @@ class FormTest : BaseTest() {
     }
 
     private fun applyHideSection() {
-        formRobot {
+        formRobot(composeTestRule) {
             resetToNoAction(firstSectionPosition)
             clickOnSelectOption(
                 firstSectionPosition,
@@ -72,7 +72,7 @@ class FormTest : BaseTest() {
     }
 
     private fun applyShowWarning() {
-        formRobot {
+        formRobot(composeTestRule) {
             resetToNoAction(firstSectionPosition)
             clickOnSelectOption(
                 firstSectionPosition,
@@ -83,7 +83,7 @@ class FormTest : BaseTest() {
     }
 
     private fun applyShowError() {
-        formRobot {
+        formRobot(composeTestRule) {
             resetToNoAction(firstSectionPosition)
             clickOnSelectOption(
                 firstSectionPosition,
@@ -94,7 +94,7 @@ class FormTest : BaseTest() {
     }
 
     private fun applySetMandatoryField() {
-        formRobot {
+        formRobot(composeTestRule) {
             val nonMandatoryLabel = "ZZ TEST NUMBER"
             val mandatoryLabel = "ZZ TEST NUMBER *"
             val position = 5
@@ -109,7 +109,7 @@ class FormTest : BaseTest() {
     }
 
     private fun applyHideOption() {
-        formRobot {
+        formRobot(composeTestRule) {
             resetToNoAction(firstSectionPosition)
             clickOnSelectOption(
                 firstSectionPosition,
@@ -120,7 +120,7 @@ class FormTest : BaseTest() {
     }
 
     private fun applyHideOptionGroup() {
-        formRobot {
+        formRobot(composeTestRule) {
             resetToNoAction(firstSectionPosition)
             clickOnSelectOption(
                 firstSectionPosition,
@@ -132,7 +132,7 @@ class FormTest : BaseTest() {
     }
 
     private fun applyShowOptionGroup() {
-        formRobot {
+        formRobot(composeTestRule) {
             resetToNoAction(firstSectionPosition)
             clickOnSelectOption(
                 firstSectionPosition,
@@ -146,7 +146,7 @@ class FormTest : BaseTest() {
     }
 
     private fun applyAssignValue() {
-        formRobot {
+        formRobot(composeTestRule) {
             resetToNoAction(firstSectionPosition)
             clickOnSelectOption(
                 firstSectionPosition,
@@ -157,7 +157,7 @@ class FormTest : BaseTest() {
     }
 
     private fun applyDisplayText() {
-        formRobot {
+        formRobot(composeTestRule) {
             resetToNoAction(firstSectionPosition)
             clickOnSelectOption(
                 firstSectionPosition,
@@ -171,7 +171,7 @@ class FormTest : BaseTest() {
     }
 
     private fun applyDisplayKeyValue() {
-        formRobot {
+        formRobot(composeTestRule) {
             resetToNoAction(firstSectionPosition)
             clickOnSelectOption(
                 firstSectionPosition,
@@ -185,7 +185,7 @@ class FormTest : BaseTest() {
     }
 
     private fun applyWarningOnComplete() {
-        formRobot {
+        formRobot(composeTestRule) {
             resetToNoAction(firstSectionPosition)
             clickOnSelectOption(
                 firstSectionPosition,
@@ -200,7 +200,7 @@ class FormTest : BaseTest() {
     }
 
     private fun applyErrorOnComplete() {
-        formRobot {
+        formRobot(composeTestRule) {
             resetToNoAction(firstSectionPosition)
             clickOnSelectOption(
                 firstSectionPosition,
diff --git a/app/src/androidTest/java/org/dhis2/usescases/programevent/ProgramEventTest.kt b/app/src/androidTest/java/org/dhis2/usescases/programevent/ProgramEventTest.kt
index b8894c8c08..68549602fa 100644
--- a/app/src/androidTest/java/org/dhis2/usescases/programevent/ProgramEventTest.kt
+++ b/app/src/androidTest/java/org/dhis2/usescases/programevent/ProgramEventTest.kt
@@ -12,6 +12,7 @@ import org.dhis2.usescases.programEventDetail.ProgramEventDetailActivity
 import org.dhis2.usescases.programevent.robot.programEventsRobot
 import org.dhis2.usescases.teidashboard.robot.eventRobot
 import org.junit.Before
+import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 
@@ -76,6 +77,7 @@ class ProgramEventTest : BaseTest() {
         }
     }
 
+    @Ignore("Flaky test, will be look om issue ANDROAPP-6030")
     @Test
     fun shouldCompleteAnEventAndReopenIt() {
         val eventDate = "15/3/2020"
diff --git a/app/src/androidTest/java/org/dhis2/usescases/programevent/robot/ProgramEventsRobot.kt b/app/src/androidTest/java/org/dhis2/usescases/programevent/robot/ProgramEventsRobot.kt
index 04cb72efce..d430956e6d 100644
--- a/app/src/androidTest/java/org/dhis2/usescases/programevent/robot/ProgramEventsRobot.kt
+++ b/app/src/androidTest/java/org/dhis2/usescases/programevent/robot/ProgramEventsRobot.kt
@@ -62,9 +62,7 @@ class ProgramEventsRobot(val composeTestRule: ComposeContentTestRule) : BaseRobo
         ).check(matches(isDisplayed()))
     }
 
-    @OptIn(ExperimentalTestApi::class)
     fun checkEventIsComplete(eventDate: String) {
-        composeTestRule.waitUntilAtLeastOneExists(hasText(eventDate))
         composeTestRule.onNodeWithText(eventDate).assertIsDisplayed()
         composeTestRule.onNodeWithText("Event completed").assertIsDisplayed()
     }
diff --git a/app/src/androidTest/java/org/dhis2/usescases/teidashboard/TeiDashboardTest.kt b/app/src/androidTest/java/org/dhis2/usescases/teidashboard/TeiDashboardTest.kt
index 8ed623b3e9..4557f174bf 100644
--- a/app/src/androidTest/java/org/dhis2/usescases/teidashboard/TeiDashboardTest.kt
+++ b/app/src/androidTest/java/org/dhis2/usescases/teidashboard/TeiDashboardTest.kt
@@ -152,6 +152,7 @@ class TeiDashboardTest : BaseTest() {
         }
     }
 
+    @Ignore("To fix in ANDROAPP-6109")
     @Test
     fun shouldSuccessfullyScheduleAnEvent() {
         prepareTeiOpenedWithNoPreviousEventProgrammeAndLaunchActivity(rule)
@@ -219,7 +220,7 @@ class TeiDashboardTest : BaseTest() {
             goToAnalytics()
         }
 
-        indicatorsRobot {
+        indicatorsRobot(composeTestRule) {
             checkDetails("0", "4817")
         }
     }
@@ -302,7 +303,7 @@ class TeiDashboardTest : BaseTest() {
             goToAnalytics()
         }
 
-        indicatorsRobot {
+        indicatorsRobot(composeTestRule) {
             checkGraphIsRendered(chartName)
         }
 
diff --git a/app/src/androidTest/java/org/dhis2/usescases/teidashboard/robot/IndicatorsRobot.kt b/app/src/androidTest/java/org/dhis2/usescases/teidashboard/robot/IndicatorsRobot.kt
index 62f4c50948..5a6af744fe 100644
--- a/app/src/androidTest/java/org/dhis2/usescases/teidashboard/robot/IndicatorsRobot.kt
+++ b/app/src/androidTest/java/org/dhis2/usescases/teidashboard/robot/IndicatorsRobot.kt
@@ -1,73 +1,41 @@
 package org.dhis2.usescases.teidashboard.robot
 
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.junit4.ComposeTestRule
+import androidx.compose.ui.test.onNodeWithText
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
-import androidx.test.espresso.matcher.ViewMatchers.hasSibling
-import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import org.dhis2.R
 import org.dhis2.common.BaseRobot
 import org.dhis2.common.matchers.RecyclerviewMatchers.Companion.atPosition
-import org.dhis2.common.matchers.RecyclerviewMatchers.Companion.isNotEmpty
-import org.hamcrest.CoreMatchers.allOf
 
-fun indicatorsRobot(indicatorsRobot: IndicatorsRobot.() -> Unit) {
-    IndicatorsRobot().apply {
+fun indicatorsRobot(
+    composeTestRule: ComposeTestRule,
+    indicatorsRobot: IndicatorsRobot.() -> Unit
+) {
+    IndicatorsRobot(composeTestRule).apply {
         indicatorsRobot()
     }
 }
 
-class IndicatorsRobot : BaseRobot() {
+class IndicatorsRobot(val composeTestRule: ComposeTestRule) : BaseRobot() {
 
     fun checkDetails(yellowFeverIndicator: String, weightIndicator: String) {
-        onView(withId(R.id.indicators_recycler)).check(
-            matches(
-                allOf(
-                    isDisplayed(), isNotEmpty(),
-                    atPosition(
-                        2,
-                        hasDescendant(
-                            allOf(
-                                withText(yellowFeverIndicator),
-                                hasSibling(
-                                    allOf(
-                                        withId(R.id.indicator_name),
-                                        withText("Measles + Yellow fever doses")
-                                    )
-                                )
-                            )
-                        )
-                    )
-                )
-            )
-        )
+        composeTestRule.onNodeWithText(yellowFeverIndicator).assertIsDisplayed()
+        composeTestRule.onNodeWithText(weightIndicator).assertIsDisplayed()
+    }
 
+    fun checkGraphIsRendered(chartName: String) {
         onView(withId(R.id.indicators_recycler)).check(
             matches(
-                allOf(
-                    isDisplayed(), isNotEmpty(),
-                    atPosition(
-                        1,
-                        hasDescendant(
-                            allOf(
-                                withText(weightIndicator),
-                                hasSibling(
-                                    allOf(
-                                        withId(R.id.indicator_name),
-                                        withText("Average weight (g)")
-                                    )
-                                )
-                            )
-                        )
-                    )
+                atPosition(
+                    1,
+                    hasDescendant(withText(chartName))
                 )
             )
         )
     }
-
-    fun checkGraphIsRendered(chartName:String){
-        onView(withId(R.id.indicators_recycler)).check(matches(atPosition(1, hasDescendant(withText(chartName)))))
-    }
 }
diff --git a/app/src/main/java/org/dhis2/App.java b/app/src/main/java/org/dhis2/App.java
index a1efb3fc2f..099a38e85d 100644
--- a/app/src/main/java/org/dhis2/App.java
+++ b/app/src/main/java/org/dhis2/App.java
@@ -131,6 +131,7 @@ public void initCrashController() {
         if (areTrackingPermissionGranted()) {
             SentryAndroid.init(this, options -> {
                 options.setDsn(BuildConfig.SENTRY_DSN);
+                options.setAnrReportInDebug(true);
 
                 // Add a callback that will be used before the event is sent to Sentry.
                 // With this callback, you can modify the event or, when returning null, also discard the event.
diff --git a/app/src/main/java/org/dhis2/bindings/ValidationStrategyExtensions.kt b/app/src/main/java/org/dhis2/bindings/ValidationStrategyExtensions.kt
deleted file mode 100644
index 63df251fb5..0000000000
--- a/app/src/main/java/org/dhis2/bindings/ValidationStrategyExtensions.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.dhis2.bindings
-
-import org.hisp.dhis.android.core.common.ValidationStrategy
-
-fun ValidationStrategy.canSkipErrorFix(hasErrorFields: Boolean, hasEmptyMandatoryFields: Boolean) =
-    when (this) {
-        ValidationStrategy.ON_COMPLETE -> true
-        ValidationStrategy.ON_UPDATE_AND_INSERT -> !hasErrorFields && !hasEmptyMandatoryFields
-    }
diff --git a/app/src/main/java/org/dhis2/data/dhislogic/DhisEventUtils.kt b/app/src/main/java/org/dhis2/data/dhislogic/DhisEventUtils.kt
deleted file mode 100644
index 27aac9e132..0000000000
--- a/app/src/main/java/org/dhis2/data/dhislogic/DhisEventUtils.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.dhis2.data.dhislogic
-
-import org.hisp.dhis.android.core.D2
-import org.hisp.dhis.android.core.common.FeatureType
-import javax.inject.Inject
-
-class DhisEventUtils @Inject constructor(val d2: D2) {
-    fun newEventNeedsExtraInfo(eventUid: String): Boolean {
-        val event = d2.eventModule().events().uid(eventUid)
-            .blockingGet()
-        val stage = d2.programModule().programStages().uid(event?.programStage())
-            .blockingGet()
-        val program = d2.programModule().programs().uid(stage?.program()?.uid())
-            .blockingGet()
-        val hasCoordinates = stage?.featureType() != null && stage.featureType() != FeatureType.NONE
-        val hasNonDefaultCatCombo = d2.categoryModule().categoryCombos()
-            .uid(program?.categoryComboUid()).blockingGet()?.isDefault != true
-        return hasCoordinates || hasNonDefaultCatCombo
-    }
-}
diff --git a/app/src/main/java/org/dhis2/data/forms/dataentry/ValueStore.kt b/app/src/main/java/org/dhis2/data/forms/dataentry/ValueStore.kt
index 0ba894599e..4381d11c82 100644
--- a/app/src/main/java/org/dhis2/data/forms/dataentry/ValueStore.kt
+++ b/app/src/main/java/org/dhis2/data/forms/dataentry/ValueStore.kt
@@ -18,11 +18,6 @@ interface ValueStore {
 
     fun deleteOptionValues(optionCodeValuesToDelete: List<String>)
     fun deleteOptionValueIfSelected(field: String, optionUid: String): StoreResult
-    fun deleteOptionValueIfSelectedInGroup(
-        field: String,
-        optionGroupUid: String,
-        isInGroup: Boolean,
-    ): StoreResult
 
     fun overrideProgram(programUid: String?)
     fun validate(dataElementUid: String, value: String?): ValidatorResult<String, Throwable>
diff --git a/app/src/main/java/org/dhis2/data/forms/dataentry/ValueStoreImpl.kt b/app/src/main/java/org/dhis2/data/forms/dataentry/ValueStoreImpl.kt
index ebd4b20bd7..8ec8091e42 100644
--- a/app/src/main/java/org/dhis2/data/forms/dataentry/ValueStoreImpl.kt
+++ b/app/src/main/java/org/dhis2/data/forms/dataentry/ValueStoreImpl.kt
@@ -258,37 +258,6 @@ class ValueStoreImpl(
         }
     }
 
-    override fun deleteOptionValueIfSelectedInGroup(
-        field: String,
-        optionGroupUid: String,
-        isInGroup: Boolean,
-    ): StoreResult {
-        val optionsInGroup =
-            d2.optionModule().optionGroups()
-                .withOptions()
-                .uid(optionGroupUid)
-                .blockingGet()
-                ?.options()
-                ?.map { d2.optionModule().options().uid(it.uid()).blockingGet()?.code()!! }
-                ?: arrayListOf()
-        return when (entryMode) {
-            EntryMode.DE -> deleteDataElementValueIfNotInGroup(
-                field,
-                optionsInGroup,
-                isInGroup,
-            )
-            EntryMode.ATTR -> deleteAttributeValueIfNotInGroup(
-                field,
-                optionsInGroup,
-                isInGroup,
-            )
-            EntryMode.DV,
-            -> throw IllegalArgumentException(
-                "DataValues can't be saved using these arguments. Use the other one.",
-            )
-        }
-    }
-
     private fun deleteDataElementValue(field: String, optionUid: String): StoreResult {
         val option = d2.optionModule().options().uid(optionUid).blockingGet()
         val possibleValues = arrayListOf(option?.name(), option?.code()).filterNotNull()
@@ -317,38 +286,6 @@ class ValueStoreImpl(
         }
     }
 
-    private fun deleteDataElementValueIfNotInGroup(
-        field: String,
-        optionCodesToShow: List<String>,
-        isInGroup: Boolean,
-    ): StoreResult {
-        val valueRepository =
-            d2.trackedEntityModule().trackedEntityDataValues().value(recordUid, field)
-        return if (valueRepository.blockingExists() &&
-            optionCodesToShow.contains(valueRepository.blockingGet()?.value()) == isInGroup
-        ) {
-            save(field, null).blockingFirst()
-        } else {
-            StoreResult(field, ValueStoreResult.VALUE_HAS_NOT_CHANGED)
-        }
-    }
-
-    private fun deleteAttributeValueIfNotInGroup(
-        field: String,
-        optionCodesToShow: List<String>,
-        isInGroup: Boolean,
-    ): StoreResult {
-        val valueRepository =
-            d2.trackedEntityModule().trackedEntityAttributeValues().value(field, recordUid)
-        return if (valueRepository.blockingExists() &&
-            optionCodesToShow.contains(valueRepository.blockingGet()?.value()) == isInGroup
-        ) {
-            save(field, null).blockingFirst()
-        } else {
-            StoreResult(field, ValueStoreResult.VALUE_HAS_NOT_CHANGED)
-        }
-    }
-
     override fun deleteOptionValues(optionCodeValuesToDelete: List<String>) {
         when (entryMode) {
             EntryMode.DE -> deleteOptionValuesForEvents(optionCodeValuesToDelete)
diff --git a/app/src/main/java/org/dhis2/data/service/SyncGranularWorker.kt b/app/src/main/java/org/dhis2/data/service/SyncGranularWorker.kt
index 96122ae22f..02a769c62e 100644
--- a/app/src/main/java/org/dhis2/data/service/SyncGranularWorker.kt
+++ b/app/src/main/java/org/dhis2/data/service/SyncGranularWorker.kt
@@ -25,10 +25,18 @@
 
 package org.dhis2.data.service
 
+import android.app.NotificationChannel
+import android.app.NotificationManager
 import android.content.Context
+import android.content.pm.ServiceInfo
+import android.os.Build
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import androidx.work.ForegroundInfo
 import androidx.work.Worker
 import androidx.work.WorkerParameters
 import org.dhis2.App
+import org.dhis2.R
 import org.dhis2.commons.Constants.ATTRIBUTE_OPTION_COMBO
 import org.dhis2.commons.Constants.CATEGORY_OPTION_COMBO
 import org.dhis2.commons.Constants.CONFLICT_TYPE
@@ -36,9 +44,10 @@ import org.dhis2.commons.Constants.ORG_UNIT
 import org.dhis2.commons.Constants.PERIOD_ID
 import org.dhis2.commons.Constants.UID
 import org.dhis2.commons.sync.ConflictType
-import java.util.Objects
 import javax.inject.Inject
 
+private const val GRANULAR_CHANNEL = "sync_granular_notification"
+private const val SYNC_GRANULAR_ID = 8071988
 class SyncGranularWorker(
     context: Context,
     workerParams: WorkerParameters,
@@ -48,12 +57,18 @@ class SyncGranularWorker(
     internal lateinit var presenter: SyncPresenter
 
     override fun doWork(): Result {
-        Objects.requireNonNull((applicationContext as App).userComponent())!!
-            .plus(SyncGranularRxModule()).inject(this)
+        (applicationContext as App).userComponent()
+            ?.plus(SyncGranularRxModule())?.inject(this)
 
         val uid = inputData.getString(UID) ?: return Result.failure()
         val conflictType = inputData.getString(CONFLICT_TYPE)?.let { ConflictType.valueOf(it) }
 
+        triggerNotification(
+            title = applicationContext.getString(R.string.app_name),
+            content = applicationContext.getString(R.string.syncing_data),
+            progress = 0,
+        )
+
         val result = when (conflictType) {
             ConflictType.PROGRAM -> {
                 presenter.blockSyncGranularProgram(uid)
@@ -79,6 +94,47 @@ class SyncGranularWorker(
                 )
             else -> Result.failure()
         }
+
+        cancelNotification()
         return result
     }
+
+    private fun triggerNotification(title: String, content: String, progress: Int) {
+        val notificationManager =
+            applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val mChannel = NotificationChannel(
+                GRANULAR_CHANNEL,
+                "GranularSync",
+                NotificationManager.IMPORTANCE_HIGH,
+            )
+            notificationManager.createNotificationChannel(mChannel)
+        }
+        val notificationBuilder: NotificationCompat.Builder = NotificationCompat.Builder(
+            applicationContext,
+            GRANULAR_CHANNEL,
+        )
+            .setSmallIcon(R.drawable.ic_sync)
+            .setContentTitle(title)
+            .setContentText(content)
+            .setOngoing(true)
+            .setOnlyAlertOnce(true)
+            .setAutoCancel(false)
+            .setProgress(100, progress, true)
+            .setPriority(NotificationCompat.PRIORITY_DEFAULT)
+        setForegroundAsync(
+            ForegroundInfo(
+                SYNC_GRANULAR_ID,
+                notificationBuilder.build(),
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC else 0,
+            ),
+        )
+    }
+
+    private fun cancelNotification() {
+        val notificationManager = NotificationManagerCompat.from(
+            applicationContext,
+        )
+        notificationManager.cancel(SYNC_GRANULAR_ID)
+    }
 }
diff --git a/app/src/main/java/org/dhis2/data/service/SyncPresenterImpl.kt b/app/src/main/java/org/dhis2/data/service/SyncPresenterImpl.kt
index 0da82acab8..9e1acd36e8 100644
--- a/app/src/main/java/org/dhis2/data/service/SyncPresenterImpl.kt
+++ b/app/src/main/java/org/dhis2/data/service/SyncPresenterImpl.kt
@@ -215,7 +215,7 @@ class SyncPresenterImpl(
         ).andThen(
             Completable.fromObservable(
                 d2.fileResourceModule().fileResourceDownloader()
-                    .byDomainType().eq(FileResourceDomainType.CUSTOM_ICON)
+                    .byDomainType().eq(FileResourceDomainType.ICON)
                     .download(),
             ),
         ).blockingAwait()
diff --git a/app/src/main/java/org/dhis2/usescases/datasets/dataSetTable/dataSetDetail/DataSetDetailFragment.kt b/app/src/main/java/org/dhis2/usescases/datasets/dataSetTable/dataSetDetail/DataSetDetailFragment.kt
index e570fbd008..cf0fa562b4 100644
--- a/app/src/main/java/org/dhis2/usescases/datasets/dataSetTable/dataSetDetail/DataSetDetailFragment.kt
+++ b/app/src/main/java/org/dhis2/usescases/datasets/dataSetTable/dataSetDetail/DataSetDetailFragment.kt
@@ -20,6 +20,7 @@ import org.hisp.dhis.android.core.common.ObjectStyle
 import org.hisp.dhis.android.core.dataset.DataSetInstance
 import org.hisp.dhis.android.core.period.Period
 import org.hisp.dhis.android.core.period.PeriodType
+import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor
 import java.util.Date
 import java.util.Locale
 import javax.inject.Inject
@@ -149,7 +150,7 @@ class DataSetDetailFragment private constructor() : FragmentGlobalAbstract(), Da
     override fun setStyle(style: ObjectStyle?) {
         style?.let {
             binding.composeDataSetIcon.setUpMetadataIcon(
-                metadataIconProvider(style),
+                metadataIconProvider(style, SurfaceColor.Primary),
             )
         }
     }
diff --git a/app/src/main/java/org/dhis2/usescases/datasets/datasetDetail/datasetList/DataSetListAdapter.kt b/app/src/main/java/org/dhis2/usescases/datasets/datasetDetail/datasetList/DataSetListAdapter.kt
index d7ed9797e9..235945ccaf 100644
--- a/app/src/main/java/org/dhis2/usescases/datasets/datasetDetail/datasetList/DataSetListAdapter.kt
+++ b/app/src/main/java/org/dhis2/usescases/datasets/datasetDetail/datasetList/DataSetListAdapter.kt
@@ -3,6 +3,11 @@ package org.dhis2.usescases.datasets.datasetDetail.datasetList
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.ComposeView
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
@@ -13,6 +18,7 @@ import org.dhis2.usescases.datasets.datasetDetail.DataSetDetailModel
 import org.dhis2.usescases.datasets.datasetDetail.datasetList.mapper.DatasetCardMapper
 import org.hisp.dhis.mobile.ui.designsystem.component.ListCard
 import org.hisp.dhis.mobile.ui.designsystem.component.ListCardTitleModel
+import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing
 
 class DataSetListAdapter(
     val viewModel: DataSetListViewModel,
@@ -48,16 +54,28 @@ class DataSetListAdapter(
                         viewModel.openDataSet(it)
                     },
                 )
-                ListCard(
-                    listAvatar = card.avatar,
-                    title = ListCardTitleModel(text = card.title),
-                    lastUpdated = card.lastUpdated,
-                    additionalInfoList = card.additionalInfo,
-                    actionButton = card.actionButton,
-                    expandLabelText = card.expandLabelText,
-                    shrinkLabelText = card.shrinkLabelText,
-                    onCardClick = card.onCardCLick,
-                )
+                Column(
+                    modifier = Modifier
+                        .padding(
+                            start = Spacing.Spacing8,
+                            end = Spacing.Spacing8,
+                            bottom = Spacing.Spacing4,
+                        ),
+                ) {
+                    if (position == 0) {
+                        Spacer(modifier = Modifier.size(Spacing.Spacing8))
+                    }
+                    ListCard(
+                        listAvatar = card.avatar,
+                        title = ListCardTitleModel(text = card.title),
+                        lastUpdated = card.lastUpdated,
+                        additionalInfoList = card.additionalInfo,
+                        actionButton = card.actionButton,
+                        expandLabelText = card.expandLabelText,
+                        shrinkLabelText = card.shrinkLabelText,
+                        onCardClick = card.onCardCLick,
+                    )
+                }
             }
 
             holder.bind(it, viewModel)
diff --git a/app/src/main/java/org/dhis2/usescases/datasets/datasetDetail/datasetList/DataSetListViewModel.kt b/app/src/main/java/org/dhis2/usescases/datasets/datasetDetail/datasetList/DataSetListViewModel.kt
index 3439625446..9eb943de26 100644
--- a/app/src/main/java/org/dhis2/usescases/datasets/datasetDetail/datasetList/DataSetListViewModel.kt
+++ b/app/src/main/java/org/dhis2/usescases/datasets/datasetDetail/datasetList/DataSetListViewModel.kt
@@ -23,7 +23,7 @@ class DataSetListViewModel(
     schedulerProvider: SchedulerProvider,
     val filterManager: FilterManager,
     val matomoAnalyticsController: MatomoAnalyticsController,
-    private val dispatcher: DispatcherProvider,
+    dispatcher: DispatcherProvider,
 
 ) : ViewModel() {
 
@@ -45,13 +45,12 @@ class DataSetListViewModel(
                 filterManager.asFlowable()
                     .startWith(filterManager)
                     .flatMap { filterManager: FilterManager ->
-
                         dataSetDetailRepository.dataSetGroups(
                             filterManager.orgUnitUidsFilters,
                             filterManager.periodFilters,
                             filterManager.stateFilters,
                             filterManager.catOptComboFilters,
-                        )
+                        ).subscribeOn(schedulerProvider.io())
                     }
                     .subscribeOn(schedulerProvider.io())
                     .observeOn(schedulerProvider.ui())
diff --git a/app/src/main/java/org/dhis2/usescases/enrollment/EnrollmentActivity.kt b/app/src/main/java/org/dhis2/usescases/enrollment/EnrollmentActivity.kt
index b5952cf2a4..e9f318a053 100644
--- a/app/src/main/java/org/dhis2/usescases/enrollment/EnrollmentActivity.kt
+++ b/app/src/main/java/org/dhis2/usescases/enrollment/EnrollmentActivity.kt
@@ -10,7 +10,6 @@ import androidx.databinding.DataBindingUtil
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.dhis2.App
 import org.dhis2.R
-import org.dhis2.commons.Constants
 import org.dhis2.commons.Constants.ENROLLMENT_UID
 import org.dhis2.commons.Constants.PROGRAM_UID
 import org.dhis2.commons.Constants.TEI_UID
@@ -32,7 +31,6 @@ import org.dhis2.ui.dialogs.bottomsheet.BottomSheetDialogUiModel
 import org.dhis2.ui.dialogs.bottomsheet.DialogButtonStyle
 import org.dhis2.usescases.events.ScheduledEventActivity
 import org.dhis2.usescases.eventsWithoutRegistration.eventCapture.EventCaptureActivity
-import org.dhis2.usescases.eventsWithoutRegistration.eventInitial.EventInitialActivity
 import org.dhis2.usescases.general.ActivityGlobalAbstract
 import org.dhis2.usescases.teiDashboard.TeiDashboardMobileActivity
 import org.dhis2.utils.granularsync.OPEN_ERROR_LOCATION
@@ -194,35 +192,15 @@ class EnrollmentActivity : ActivityGlobalAbstract(), EnrollmentView {
         if (presenter.isEventScheduleOrSkipped(eventUid)) {
             val scheduleEventIntent = ScheduledEventActivity.getIntent(this, eventUid)
             openEventForResult.launch(scheduleEventIntent)
-        } else if (presenter.openInitial(eventUid)) {
-            val bundle = EventInitialActivity.getBundle(
-                presenter.getProgram()?.uid(),
-                eventUid,
-                null,
-                presenter.getEnrollment()!!.trackedEntityInstance(),
-                null,
-                presenter.getEnrollment()!!.organisationUnit(),
-                presenter.getEventStage(eventUid),
-                presenter.getEnrollment()!!.uid(),
-                0,
-                presenter.getEnrollment()!!.status(),
-            )
-            val eventInitialIntent = Intent(abstracContext, EventInitialActivity::class.java)
-            eventInitialIntent.putExtras(bundle)
-            startActivityForResult(eventInitialIntent, RQ_EVENT)
         } else {
             val eventCreationIntent = Intent(abstracContext, EventCaptureActivity::class.java)
             eventCreationIntent.putExtras(
                 EventCaptureActivity.getActivityBundle(
                     eventUid,
                     presenter.getProgram()?.uid() ?: "",
-                    EventMode.CHECK,
+                    EventMode.NEW,
                 ),
             )
-            eventCreationIntent.putExtra(
-                Constants.TRACKED_ENTITY_INSTANCE,
-                presenter.getEnrollment()!!.trackedEntityInstance(),
-            )
             startActivityForResult(eventCreationIntent, RQ_EVENT)
         }
     }
@@ -352,9 +330,6 @@ class EnrollmentActivity : ActivityGlobalAbstract(), EnrollmentView {
         binding.enrollmentStatus = status
     }
 
-    override fun showStatusOptions(currentStatus: EnrollmentStatus) {
-    }
-
     /*endregion*/
 
     override fun requestFocus() {
diff --git a/app/src/main/java/org/dhis2/usescases/enrollment/EnrollmentPresenterImpl.kt b/app/src/main/java/org/dhis2/usescases/enrollment/EnrollmentPresenterImpl.kt
index e0bfac9128..a87db3bff1 100644
--- a/app/src/main/java/org/dhis2/usescases/enrollment/EnrollmentPresenterImpl.kt
+++ b/app/src/main/java/org/dhis2/usescases/enrollment/EnrollmentPresenterImpl.kt
@@ -19,7 +19,6 @@ import org.dhis2.utils.analytics.AnalyticsHelper
 import org.dhis2.utils.analytics.DELETE_AND_BACK
 import org.hisp.dhis.android.core.D2
 import org.hisp.dhis.android.core.arch.repositories.`object`.ReadOnlyOneObjectRepositoryFinalImpl
-import org.hisp.dhis.android.core.common.FeatureType
 import org.hisp.dhis.android.core.common.Geometry
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.enrollment.Enrollment
@@ -50,7 +49,6 @@ class EnrollmentPresenterImpl(
     private val eventCollectionRepository: EventCollectionRepository,
     private val teiAttributesProvider: TeiAttributesProvider,
 ) {
-    private var finishing: Boolean = false
     private val disposable = CompositeDisposable()
     private val backButtonProcessor: FlowableProcessor<Boolean> = PublishProcessor.create()
     private var hasShownIncidentDateEditionWarning = false
@@ -168,6 +166,7 @@ class EnrollmentPresenterImpl(
                         ),
                 )
             }
+
             EnrollmentActivity.EnrollmentMode.CHECK -> view.setResultAndFinish()
         }
     }
@@ -178,29 +177,12 @@ class EnrollmentPresenterImpl(
                 view.showDateEditionWarning()
             }
         }
-        if (finishing) {
-            view.performSaveClick()
-        }
-        finishing = false
     }
 
     fun backIsClicked() {
         backButtonProcessor.onNext(true)
     }
 
-    fun openInitial(eventUid: String): Boolean {
-        val catComboUid = getProgram()?.categoryComboUid()
-        val event = d2.eventModule().events().uid(eventUid).blockingGet()
-        val stage = d2.programModule().programStages().uid(event?.programStage()).blockingGet()
-        val needsCatCombo = programRepository.blockingGet()?.categoryComboUid() != null &&
-            d2.categoryModule().categoryCombos().uid(catComboUid)
-                .blockingGet()?.isDefault == false
-        val needsCoordinates =
-            stage?.featureType() != null && stage.featureType() != FeatureType.NONE
-
-        return needsCatCombo || needsCoordinates
-    }
-
     fun getEnrollment(): Enrollment? {
         return enrollmentObjectRepository.blockingGet()
     }
@@ -224,8 +206,6 @@ class EnrollmentPresenterImpl(
         }
     }
 
-    fun hasAccess() = getProgram()?.access()?.data()?.write() ?: false
-
     fun saveEnrollmentGeometry(geometry: Geometry?) {
         enrollmentObjectRepository.setGeometry(geometry)
     }
@@ -258,13 +238,6 @@ class EnrollmentPresenterImpl(
         }
     }
 
-    fun setFinishing() {
-        finishing = true
-    }
-
-    fun getEventStage(eventUid: String) =
-        enrollmentFormRepository.getProgramStageUidFromEvent(eventUid)
-
     fun showOrHideSaveButton() {
         val teiUid = teiRepository.blockingGet()?.uid() ?: ""
         val programUid = getProgram()?.uid() ?: ""
diff --git a/app/src/main/java/org/dhis2/usescases/enrollment/EnrollmentView.kt b/app/src/main/java/org/dhis2/usescases/enrollment/EnrollmentView.kt
index bc0c10c7b0..9a953b3bd7 100644
--- a/app/src/main/java/org/dhis2/usescases/enrollment/EnrollmentView.kt
+++ b/app/src/main/java/org/dhis2/usescases/enrollment/EnrollmentView.kt
@@ -9,7 +9,6 @@ interface EnrollmentView : AbstractActivityContracts.View {
     fun setAccess(access: Boolean?)
 
     fun renderStatus(status: EnrollmentStatus)
-    fun showStatusOptions(currentStatus: EnrollmentStatus)
 
     fun setSaveButtonVisible(visible: Boolean)
 
diff --git a/app/src/main/java/org/dhis2/usescases/events/ScheduledEventActivity.kt b/app/src/main/java/org/dhis2/usescases/events/ScheduledEventActivity.kt
index 85f18d0d2c..28952bf12a 100644
--- a/app/src/main/java/org/dhis2/usescases/events/ScheduledEventActivity.kt
+++ b/app/src/main/java/org/dhis2/usescases/events/ScheduledEventActivity.kt
@@ -10,7 +10,6 @@ import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.databinding.DataBindingUtil
 import org.dhis2.App
 import org.dhis2.R
-import org.dhis2.commons.data.EventCreationType
 import org.dhis2.commons.date.DateUtils
 import org.dhis2.commons.dialogs.PeriodDialog
 import org.dhis2.databinding.ActivityEventScheduledBinding
@@ -21,7 +20,6 @@ import org.dhis2.usescases.eventsWithoutRegistration.eventDetails.models.EventIn
 import org.dhis2.usescases.eventsWithoutRegistration.eventDetails.providers.ProvideInputDate
 import org.dhis2.usescases.eventsWithoutRegistration.eventDetails.providers.ProvidePeriodSelector
 import org.dhis2.usescases.eventsWithoutRegistration.eventDetails.providers.willShowCalendar
-import org.dhis2.usescases.eventsWithoutRegistration.eventInitial.EventInitialActivity
 import org.dhis2.usescases.general.ActivityGlobalAbstract
 import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.event.EventStatus
@@ -237,28 +235,11 @@ class ScheduledEventActivity : ActivityGlobalAbstract(), ScheduledEventContract.
         }
     }
 
-    override fun openInitialActivity() {
-        val bundle = EventInitialActivity.getBundle(
-            program.uid(),
-            event.uid(),
-            EventCreationType.DEFAULT.name,
-            presenter.getEventTei(),
-            stage.periodType(),
-            presenter.getEnrollment()?.organisationUnit(),
-            stage.uid(),
-            event.enrollment(),
-            stage.standardInterval() ?: 0,
-            presenter.getEnrollment()?.status(),
-        )
-        startActivity(Intent(this, EventInitialActivity::class.java).apply { putExtras(bundle) })
-        finish()
-    }
-
     override fun openFormActivity() {
         val bundle = EventCaptureActivity.getActivityBundle(
             event.uid(),
             program.uid(),
-            EventMode.CHECK,
+            EventMode.SCHEDULE,
         )
         Intent(activity, EventCaptureActivity::class.java).apply {
             putExtras(bundle)
diff --git a/app/src/main/java/org/dhis2/usescases/events/ScheduledEventContract.kt b/app/src/main/java/org/dhis2/usescases/events/ScheduledEventContract.kt
index 052a792c2a..dfc435ff34 100644
--- a/app/src/main/java/org/dhis2/usescases/events/ScheduledEventContract.kt
+++ b/app/src/main/java/org/dhis2/usescases/events/ScheduledEventContract.kt
@@ -16,7 +16,6 @@ class ScheduledEventContract {
         fun setEvent(event: Event)
         fun setStage(programStage: ProgramStage, event: Event)
         fun setProgram(program: Program)
-        fun openInitialActivity()
         fun openFormActivity()
     }
 
diff --git a/app/src/main/java/org/dhis2/usescases/events/ScheduledEventModule.kt b/app/src/main/java/org/dhis2/usescases/events/ScheduledEventModule.kt
index 8f54a87090..ff27377572 100644
--- a/app/src/main/java/org/dhis2/usescases/events/ScheduledEventModule.kt
+++ b/app/src/main/java/org/dhis2/usescases/events/ScheduledEventModule.kt
@@ -3,7 +3,6 @@ package org.dhis2.usescases.events
 import dagger.Module
 import dagger.Provides
 import org.dhis2.commons.di.dagger.PerActivity
-import org.dhis2.data.dhislogic.DhisEventUtils
 import org.hisp.dhis.android.core.D2
 
 @Module
@@ -13,8 +12,7 @@ class ScheduledEventModule(val eventUid: String, val view: ScheduledEventContrac
     @PerActivity
     internal fun providePresenter(
         d2: D2,
-        eventUtils: DhisEventUtils,
     ): ScheduledEventContract.Presenter {
-        return ScheduledEventPresenterImpl(view, d2, eventUid, eventUtils)
+        return ScheduledEventPresenterImpl(view, d2, eventUid)
     }
 }
diff --git a/app/src/main/java/org/dhis2/usescases/events/ScheduledEventPresenterImpl.kt b/app/src/main/java/org/dhis2/usescases/events/ScheduledEventPresenterImpl.kt
index 0815cde501..fc8cebc39c 100644
--- a/app/src/main/java/org/dhis2/usescases/events/ScheduledEventPresenterImpl.kt
+++ b/app/src/main/java/org/dhis2/usescases/events/ScheduledEventPresenterImpl.kt
@@ -3,11 +3,10 @@ package org.dhis2.usescases.events
 import io.reactivex.Single
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
-import org.dhis2.data.dhislogic.DhisEventUtils
+import org.dhis2.commons.date.DateUtils
 import org.dhis2.usescases.eventsWithoutRegistration.eventDetails.providers.DEFAULT_MAX_DATE
 import org.dhis2.usescases.eventsWithoutRegistration.eventDetails.providers.DEFAULT_MIN_DATE
 import org.dhis2.usescases.eventsWithoutRegistration.eventDetails.providers.InputDateValues
-import org.dhis2.utils.DateUtils
 import org.hisp.dhis.android.core.D2
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper
 import org.hisp.dhis.android.core.category.CategoryOption
@@ -25,7 +24,6 @@ class ScheduledEventPresenterImpl(
     val view: ScheduledEventContract.View,
     val d2: D2,
     val eventUid: String,
-    val eventUtils: DhisEventUtils,
 ) : ScheduledEventContract.Presenter {
 
     private lateinit var disposable: CompositeDisposable
@@ -84,11 +82,7 @@ class ScheduledEventPresenterImpl(
     override fun setEventDate(date: Date) {
         d2.eventModule().events().uid(eventUid).setEventDate(date)
         d2.eventModule().events().uid(eventUid).setStatus(EventStatus.ACTIVE)
-        if (eventUtils.newEventNeedsExtraInfo(eventUid)) {
-            view.openInitialActivity()
-        } else {
-            view.openFormActivity()
-        }
+        view.openFormActivity()
     }
 
     override fun formatDateValues(date: InputDateValues): Date {
diff --git a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureActivity.kt b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureActivity.kt
index b0c1f1338a..d16cbe5515 100644
--- a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureActivity.kt
+++ b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureActivity.kt
@@ -67,9 +67,8 @@ class EventCaptureActivity :
     TEIDataActivityContract {
     private lateinit var binding: ActivityEventCaptureBinding
 
-    @JvmField
     @Inject
-    var presenter: EventCaptureContract.Presenter? = null
+    override lateinit var presenter: EventCaptureContract.Presenter
 
     @JvmField
     @Inject
@@ -124,8 +123,8 @@ class EventCaptureActivity :
             }
         }
         showProgress()
-        presenter!!.initNoteCounter()
-        presenter!!.init()
+        presenter.initNoteCounter()
+        presenter.init()
         binding.syncButton.setOnClickListener { showSyncDialog(EVENT_SYNC) }
 
         if (intent.shouldLaunchSyncDialog()) {
@@ -227,14 +226,14 @@ class EventCaptureActivity :
 
     override fun onResume() {
         super.onResume()
-        presenter!!.refreshTabCounters()
+        presenter.refreshTabCounters()
         with(dashboardViewModel) {
             this?.selectedEventUid()?.observe(this@EventCaptureActivity, ::updateLandscapeViewsOnEventChange)
         }
     }
 
     override fun onDestroy() {
-        presenter!!.onDettach()
+        presenter.onDettach()
         super.onDestroy()
     }
 
@@ -272,11 +271,11 @@ class EventCaptureActivity :
                 {
                     /*Unused*/
                 },
-                { presenter!!.deleteEvent() },
+                { presenter.deleteEvent() },
             )
             dialog.show(supportFragmentManager, AlertBottomDialog::class.java.simpleName)
         } else if (isFormScreen()) {
-            presenter?.emitAction(EventCaptureAction.ON_BACK)
+            presenter.emitAction(EventCaptureAction.ON_BACK)
         } else {
             finishDataEntry()
         }
@@ -284,7 +283,7 @@ class EventCaptureActivity :
 
     private fun isFormScreen(): Boolean {
         return if (this.isPortrait()) {
-            adapter?.isFormScreenShown(binding.eventViewPager?.currentItem) == true
+            adapter?.isFormScreenShown(binding.eventViewPager.currentItem) == true
         } else {
             true
         }
@@ -292,7 +291,7 @@ class EventCaptureActivity :
 
     override fun updatePercentage(primaryValue: Float) {
         binding.completion.setCompletionPercentage(primaryValue)
-        if (!presenter!!.completionPercentageVisibility) {
+        if (!presenter.getCompletionPercentageVisibility()) {
             binding.completion.visibility = View.GONE
         }
     }
@@ -328,15 +327,15 @@ class EventCaptureActivity :
         }
     }
 
-    override fun SaveAndFinish() {
+    override fun saveAndFinish() {
         displayMessage(getString(R.string.saved))
         setAction(FormBottomDialog.ActionType.FINISH)
     }
 
     override fun attemptToSkip() {
         instance
-            .setAccessDataWrite(presenter!!.canWrite())
-            .setIsExpired(presenter!!.hasExpired())
+            .setAccessDataWrite(presenter.canWrite())
+            .setIsExpired(presenter.hasExpired())
             .setSkip(true)
             .setListener { actionType: FormBottomDialog.ActionType -> setAction(actionType) }
             .show(supportFragmentManager, SHOW_OPTIONS)
@@ -344,8 +343,8 @@ class EventCaptureActivity :
 
     override fun attemptToReschedule() {
         instance
-            .setAccessDataWrite(presenter!!.canWrite())
-            .setIsExpired(presenter!!.hasExpired())
+            .setAccessDataWrite(presenter.canWrite())
+            .setIsExpired(presenter.hasExpired())
             .setReschedule(true)
             .setListener { actionType: FormBottomDialog.ActionType -> setAction(actionType) }
             .show(supportFragmentManager, SHOW_OPTIONS)
@@ -355,12 +354,12 @@ class EventCaptureActivity :
         when (actionType) {
             FormBottomDialog.ActionType.COMPLETE -> {
                 isEventCompleted = true
-                presenter!!.completeEvent(false)
+                presenter.completeEvent(false)
             }
 
-            FormBottomDialog.ActionType.COMPLETE_ADD_NEW -> presenter!!.completeEvent(true)
+            FormBottomDialog.ActionType.COMPLETE_ADD_NEW -> presenter.completeEvent(true)
             FormBottomDialog.ActionType.FINISH_ADD_NEW -> restartDataEntry()
-            FormBottomDialog.ActionType.SKIP -> presenter!!.skipEvent()
+            FormBottomDialog.ActionType.SKIP -> presenter.skipEvent()
             FormBottomDialog.ActionType.RESCHEDULE -> { // Do nothing
             }
 
@@ -401,29 +400,15 @@ class EventCaptureActivity :
         finish()
     }
 
-    override fun renderInitialInfo(
-        stageName: String,
-        eventDate: String,
-        orgUnit: String,
-        catOption: String,
-    ) {
+    override fun renderInitialInfo(stageName: String) {
         binding.programStageName.text = stageName
-        val eventDataString = StringBuilder(String.format("%s | %s", eventDate, orgUnit))
-        if (catOption.isNotEmpty()) {
-            eventDataString.append(String.format(" | %s", catOption))
-        }
-        binding.eventSecundaryInfo.text = eventDataString
-    }
-
-    override fun getPresenter(): EventCaptureContract.Presenter {
-        return presenter!!
     }
 
     override fun showMoreOptions(view: View) {
         AppMenuHelper.Builder().menu(this, R.menu.event_menu).anchor(view)
             .onMenuInflated { popupMenu: PopupMenu ->
                 popupMenu.menu.findItem(R.id.menu_delete).isVisible =
-                    presenter!!.canWrite() && presenter!!.isEnrollmentOpen
+                    presenter.canWrite() && presenter.isEnrollmentOpen()
                 popupMenu.menu.findItem(R.id.menu_share).isVisible = false
             }
             .onMenuItemClicked { itemId: Int? ->
@@ -448,7 +433,7 @@ class EventCaptureActivity :
     }
 
     private fun confirmDeleteEvent() {
-        presenter?.programStage().let {
+        presenter.programStage().let {
             CustomDialog(
                 this,
                 resourceManager.formatWithEventLabel(
@@ -465,7 +450,7 @@ class EventCaptureActivity :
                 object : DialogClickListener {
                     override fun onPositive() {
                         analyticsHelper().setEvent(DELETE_EVENT, CLICK, DELETE_EVENT)
-                        presenter!!.deleteEvent()
+                        presenter.deleteEvent()
                     }
 
                     override fun onNegative() {
@@ -482,7 +467,7 @@ class EventCaptureActivity :
             .setMessage(
                 resourceManager.formatWithEventLabel(
                     R.string.event_label_date_in_future_message,
-                    programStageUid = presenter?.programStage(),
+                    programStageUid = presenter.programStage(),
                 ),
             )
             .setPositiveButton(
@@ -556,7 +541,15 @@ class EventCaptureActivity :
                         contextView,
                         R.string.sync_offline_check_connection,
                         Snackbar.LENGTH_SHORT,
-                    ).show()
+                    ).onNoConnectionListener {
+                val contextView = findViewById<View>(R.id.navigationBar)
+                Snackbar.make(
+                    contextView,
+                    R.string.sync_offline_check_connection,
+                    Snackbar.LENGTH_SHORT,
+                ).show()
+            }
+            .show()
                 }
                 .show(syncType)
         }
diff --git a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureContract.java b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureContract.java
deleted file mode 100644
index 0cbab10877..0000000000
--- a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureContract.java
+++ /dev/null
@@ -1,166 +0,0 @@
-package org.dhis2.usescases.eventsWithoutRegistration.eventCapture;
-
-import androidx.lifecycle.LiveData;
-
-import org.dhis2.ui.dialogs.bottomsheet.FieldWithIssue;
-import org.dhis2.usescases.eventsWithoutRegistration.eventCapture.model.EventCompletionDialog;
-import org.dhis2.usescases.general.AbstractActivityContracts;
-import org.hisp.dhis.android.core.common.ValidationStrategy;
-import org.hisp.dhis.android.core.event.EventStatus;
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnit;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import io.reactivex.Flowable;
-import io.reactivex.Observable;
-import io.reactivex.Single;
-
-public class EventCaptureContract {
-
-    public interface View extends AbstractActivityContracts.View {
-
-        void renderInitialInfo(String stageName, String eventDate, String orgUnit, String catOption);
-
-        EventCaptureContract.Presenter getPresenter();
-
-        void updatePercentage(float primaryValue);
-
-        void showCompleteActions(
-                boolean canComplete,
-                Map<String, String> emptyMandatoryFields,
-                EventCompletionDialog eventCompletionDialog);
-
-        void restartDataEntry();
-
-        void finishDataEntry();
-
-        void SaveAndFinish();
-
-        void showSnackBar(int messageId, String programStage);
-
-        void attemptToSkip();
-
-        void attemptToReschedule();
-
-        void showEventIntegrityAlert();
-
-        void updateNoteBadge(int numberOfNotes);
-
-        void goBack();
-
-        void showProgress();
-
-        void hideProgress();
-
-        void showNavigationBar();
-
-        void hideNavigationBar();
-    }
-
-    public interface Presenter extends AbstractActivityContracts.Presenter {
-
-        LiveData<EventCaptureAction> observeActions();
-
-        void init();
-
-        void onBackClick();
-
-        void attemptFinish(boolean canComplete,
-                           @Nullable String onCompleteMessage,
-                           List<FieldWithIssue> errorFields,
-                           Map<String, String> emptyMandatoryFields,
-                           List<FieldWithIssue> warningFields);
-
-        boolean isEnrollmentOpen();
-
-        void completeEvent(boolean addNew);
-
-        void deleteEvent();
-
-        void skipEvent();
-
-        void rescheduleEvent(Date time);
-
-        boolean canWrite();
-
-        boolean hasExpired();
-
-        void initNoteCounter();
-
-        void refreshTabCounters();
-
-        void hideProgress();
-
-        void showProgress();
-
-        boolean getCompletionPercentageVisibility();
-
-        void emitAction(@NotNull EventCaptureAction onBack);
-
-        String programStage();
-
-        @Nullable
-        String getTeiUid();
-
-        @Nullable
-        String getEnrollmentUid();
-    }
-
-    public interface EventCaptureRepository {
-
-        Flowable<Boolean> eventIntegrityCheck();
-
-        Flowable<String> programStageName();
-
-        Flowable<String> eventDate();
-
-        Flowable<OrganisationUnit> orgUnit();
-
-        Flowable<String> catOption();
-
-        Observable<Boolean> completeEvent();
-
-        Flowable<EventStatus> eventStatus();
-
-        boolean isEnrollmentOpen();
-
-        Observable<Boolean> deleteEvent();
-
-        Observable<Boolean> updateEventStatus(EventStatus skipped);
-
-        Observable<Boolean> rescheduleEvent(Date time);
-
-        Observable<String> programStage();
-
-        boolean getAccessDataWrite();
-
-        boolean isEnrollmentCancelled();
-
-        boolean isEventEditable(String eventUid);
-
-        Single<Boolean> canReOpenEvent();
-
-        Observable<Boolean> isCompletedEventExpired(String eventUid);
-
-        Single<Integer> getNoteCount();
-
-        boolean showCompletionPercentage();
-
-        boolean hasAnalytics();
-
-        boolean hasRelationships();
-
-        ValidationStrategy validationStrategy();
-
-        @Nullable
-        String getTeiUid();
-
-        @Nullable
-        String getEnrollmentUid();
-    }
-
-}
diff --git a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureContract.kt b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureContract.kt
new file mode 100644
index 0000000000..91e9fff76c
--- /dev/null
+++ b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureContract.kt
@@ -0,0 +1,89 @@
+package org.dhis2.usescases.eventsWithoutRegistration.eventCapture
+
+import androidx.lifecycle.LiveData
+import io.reactivex.Flowable
+import io.reactivex.Observable
+import io.reactivex.Single
+import org.dhis2.form.model.EventMode
+import org.dhis2.ui.dialogs.bottomsheet.FieldWithIssue
+import org.dhis2.usescases.eventsWithoutRegistration.eventCapture.model.EventCompletionDialog
+import org.dhis2.usescases.general.AbstractActivityContracts
+import org.hisp.dhis.android.core.common.ValidationStrategy
+import org.hisp.dhis.android.core.event.EventStatus
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
+import java.util.Date
+
+class EventCaptureContract {
+    interface View : AbstractActivityContracts.View {
+        fun renderInitialInfo(stageName: String)
+        val presenter: Presenter
+        fun updatePercentage(primaryValue: Float)
+        fun showCompleteActions(eventCompletionDialog: EventCompletionDialog)
+
+        fun restartDataEntry()
+        fun finishDataEntry()
+        fun saveAndFinish()
+        fun showSnackBar(messageId: Int, programStage: String)
+        fun attemptToSkip()
+        fun attemptToReschedule()
+        fun showEventIntegrityAlert()
+        fun updateNoteBadge(numberOfNotes: Int)
+        fun goBack()
+        fun showProgress()
+        fun hideProgress()
+        fun showNavigationBar()
+        fun hideNavigationBar()
+    }
+
+    interface Presenter : AbstractActivityContracts.Presenter {
+        fun observeActions(): LiveData<EventCaptureAction>
+        fun init()
+        fun onBackClick()
+        fun attemptFinish(
+            canComplete: Boolean,
+            onCompleteMessage: String?,
+            errorFields: List<FieldWithIssue>,
+            emptyMandatoryFields: Map<String, String>,
+            warningFields: List<FieldWithIssue>,
+            eventMode: EventMode? = null,
+        )
+
+        fun isEnrollmentOpen(): Boolean
+        fun completeEvent(addNew: Boolean)
+        fun deleteEvent()
+        fun skipEvent()
+        fun rescheduleEvent(time: Date)
+        fun canWrite(): Boolean
+        fun hasExpired(): Boolean
+        fun initNoteCounter()
+        fun refreshTabCounters()
+        fun hideProgress()
+        fun showProgress()
+        fun getCompletionPercentageVisibility(): Boolean
+        fun emitAction(onBack: EventCaptureAction)
+        fun programStage(): String
+    }
+
+    interface EventCaptureRepository {
+        fun eventIntegrityCheck(): Flowable<Boolean>
+        fun programStageName(): Flowable<String>
+        fun orgUnit(): Flowable<OrganisationUnit>
+        fun completeEvent(): Observable<Boolean>
+        fun eventStatus(): Flowable<EventStatus>
+        val isEnrollmentOpen: Boolean
+        fun deleteEvent(): Observable<Boolean>
+        fun updateEventStatus(skipped: EventStatus): Observable<Boolean>
+        fun rescheduleEvent(time: Date): Observable<Boolean>
+        fun programStage(): Observable<String>
+        val accessDataWrite: Boolean
+        val isEnrollmentCancelled: Boolean
+        fun isEventEditable(eventUid: String): Boolean
+        fun canReOpenEvent(): Single<Boolean>
+        fun isCompletedEventExpired(eventUid: String): Observable<Boolean>
+        val noteCount: Single<Int>
+        fun showCompletionPercentage(): Boolean
+        fun hasAnalytics(): Boolean
+        fun hasRelationships(): Boolean
+        fun validationStrategy(): ValidationStrategy
+    }
+}
diff --git a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCapturePresenterImpl.kt b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCapturePresenterImpl.kt
index 51c2072858..cc317af7eb 100644
--- a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCapturePresenterImpl.kt
+++ b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCapturePresenterImpl.kt
@@ -7,17 +7,19 @@ import io.reactivex.Flowable
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.processors.PublishProcessor
 import org.dhis2.R
-import org.dhis2.bindings.canSkipErrorFix
 import org.dhis2.commons.prefs.Preference
 import org.dhis2.commons.prefs.PreferenceProvider
 import org.dhis2.commons.schedulers.SchedulerProvider
 import org.dhis2.commons.schedulers.defaultSubscribe
+import org.dhis2.form.data.EventRepository
+import org.dhis2.form.model.EventMode
 import org.dhis2.ui.dialogs.bottomsheet.FieldWithIssue
 import org.dhis2.usescases.eventsWithoutRegistration.EventIdlingResourceSingleton
 import org.dhis2.usescases.eventsWithoutRegistration.eventCapture.EventCaptureContract.EventCaptureRepository
 import org.dhis2.usescases.eventsWithoutRegistration.eventCapture.domain.ConfigureEventCompletionDialog
 import org.dhis2.usescases.eventsWithoutRegistration.eventCapture.model.EventCaptureInitialInfo
 import org.hisp.dhis.android.core.common.Unit
+import org.hisp.dhis.android.core.common.ValidationStrategy
 import org.hisp.dhis.android.core.event.EventStatus
 import timber.log.Timber
 import java.util.Date
@@ -56,9 +58,7 @@ class EventCapturePresenterImpl(
         compositeDisposable.add(
             Flowable.zip(
                 eventCaptureRepository.programStageName(),
-                eventCaptureRepository.eventDate(),
                 eventCaptureRepository.orgUnit(),
-                eventCaptureRepository.catOption(),
                 ::EventCaptureInitialInfo,
             ).defaultSubscribe(
                 schedulerProvider,
@@ -69,9 +69,6 @@ class EventCapturePresenterImpl(
                     )
                     view.renderInitialInfo(
                         initialInfo.programStageName,
-                        initialInfo.eventDate,
-                        initialInfo.organisationUnit.displayName(),
-                        initialInfo.categoryOption,
                     )
                 },
                 Timber::e,
@@ -114,15 +111,21 @@ class EventCapturePresenterImpl(
         errorFields: List<FieldWithIssue>,
         emptyMandatoryFields: Map<String, String>,
         warningFields: List<FieldWithIssue>,
+        eventMode: EventMode?,
     ) {
         val eventStatus = eventStatus
         if (eventStatus != EventStatus.ACTIVE) {
             setUpActionByStatus(eventStatus)
         } else {
-            val validationStrategy = eventCaptureRepository.validationStrategy()
-            val canSkipErrorFix = validationStrategy.canSkipErrorFix(
+            val canSkipErrorFix = canSkipErrorFix(
                 hasErrorFields = errorFields.isNotEmpty(),
                 hasEmptyMandatoryFields = emptyMandatoryFields.isNotEmpty(),
+                hasEmptyEventCreationMandatoryFields = with(emptyMandatoryFields) {
+                    containsValue(EventRepository.EVENT_DETAILS_SECTION_UID) ||
+                        containsValue(EventRepository.EVENT_CATEGORY_COMBO_SECTION_UID)
+                },
+                eventMode = eventMode,
+                validationStrategy = eventCaptureRepository.validationStrategy(),
             )
             val eventCompletionDialog = configureEventCompletionDialog.invoke(
                 errorFields,
@@ -132,20 +135,32 @@ class EventCapturePresenterImpl(
                 onCompleteMessage,
                 canSkipErrorFix,
             )
-            view.showCompleteActions(
-                canComplete && eventCaptureRepository.isEnrollmentOpen,
-                emptyMandatoryFields,
-                eventCompletionDialog,
-            )
+            view.showCompleteActions(eventCompletionDialog)
         }
         view.showNavigationBar()
     }
 
+    private fun canSkipErrorFix(
+        hasErrorFields: Boolean,
+        hasEmptyMandatoryFields: Boolean,
+        hasEmptyEventCreationMandatoryFields: Boolean,
+        eventMode: EventMode?,
+        validationStrategy: ValidationStrategy,
+    ): Boolean {
+        return when (validationStrategy) {
+            ValidationStrategy.ON_COMPLETE -> when (eventMode) {
+                EventMode.NEW -> !hasEmptyEventCreationMandatoryFields
+                else -> true
+            }
+            ValidationStrategy.ON_UPDATE_AND_INSERT -> !hasErrorFields && !hasEmptyMandatoryFields
+        }
+    }
+
     private fun setUpActionByStatus(eventStatus: EventStatus) {
         when (eventStatus) {
             EventStatus.COMPLETED ->
                 if (!hasExpired && !eventCaptureRepository.isEnrollmentCancelled) {
-                    view.SaveAndFinish()
+                    view.saveAndFinish()
                 } else {
                     view.finishDataEntry()
                 }
@@ -163,11 +178,13 @@ class EventCapturePresenterImpl(
     }
 
     override fun completeEvent(addNew: Boolean) {
+        EventIdlingResourceSingleton.increment()
         compositeDisposable.add(
             eventCaptureRepository.completeEvent()
                 .defaultSubscribe(
                     schedulerProvider,
-                    {
+                    onNext = {
+                        EventIdlingResourceSingleton.decrement()
                         if (addNew) {
                             view.restartDataEntry()
                         } else {
@@ -175,7 +192,10 @@ class EventCapturePresenterImpl(
                             view.finishDataEntry()
                         }
                     },
-                    Timber::e,
+                    onError = {
+                        EventIdlingResourceSingleton.decrement()
+                        Timber.e(it)
+                    },
                 ),
         )
     }
@@ -280,11 +300,4 @@ class EventCapturePresenterImpl(
         get() = eventCaptureRepository.eventStatus().blockingFirst()
 
     override fun programStage(): String = eventCaptureRepository.programStage().blockingFirst()
-
-    override fun getEnrollmentUid(): String? {
-        return eventCaptureRepository.enrollmentUid
-    }
-    override fun getTeiUid(): String? {
-        return eventCaptureRepository.teiUid
-    }
 }
diff --git a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureRepositoryImpl.java b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureRepositoryImpl.java
index 7111c4bf5f..2a0e94832c 100644
--- a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureRepositoryImpl.java
+++ b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureRepositoryImpl.java
@@ -2,7 +2,6 @@
 
 import org.dhis2.commons.bindings.SdkExtensionsKt;
 import org.dhis2.data.dhislogic.AuthoritiesKt;
-import org.dhis2.utils.DateUtils;
 import org.hisp.dhis.android.core.D2;
 import org.hisp.dhis.android.core.common.BaseIdentifiableObject;
 import org.hisp.dhis.android.core.common.ValidationStrategy;
@@ -72,31 +71,17 @@ public Flowable<String> programStageName() {
     }
 
     @Override
-    public Flowable<String> eventDate() {
-        Event currentEvent = getCurrentEvent();
+    public Flowable<OrganisationUnit> orgUnit() {
         return Flowable.just(
-                currentEvent.eventDate() != null ? DateUtils.uiDateFormat().format(currentEvent.eventDate()) : ""
+                Objects.requireNonNull(
+                        d2.organisationUnitModule()
+                                .organisationUnits()
+                                .uid(getCurrentEvent().organisationUnit())
+                                .blockingGet()
+                )
         );
     }
 
-    @Override
-    public Flowable<OrganisationUnit> orgUnit() {
-        return Flowable.just(d2.organisationUnitModule().organisationUnits().uid(getCurrentEvent().organisationUnit()).blockingGet());
-    }
-
-
-    @Override
-    public Flowable<String> catOption() {
-        return Flowable.just(d2.categoryModule().categoryOptionCombos().uid(getCurrentEvent().attributeOptionCombo()))
-                .map(categoryOptionComboRepo -> {
-                    if (categoryOptionComboRepo.blockingGet() == null)
-                        return "";
-                    else
-                        return categoryOptionComboRepo.blockingGet().displayName();
-                })
-                .map(displayName -> displayName.equals("default") ? "" : displayName);
-    }
-
     @Override
     public Observable<Boolean> completeEvent() {
         return Observable.fromCallable(() -> {
@@ -162,8 +147,8 @@ public Single<Boolean> canReOpenEvent() {
     @Override
     public Observable<Boolean> isCompletedEventExpired(String eventUid) {
         return d2.eventModule().eventService().getEditableStatus(eventUid).map(editionStatus -> {
-            if (editionStatus instanceof EventEditableStatus.NonEditable) {
-                return ((EventEditableStatus.NonEditable) editionStatus).getReason() == EventNonEditableReason.EXPIRED;
+            if (editionStatus instanceof EventEditableStatus.NonEditable nonEditableStatus) {
+                return nonEditableStatus.getReason() == EventNonEditableReason.EXPIRED;
             } else {
                 return false;
             }
diff --git a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/domain/ConfigureEventCompletionDialog.kt b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/domain/ConfigureEventCompletionDialog.kt
index c85784aa50..3543b4641b 100644
--- a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/domain/ConfigureEventCompletionDialog.kt
+++ b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/domain/ConfigureEventCompletionDialog.kt
@@ -96,7 +96,7 @@ class ConfigureEventCompletionDialog(
         WARNING,
         SUCCESSFUL,
         -> EventCompletionButtons(
-            CompleteButton(),
+            CompleteButton,
             FormBottomDialog.ActionType.COMPLETE,
         )
     }
diff --git a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/eventCaptureFragment/EventCaptureFormFragment.java b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/eventCaptureFragment/EventCaptureFormFragment.java
index f3915a35b3..0e00f1c11e 100644
--- a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/eventCaptureFragment/EventCaptureFormFragment.java
+++ b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/eventCaptureFragment/EventCaptureFormFragment.java
@@ -96,7 +96,7 @@ public void onCreate(@Nullable @org.jetbrains.annotations.Nullable Bundle savedI
                     return Unit.INSTANCE;
                 })
                 .onDataIntegrityResult(result -> {
-                    presenter.handleDataIntegrityResult(result);
+                    presenter.handleDataIntegrityResult(result, eventMode);
                     return Unit.INSTANCE;
                 })
                 .factory(activity.getSupportFragmentManager())
diff --git a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/eventCaptureFragment/EventCaptureFormPresenter.kt b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/eventCaptureFragment/EventCaptureFormPresenter.kt
index b3d8625fc3..4b491b27c1 100644
--- a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/eventCaptureFragment/EventCaptureFormPresenter.kt
+++ b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/eventCaptureFragment/EventCaptureFormPresenter.kt
@@ -13,6 +13,7 @@ import org.dhis2.form.data.FieldsWithWarningResult
 import org.dhis2.form.data.MissingMandatoryResult
 import org.dhis2.form.data.NotSavedResult
 import org.dhis2.form.data.SuccessfulResult
+import org.dhis2.form.model.EventMode
 import org.dhis2.usescases.eventsWithoutRegistration.EventIdlingResourceSingleton
 import org.dhis2.usescases.eventsWithoutRegistration.eventCapture.EventCaptureContract
 import org.dhis2.usescases.eventsWithoutRegistration.eventCapture.domain.ReOpenEventUseCase
@@ -32,7 +33,7 @@ class EventCaptureFormPresenter(
     private val dispatcherProvider: DispatcherProvider,
 ) {
 
-    fun handleDataIntegrityResult(result: DataIntegrityCheckResult) {
+    fun handleDataIntegrityResult(result: DataIntegrityCheckResult, eventMode: EventMode? = null) {
         when (result) {
             is FieldsWithErrorResult -> activityPresenter.attemptFinish(
                 result.canComplete,
@@ -40,6 +41,7 @@ class EventCaptureFormPresenter(
                 result.fieldUidErrorList,
                 result.mandatoryFields,
                 result.warningFields,
+                eventMode,
             )
 
             is FieldsWithWarningResult -> activityPresenter.attemptFinish(
@@ -48,6 +50,7 @@ class EventCaptureFormPresenter(
                 emptyList(),
                 emptyMap(),
                 result.fieldUidWarningList,
+                eventMode,
             )
 
             is MissingMandatoryResult -> activityPresenter.attemptFinish(
@@ -56,6 +59,7 @@ class EventCaptureFormPresenter(
                 result.errorFields,
                 result.mandatoryFields,
                 result.warningFields,
+                eventMode,
             )
 
             is SuccessfulResult -> activityPresenter.attemptFinish(
@@ -96,7 +100,7 @@ class EventCaptureFormPresenter(
             EventNonEditableReason.EVENT_DATE_IS_NOT_IN_ORGUNIT_RANGE -> resourceManager.getString(R.string.event_date_not_in_orgunit_range) to false
             EventNonEditableReason.NO_CATEGORY_COMBO_ACCESS -> resourceManager.getString(R.string.edition_no_catcombo_access) to false
             EventNonEditableReason.ENROLLMENT_IS_NOT_OPEN -> resourceManager.formatWithEnrollmentLabel(
-                null,
+                d2.eventModule().events().uid(eventUid).blockingGet()?.program(),
                 R.string.edition_enrollment_is_no_open_V2,
                 1,
             ) to false
diff --git a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/eventInitialFragment/EventCaptureInitialComponent.kt b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/eventInitialFragment/EventCaptureInitialComponent.kt
deleted file mode 100644
index c2dc482ebc..0000000000
--- a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/eventInitialFragment/EventCaptureInitialComponent.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.dhis2.usescases.eventsWithoutRegistration.eventCapture.eventInitialFragment
-
-import dagger.Subcomponent
-
-@Subcomponent(modules = [EventCaptureInitialModule::class])
-interface EventCaptureInitialComponent {
-    fun inject(fragment: EventCaptureInitialFragment)
-}
diff --git a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/eventInitialFragment/EventCaptureInitialFragment.kt b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/eventInitialFragment/EventCaptureInitialFragment.kt
deleted file mode 100644
index ee69557db7..0000000000
--- a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/eventInitialFragment/EventCaptureInitialFragment.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.dhis2.usescases.eventsWithoutRegistration.eventCapture.eventInitialFragment
-
-import org.dhis2.usescases.general.FragmentGlobalAbstract
-
-class EventCaptureInitialFragment : FragmentGlobalAbstract()
diff --git a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/eventInitialFragment/EventCaptureInitialModule.kt b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/eventInitialFragment/EventCaptureInitialModule.kt
deleted file mode 100644
index 3a5d2ef621..0000000000
--- a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/eventInitialFragment/EventCaptureInitialModule.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.dhis2.usescases.eventsWithoutRegistration.eventCapture.eventInitialFragment
-
-import dagger.Module
-
-@Module
-class EventCaptureInitialModule
diff --git a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/model/EventCaptureInitialInfo.kt b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/model/EventCaptureInitialInfo.kt
index cb20466399..aee1cf565d 100644
--- a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/model/EventCaptureInitialInfo.kt
+++ b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/model/EventCaptureInitialInfo.kt
@@ -4,7 +4,5 @@ import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
 
 data class EventCaptureInitialInfo(
     val programStageName: String,
-    val eventDate: String,
     val organisationUnit: OrganisationUnit,
-    val categoryOption: String,
 )
diff --git a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventDetails/data/EventDetailsRepository.kt b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventDetails/data/EventDetailsRepository.kt
index 29dcda480d..a70ef1c12c 100644
--- a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventDetails/data/EventDetailsRepository.kt
+++ b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventDetails/data/EventDetailsRepository.kt
@@ -3,11 +3,12 @@ package org.dhis2.usescases.eventsWithoutRegistration.eventDetails.data
 import io.reactivex.Observable
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
+import org.dhis2.commons.data.EventCreationType
+import org.dhis2.commons.date.DateUtils
 import org.dhis2.data.dhislogic.AUTH_ALL
 import org.dhis2.data.dhislogic.AUTH_UNCOMPLETE_EVENT
 import org.dhis2.form.model.FieldUiModel
 import org.dhis2.form.ui.FieldViewModelFactory
-import org.dhis2.utils.DateUtils
 import org.hisp.dhis.android.core.D2
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.category.CategoryCombo
@@ -36,6 +37,7 @@ class EventDetailsRepository(
     private val eventUid: String?,
     private val programStageUid: String?,
     private val fieldFactory: FieldViewModelFactory?,
+    private val eventCreationType: EventCreationType,
     private val onError: (Throwable) -> String?,
 ) {
 
@@ -148,10 +150,15 @@ class EventDetailsRepository(
         return d2.organisationUnitModule().organisationUnits()
             .byProgramUids(listOf(programUid))
             .byParentUid().eq(parentUid)
-            .byOrganisationUnitScope(OrganisationUnit.Scope.SCOPE_DATA_CAPTURE)
+            .byOrganisationUnitScope(getOrgUnitScope())
             .blockingGet()
     }
 
+    private fun getOrgUnitScope() = when (eventCreationType) {
+        EventCreationType.REFERAL -> OrganisationUnit.Scope.SCOPE_TEI_SEARCH
+        else -> OrganisationUnit.Scope.SCOPE_DATA_CAPTURE
+    }
+
     fun getOrganisationUnit(orgUnitUid: String): OrganisationUnit? {
         return d2.organisationUnitModule().organisationUnits()
             .byUid()
@@ -160,10 +167,18 @@ class EventDetailsRepository(
     }
 
     fun getOrganisationUnits(): List<OrganisationUnit> {
-        return d2.organisationUnitModule().organisationUnits()
-            .byOrganisationUnitScope(OrganisationUnit.Scope.SCOPE_DATA_CAPTURE)
-            .byProgramUids(listOf(programUid))
-            .blockingGet()
+        val scope = getOrgUnitScope()
+        return when (scope) {
+            OrganisationUnit.Scope.SCOPE_DATA_CAPTURE ->
+                d2.organisationUnitModule().organisationUnits()
+                    .byOrganisationUnitScope(OrganisationUnit.Scope.SCOPE_DATA_CAPTURE)
+                    .byProgramUids(listOf(programUid))
+                    .blockingGet()
+            OrganisationUnit.Scope.SCOPE_TEI_SEARCH ->
+                d2.organisationUnitModule().organisationUnits()
+                    .byProgramUids(listOf(programUid))
+                    .blockingGet()
+        }
     }
 
     fun getGeometryModel(): FieldUiModel {
diff --git a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventDetails/domain/ConfigureEventDetails.kt b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventDetails/domain/ConfigureEventDetails.kt
index 300ad092f4..4026469dd4 100644
--- a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventDetails/domain/ConfigureEventDetails.kt
+++ b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventDetails/domain/ConfigureEventDetails.kt
@@ -5,6 +5,7 @@ import kotlinx.coroutines.flow.flowOf
 import org.dhis2.commons.data.EventCreationType
 import org.dhis2.commons.data.EventCreationType.REFERAL
 import org.dhis2.commons.resources.MetadataIconProvider
+import org.dhis2.ui.toColor
 import org.dhis2.usescases.eventsWithoutRegistration.eventDetails.data.EventDetailsRepository
 import org.dhis2.usescases.eventsWithoutRegistration.eventDetails.models.EventDetails
 import org.dhis2.usescases.eventsWithoutRegistration.eventDetails.providers.EventDetailResourcesProvider
@@ -14,6 +15,7 @@ import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.event.EventEditableStatus.Editable
 import org.hisp.dhis.android.core.event.EventEditableStatus.NonEditable
 import org.hisp.dhis.android.core.event.EventStatus.OVERDUE
+import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor
 import java.util.Date
 
 class ConfigureEventDetails(
@@ -40,11 +42,17 @@ class ConfigureEventDetails(
         )
         val storedEvent = repository.getEvent()
         val programStage = repository.getProgramStage()
+        val program = repository.getProgram()
         return flowOf(
             EventDetails(
                 name = programStage?.displayName(),
                 description = programStage?.displayDescription(),
-                metadataIconData = programStage?.style()?.let { metadataIconProvider(programStage.style()) },
+                metadataIconData = programStage?.style()?.let {
+                    metadataIconProvider(
+                        programStage.style(),
+                        program?.style()?.color()?.toColor() ?: SurfaceColor.Primary,
+                    )
+                },
                 enabled = isEnable(storedEvent),
                 isEditable = isEditable(),
                 editableReason = getEditableReason(),
diff --git a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventDetails/injection/EventDetailsModule.kt b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventDetails/injection/EventDetailsModule.kt
index dafd987db5..daf4ee8309 100644
--- a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventDetails/injection/EventDetailsModule.kt
+++ b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventDetails/injection/EventDetailsModule.kt
@@ -83,6 +83,7 @@ class EventDetailsModule(
             programUid = programUid,
             eventUid = eventUid,
             programStageUid = programStageUid,
+            eventCreationType = eventCreationType,
             fieldFactory = FieldViewModelFactoryImpl(
                 UiStyleProviderImpl(
                     FormUiModelColorFactoryImpl(context, colorUtils),
diff --git a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventDetails/ui/EventDetailsFragment.kt b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventDetails/ui/EventDetailsFragment.kt
index 3ca3f39d94..036a3fe9f7 100644
--- a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventDetails/ui/EventDetailsFragment.kt
+++ b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventDetails/ui/EventDetailsFragment.kt
@@ -239,7 +239,11 @@ class EventDetailsFragment : FragmentGlobalAbstract() {
                         detailsEnabled = details.enabled,
                         onDateClick = {},
                         onDateSelected = { dateValues ->
-                            viewModel.onDateSet(dateValues.year, dateValues.month - 1, dateValues.day)
+                            viewModel.onDateSet(
+                                dateValues.year,
+                                dateValues.month - 1,
+                                dateValues.day,
+                            )
                         },
                         onClear = { viewModel.onClearEventReportDate() },
                         required = true,
@@ -298,7 +302,10 @@ class EventDetailsFragment : FragmentGlobalAbstract() {
                     )
                 }
             } else if (!catCombo.isDefault) {
-                ProvideEmptyCategorySelector(name = catCombo.displayName ?: getString(R.string.cat_combo), option = getString(R.string.no_options))
+                ProvideEmptyCategorySelector(
+                    name = catCombo.displayName ?: getString(R.string.cat_combo),
+                    option = getString(R.string.no_options),
+                )
             }
             ProvideCoordinates(
                 coordinates = coordinates,
@@ -339,7 +346,20 @@ class EventDetailsFragment : FragmentGlobalAbstract() {
             )
             .singleSelection()
             .orgUnitScope(
-                OrgUnitSelectorScope.ProgramCaptureScope(viewModel.eventOrgUnit.value.programUid!!),
+                when (getEventCreationType(requireArguments().getString(EVENT_CREATION_TYPE))) {
+                    EventCreationType.REFERAL ->
+                        OrgUnitSelectorScope.ProgramSearchScope(
+                            viewModel.eventOrgUnit.value.programUid!!,
+                        )
+
+                    EventCreationType.DEFAULT,
+                    EventCreationType.ADDNEW,
+                    EventCreationType.SCHEDULE,
+                    ->
+                        OrgUnitSelectorScope.ProgramCaptureScope(
+                            viewModel.eventOrgUnit.value.programUid!!,
+                        )
+                },
             )
             .onSelection { selectedOrgUnits ->
                 viewModel.setUpOrgUnit(selectedOrgUnit = selectedOrgUnits.firstOrNull()?.uid())
diff --git a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventInitial/EventInitialRepositoryImpl.java b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventInitial/EventInitialRepositoryImpl.java
index 78c2b7adf3..010541dad7 100644
--- a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventInitial/EventInitialRepositoryImpl.java
+++ b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventInitial/EventInitialRepositoryImpl.java
@@ -3,13 +3,12 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import org.dhis2.R;
 import org.dhis2.commons.resources.MetadataIconProvider;
 import org.dhis2.data.forms.FormSectionViewModel;
-import org.dhis2.mobileProgramRules.RuleEngineHelper;
 import org.dhis2.form.model.FieldUiModel;
 import org.dhis2.form.model.OptionSetConfiguration;
 import org.dhis2.form.ui.FieldViewModelFactory;
+import org.dhis2.mobileProgramRules.RuleEngineHelper;
 import org.dhis2.ui.MetadataIconData;
 import org.dhis2.utils.Result;
 import org.hisp.dhis.android.core.D2;
@@ -59,7 +58,6 @@ public class EventInitialRepositoryImpl implements EventInitialRepository {
     private final String stageUid;
 
     private final MetadataIconProvider metadataIconProvider;
-
     EventInitialRepositoryImpl(String eventUid,
                                String stageUid,
                                D2 d2,
@@ -303,9 +301,9 @@ public Flowable<List<FieldUiModel>> list() {
 
     @Override
     public Flowable<Result<RuleEffect>> calculate() {
-        if(ruleEngineHelper!=null) {
+        if (ruleEngineHelper != null) {
             return Flowable.just(ruleEngineHelper.evaluate()).map(Result::success);
-        }else{
+        } else {
             return Flowable.just(Result.success(new ArrayList<>()));
         }
     }
@@ -323,6 +321,7 @@ private FieldUiModel transform(@NonNull ProgramStageDataElement stage, DataEleme
         String formName = dataElement.displayFormName();
         String description = dataElement.displayDescription();
 
+
         OptionSetConfiguration optionSetConfig = null;
         if (optionSet != null) {
             List<Option> dataValueOptions = d2.optionModule().options().byOptionSetUid().eq(optionSet).byCode().eq(dataValue).blockingGet();
@@ -335,7 +334,9 @@ private FieldUiModel transform(@NonNull ProgramStageDataElement stage, DataEleme
                         List<Option> options = d2.optionModule().options().byOptionSetUid().eq(optionSet).blockingGet();
                         HashMap<String, MetadataIconData> metadataIconMap = new HashMap<>();
                         for (Option optionItem : options) {
-                            metadataIconMap.put(optionItem.uid(), metadataIconProvider.invoke(optionItem.style()));
+                            metadataIconMap.put(
+                                    optionItem.uid(),
+                                    metadataIconProvider.invoke(optionItem.style()));
                         }
 
                         return new OptionSetConfiguration.OptionConfigData(
diff --git a/app/src/main/java/org/dhis2/usescases/main/HomeRepositoryImpl.kt b/app/src/main/java/org/dhis2/usescases/main/HomeRepositoryImpl.kt
index cddece87ca..5f303caf7b 100644
--- a/app/src/main/java/org/dhis2/usescases/main/HomeRepositoryImpl.kt
+++ b/app/src/main/java/org/dhis2/usescases/main/HomeRepositoryImpl.kt
@@ -51,7 +51,7 @@ class HomeRepositoryImpl(
     }
 
     override fun hasHomeAnalytics(): Boolean {
-        return charts?.getHomeVisualizations(null)?.isNotEmpty() == true
+        return charts?.getVisualizationGroups(null)?.isNotEmpty() == true
     }
 
     override fun getServerVersion(): Single<SystemInfo?> {
diff --git a/app/src/main/java/org/dhis2/usescases/main/MainPresenter.kt b/app/src/main/java/org/dhis2/usescases/main/MainPresenter.kt
index 80861f6011..9b684c38f0 100644
--- a/app/src/main/java/org/dhis2/usescases/main/MainPresenter.kt
+++ b/app/src/main/java/org/dhis2/usescases/main/MainPresenter.kt
@@ -303,8 +303,10 @@ class MainPresenter(
     }
 
     fun onDataSuccess() {
-        userManager.d2.dataStoreModule().localDataStore().value(WAS_INITIAL_SYNC_DONE)
-            .blockingSet(TRUE)
+        launch(dispatcherProvider.io()) {
+            userManager.d2.dataStoreModule().localDataStore().value(WAS_INITIAL_SYNC_DONE)
+                .blockingSet(TRUE)
+        }
     }
 
     fun trackHomeAnalytics() {
diff --git a/app/src/main/java/org/dhis2/usescases/main/program/ProgramRepositoryImpl.kt b/app/src/main/java/org/dhis2/usescases/main/program/ProgramRepositoryImpl.kt
index 0ecadd389d..17ca1caa75 100644
--- a/app/src/main/java/org/dhis2/usescases/main/program/ProgramRepositoryImpl.kt
+++ b/app/src/main/java/org/dhis2/usescases/main/program/ProgramRepositoryImpl.kt
@@ -17,6 +17,7 @@ import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.program.Program
 import org.hisp.dhis.android.core.program.ProgramType.WITHOUT_REGISTRATION
 import org.hisp.dhis.android.core.program.ProgramType.WITH_REGISTRATION
+import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor
 
 internal class ProgramRepositoryImpl(
     private val d2: D2,
@@ -76,7 +77,7 @@ internal class ProgramRepositoryImpl(
                                 },
                                 resourceManager.defaultDataSetLabel(),
                                 filterPresenter.areFiltersActive(),
-                                metadataIconProvider(dataSet.style()),
+                                metadataIconProvider(dataSet.style(), SurfaceColor.Primary),
                             )
                         }
                 }
@@ -116,7 +117,7 @@ internal class ProgramRepositoryImpl(
                     state,
                     hasOverdue = false,
                     filtersAreActive = false,
-                    metadataIconData = metadataIconProvider(program.style()),
+                    metadataIconData = metadataIconProvider(program.style(), SurfaceColor.Primary),
                 ).copy(
                     stockConfig = if (d2.isStockProgram(program.uid())) {
                         d2.stockUseCase(program.uid())?.toAppConfig()
diff --git a/app/src/main/java/org/dhis2/usescases/main/program/ProgramUi.kt b/app/src/main/java/org/dhis2/usescases/main/program/ProgramUi.kt
index 9e584ba843..8504795eeb 100644
--- a/app/src/main/java/org/dhis2/usescases/main/program/ProgramUi.kt
+++ b/app/src/main/java/org/dhis2/usescases/main/program/ProgramUi.kt
@@ -36,6 +36,7 @@ import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.LocalTextStyle
 import androidx.compose.material.Text
+import androidx.compose.material.TextButton
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.ErrorOutline
 import androidx.compose.runtime.Composable
@@ -73,8 +74,6 @@ import org.dhis2.ui.MetadataIcon
 import org.dhis2.ui.MetadataIconData
 import org.dhis2.ui.toColor
 import org.hisp.dhis.android.core.common.State
-import org.hisp.dhis.mobile.ui.designsystem.component.Button
-import org.hisp.dhis.mobile.ui.designsystem.component.ButtonStyle
 import org.hisp.dhis.mobile.ui.designsystem.component.InfoBar
 import org.hisp.dhis.mobile.ui.designsystem.component.InfoBarData
 import org.hisp.dhis.mobile.ui.designsystem.component.internal.ImageCardData
@@ -358,12 +357,14 @@ fun ProgramDescriptionDialog(description: String, onDismiss: () -> Unit) {
             Text(text = description)
         },
         confirmButton = {
-            Button(
-                modifier = Modifier.padding(bottom = 16.dp, end = 16.dp),
-                text = stringResource(id = R.string.action_close).uppercase(),
+            TextButton(
                 onClick = { onDismiss() },
-                style = ButtonStyle.TEXT,
-            )
+            ) {
+                Text(
+                    text = stringResource(id = R.string.action_close).uppercase(),
+                    color = colorResource(id = R.color.black_de0),
+                )
+            }
         },
     )
 }
diff --git a/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailActivity.kt b/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailActivity.kt
index cfc9383d70..fed6c83568 100644
--- a/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailActivity.kt
+++ b/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailActivity.kt
@@ -318,8 +318,7 @@ class ProgramEventDetailActivity :
     }
 
     override fun selectOrgUnitForNewEvent() {
-        binding.addEventButton.isEnabled = false
-
+        enableAddEventButton(false)
         OUTreeFragment.Builder()
             .showAsDialog()
             .singleSelection()
@@ -335,12 +334,18 @@ class ProgramEventDetailActivity :
                             programStageUid = it,
                         )
                     }
+                } else {
+                    enableAddEventButton(true)
                 }
             }
             .build()
             .show(supportFragmentManager, "ORG_UNIT_DIALOG")
     }
 
+    private fun enableAddEventButton(enable: Boolean) {
+        binding.addEventButton.isEnabled = enable
+    }
+
     override fun setWritePermission(canWrite: Boolean) {
         programEventsViewModel.writePermission.value = canWrite
     }
diff --git a/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailLiveAdapter.kt b/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailLiveAdapter.kt
index 9550b1f735..28304f5177 100644
--- a/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailLiveAdapter.kt
+++ b/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailLiveAdapter.kt
@@ -3,8 +3,10 @@ package org.dhis2.usescases.programEventDetail
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.testTag
@@ -70,14 +72,17 @@ class ProgramEventDetailLiveAdapter(
                         }
                     },
                 )
-                Box(
+                Column(
                     modifier = Modifier
                         .padding(
                             start = Spacing.Spacing8,
                             end = Spacing.Spacing8,
-                            bottom = Spacing.Spacing8,
+                            bottom = Spacing.Spacing4,
                         ),
                 ) {
+                    if (position == 0) {
+                        Spacer(modifier = Modifier.size(Spacing.Spacing8))
+                    }
                     ListCard(
                         modifier = Modifier.testTag("EVENT_ITEM"),
                         listAvatar = card.avatar,
diff --git a/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailModule.kt b/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailModule.kt
index f1a76f39d2..5741d39b91 100644
--- a/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailModule.kt
+++ b/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailModule.kt
@@ -5,6 +5,7 @@ import dagger.Module
 import dagger.Provides
 import dhis2.org.analytics.charts.Charts
 import org.dhis2.animations.CarouselViewAnimations
+import org.dhis2.commons.date.DateUtils
 import org.dhis2.commons.di.dagger.PerActivity
 import org.dhis2.commons.filters.DisableHomeFiltersFromSettingsApp
 import org.dhis2.commons.filters.FilterManager
@@ -198,8 +199,14 @@ class ProgramEventDetailModule(
     fun provideCreateEventUseCase(
         dispatcher: DispatcherProvider,
         d2: D2,
+        dateUtils: DateUtils,
     ) = CreateEventUseCase(
         dispatcher = dispatcher,
         d2 = d2,
+        dateUtils = dateUtils,
     )
+
+    @Provides
+    @PerActivity
+    fun provideDateUtils() = DateUtils.getInstance()
 }
diff --git a/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailRepositoryImpl.kt b/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailRepositoryImpl.kt
index ee1cc3e966..1d73fec3a3 100644
--- a/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailRepositoryImpl.kt
+++ b/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailRepositoryImpl.kt
@@ -143,7 +143,7 @@ class ProgramEventDetailRepositoryImpl internal constructor(
     }
 
     override fun programHasAnalytics(): Boolean {
-        return charts != null && charts.getProgramVisualizations(null, programUid).isNotEmpty()
+        return charts?.getVisualizationGroups(programUid)?.isNotEmpty() == true
     }
 
     override fun isEventEditable(eventUid: String): Boolean {
diff --git a/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventMapper.kt b/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventMapper.kt
index ae7a4ce9c9..19a5b9a71c 100644
--- a/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventMapper.kt
+++ b/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventMapper.kt
@@ -8,6 +8,7 @@ import org.dhis2.commons.data.tuples.Pair
 import org.dhis2.commons.date.DateUtils
 import org.dhis2.commons.resources.DhisPeriodUtils
 import org.dhis2.commons.resources.MetadataIconProvider
+import org.dhis2.ui.toColor
 import org.hisp.dhis.android.core.D2
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
@@ -19,6 +20,7 @@ import org.hisp.dhis.android.core.dataelement.DataElement
 import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.period.PeriodType
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValue
+import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor
 import java.util.Date
 import java.util.Locale
 
@@ -33,6 +35,7 @@ class ProgramEventMapper(
             d2.programModule().programStages().uid(event.programStage()).blockingGet()
 
         val eventDate = event.eventDate() ?: event.dueDate()
+        val program = d2.programModule().programs().uid(event.program()).blockingGet()
 
         return EventViewModel(
             EventViewModelType.EVENT,
@@ -59,6 +62,7 @@ class ProgramEventMapper(
             getCategoryComboFromOptionCombo(event.attributeOptionCombo())?.displayName(),
             metadataIconData = metadataIconProvider(
                 programStage?.style() ?: ObjectStyle.builder().build(),
+                program?.style()?.color()?.toColor() ?: SurfaceColor.Primary,
             ),
         )
     }
diff --git a/app/src/main/java/org/dhis2/usescases/programEventDetail/usecase/CreateEventUseCase.kt b/app/src/main/java/org/dhis2/usescases/programEventDetail/usecase/CreateEventUseCase.kt
index bf6643cdf7..e053a02c0e 100644
--- a/app/src/main/java/org/dhis2/usescases/programEventDetail/usecase/CreateEventUseCase.kt
+++ b/app/src/main/java/org/dhis2/usescases/programEventDetail/usecase/CreateEventUseCase.kt
@@ -1,6 +1,7 @@
 package org.dhis2.usescases.programEventDetail.usecase
 
 import kotlinx.coroutines.withContext
+import org.dhis2.commons.date.DateUtils
 import org.dhis2.commons.viewmodel.DispatcherProvider
 import org.hisp.dhis.android.core.D2
 import org.hisp.dhis.android.core.event.EventCreateProjection
@@ -9,6 +10,7 @@ import org.hisp.dhis.android.core.maintenance.D2Error
 class CreateEventUseCase(
     private val dispatcher: DispatcherProvider,
     private val d2: D2,
+    private val dateUtils: DateUtils,
 ) {
     suspend operator fun invoke(
         programUid: String,
@@ -26,6 +28,9 @@ class CreateEventUseCase(
                 }.build(),
             )
 
+            val eventRepository = d2.eventModule().events().uid(eventUid)
+            eventRepository.setEventDate(dateUtils.today)
+
             Result.success(eventUid)
         } catch (error: D2Error) {
             Result.failure(error)
diff --git a/app/src/main/java/org/dhis2/usescases/programStageSelection/ProgramStageSelectionInjector.kt b/app/src/main/java/org/dhis2/usescases/programStageSelection/ProgramStageSelectionInjector.kt
index a75e055148..551383a75c 100644
--- a/app/src/main/java/org/dhis2/usescases/programStageSelection/ProgramStageSelectionInjector.kt
+++ b/app/src/main/java/org/dhis2/usescases/programStageSelection/ProgramStageSelectionInjector.kt
@@ -3,6 +3,7 @@ package org.dhis2.usescases.programStageSelection
 import dagger.Module
 import dagger.Provides
 import dagger.Subcomponent
+import org.dhis2.commons.date.DateUtils
 import org.dhis2.commons.di.dagger.PerActivity
 import org.dhis2.commons.network.NetworkUtils
 import org.dhis2.commons.resources.D2ErrorUtils
@@ -73,9 +74,14 @@ class ProgramStageSelectionModule(
     fun provideCreateEventUseCase(
         dispatcherProvider: DispatcherProvider,
         d2: D2,
-    ) = CreateEventUseCase(dispatcherProvider, d2)
+        dateUtils: DateUtils,
+    ) = CreateEventUseCase(dispatcherProvider, d2, dateUtils)
 
     @Provides
     @PerActivity
     fun provideD2ErrorUtils() = D2ErrorUtils(view.context, NetworkUtils(view.context))
+
+    @Provides
+    @PerActivity
+    fun provideDateUitls() = DateUtils.getInstance()
 }
diff --git a/app/src/main/java/org/dhis2/usescases/programStageSelection/ProgramStageSelectionPresenter.kt b/app/src/main/java/org/dhis2/usescases/programStageSelection/ProgramStageSelectionPresenter.kt
index 6762fa225a..e19a9e7843 100644
--- a/app/src/main/java/org/dhis2/usescases/programStageSelection/ProgramStageSelectionPresenter.kt
+++ b/app/src/main/java/org/dhis2/usescases/programStageSelection/ProgramStageSelectionPresenter.kt
@@ -14,6 +14,7 @@ import org.dhis2.form.model.EventMode
 import org.dhis2.usescases.programEventDetail.usecase.CreateEventUseCase
 import org.dhis2.utils.Result
 import org.hisp.dhis.android.core.program.ProgramStage
+import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor
 import org.hisp.dhis.rules.models.RuleEffect
 import timber.log.Timber
 
@@ -52,7 +53,7 @@ class ProgramStageSelectionPresenter(
                 programStages.map { programStage ->
                     ProgramStageData(
                         programStage,
-                        metadataIconProvider(programStage.style()),
+                        metadataIconProvider(programStage.style(), SurfaceColor.Primary),
                     )
                 }
             }
diff --git a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchRepositoryImpl.java b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchRepositoryImpl.java
index 3d22a6944a..ff0f8f0769 100644
--- a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchRepositoryImpl.java
+++ b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchRepositoryImpl.java
@@ -18,6 +18,7 @@
 import org.dhis2.commons.data.SearchTeiModel;
 import org.dhis2.commons.data.tuples.Pair;
 import org.dhis2.commons.data.tuples.Trio;
+import org.dhis2.commons.date.DateUtils;
 import org.dhis2.commons.filters.FilterManager;
 import org.dhis2.commons.filters.data.FilterPresenter;
 import org.dhis2.commons.filters.sorting.SortingItem;
@@ -78,6 +79,7 @@
 import org.hisp.dhis.android.core.trackedentity.search.TrackedEntitySearchItem;
 import org.hisp.dhis.android.core.trackedentity.search.TrackedEntitySearchItemAttribute;
 import org.hisp.dhis.android.core.trackedentity.search.TrackedEntitySearchItemHelper;
+import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
@@ -285,9 +287,10 @@ public Observable<Pair<String, String>> saveToEnroll(@NonNull String teiType,
                             if (dataValue.contains("_os_"))
                                 dataValue = dataValue.split("_os_")[1];
 
-                            boolean isGenerated = d2.trackedEntityModule().trackedEntityAttributes().uid(key).blockingGet().generated();
-
-                            if (!isGenerated) {
+                            TrackedEntityAttribute attribute = d2.trackedEntityModule().trackedEntityAttributes().uid(key).blockingGet();
+                            boolean isGenerated = attribute.generated();
+                            boolean hasValidValue = attribute.valueType().getValidator().validate(dataValue).getSucceeded();
+                            if (!isGenerated && hasValidValue) {
                                 valueStore.overrideProgram(programUid);
                                 valueStore.save(key, dataValue).blockingFirst();
                             }
@@ -303,6 +306,7 @@ public Observable<Pair<String, String>> saveToEnroll(@NonNull String teiType,
                                         .organisationUnit(orgUnit)
                                         .build())
                         .map(enrollmentUid -> {
+                            d2.enrollmentModule().enrollments().uid(enrollmentUid).setEnrollmentDate(DateUtils.getInstance().getToday());
                             d2.enrollmentModule().enrollments().uid(enrollmentUid).setFollowUp(false);
                             return Pair.create(enrollmentUid, uid);
                         })
@@ -655,7 +659,9 @@ public List<EventViewModel> getEventsForMap(List<SearchTeiModel> teis) {
                             0,
                             periodUtils.getPeriodUIString(cacheStages.get(event.programStage()).periodType(), event.eventDate() != null ? event.eventDate() : event.dueDate(), Locale.getDefault()),
                             null,
-                            metadataIconProvider.invoke(cacheStages.get(event.programStage()).style())
+                            metadataIconProvider.invoke(cacheStages.get(event.programStage()).style()),
+                            true,
+                            true
                     ));
         }
 
diff --git a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchRepositoryImplKt.kt b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchRepositoryImplKt.kt
index 5beb64e607..20e0b4b7c5 100644
--- a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchRepositoryImplKt.kt
+++ b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchRepositoryImplKt.kt
@@ -10,6 +10,7 @@ import org.dhis2.data.search.SearchParametersModel
 import org.dhis2.form.model.FieldUiModel
 import org.dhis2.form.model.OptionSetConfiguration
 import org.dhis2.form.ui.FieldViewModelFactory
+import org.dhis2.ui.toColor
 import org.hisp.dhis.android.core.D2
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.common.ObjectStyle
@@ -19,6 +20,7 @@ import org.hisp.dhis.android.core.program.SectionRenderingType
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
 import org.hisp.dhis.android.core.trackedentity.search.TrackedEntitySearchCollectionRepository
 import org.hisp.dhis.android.core.trackedentity.search.TrackedEntitySearchItem
+import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor
 
 class SearchRepositoryImplKt(
     private val searchRepositoryJava: SearchRepository,
@@ -107,6 +109,8 @@ class SearchRepositoryImplKt(
                 isSearchable || isUnique
             }
 
+        val program = d2.programModule().programs().uid(programUid).blockingGet()
+
         return searchableAttributes.mapNotNull { programAttribute ->
             d2.trackedEntityModule().trackedEntityAttributes()
                 .uid(programAttribute.trackedEntityAttribute()!!.uid())
@@ -124,7 +128,12 @@ class SearchRepositoryImplKt(
                                 .blockingGet()
 
                             val metadataIconMap =
-                                options.associate { it.uid() to metadataIconProvider(it.style()) }
+                                options.associate {
+                                    it.uid() to metadataIconProvider(
+                                        it.style(),
+                                        program?.style()?.color()?.toColor() ?: SurfaceColor.Primary,
+                                    )
+                                }
 
                             OptionSetConfiguration.OptionConfigData(
                                 options = options,
@@ -168,7 +177,7 @@ class SearchRepositoryImplKt(
                                 .blockingGet()
 
                             val metadataIconMap =
-                                options.associate { it.uid() to metadataIconProvider(it.style()) }
+                                options.associate { it.uid() to metadataIconProvider(it.style(), SurfaceColor.Primary) }
 
                             OptionSetConfiguration.OptionConfigData(
                                 options = options,
diff --git a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchTEIViewModel.kt b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchTEIViewModel.kt
index 8325eacc43..38441502cd 100644
--- a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchTEIViewModel.kt
+++ b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchTEIViewModel.kt
@@ -18,6 +18,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.dhis2.R
 import org.dhis2.commons.data.SearchTeiModel
+import org.dhis2.commons.date.DateUtils
 import org.dhis2.commons.filters.FilterManager
 import org.dhis2.commons.idlingresource.SearchIdlingResourceSingleton
 import org.dhis2.commons.network.NetworkUtils
@@ -33,8 +34,11 @@ import org.dhis2.usescases.searchTrackEntity.listView.SearchResult
 import org.dhis2.usescases.searchTrackEntity.searchparameters.model.SearchParametersUiState
 import org.dhis2.usescases.searchTrackEntity.ui.UnableToSearchOutsideData
 import org.dhis2.utils.customviews.navigationbar.NavigationPageConfigurator
+import org.hisp.dhis.android.core.arch.helpers.Result
+import org.hisp.dhis.android.core.common.ValueType
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import timber.log.Timber
+import java.text.ParseException
 
 const val TEI_TYPE_SEARCH_MAX_RESULTS = 5
 
@@ -90,7 +94,6 @@ class SearchTEIViewModel(
     val teTypeName: LiveData<String> = _teTypeName
 
     var uiState by mutableStateOf(SearchParametersUiState())
-        private set
 
     private var fetchJob: Job? = null
 
@@ -274,7 +277,11 @@ class SearchTEIViewModel(
         val updatedItems = uiState.items.map {
             (it as FieldUiModelImpl).copy(value = null, displayName = null)
         }
-        uiState = uiState.copy(items = updatedItems)
+        uiState = uiState.copy(
+            items = updatedItems,
+            searchedItems = mapOf(),
+        )
+        searching = false
     }
 
     private fun updateSearch() {
@@ -430,7 +437,10 @@ class SearchTEIViewModel(
         viewModelScope.launch(dispatchers.io()) {
             if (canPerformSearch()) {
                 searching = queryData.isNotEmpty()
-                uiState = uiState.copy(clearSearchEnabled = queryData.isNotEmpty())
+                uiState = uiState.copy(
+                    clearSearchEnabled = queryData.isNotEmpty(),
+                    searchedItems = getFriendlyQueryData(),
+                )
                 when (_screenState.value?.screenState) {
                     SearchScreenState.LIST -> {
                         SearchIdlingResourceSingleton.increment()
@@ -457,6 +467,8 @@ class SearchTEIViewModel(
                 )
                 uiState = uiState.copy(minAttributesMessage = message)
                 uiState.updateMinAttributeWarning(true)
+                setSearchScreen()
+                _refreshData.postValue(Unit)
             }
         }
     }
@@ -544,7 +556,6 @@ class SearchTEIViewModel(
     fun onDataLoaded(
         programResultCount: Int,
         globalResultCount: Int? = null,
-        isLandscape: Boolean = false,
         onlineErrorCode: D2ErrorCode? = null,
     ) {
         val canDisplayResults = canDisplayResult(
@@ -565,7 +576,7 @@ class SearchTEIViewModel(
                 hasGlobalResults,
             )
         } else if (displayFrontPageList()) {
-            handleDisplayInListResult(hasProgramResults, isLandscape)
+            handleDisplayInListResult(hasProgramResults)
         } else {
             handleInitWithoutData()
         }
@@ -573,7 +584,7 @@ class SearchTEIViewModel(
         SearchIdlingResourceSingleton.decrement()
     }
 
-    private fun handleDisplayInListResult(hasProgramResults: Boolean, isLandscape: Boolean) {
+    private fun handleDisplayInListResult(hasProgramResults: Boolean) {
         val result = when {
             !hasProgramResults && searchRepository.canCreateInProgramWithoutSearch() ->
                 listOf(
@@ -806,13 +817,25 @@ class SearchTEIViewModel(
         }
 
         is FormIntent.OnFocus -> {
-            val updatedItems = uiState.items.map {
-                if (it.focused && it.uid != formIntent.uid) {
-                    (it as FieldUiModelImpl).copy(focused = false)
-                } else if (it.uid == formIntent.uid) {
-                    (it as FieldUiModelImpl).copy(focused = true)
+            val updatedItems = uiState.items.map { field ->
+                if (field.focused && field.uid != formIntent.uid) {
+                    val validation = field.value?.takeIf {
+                        field.valueType in listOf(
+                            ValueType.DATE, ValueType.DATETIME, ValueType.AGE, ValueType.TIME,
+                        )
+                    }?.let { value -> field.valueType?.validator?.validate(value) }
+
+                    (field as FieldUiModelImpl).copy(
+                        focused = false,
+                        error = when (validation) {
+                            is Result.Failure -> resourceManager.getString(R.string.formatting_error)
+                            else -> null
+                        },
+                    )
+                } else if (field.uid == formIntent.uid) {
+                    (field as FieldUiModelImpl).copy(focused = true)
                 } else {
-                    it
+                    field
                 }
             }
             uiState = uiState.copy(items = updatedItems)
@@ -838,7 +861,10 @@ class SearchTEIViewModel(
             )
 
             searching = queryData.isNotEmpty()
-            uiState = uiState.copy(clearSearchEnabled = queryData.isNotEmpty())
+            uiState = uiState.copy(
+                clearSearchEnabled = queryData.isNotEmpty(),
+                searchedItems = getFriendlyQueryData(),
+            )
 
             val searchParametersModel = SearchParametersModel(
                 selectedProgram = searchRepository.getProgram(initialProgramUid),
@@ -892,4 +918,61 @@ class SearchTEIViewModel(
         }
         uiState = uiState.copy(items = updatedItems)
     }
+
+    fun getFriendlyQueryData(): Map<String, String> {
+        val map = mutableMapOf<String, String>()
+        uiState.items.filter { !it.value.isNullOrEmpty() }
+            .forEach { item ->
+                when (item.valueType) {
+                    ValueType.ORGANISATION_UNIT, ValueType.MULTI_TEXT -> {
+                        map[item.uid] = (item.displayName ?: "")
+                    }
+                    ValueType.DATE, ValueType.AGE -> {
+                        item.value?.let {
+                            if (it.isNotEmpty()) {
+                                val date = try {
+                                    DateUtils.oldUiDateFormat().parse(it)
+                                } catch (e: ParseException) {
+                                    null
+                                }
+                                map[item.uid] = date?.let {
+                                    DateUtils.uiDateFormat().format(date)
+                                } ?: it
+                            }
+                        }
+                    }
+                    ValueType.DATETIME -> {
+                        item.value?.let {
+                            if (it.isNotEmpty()) {
+                                val date = try {
+                                    DateUtils.databaseDateFormatNoSeconds().parse(it)
+                                } catch (e: ParseException) {
+                                    null
+                                }
+                                map[item.uid] = date?.let {
+                                    DateUtils.uiDateTimeFormat().format(date)
+                                } ?: it
+                            }
+                        }
+                    }
+                    ValueType.BOOLEAN -> {
+                        map[item.uid] = "${item.label}: ${item.value}"
+                    }
+                    ValueType.TRUE_ONLY -> {
+                        item.value?.let {
+                            if (it == "true") {
+                                map[item.uid] = item.label
+                            }
+                        }
+                    }
+                    ValueType.PERCENTAGE -> {
+                        map[item.uid] = "${item.value}%"
+                    }
+                    else -> {
+                        map[item.uid] = (item.value ?: "")
+                    }
+                }
+            }
+        return map
+    }
 }
diff --git a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchTEUi.kt b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchTEUi.kt
new file mode 100644
index 0000000000..44f045cd1d
--- /dev/null
+++ b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchTEUi.kt
@@ -0,0 +1,389 @@
+package org.dhis2.usescases.searchTrackEntity
+
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.ExperimentalAnimationApi
+import androidx.compose.animation.slideInVertically
+import androidx.compose.animation.slideOutVertically
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.wrapContentWidth
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.Button
+import androidx.compose.material.ButtonDefaults
+import androidx.compose.material.CircularProgressIndicator
+import androidx.compose.material.Icon
+import androidx.compose.material.LocalTextStyle
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.res.vectorResource
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import org.dhis2.R
+import org.dhis2.usescases.searchTrackEntity.listView.SearchResult
+
+@Composable
+fun SearchResult(
+    searchResultType: SearchResult.SearchResultType,
+    onSearchOutsideClick: () -> Unit,
+) {
+    when (searchResultType) {
+        SearchResult.SearchResultType.LOADING ->
+            LoadingContent(
+                loadingDescription = stringResource(R.string.search_loading_more),
+            )
+
+        SearchResult.SearchResultType.SEARCH_OUTSIDE -> SearchOutsideProgram(
+            resultText = stringResource(R.string.search_no_results_in_program),
+            buttonText = stringResource(R.string.search_outside_action),
+            onSearchOutsideClick = onSearchOutsideClick,
+        )
+
+        SearchResult.SearchResultType.NO_MORE_RESULTS -> NoMoreResults()
+        SearchResult.SearchResultType.TOO_MANY_RESULTS -> TooManyResults()
+        SearchResult.SearchResultType.NO_RESULTS -> NoResults()
+        SearchResult.SearchResultType.SEARCH_OR_CREATE -> SearchOrCreate()
+        else -> {
+            // Nothing to do in these cases
+        }
+    }
+}
+
+@Composable
+fun SearchButton(modifier: Modifier = Modifier, onClick: () -> Unit) {
+    Button(
+        modifier = modifier,
+        onClick = onClick,
+        colors = ButtonDefaults.buttonColors(backgroundColor = Color.White),
+        shape = RoundedCornerShape(24.dp),
+        elevation = ButtonDefaults.elevation(),
+    ) {
+        Row(
+            modifier = modifier,
+            horizontalArrangement = Arrangement.Start,
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Icon(
+                painter = painterResource(id = R.drawable.ic_search),
+                contentDescription = "",
+                tint = colorResource(id = R.color.colorPrimary),
+            )
+            Spacer(modifier = Modifier.size(16.dp))
+            Text(
+                text = stringResource(id = R.string.search),
+                color = colorResource(id = R.color.textSecondary),
+            )
+        }
+    }
+}
+
+@Composable
+fun WrappedSearchButton(onClick: () -> Unit) {
+    SearchButton(
+        modifier = Modifier
+            .wrapContentWidth(align = Alignment.CenterHorizontally)
+            .height(44.dp),
+        onClick = onClick,
+    )
+}
+
+@ExperimentalAnimationApi
+@Composable
+fun FullSearchButton(modifier: Modifier, visible: Boolean = true, onClick: () -> Unit) {
+    AnimatedVisibility(
+        modifier = modifier,
+        visible = visible,
+        enter = slideInVertically(),
+        exit = slideOutVertically(),
+    ) {
+        SearchButton(
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(48.dp),
+            onClick = onClick,
+        )
+    }
+}
+
+@Composable
+fun LoadingContent(loadingDescription: String) {
+    Column(
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(16.dp),
+        horizontalAlignment = Alignment.CenterHorizontally,
+    ) {
+        CircularProgressIndicator()
+        Spacer(modifier = Modifier.size(16.dp))
+        Text(
+            text = loadingDescription,
+            fontSize = 14.sp,
+            color = Color.Black.copy(alpha = 0.38f),
+            style = LocalTextStyle.current.copy(
+                lineHeight = 10.sp,
+                fontFamily = FontFamily(Font(R.font.rubik_regular)),
+            ),
+        )
+    }
+}
+
+@Composable
+fun SearchOutsideProgram(resultText: String, buttonText: String, onSearchOutsideClick: () -> Unit) {
+    Column(
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(16.dp),
+        horizontalAlignment = Alignment.CenterHorizontally,
+    ) {
+        Text(
+            text = resultText,
+            fontSize = 14.sp,
+            color = Color.Black.copy(alpha = 0.38f),
+            style = LocalTextStyle.current.copy(
+                lineHeight = 10.sp,
+                fontFamily = FontFamily(Font(R.font.rubik_regular)),
+            ),
+        )
+        Spacer(modifier = Modifier.size(16.dp))
+        Button(
+            onClick = onSearchOutsideClick,
+            border = BorderStroke(1.dp, colorResource(id = R.color.colorPrimary)),
+            colors = ButtonDefaults.buttonColors(
+                backgroundColor = colorResource(id = R.color.white),
+            ),
+        ) {
+            Icon(
+                painter = painterResource(id = R.drawable.ic_search),
+                contentDescription = "",
+                tint = colorResource(id = R.color.colorPrimary),
+            )
+            Spacer(modifier = Modifier.size(16.dp))
+            Text(text = buttonText, color = colorResource(id = R.color.colorPrimary))
+        }
+    }
+}
+
+@Composable
+fun NoMoreResults() {
+    Column(
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(16.dp),
+        horizontalAlignment = Alignment.CenterHorizontally,
+    ) {
+        Text(
+            text = stringResource(R.string.string_no_more_results),
+            fontSize = 14.sp,
+            color = Color.Black.copy(alpha = 0.38f),
+            style = LocalTextStyle.current.copy(
+                lineHeight = 10.sp,
+                fontFamily = FontFamily(Font(R.font.rubik_regular)),
+            ),
+        )
+    }
+}
+
+@Composable
+fun NoResults() {
+    Column(
+        modifier = Modifier
+            .fillMaxWidth()
+            .fillMaxHeight()
+            .padding(16.dp),
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.Center,
+    ) {
+        Image(
+            imageVector = ImageVector.vectorResource(id = R.drawable.ic_empty_folder),
+            contentDescription = "",
+        )
+        Spacer(modifier = Modifier.size(16.dp))
+        Text(
+            text = stringResource(R.string.search_no_results),
+            fontSize = 17.sp,
+            color = Color.Black.copy(alpha = 0.38f),
+            style = LocalTextStyle.current.copy(
+                lineHeight = 24.sp,
+                fontFamily = FontFamily(Font(R.font.rubik_regular)),
+            ),
+        )
+    }
+}
+
+@Composable
+fun TooManyResults() {
+    Column(
+        modifier = Modifier
+            .fillMaxWidth()
+            .fillMaxHeight()
+            .padding(16.dp),
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.Center,
+    ) {
+        Image(
+            imageVector = ImageVector.vectorResource(id = R.drawable.ic_too_many),
+            contentDescription = "",
+        )
+        Spacer(modifier = Modifier.size(16.dp))
+        Text(
+            text = stringResource(R.string.search_too_many_results),
+            fontSize = 17.sp,
+            color = colorResource(id = R.color.pink_500),
+            style = LocalTextStyle.current.copy(
+                lineHeight = 24.sp,
+                fontFamily = FontFamily(Font(R.font.rubik_regular)),
+            ),
+        )
+        Text(
+            text = stringResource(R.string.search_too_many_results_message),
+            fontSize = 17.sp,
+            color = Color.Black.copy(alpha = 0.38f),
+            style = LocalTextStyle.current.copy(
+                lineHeight = 24.sp,
+                fontFamily = FontFamily(Font(R.font.rubik_regular)),
+            ),
+        )
+    }
+}
+
+@Composable
+fun SearchOrCreate() {
+    Column(
+        modifier = Modifier
+            .fillMaxWidth()
+            .fillMaxHeight()
+            .padding(16.dp),
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.Center,
+    ) {
+        Image(
+            imageVector = ImageVector.vectorResource(id = R.drawable.ic_searchvscreate),
+            contentDescription = "",
+        )
+        Spacer(modifier = Modifier.size(16.dp))
+        Text(
+            text = stringResource(R.string.search_or_create),
+            fontSize = 17.sp,
+            color = Color.Black.copy(alpha = 0.38f),
+            style = LocalTextStyle.current.copy(
+                lineHeight = 24.sp,
+                fontFamily = FontFamily(Font(R.font.rubik_regular)),
+            ),
+        )
+    }
+}
+
+@ExperimentalAnimationApi
+@Composable
+fun CreateNewButton(modifier: Modifier, extended: Boolean = true, onClick: () -> Unit) {
+    Button(
+        modifier = modifier
+            .wrapContentWidth()
+            .height(56.dp),
+        contentPadding = PaddingValues(16.dp),
+        onClick = onClick,
+        colors = ButtonDefaults.buttonColors(backgroundColor = Color.White),
+        shape = RoundedCornerShape(16.dp),
+        elevation = ButtonDefaults.elevation(),
+    ) {
+        Icon(
+            modifier = Modifier.size(24.dp),
+            painter = painterResource(id = R.drawable.ic_add_accent),
+            contentDescription = "",
+            tint = colorResource(id = R.color.colorPrimary),
+        )
+        AnimatedVisibility(visible = extended) {
+            Row {
+                Spacer(modifier = Modifier.size(12.dp))
+                Text(
+                    text = stringResource(R.string.search_create_new),
+                    color = colorResource(id = R.color.colorPrimary),
+                )
+            }
+        }
+    }
+}
+
+@ExperimentalAnimationApi
+@Preview(showBackground = true, backgroundColor = 0x2C98F0)
+@Composable
+fun SearchFullWidthPreview() {
+    FullSearchButton(modifier = Modifier) {
+    }
+}
+
+@Preview(showBackground = true, backgroundColor = 0x2C98F0)
+@Composable
+fun SearchWrapWidthPreview() {
+    WrappedSearchButton {
+    }
+}
+
+@ExperimentalAnimationApi
+@Preview
+@Composable
+fun ExtendedCreateNewButtonPreview() {
+    CreateNewButton(modifier = Modifier) {}
+}
+
+@ExperimentalAnimationApi
+@Preview
+@Composable
+fun CreateNewButtonPreview() {
+    CreateNewButton(modifier = Modifier, extended = false) {}
+}
+
+@Preview(showBackground = true)
+@Composable
+fun LoadingMoreResultsPreview() {
+    LoadingContent(loadingDescription = "Loading more results...")
+}
+
+@Preview(showBackground = true)
+@Composable
+fun SearchOutsidePreview() {
+    SearchResult(searchResultType = SearchResult.SearchResultType.SEARCH_OUTSIDE) {}
+}
+
+@Preview(showBackground = true)
+@Composable
+fun NoMoreResultsPreview() {
+    SearchResult(searchResultType = SearchResult.SearchResultType.NO_MORE_RESULTS) {}
+}
+
+@Preview(showBackground = true)
+@Composable
+fun TooManyResultsPreview() {
+    SearchResult(searchResultType = SearchResult.SearchResultType.TOO_MANY_RESULTS) {}
+}
+
+@Preview(showBackground = true)
+@Composable
+fun NoResultsPreview() {
+    SearchResult(searchResultType = SearchResult.SearchResultType.NO_RESULTS) {}
+}
+
+@Preview(showBackground = true)
+@Composable
+fun SearchOrCreatePreview() {
+    SearchResult(searchResultType = SearchResult.SearchResultType.SEARCH_OR_CREATE) {}
+}
diff --git a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/adapters/BaseTeiViewHolder.kt b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/adapters/BaseTeiViewHolder.kt
index 8a95eb0af7..352a764d5c 100644
--- a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/adapters/BaseTeiViewHolder.kt
+++ b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/adapters/BaseTeiViewHolder.kt
@@ -61,8 +61,7 @@ abstract class BaseTeiViewHolder(
             val enrollmentIconDataList: List<EnrollmentIconData> =
                 programInfo.getEnrollmentIconsData(
                     if (selectedEnrollment != null) selectedEnrollment.program() else null,
-                    getMetadataIconData(selectedEnrollment.program()),
-                )
+                ) { programUid -> getMetadataIconData(programUid) }
             enrollmentIconDataList.paintAllEnrollmentIcons(
                 binding.composeProgramList,
             )
diff --git a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/adapters/SearchTeiLiveAdapter.kt b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/adapters/SearchTeiLiveAdapter.kt
index 5eb90556d9..18b34dd602 100644
--- a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/adapters/SearchTeiLiveAdapter.kt
+++ b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/adapters/SearchTeiLiveAdapter.kt
@@ -3,6 +3,11 @@ package org.dhis2.usescases.searchTrackEntity.adapters
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.ComposeView
 import androidx.paging.PagingDataAdapter
 import androidx.recyclerview.widget.RecyclerView
@@ -15,6 +20,7 @@ import org.dhis2.databinding.ItemSearchTrackedEntityBinding
 import org.dhis2.usescases.searchTrackEntity.ui.mapper.TEICardMapper
 import org.hisp.dhis.mobile.ui.designsystem.component.ListCard
 import org.hisp.dhis.mobile.ui.designsystem.component.ListCardTitleModel
+import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing
 
 class SearchTeiLiveAdapter(
     private val fromRelationship: Boolean,
@@ -100,18 +106,29 @@ class SearchTeiLiveAdapter(
                                 onImageClick(path)
                             },
                         )
-                        ListCard(
-                            listAvatar = card.avatar,
-                            title = ListCardTitleModel(text = card.title),
-                            lastUpdated = card.lastUpdated,
-                            additionalInfoList = card.additionalInfo,
-                            actionButton = card.actionButton,
-                            expandLabelText = card.expandLabelText,
-                            shrinkLabelText = card.shrinkLabelText,
-                            onCardClick = card.onCardCLick,
-                        )
+                        Column(
+                            modifier = Modifier
+                                .padding(
+                                    start = Spacing.Spacing8,
+                                    end = Spacing.Spacing8,
+                                    bottom = Spacing.Spacing4,
+                                ),
+                        ) {
+                            if (position == 0) {
+                                Spacer(modifier = Modifier.size(Spacing.Spacing8))
+                            }
+                            ListCard(
+                                listAvatar = card.avatar,
+                                title = ListCardTitleModel(text = card.title),
+                                lastUpdated = card.lastUpdated,
+                                additionalInfoList = card.additionalInfo,
+                                actionButton = card.actionButton,
+                                expandLabelText = card.expandLabelText,
+                                shrinkLabelText = card.shrinkLabelText,
+                                onCardClick = card.onCardCLick,
+                            )
+                        }
                     }
-
                     holder.bind(it, {
                         getItem(holder.absoluteAdapterPosition)?.toggleAttributeList()
                         notifyItemChanged(holder.absoluteAdapterPosition)
diff --git a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/listView/SearchResult.kt b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/listView/SearchResult.kt
index acf16c9c2d..b516c8ed26 100644
--- a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/listView/SearchResult.kt
+++ b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/listView/SearchResult.kt
@@ -20,7 +20,7 @@ data class SearchResult(
     }
 
     fun shouldClearProgramData() =
-        type == SearchResultType.TOO_MANY_RESULTS || type == SearchResultType.SEARCH_OR_CREATE
+        type == SearchResultType.SEARCH_OR_CREATE
 
     fun shouldClearGlobalData() = type == SearchResultType.SEARCH_OUTSIDE
 
diff --git a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/listView/SearchResultHolder.kt b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/listView/SearchResultHolder.kt
index 11b9a8a7c0..e1395e63e8 100644
--- a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/listView/SearchResultHolder.kt
+++ b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/listView/SearchResultHolder.kt
@@ -1,10 +1,10 @@
 package org.dhis2.usescases.searchTrackEntity.listView
 
-import android.view.ViewGroup
 import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.core.view.updateLayoutParams
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.composethemeadapter.MdcTheme
+import org.dhis2.bindings.dp
 import org.dhis2.databinding.ResultSearchListBinding
 import org.dhis2.usescases.searchTrackEntity.ui.SearchResultUi
 
@@ -22,10 +22,8 @@ class SearchResultHolder(
     fun bind(item: SearchResult) {
         binding.composeView.apply {
             updateLayoutParams {
-                height = if (item.shouldDisplayInFullSize()) {
-                    ViewGroup.LayoutParams.MATCH_PARENT
-                } else {
-                    ViewGroup.LayoutParams.WRAP_CONTENT
+                if (item.shouldDisplayInFullSize()) {
+                    setPadding(0, 160.dp, 0, 0)
                 }
             }
         }.setContent {
diff --git a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/listView/SearchTEList.kt b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/listView/SearchTEList.kt
index 81f806a9b9..0346a8ec12 100644
--- a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/listView/SearchTEList.kt
+++ b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/listView/SearchTEList.kt
@@ -20,6 +20,7 @@ import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.viewModelScope
+import androidx.paging.LoadState
 import androidx.recyclerview.widget.ConcatAdapter
 import androidx.recyclerview.widget.RecyclerView
 import kotlinx.coroutines.flow.collectLatest
@@ -183,7 +184,7 @@ class SearchTEList : FragmentGlobalAbstract() {
                     val createButtonVisibility by viewModel
                         .createButtonScrollVisibility.observeAsState(true)
                     val queryData = remember(viewModel.uiState) {
-                        viewModel.queryData
+                        viewModel.uiState.searchedItems
                     }
 
                     FullSearchButtonAndWorkingList(
@@ -270,9 +271,22 @@ class SearchTEList : FragmentGlobalAbstract() {
                 if (searchResult.shouldClearGlobalData()) {
                     globalAdapter.refresh()
                 }
+                if (searchResult.type == SearchResult.SearchResultType.TOO_MANY_RESULTS) {
+                    listAdapter.removeAdapter(liveAdapter)
+                }
+                displayResult(it)
+                updateRecycler()
+            }
+        }
+
+        liveAdapter.addLoadStateListener { state ->
+            if (state.append == LoadState.Loading) {
+                displayResult(
+                    listOf(SearchResult(SearchResult.SearchResultType.LOADING)),
+                )
+            } else {
+                displayResult(null)
             }
-            displayResult(it)
-            updateRecycler()
         }
     }
 
@@ -289,6 +303,9 @@ class SearchTEList : FragmentGlobalAbstract() {
     }
 
     private fun restoreAdapters() {
+        if (!listAdapter.adapters.contains(liveAdapter)) {
+            listAdapter.addAdapter(1, liveAdapter)
+        }
         initLoading(null)
         liveAdapter.refresh()
         if (!viewModel.filtersApplyOnGlobalSearch()) {
@@ -322,7 +339,6 @@ class SearchTEList : FragmentGlobalAbstract() {
             } else {
                 null
             },
-            isLandscape = isLandscape(),
             onlineErrorCode = liveAdapter.snapshot().items.lastOrNull()?.onlineErrorCode,
         )
     }
@@ -331,7 +347,6 @@ class SearchTEList : FragmentGlobalAbstract() {
         viewModel.onDataLoaded(
             programResultCount = liveAdapter.itemCount,
             globalResultCount = globalAdapter.itemCount,
-            isLandscape = isLandscape(),
         )
     }
 
diff --git a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/searchparameters/SearchParametersScreen.kt b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/searchparameters/SearchParametersScreen.kt
index 5b7a857361..af52d14a5b 100644
--- a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/searchparameters/SearchParametersScreen.kt
+++ b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/searchparameters/SearchParametersScreen.kt
@@ -144,6 +144,7 @@ fun SearchParametersScreen(
                         message = message,
                         duration = SnackbarDuration.Short,
                     )
+                    uiState.updateMinAttributeWarning(false)
                 }
             }
         }
diff --git a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/searchparameters/model/SearchParametersUiState.kt b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/searchparameters/model/SearchParametersUiState.kt
index c842718638..a407294946 100644
--- a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/searchparameters/model/SearchParametersUiState.kt
+++ b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/searchparameters/model/SearchParametersUiState.kt
@@ -12,6 +12,7 @@ data class SearchParametersUiState(
     ),
     val searchEnabled: Boolean = false,
     val clearSearchEnabled: Boolean = false,
+    val searchedItems: Map<String, String> = mapOf(),
     private val _isOnBackPressed: MutableSharedFlow<Boolean> = MutableSharedFlow(
         replay = Int.MAX_VALUE,
     ),
diff --git a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/ui/SearchTEUi.kt b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/ui/SearchTEUi.kt
index 67ca5dc3da..516d63d134 100644
--- a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/ui/SearchTEUi.kt
+++ b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/ui/SearchTEUi.kt
@@ -240,7 +240,7 @@ fun FullSearchButtonAndWorkingList(
                     top = Spacing.Spacing16,
                     start = Spacing.Spacing16,
                     end = Spacing.Spacing16,
-                    bottom = Spacing.Spacing16,
+                    bottom = Spacing.Spacing0,
                 ),
                 verticalAlignment = Alignment.CenterVertically,
             ) {
diff --git a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/ui/mapper/TEICardMapper.kt b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/ui/mapper/TEICardMapper.kt
index ef662e1a5f..4482d88eff 100644
--- a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/ui/mapper/TEICardMapper.kt
+++ b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/ui/mapper/TEICardMapper.kt
@@ -129,8 +129,13 @@ class TEICardMapper(
                 list = list,
                 enrolledPrograms = searchTEIModel.programInfo,
             )
+            val programUid: String? = if (searchTEIModel.selectedEnrollment != null) {
+                searchTEIModel.selectedEnrollment.program().toString()
+            } else {
+                null
+            }
             checkEnrollmentStatus(
-                programUid = searchTEIModel.selectedEnrollment.program()!!,
+                programUid = programUid,
                 list = list,
                 status = searchTEIModel.selectedEnrollment?.status(),
             )
@@ -176,7 +181,7 @@ class TEICardMapper(
     }
 
     private fun checkEnrollmentStatus(
-        programUid: String,
+        programUid: String?,
         list: MutableList<AdditionalInfoItem>,
         status: EnrollmentStatus?,
     ) {
diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/DashboardRepositoryImpl.kt b/app/src/main/java/org/dhis2/usescases/teiDashboard/DashboardRepositoryImpl.kt
index 34d14b0016..9700c6d1c8 100644
--- a/app/src/main/java/org/dhis2/usescases/teiDashboard/DashboardRepositoryImpl.kt
+++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/DashboardRepositoryImpl.kt
@@ -35,6 +35,7 @@ import org.hisp.dhis.android.core.systeminfo.SystemInfo
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
+import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor
 import timber.log.Timber
 
 class DashboardRepositoryImpl(
@@ -74,7 +75,7 @@ class DashboardRepositoryImpl(
         return d2.eventModule().events().byEnrollmentUid().eq(enrollmentUid)
             .byDeleted().isFalse
             .orderByTimeline(RepositoryScope.OrderByDirection.ASC)
-            .get().toFlowable().flatMapIterable { events: List<Event>? -> events }
+            .get().toFlowable().flatMapIterable { events: List<Event>? -> events }.distinct()
             .map { event: Event ->
                 var event = event
                 if (java.lang.Boolean.FALSE
@@ -414,7 +415,7 @@ class DashboardRepositoryImpl(
             .map { programUids ->
                 d2.programModule().programs().byUid()
                     .`in`(programUids.filterNotNull()).blockingGet().map {
-                        Pair(it, metadataIconProvider(it.style()))
+                        Pair(it, metadataIconProvider(it.style(), SurfaceColor.Primary))
                     }
             }
     }
diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/DashboardViewModel.kt b/app/src/main/java/org/dhis2/usescases/teiDashboard/DashboardViewModel.kt
index 4c05023cda..23082c5bd5 100644
--- a/app/src/main/java/org/dhis2/usescases/teiDashboard/DashboardViewModel.kt
+++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/DashboardViewModel.kt
@@ -132,23 +132,47 @@ class DashboardViewModel(
     fun updateEnrollmentStatus(
         status: EnrollmentStatus,
     ) {
-        if (dashboardModel.value is DashboardEnrollmentModel) {
-            val result = repository.updateEnrollmentStatus(
-                (dashboardModel.value as DashboardEnrollmentModel).currentEnrollment.uid(),
-                status,
-            ).blockingFirst()
-
-            if (result == StatusChangeResultCode.CHANGED) {
-                _showStatusBar.value = status
-                _syncNeeded.value = true
-                _state.value = State.TO_UPDATE
-                updateDashboard()
-                updateEnrollment.value = true
-            } else {
-                showStatusErrorMessages.value = result
+        viewModelScope.launch(dispatcher.io()) {
+            if (dashboardModel.value is DashboardEnrollmentModel) {
+                val result = repository.updateEnrollmentStatus(
+                    (dashboardModel.value as DashboardEnrollmentModel).currentEnrollment.uid(),
+                    status,
+                ).blockingFirst()
+
+                if (result == StatusChangeResultCode.CHANGED) {
+                    _showStatusBar.value = status
+                    _syncNeeded.value = true
+                    _state.value = State.TO_UPDATE
+                    updateEnrollment.postValue(true)
+                } else {
+                    showStatusErrorMessages.postValue(result)
+                }
+            }
+        }
+    }
+
+    fun deleteEnrollment(
+        onSuccess: (Boolean?) -> Unit,
+        onAuthorityError: () -> Unit,
+    ) {
+        viewModelScope.launch(dispatcher.io()) {
+            val result = async {
+                dashboardModel.value.takeIf { it is DashboardEnrollmentModel }?.let {
+                    repository.deleteEnrollment((it as DashboardEnrollmentModel).currentEnrollment.uid())
+                        .blockingGet()
+                }
+            }
+            try {
+                val hasMoreEnrollments = result.await()
+                onSuccess(hasMoreEnrollments)
+            } catch (e: AuthorityException) {
+                onAuthorityError()
+            } catch (e: Exception) {
+                Timber.e(e)
             }
         }
     }
+}
 
     fun deleteEnrollment(
         onSuccess: (Boolean?) -> Unit,
diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/TeiDashboardMobileActivity.kt b/app/src/main/java/org/dhis2/usescases/teiDashboard/TeiDashboardMobileActivity.kt
index c16f884432..cf3251fc02 100644
--- a/app/src/main/java/org/dhis2/usescases/teiDashboard/TeiDashboardMobileActivity.kt
+++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/TeiDashboardMobileActivity.kt
@@ -20,27 +20,19 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModelProvider
 import androidx.viewpager2.widget.ViewPager2
-import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.google.android.material.snackbar.Snackbar
 import org.dhis2.App
 import org.dhis2.R
 import org.dhis2.commons.Constants
 import org.dhis2.commons.Constants.TEI_UID
-import org.dhis2.commons.featureconfig.data.FeatureConfigRepository
-import org.dhis2.commons.featureconfig.model.Feature
 import org.dhis2.commons.filters.FilterManager
 import org.dhis2.commons.filters.Filters
 import org.dhis2.commons.network.NetworkUtils
 import org.dhis2.commons.popupmenu.AppMenuHelper
-import org.dhis2.commons.resources.ColorUtils
 import org.dhis2.commons.resources.ResourceManager
 import org.dhis2.commons.sync.OnDismissListener
 import org.dhis2.commons.sync.SyncContext
 import org.dhis2.databinding.ActivityDashboardMobileBinding
-import org.dhis2.form.model.EnrollmentMode
-import org.dhis2.form.model.EnrollmentRecords
-import org.dhis2.form.ui.FormView
-import org.dhis2.form.ui.provider.EnrollmentResultDialogUiProvider
 import org.dhis2.ui.ThemeManager
 import org.dhis2.ui.dialogs.bottomsheet.DeleteBottomSheetDialog
 import org.dhis2.usescases.enrollment.EnrollmentActivity
@@ -51,7 +43,6 @@ import org.dhis2.usescases.teiDashboard.adapters.DashboardPagerAdapter
 import org.dhis2.usescases.teiDashboard.adapters.DashboardPagerAdapter.Companion.NO_POSITION
 import org.dhis2.usescases.teiDashboard.adapters.DashboardPagerAdapter.DashboardPageType
 import org.dhis2.usescases.teiDashboard.dashboardfragments.relationships.MapButtonObservable
-import org.dhis2.usescases.teiDashboard.dashboardfragments.teidata.TEIDataActivityContract
 import org.dhis2.usescases.teiDashboard.dashboardfragments.teidata.TEIDataFragment.Companion.newInstance
 import org.dhis2.usescases.teiDashboard.teiProgramList.TeiProgramListActivity
 import org.dhis2.usescases.teiDashboard.ui.setButtonContent
@@ -72,16 +63,12 @@ import javax.inject.Inject
 class TeiDashboardMobileActivity :
     ActivityGlobalAbstract(),
     TeiDashboardContracts.View,
-    MapButtonObservable,
-    TEIDataActivityContract {
+    MapButtonObservable {
     private var currentOrientation = -1
 
     @Inject
     lateinit var presenter: TeiDashboardContracts.Presenter
 
-    var featureConfig: FeatureConfigRepository? = null
-        @Inject set
-
     @Inject
     lateinit var filterManager: FilterManager
 
@@ -114,8 +101,6 @@ class TeiDashboardMobileActivity :
     private var elevation = 0f
     private var restartingActivity = false
 
-    private lateinit var formView: FormView
-
     private val detailsLauncher = registerForActivityResult(
         ActivityResultContracts.StartActivityForResult(),
     ) {
@@ -204,7 +189,6 @@ class TeiDashboardMobileActivity :
         if (intent.shouldLaunchSyncDialog()) {
             openSyncDialog()
         }
-        setFormViewForLandScape()
         setNavigationBar()
         setEditButton()
         dashboardViewModel.showStatusErrorMessages.observe(this) {
@@ -218,47 +202,6 @@ class TeiDashboardMobileActivity :
         }
     }
 
-    private fun setFormViewForLandScape() {
-        if (isLandscape() && enrollmentUid != null) {
-            val saveButton = findViewById<View>(R.id.saveLand) as FloatingActionButton
-            formView = FormView.Builder()
-                .locationProvider(locationProvider)
-                .onItemChangeListener {
-                    // Do nothing
-                }
-                .onLoadingListener { loading ->
-                    if (loading) {
-                        showLoadingProgress(true)
-                    } else {
-                        showLoadingProgress(false)
-                    }
-                }
-                .onFinishDataEntry {
-                    dashboardViewModel.updateDashboard()
-                }
-                .resultDialogUiProvider(
-                    EnrollmentResultDialogUiProvider(
-                        ResourceManager(
-                            this.context,
-                            ColorUtils(),
-                        ),
-                    ),
-                )
-                .factory(supportFragmentManager)
-                .setRecords(EnrollmentRecords(enrollmentUid!!, EnrollmentMode.NEW))
-                .useComposeForm(
-                    featureConfig?.isFeatureEnable(Feature.COMPOSE_FORMS) ?: false,
-                )
-                .build()
-
-            supportFragmentManager.beginTransaction()
-                .replace(R.id.tei_form_view, formView)
-                .commitAllowingStateLoss()
-
-            saveButton.setOnClickListener { formView.onSaveClick() }
-        }
-    }
-
     private fun setEditButton() {
         binding.editButton.setButtonContent(presenter.teType) {
             enrollmentUid?.let { enrollmentUid ->
@@ -329,7 +272,7 @@ class TeiDashboardMobileActivity :
         super.onDestroy()
     }
 
-    override fun openSyncDialog() {
+    fun openSyncDialog() {
         enrollmentUid?.let { enrollmentUid ->
             SyncStatusDialog.Builder()
                 .withContext(this, null)
@@ -396,12 +339,12 @@ class TeiDashboardMobileActivity :
                         binding.relationshipMapIcon.visibility = View.GONE
                     }
                     if (pageType == DashboardPageType.TEI_DETAIL && programUid != null) {
-                        binding.toolbarTitle?.visibility = View.GONE
-                        binding.editButton?.visibility = View.VISIBLE
+                        binding.toolbarTitle.visibility = View.GONE
+                        binding.editButton.visibility = View.VISIBLE
                         binding.syncButton.visibility = View.GONE
                     } else {
-                        binding.toolbarTitle?.visibility = View.VISIBLE
-                        binding.editButton?.visibility = View.GONE
+                        binding.toolbarTitle.visibility = View.VISIBLE
+                        binding.editButton.visibility = View.GONE
                         binding.syncButton.visibility = View.VISIBLE
                     }
                     binding.navigationBar.selectItemAt(position)
@@ -776,35 +719,6 @@ class TeiDashboardMobileActivity :
         startActivity(intent)
     }
 
-    override fun finishActivity() {
-        finish()
-    }
-
-    override fun restoreAdapter(programUid: String, teiUid: String, enrollmentUid: String) {
-        startActivity(
-            intent(
-                this,
-                teiUid,
-                programUid,
-                enrollmentUid,
-            ),
-        )
-    }
-
-    override fun executeOnUIThread() {
-        activity.runOnUiThread {
-            showDescription(getString(R.string.error_applying_rule_effects))
-        }
-    }
-
-    override fun getContext(): Context {
-        return this
-    }
-
-    override fun activityTeiUid(): String? {
-        return teiUid
-    }
-
     companion object {
         private const val TEI_SYNC = "SYNC_TEI"
 
diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/indicators/BaseIndicatorRepository.kt b/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/indicators/BaseIndicatorRepository.kt
index 905d1f79f2..623fd92494 100644
--- a/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/indicators/BaseIndicatorRepository.kt
+++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/indicators/BaseIndicatorRepository.kt
@@ -81,17 +81,16 @@ abstract class BaseIndicatorRepository(
                     .get()
             }
             .flatMapPublisher { ruleAction ->
-                if (ruleAction.isEmpty()) {
-                    return@flatMapPublisher Flowable.just<List<AnalyticsModel>>(listOf())
+                return@flatMapPublisher if (ruleAction.isEmpty()) {
+                    Flowable.just<List<AnalyticsModel>>(listOf())
                 } else {
-                    return@flatMapPublisher Flowable.fromCallable {
+                    Flowable.fromCallable {
                         ruleEngineHelper?.refreshContext()
                         ruleEngineHelper?.evaluate().let { Result.success(it ?: emptyList()) }
+                    }.map { effects ->
+                        // Restart rule engine to take into account value changes
+                        applyRuleEffectForIndicators(effects)
                     }
-                        .map { effects ->
-                            // Restart rule engine to take into account value changes
-                            applyRuleEffectForIndicators(effects)
-                        }
                 }
             }
 
@@ -113,7 +112,7 @@ abstract class BaseIndicatorRepository(
                             .displayName((ruleAction).content())
                             .build(),
                         ruleEffect.data,
-                        "",
+                        null,
                         ruleAction.values["location"] ?: default_location,
                         resourceManager.defaultIndicatorLabel(),
                     )
@@ -126,7 +125,7 @@ abstract class BaseIndicatorRepository(
                             .displayName(resourceManager.defaultIndicatorLabel())
                             .build(),
                         "${ruleAction.content() ?: ""}${ruleEffect.data}",
-                        "",
+                        null,
                         ruleAction.values["location"] ?: default_location,
                         resourceManager.defaultIndicatorLabel(),
                     )
@@ -142,30 +141,32 @@ abstract class BaseIndicatorRepository(
     private fun getLegendColorForIndicator(
         indicator: ProgramIndicator,
         value: String?,
-    ): Observable<Trio<ProgramIndicator?, String?, String?>?>? {
-        var color: String
+    ): Observable<Trio<ProgramIndicator?, String?, String?>?> {
+        var color: String?
         try {
             color = if (value?.toFloat()?.isNaN() == true) {
-                ""
+                null
             } else {
                 indicator.legendSets()?.let {
+                    val uid = it.first().uid()
+                    val legendValue = value?.toDouble() ?: 0.0
                     if (it.isNotEmpty()) {
-                        val legends = d2.legendSetModule().legends().byStartValue()
-                            .smallerThan(value?.toDouble() ?: 0.0).byEndValue()
-                            .biggerThan(value?.toDouble() ?: 0.0)
-                            .byLegendSet().eq(it.first().uid()).blockingGet()
+                        val legends = d2.legendSetModule().legends()
+                            .byStartValue().smallerThan(legendValue)
+                            .byEndValue().biggerOrEqualTo(legendValue)
+                            .byLegendSet().eq(uid).blockingGet()
                         if (legends.isNotEmpty()) {
                             legends.first().color() ?: ""
                         } else {
-                            ""
+                            null
                         }
                     } else {
-                        ""
+                        null
                     }
-                } ?: ""
+                }
             }
         } catch (e: java.lang.Exception) {
-            color = ""
+            color = null
         }
 
         return Observable.just(
@@ -198,17 +199,24 @@ abstract class BaseIndicatorRepository(
                     },
                 )
             }.sortedBy { (it as IndicatorModel).programIndicator?.displayName() }
-            if (indicatorList.isNotEmpty() && charts.isNotEmpty()) {
-                add(SectionTitle(resourceManager.sectionChartsAndIndicators()))
-                add(SectionTitle(resourceManager.sectionIndicators(), SectionType.SUBSECTION))
-                addAll(indicatorList)
-                addAll(charts)
-            } else if (indicatorList.isNotEmpty() && charts.isEmpty()) {
-                add(SectionTitle(resourceManager.sectionIndicators()))
-                addAll(indicatorList)
-            } else if (indicatorList.isEmpty() && charts.isNotEmpty()) {
-                add(SectionTitle(resourceManager.sectionCharts()))
-                addAll(charts)
+
+            when {
+                indicatorList.isNotEmpty() && charts.isNotEmpty() -> {
+                    add(SectionTitle(resourceManager.sectionChartsAndIndicators()))
+                    add(SectionTitle(resourceManager.sectionIndicators(), SectionType.SUBSECTION))
+                    addAll(indicatorList)
+                    addAll(charts)
+                }
+
+                indicatorList.isNotEmpty() -> {
+                    add(SectionTitle(resourceManager.sectionIndicators()))
+                    addAll(indicatorList)
+                }
+
+                charts.isNotEmpty() -> {
+                    add(SectionTitle(resourceManager.sectionCharts()))
+                    addAll(charts)
+                }
             }
         }
     }
diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/relationships/RelationshipRepositoryImpl.kt b/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/relationships/RelationshipRepositoryImpl.kt
index eb27e6d2ac..4723115dbb 100644
--- a/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/relationships/RelationshipRepositoryImpl.kt
+++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/relationships/RelationshipRepositoryImpl.kt
@@ -23,6 +23,7 @@ import org.hisp.dhis.android.core.relationship.RelationshipItemEvent
 import org.hisp.dhis.android.core.relationship.RelationshipItemTrackedEntityInstance
 import org.hisp.dhis.android.core.relationship.RelationshipType
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
+import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor
 
 class RelationshipRepositoryImpl(
     private val d2: D2,
@@ -357,11 +358,11 @@ class RelationshipRepositoryImpl(
                 val event = d2.eventModule().events().uid(uid).blockingGet()
                 val program = d2.programModule().programs().uid(event?.program()).blockingGet()
                 if (program?.programType() == ProgramType.WITHOUT_REGISTRATION) {
-                    metadataIconProvider.invoke(program.style())
+                    metadataIconProvider.invoke(program.style(), SurfaceColor.Primary)
                 } else {
                     val programStage =
                         d2.programModule().programStages().uid(event?.programStage()).blockingGet()
-                    metadataIconProvider(programStage!!.style())
+                    metadataIconProvider(programStage!!.style(), SurfaceColor.Primary)
                 }
             }
             RelationshipOwnerType.TEI -> {
@@ -369,7 +370,7 @@ class RelationshipRepositoryImpl(
                     .uid(uid).blockingGet()
                 val teType = d2.trackedEntityModule().trackedEntityTypes()
                     .uid(tei?.trackedEntityType()).blockingGet()
-                return metadataIconProvider(teType!!.style())
+                return metadataIconProvider(teType!!.style(), SurfaceColor.Primary)
             }
         }
     }
diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TEIDataContracts.kt b/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TEIDataContracts.kt
index f9be500af1..27893cf19d 100644
--- a/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TEIDataContracts.kt
+++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TEIDataContracts.kt
@@ -11,7 +11,6 @@ import org.dhis2.commons.data.EventViewModel
 import org.dhis2.commons.data.StageSection
 import org.dhis2.form.model.EventMode
 import org.dhis2.usescases.general.AbstractActivityContracts
-import org.hisp.dhis.android.core.enrollment.Enrollment
 import org.hisp.dhis.android.core.program.Program
 import org.hisp.dhis.android.core.program.ProgramStage
 
@@ -22,7 +21,6 @@ class TEIDataContracts {
         fun displayScheduleEvent()
         fun showDialogCloseProgram()
         fun areEventsCompleted(): Consumer<Single<Boolean>>
-        fun switchFollowUp(followUp: Boolean)
         fun displayGenerateEvent(eventUid: String)
         fun restoreAdapter(programUid: String, teiUid: String, enrollmentUid: String)
         fun openEventDetails(intent: Intent, options: ActivityOptionsCompat)
@@ -30,11 +28,8 @@ class TEIDataContracts {
         fun openEventCapture(intent: Intent)
         fun observeStageSelection(
             currentProgram: Program,
-            currentEnrollment: Enrollment,
         ): Flowable<StageSection>
 
-        fun setEnrollmentData(program: Program?, enrollment: Enrollment?)
-
         fun showSyncDialog(eventUid: String, enrollmentUid: String)
         fun displayCatComboOptionSelectorForEvents(data: List<EventViewModel>)
 
diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TEIDataFragment.kt b/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TEIDataFragment.kt
index 7753421b8c..49daa770b8 100644
--- a/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TEIDataFragment.kt
+++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TEIDataFragment.kt
@@ -12,7 +12,6 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.core.app.ActivityOptionsCompat
-import androidx.databinding.ObservableBoolean
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.map
@@ -61,7 +60,6 @@ import org.dhis2.usescases.teiDashboard.ui.mapper.TeiDashboardCardMapper
 import org.dhis2.usescases.teiDashboard.ui.model.InfoBarType
 import org.dhis2.usescases.teiDashboard.ui.model.TimelineEventsHeaderModel
 import org.dhis2.utils.granularsync.SyncStatusDialog
-import org.hisp.dhis.android.core.enrollment.Enrollment
 import org.hisp.dhis.android.core.enrollment.EnrollmentStatus
 import org.hisp.dhis.android.core.program.Program
 import org.hisp.dhis.android.core.program.ProgramStage
@@ -96,15 +94,17 @@ class TEIDataFragment : FragmentGlobalAbstract(), TEIDataContracts.View {
     private var eventAdapter: EventAdapter? = null
     private var dialog: CustomDialog? = null
     private var programStageFromEvent: ProgramStage? = null
-    private val followUp = ObservableBoolean(false)
     private var eventCatComboOptionSelector: EventCatComboOptionSelector? = null
     private val dashboardViewModel: DashboardViewModel by activityViewModels()
-    private val dashboardActivity: TEIDataActivityContract by lazy { context as TEIDataActivityContract }
+    private val dashboardActivity: TeiDashboardMobileActivity by lazy { context as TeiDashboardMobileActivity }
+
+    private var showAllEnrollment = false
+    private var programUid: String? = null
 
     override fun onAttach(context: Context) {
         super.onAttach(context)
         with(requireArguments()) {
-            val programUid = getString("PROGRAM_UID")
+            programUid = getString("PROGRAM_UID")
             val teiUid = getString("TEI_UID")
                 ?: throw NullPointerException("A TEI uid is required to launch fragment")
             val enrollmentUid = getString("ENROLLMENT_UID") ?: ""
@@ -139,6 +139,7 @@ class TEIDataFragment : FragmentGlobalAbstract(), TEIDataContracts.View {
                 }
                 noEnrollmentSelected.observe(viewLifecycleOwner) { noEnrollmentSelected ->
                     if (noEnrollmentSelected) {
+                        showAllEnrollment = true
                         showLegacyCard(dashboardModel.value as DashboardTEIModel)
                     } else {
                         showDetailCard()
@@ -223,8 +224,8 @@ class TEIDataFragment : FragmentGlobalAbstract(), TEIDataContracts.View {
                     programsCallback = {
                         startActivity(
                             TeiDashboardMobileActivity.intent(
-                                dashboardActivity.getContext(),
-                                dashboardActivity.activityTeiUid(),
+                                dashboardActivity.context,
+                                dashboardActivity.teiUid,
                                 null,
                                 null,
                             ),
@@ -295,6 +296,9 @@ class TEIDataFragment : FragmentGlobalAbstract(), TEIDataContracts.View {
     override fun onResume() {
         super.onResume()
         presenter.init()
+        if (!showAllEnrollment) {
+            dashboardViewModel.updateDashboard()
+        }
     }
 
     override fun onPause() {
@@ -302,17 +306,6 @@ class TEIDataFragment : FragmentGlobalAbstract(), TEIDataContracts.View {
         super.onPause()
     }
 
-    override fun setEnrollmentData(program: Program?, enrollment: Enrollment?) {
-        enrollment?.let {
-            followUp.set(
-                when (enrollment.followUp()) {
-                    true -> true
-                    else -> false
-                },
-            )
-        }
-    }
-
     private fun openChooser(value: String, action: String) {
         val intent = Intent(action).apply {
             when (action) {
@@ -337,7 +330,6 @@ class TEIDataFragment : FragmentGlobalAbstract(), TEIDataContracts.View {
 
     override fun observeStageSelection(
         currentProgram: Program,
-        currentEnrollment: Enrollment,
     ): Flowable<StageSection> {
         if (eventAdapter == null) {
             eventAdapter = EventAdapter(
@@ -345,7 +337,6 @@ class TEIDataFragment : FragmentGlobalAbstract(), TEIDataContracts.View {
                 currentProgram,
                 colorUtils,
                 cardMapper,
-                initialSelectedEventUid = dashboardViewModel.selectedEventUid().value,
             )
             binding.teiRecycler.adapter = eventAdapter
         }
@@ -409,7 +400,11 @@ class TEIDataFragment : FragmentGlobalAbstract(), TEIDataContracts.View {
                 R.string.event_label_completed,
                 programStageFromEvent?.uid(),
             ),
-            getString(R.string.complete_enrollment_message),
+            resourceManager.formatWithEnrollmentLabel(
+                programUid = programUid,
+                stringResource = R.string.complete_enrollment_message_V2,
+                quantity = 1,
+            ),
             getString(R.string.button_ok),
             getString(R.string.cancel),
             RC_EVENTS_COMPLETED,
@@ -455,41 +450,37 @@ class TEIDataFragment : FragmentGlobalAbstract(), TEIDataContracts.View {
         return this.viewLifecycleOwner
     }
 
-    override fun switchFollowUp(followUp: Boolean) {
-        this.followUp.set(followUp)
-    }
-
     override fun displayGenerateEvent(eventUid: String) {
         presenter.displayGenerateEvent(eventUid)
         dashboardViewModel.updateEventUid(null)
     }
 
     override fun restoreAdapter(programUid: String, teiUid: String, enrollmentUid: String) {
-        dashboardActivity.restoreAdapter(programUid, teiUid, enrollmentUid)
-        dashboardActivity.finishActivity()
+        dashboardActivity.startActivity(
+            TeiDashboardMobileActivity.intent(
+                activity,
+                teiUid,
+                programUid,
+                enrollmentUid,
+            ),
+        )
+        dashboardActivity.finish()
     }
 
     override fun openEventDetails(intent: Intent, options: ActivityOptionsCompat) =
-        contractHandler.scheduleEvent(intent, options).observe(this.viewLifecycleOwner) {
+        contractHandler.scheduleEvent(intent, options).observe(viewLifecycleOwner) {
             updateEnrollment(true)
         }
 
     override fun openEventInitial(intent: Intent) =
-        contractHandler.editEvent(intent).observe(this.viewLifecycleOwner) {
+        contractHandler.editEvent(intent).observe(viewLifecycleOwner) {
             updateEnrollment(true)
         }
 
-    override fun openEventCapture(intent: Intent) {
-        if (dashboardActivity is TeiDashboardMobileActivity) {
-            contractHandler.editEvent(intent).observe(this.viewLifecycleOwner) {
-                updateEnrollment(true)
-            }
-        }
-        if (dashboardActivity is EventCaptureActivity) {
-            val selectedEventUid = intent.getStringExtra(Constants.EVENT_UID)
-            dashboardViewModel.updateSelectedEventUid(selectedEventUid)
+    override fun openEventCapture(intent: Intent) =
+        contractHandler.editEvent(intent).observe(viewLifecycleOwner) {
+            updateEnrollment(true)
         }
-    }
 
     override fun goToEventInitial(
         eventCreationType: EventCreationType,
@@ -516,9 +507,7 @@ class TEIDataFragment : FragmentGlobalAbstract(), TEIDataContracts.View {
             bundle.putString(Constants.PROGRAM_STAGE_UID, programStage.uid())
             bundle.putInt(Constants.EVENT_SCHEDULE_INTERVAL, programStage.standardInterval() ?: 0)
             intent.putExtras(bundle)
-            contractHandler.createEvent(intent).observe(this.viewLifecycleOwner) {
-                updateEnrollment(true)
-            }
+            contractHandler.createEvent(intent)
         }
     }
 
@@ -582,7 +571,9 @@ class TEIDataFragment : FragmentGlobalAbstract(), TEIDataContracts.View {
     }
 
     override fun showProgramRuleErrorMessage() {
-        dashboardActivity.executeOnUIThread()
+        dashboardActivity.runOnUiThread {
+            showDescription(getString(R.string.error_applying_rule_effects))
+        }
     }
 
     override fun updateEnrollment(update: Boolean) {
@@ -593,7 +584,6 @@ class TEIDataFragment : FragmentGlobalAbstract(), TEIDataContracts.View {
     }
 
     companion object {
-        const val RC_GENERATE_EVENT = 1501
         const val RC_EVENTS_COMPLETED = 1601
         const val PREF_COMPLETED_EVENT = "COMPLETED_EVENT"
 
diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TEIDataModule.kt b/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TEIDataModule.kt
index e4bccc4316..456ca6e8a3 100644
--- a/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TEIDataModule.kt
+++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TEIDataModule.kt
@@ -4,6 +4,7 @@ import androidx.activity.result.ActivityResultRegistry
 import dagger.Module
 import dagger.Provides
 import org.dhis2.commons.data.EntryMode
+import org.dhis2.commons.date.DateUtils
 import org.dhis2.commons.di.dagger.PerFragment
 import org.dhis2.commons.network.NetworkUtils
 import org.dhis2.commons.reporting.CrashReportController
@@ -171,11 +172,16 @@ class TEIDataModule(
     fun provideCreateEventUseCase(
         dispatcherProvider: DispatcherProvider,
         d2: D2,
+        dateUtils: DateUtils,
     ) = CreateEventUseCase(
         dispatcher = dispatcherProvider,
         d2 = d2,
+        dateUtils = dateUtils,
     )
 
     @Provides
     fun provideD2ErrorUtils() = D2ErrorUtils(view.context, NetworkUtils(view.context))
+
+    @Provides
+    fun provideDateUtils() = DateUtils.getInstance()
 }
diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TEIDataPresenter.kt b/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TEIDataPresenter.kt
index 7bd0464cfc..7216e851ba 100644
--- a/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TEIDataPresenter.kt
+++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TEIDataPresenter.kt
@@ -10,12 +10,10 @@ import androidx.lifecycle.MutableLiveData
 import io.reactivex.Completable
 import io.reactivex.Flowable
 import io.reactivex.Observable
-import io.reactivex.Single
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.processors.BehaviorProcessor
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
-import org.dhis2.R
 import org.dhis2.commons.Constants
 import org.dhis2.commons.bindings.canCreateEventInEnrollment
 import org.dhis2.commons.bindings.enrollment
@@ -39,23 +37,19 @@ import org.dhis2.usescases.eventsWithoutRegistration.eventCapture.EventCaptureAc
 import org.dhis2.usescases.eventsWithoutRegistration.eventInitial.EventInitialActivity
 import org.dhis2.usescases.programEventDetail.usecase.CreateEventUseCase
 import org.dhis2.usescases.programStageSelection.ProgramStageSelectionActivity
-import org.dhis2.usescases.teiDashboard.DashboardProgramModel
 import org.dhis2.usescases.teiDashboard.DashboardRepository
 import org.dhis2.usescases.teiDashboard.dashboardfragments.teidata.TeiDataIdlingResourceSingleton.decrement
 import org.dhis2.usescases.teiDashboard.dashboardfragments.teidata.TeiDataIdlingResourceSingleton.increment
 import org.dhis2.usescases.teiDashboard.domain.GetNewEventCreationTypeOptions
 import org.dhis2.usescases.teiDashboard.ui.EventCreationOptions
 import org.dhis2.utils.Result
-import org.dhis2.utils.analytics.ACTIVE_FOLLOW_UP
 import org.dhis2.utils.analytics.AnalyticsHelper
 import org.dhis2.utils.analytics.CREATE_EVENT_TEI
-import org.dhis2.utils.analytics.FOLLOW_UP
 import org.dhis2.utils.analytics.TYPE_EVENT_TEI
 import org.hisp.dhis.android.core.D2
 import org.hisp.dhis.android.core.enrollment.Enrollment
 import org.hisp.dhis.android.core.enrollment.EnrollmentStatus
 import org.hisp.dhis.android.core.event.EventStatus
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
 import org.hisp.dhis.android.core.program.Program
 import org.hisp.dhis.android.core.program.ProgramStage
 import org.hisp.dhis.rules.models.RuleEffect
@@ -92,14 +86,10 @@ class TEIDataPresenter(
     private val _events: MutableLiveData<List<EventViewModel>> = MutableLiveData()
     val events: LiveData<List<EventViewModel>> = _events
 
-    private val _totalTimeLineEvents: MutableLiveData<Int> = MutableLiveData()
-    val totalTimeLineEvents: LiveData<Int> = _totalTimeLineEvents
-
     fun init() {
         programUid?.let {
             val program = d2.program(it) ?: throw NullPointerException()
-            val enrollment = d2.enrollment(enrollmentUid) ?: throw NullPointerException()
-            val sectionFlowable = view.observeStageSelection(program, enrollment)
+            val sectionFlowable = view.observeStageSelection(program)
                 .startWith(StageSection("", false, false))
                 .map { (stageUid, showOptions, showAllEvents) ->
                     currentStage = if (stageUid == currentStage && !showOptions) "" else stageUid
@@ -131,53 +121,38 @@ class TEIDataPresenter(
                                 events,
                                 calcResult,
                             )
-                        }
+                        }.subscribeOn(schedulerProvider.io())
                     }
                     .subscribeOn(schedulerProvider.io())
                     .observeOn(schedulerProvider.ui())
                     .subscribe(
                         { events ->
                             _events.postValue(events)
-                            _totalTimeLineEvents.postValue(
-                                events.firstOrNull()?.eventCount
-                                    ?: 0,
-                            )
                             decrement()
                         },
                         Timber.Forest::d,
                     ),
             )
-            compositeDisposable.add(
-                Single.zip(
-                    teiDataRepository.getEnrollment(),
-                    teiDataRepository.getEnrollmentProgram(),
-                ) { val0, val1 -> Pair(val0, val1) }
-                    .subscribeOn(schedulerProvider.io())
-                    .observeOn(schedulerProvider.ui())
-                    .subscribe({ data ->
-                        view.setEnrollmentData(
-                            data.second,
-                            data.first,
-                        )
-                    }, Timber.Forest::e),
-            )
+
             getEventsWithoutCatCombo()
         } ?: run {
-            view.setEnrollmentData(null, null)
             _shouldDisplayEventCreationButton.value = false
         }
 
-        updateCreateEventButtonVisibility(dashboardRepository.getGrouping())
+        updateCreateEventButtonVisibility()
     }
 
     @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
-    fun updateCreateEventButtonVisibility(isGrouping: Boolean) {
-        val enrollment = d2.enrollment(enrollmentUid)
-        val showButton =
-            enrollment != null &&
-                !isGrouping && enrollment.status() == EnrollmentStatus.ACTIVE &&
-                canAddNewEvents()
-        _shouldDisplayEventCreationButton.value = showButton
+    fun updateCreateEventButtonVisibility() {
+        CoroutineScope(dispatcher.io()).launch {
+            val isGrouping = dashboardRepository.getGrouping()
+            val enrollment = d2.enrollment(enrollmentUid)
+            val showButton =
+                enrollment != null &&
+                    !isGrouping && enrollment.status() == EnrollmentStatus.ACTIVE &&
+                    canAddNewEvents()
+            _shouldDisplayEventCreationButton.postValue(showButton)
+        }
     }
 
     private fun applyEffects(
@@ -284,22 +259,6 @@ class TEIDataPresenter(
         }
     }
 
-    fun onFollowUp(dashboardProgramModel: DashboardProgramModel) {
-        val followup =
-            dashboardRepository.setFollowUp(dashboardProgramModel.currentEnrollment.uid())
-        analyticsHelper.setEvent(ACTIVE_FOLLOW_UP, java.lang.Boolean.toString(followup), FOLLOW_UP)
-        view.showToast(
-            if (followup) {
-                view.context.getString(R.string.follow_up_enabled)
-            } else {
-                view.context.getString(
-                    R.string.follow_up_disabled,
-                )
-            },
-        )
-        view.switchFollowUp(followup)
-    }
-
     fun onEventCreationClick(eventCreationId: Int) {
         createEventInEnrollment(eventCreationOptionsMapper.getActionType(eventCreationId))
     }
@@ -398,7 +357,7 @@ class TEIDataPresenter(
     fun onGroupingChanged(shouldGroupBool: Boolean) {
         programUid?.let {
             groupingProcessor.onNext(shouldGroupBool)
-            updateCreateEventButtonVisibility(shouldGroupBool)
+            updateCreateEventButtonVisibility()
         }
     }
 
@@ -406,12 +365,8 @@ class TEIDataPresenter(
         view.showSyncDialog(eventUid, enrollmentUid)
     }
 
-    fun enrollmentOrgUnitInCaptureScope(enrollmentOrgUnit: String): Boolean {
-        return !d2.organisationUnitModule().organisationUnits()
-            .byOrganisationUnitScope(OrganisationUnit.Scope.SCOPE_DATA_CAPTURE)
-            .byUid().eq(enrollmentOrgUnit)
-            .blockingIsEmpty()
-    }
+    fun enrollmentOrgUnitInCaptureScope(enrollmentOrgUnit: String) =
+        teiDataRepository.enrollmentOrgUnitInCaptureScope(enrollmentOrgUnit)
 
     private fun canAddNewEvents(): Boolean {
         return d2.canCreateEventInEnrollment(enrollmentUid, stagesToHide)
@@ -425,7 +380,7 @@ class TEIDataPresenter(
         if (stage != null) {
             when (eventCreationType) {
                 EventCreationType.ADDNEW -> programUid?.let { program ->
-                    view.displayOrgUnitSelectorForNewEvent(program, stage.uid())
+                    checkOrgUnitCount(program, stage.uid())
                 }
 
                 else -> view.goToEventInitial(eventCreationType, stage)
@@ -462,14 +417,15 @@ class TEIDataPresenter(
                     } == true
             }.sortedBy { stage -> stage.sortOrder() }
 
-    fun isEventEditable(eventUid: String): Boolean {
-        return teiDataRepository.isEventEditable(eventUid)
-    }
-
-    fun displayOrganisationUnit(): Boolean {
-        return programUid?.let {
-            teiDataRepository.displayOrganisationUnit(it)
-        } ?: false
+    fun checkOrgUnitCount(programUid: String, programStageUid: String) {
+        CoroutineScope(dispatcher.io()).launch {
+            val orgUnits = teiDataRepository.programOrgListInCaptureScope(programUid)
+            if (orgUnits.count() == 1) {
+                onOrgUnitForNewEventSelected(orgUnits.first().uid(), programStageUid)
+            } else {
+                view.displayOrgUnitSelectorForNewEvent(programUid, programStageUid)
+            }
+        }
     }
 
     fun onOrgUnitForNewEventSelected(orgUnitUid: String, programStageUid: String) {
diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TeiDataRepository.kt b/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TeiDataRepository.kt
index 86e5073bdf..f429b0d184 100644
--- a/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TeiDataRepository.kt
+++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TeiDataRepository.kt
@@ -24,4 +24,6 @@ interface TeiDataRepository {
     fun getTeiHeader(): String?
     fun isEventEditable(eventUid: String): Boolean
     fun displayOrganisationUnit(programUid: String): Boolean
+    fun enrollmentOrgUnitInCaptureScope(enrollmentOrgUnit: String): Boolean
+    fun programOrgListInCaptureScope(programUid: String): List<OrganisationUnit>
 }
diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TeiDataRepositoryImpl.kt b/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TeiDataRepositoryImpl.kt
index b558b2cd9d..c003fc5430 100644
--- a/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TeiDataRepositoryImpl.kt
+++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TeiDataRepositoryImpl.kt
@@ -3,12 +3,14 @@ package org.dhis2.usescases.teiDashboard.dashboardfragments.teidata
 import io.reactivex.Single
 import org.dhis2.bindings.profilePicturePath
 import org.dhis2.bindings.userFriendlyValue
+import org.dhis2.commons.bindings.program
 import org.dhis2.commons.data.EventViewModel
 import org.dhis2.commons.data.EventViewModelType
 import org.dhis2.commons.data.StageSection
 import org.dhis2.commons.date.DateUtils
 import org.dhis2.commons.resources.DhisPeriodUtils
 import org.dhis2.commons.resources.MetadataIconProvider
+import org.dhis2.ui.toColor
 import org.hisp.dhis.android.core.D2
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.category.CategoryCombo
@@ -21,6 +23,7 @@ import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
 import org.hisp.dhis.android.core.period.PeriodType
 import org.hisp.dhis.android.core.program.Program
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
+import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor
 import java.util.Locale
 
 class TeiDataRepositoryImpl(
@@ -73,9 +76,11 @@ class TeiDataRepositoryImpl(
     override fun eventsWithoutCatCombo(): Single<List<EventViewModel>> {
         return getEnrollmentProgram()
             .flatMap { program ->
-                d2.categoryModule().categoryCombos().uid(program.categoryComboUid()).get()
+                d2.categoryModule().categoryCombos().uid(program.categoryComboUid()).get().map {
+                    Pair(program, it)
+                }
             }
-            .flatMap { categoryCombo ->
+            .flatMap { (program, categoryCombo) ->
                 if (categoryCombo.isDefault == true) {
                     Single.just(emptyList())
                 } else {
@@ -118,7 +123,10 @@ class TeiDataRepositoryImpl(
                                 dataElementValues = null,
                                 displayDate = null,
                                 nameCategoryOptionCombo = null,
-                                metadataIconData = metadataIconProvider(stage.style()),
+                                metadataIconData = metadataIconProvider(
+                                    stage.style(),
+                                    program.style().color()?.toColor() ?: SurfaceColor.Primary,
+                                ),
                             )
                         }
                     }
@@ -149,6 +157,7 @@ class TeiDataRepositoryImpl(
         val eventViewModels = mutableListOf<EventViewModel>()
         var eventRepo: EventCollectionRepository
         val maxEventToShow = 3
+        val program = programUid?.let { d2.program(programUid) }
 
         return d2.programModule().programStages()
             .byProgramUid().eq(programUid)
@@ -189,7 +198,10 @@ class TeiDataRepositoryImpl(
                             groupedByStage = true,
                             displayDate = null,
                             nameCategoryOptionCombo = null,
-                            metadataIconData = metadataIconProvider(programStage.style()),
+                            metadataIconData = metadataIconProvider(
+                                programStage.style(),
+                                program?.style()?.color()?.toColor() ?: SurfaceColor.Primary,
+                            ),
                         ),
                     )
                     checkEventStatus(eventList).take(
@@ -224,7 +236,10 @@ class TeiDataRepositoryImpl(
                                 ),
                                 nameCategoryOptionCombo =
                                 getCategoryComboFromOptionCombo(event.attributeOptionCombo())?.displayName(),
-                                metadataIconData = metadataIconProvider(programStage.style()),
+                                metadataIconData = metadataIconProvider(
+                                    programStage.style(),
+                                    program?.style()?.color()?.toColor() ?: SurfaceColor.Primary,
+                                ),
                             ),
                         )
                     }
@@ -247,7 +262,10 @@ class TeiDataRepositoryImpl(
                                 nameCategoryOptionCombo = null,
                                 showAllEvents = showAllEvents,
                                 maxEventsToShow = maxEventToShow,
-                                metadataIconData = metadataIconProvider(programStage.style()),
+                                metadataIconData = metadataIconProvider(
+                                    programStage.style(),
+                                    program?.style()?.color()?.toColor() ?: SurfaceColor.Primary,
+                                ),
                             ),
                         )
                     }
@@ -262,6 +280,7 @@ class TeiDataRepositoryImpl(
     ): Single<List<EventViewModel>> {
         val eventViewModels = mutableListOf<EventViewModel>()
         val maxEventToShow = 5
+        val program = programUid?.let { d2.program(it) }
 
         return eventRepository
             .orderByTimeline(RepositoryScope.OrderByDirection.DESC)
@@ -287,16 +306,23 @@ class TeiDataRepositoryImpl(
                                 .uid(event.organisationUnit()).blockingGet()?.displayName()
                                 ?: "",
                             catComboName = getCatOptionComboName(event.attributeOptionCombo()),
-                            dataElementValues = getEventValues(event.uid(), programStage?.uid()),
+                            dataElementValues = getEventValues(event.uid(), programStage.uid()),
                             groupedByStage = false,
                             displayDate = periodUtils.getPeriodUIString(
-                                programStage?.periodType() ?: PeriodType.Daily,
+                                programStage.periodType() ?: PeriodType.Daily,
                                 event.eventDate() ?: event.dueDate()!!,
                                 Locale.getDefault(),
                             ),
                             nameCategoryOptionCombo =
                             getCategoryComboFromOptionCombo(event.attributeOptionCombo())?.displayName(),
-                            metadataIconData = metadataIconProvider(programStage.style()),
+                            metadataIconData = metadataIconProvider(
+                                programStage.style(),
+                                program?.style()?.color()?.toColor() ?: SurfaceColor.Primary,
+                            ),
+                            editable = isEventEditable(event.uid()),
+                            displayOrgUnit = programUid?.let {
+                                displayOrganisationUnit(it)
+                            } ?: false,
                         ),
                     )
                 }
@@ -323,7 +349,10 @@ class TeiDataRepositoryImpl(
                             nameCategoryOptionCombo = null,
                             showAllEvents = showAllEvents,
                             maxEventsToShow = maxEventToShow,
-                            metadataIconData = metadataIconProvider(programStage.style()),
+                            metadataIconData = metadataIconProvider(
+                                programStage.style(),
+                                program?.style()?.color()?.toColor() ?: SurfaceColor.Primary,
+                            ),
                         ),
                     )
                 }
@@ -414,4 +443,19 @@ class TeiDataRepositoryImpl(
             .byProgramUids(listOf(programUid))
             .blockingGet().size > 1
     }
+
+    override fun enrollmentOrgUnitInCaptureScope(enrollmentOrgUnit: String): Boolean {
+        return !getOrgUnitCollectionRepositoryByCaptureScope()
+            .byUid().eq(enrollmentOrgUnit)
+            .blockingIsEmpty()
+    }
+
+    override fun programOrgListInCaptureScope(programUid: String) =
+        getOrgUnitCollectionRepositoryByCaptureScope()
+            .byProgramUids(listOf(programUid))
+            .blockingGet()
+
+    private fun getOrgUnitCollectionRepositoryByCaptureScope() =
+        d2.organisationUnitModule().organisationUnits()
+            .byOrganisationUnitScope(OrganisationUnit.Scope.SCOPE_DATA_CAPTURE)
 }
diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/teievents/EventAdapter.kt b/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/teievents/EventAdapter.kt
index 7e7313945b..96c5f854f9 100644
--- a/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/teievents/EventAdapter.kt
+++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/teievents/EventAdapter.kt
@@ -31,6 +31,8 @@ import org.dhis2.commons.resources.ColorUtils
 import org.dhis2.databinding.ItemEventBinding
 import org.dhis2.usescases.teiDashboard.dashboardfragments.teidata.TEIDataPresenter
 import org.dhis2.usescases.teiDashboard.dashboardfragments.teidata.teievents.ui.mapper.TEIEventCardMapper
+import org.hisp.dhis.android.core.event.EventStatus
+import org.dhis2.usescases.teiDashboard.dashboardfragments.teidata.teievents.ui.mapper.TEIEventCardMapper
 import org.dhis2.utils.isLandscape
 import org.hisp.dhis.android.core.event.EventStatus
 import org.hisp.dhis.android.core.program.Program
@@ -132,7 +134,7 @@ class EventAdapter(
                     materialView.visibility = View.GONE
                     val composeView = holder.itemView.findViewById<ComposeView>(R.id.composeView)
                     composeView.setContent {
-                        val leftSpacing = if (it.groupedByStage == true) Spacing.Spacing56 else Spacing.Spacing16
+                        val leftSpacing = if (it.groupedByStage == true) Spacing.Spacing64 else Spacing.Spacing16
                         val bottomSpacing = if (it.showBottomShadow) {
                             Spacing.Spacing16
                         } else {
@@ -140,10 +142,8 @@ class EventAdapter(
                         }
                         val card = cardMapper.map(
                             event = it,
-                            editable = it.event?.uid()
-                                ?.let { uid -> presenter.isEventEditable(uid) } ?: true,
-                            displayOrgUnit = it.event?.program()
-                                ?.let { _ -> presenter.displayOrganisationUnit() } ?: true,
+                            editable = it.editable,
+                            displayOrgUnit = it.displayOrgUnit,
                             onCardClick = {
                                 it.event?.let { event ->
                                     when (event.status()) {
@@ -159,26 +159,11 @@ class EventAdapter(
                                                 event.uid(),
                                                 event.status()!!,
                                             )
-
-                                            if (isLandscape()) {
-                                                if (previousSelectedPosition != RecyclerView.NO_POSITION) {
-                                                    currentList[previousSelectedPosition].isClicked = false
-                                                    notifyItemChanged(previousSelectedPosition)
-                                                }
-                                                previousSelectedPosition = position
-                                                getItem(position).isClicked = true
-                                                notifyItemChanged(position)
-                                            }
                                         }
                                     }
                                 }
                             },
                         )
-
-                        if (it.event?.uid() == initialSelectedEventUid && previousSelectedPosition == RecyclerView.NO_POSITION) {
-                            it.isClicked = true
-                            previousSelectedPosition = position
-                        }
                         Box(
                             modifier = Modifier
                                 .padding(
@@ -208,13 +193,6 @@ class EventAdapter(
                                 shrinkLabelText = card.shrinkLabelText,
                                 onCardClick = card.onCardCLick,
                             )
-                            if (it.isClicked) {
-                                Box(
-                                    modifier = Modifier
-                                        .matchParentSize()
-                                        .background(color = SurfaceColor.Primary.copy(alpha = 0.1f), shape = RoundedCornerShape(Radius.S)),
-                                )
-                            }
                         }
                     }
 
diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/teievents/StageViewHolder.kt b/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/teievents/StageViewHolder.kt
index e0dc3d911f..a0138270a3 100644
--- a/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/teievents/StageViewHolder.kt
+++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/teievents/StageViewHolder.kt
@@ -27,6 +27,7 @@ import org.dhis2.ui.MetadataIconData
 import org.dhis2.usescases.teiDashboard.dashboardfragments.teidata.TEIDataPresenter
 import org.dhis2.usescases.teiDashboard.ui.NewEventOptions
 import org.hisp.dhis.mobile.ui.designsystem.component.Avatar
+import org.hisp.dhis.mobile.ui.designsystem.component.AvatarSize
 import org.hisp.dhis.mobile.ui.designsystem.component.AvatarStyle
 import org.hisp.dhis.mobile.ui.designsystem.component.Description
 import org.hisp.dhis.mobile.ui.designsystem.component.Title
@@ -106,7 +107,7 @@ internal class StageViewHolder(
     ) {
         Avatar(
             metadataAvatar = {
-                MetadataIcon(metadataIconData = metadataIconData)
+                MetadataIcon(metadataIconData = metadataIconData, size = AvatarSize.Large)
             },
             style = AvatarStyle.METADATA,
         )
diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/dialogs/scheduling/SchedulingViewModel.kt b/app/src/main/java/org/dhis2/usescases/teiDashboard/dialogs/scheduling/SchedulingViewModel.kt
index 94ce92a132..e261d52861 100644
--- a/app/src/main/java/org/dhis2/usescases/teiDashboard/dialogs/scheduling/SchedulingViewModel.kt
+++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/dialogs/scheduling/SchedulingViewModel.kt
@@ -61,6 +61,7 @@ class SchedulingViewModel(
             eventUid = null,
             programStageUid = programStage.value.uid(),
             fieldFactory = null,
+            eventCreationType = EventCreationType.SCHEDULE,
             onError = resourceManager::parseD2Error,
         )
         configureEventReportDate = ConfigureEventReportDate(
@@ -148,7 +149,7 @@ class SchedulingViewModel(
 
     fun onDateSet(year: Int, month: Int, day: Int) {
         val calendar = Calendar.getInstance()
-        calendar[year, month, day, 0, 0] = 0
+        calendar[year, month - 1, day, 0, 0] = 0
         calendar[Calendar.MILLISECOND] = 0
         val selectedDate = calendar.time
         setUpEventReportDate(selectedDate)
diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/teiProgramList/TeiProgramListRepositoryImpl.java b/app/src/main/java/org/dhis2/usescases/teiDashboard/teiProgramList/TeiProgramListRepositoryImpl.java
index c35959c8eb..973e128a50 100644
--- a/app/src/main/java/org/dhis2/usescases/teiDashboard/teiProgramList/TeiProgramListRepositoryImpl.java
+++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/teiProgramList/TeiProgramListRepositoryImpl.java
@@ -15,6 +15,7 @@
 import org.hisp.dhis.android.core.enrollment.EnrollmentStatus;
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit;
 import org.hisp.dhis.android.core.program.Program;
+import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/app/src/main/java/org/dhis2/usescases/troubleshooting/TroubleshootingRepository.kt b/app/src/main/java/org/dhis2/usescases/troubleshooting/TroubleshootingRepository.kt
index 151f28cd7a..f7b881d9cf 100644
--- a/app/src/main/java/org/dhis2/usescases/troubleshooting/TroubleshootingRepository.kt
+++ b/app/src/main/java/org/dhis2/usescases/troubleshooting/TroubleshootingRepository.kt
@@ -11,6 +11,7 @@ import org.hisp.dhis.android.core.program.ProgramRuleActionType
 import org.hisp.dhis.antlr.ParserExceptionWithoutContext
 import org.hisp.dhis.lib.expression.Expression
 import org.hisp.dhis.lib.expression.spi.ExpressionData
+import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor
 import org.hisp.dhis.rules.api.EnvironmentVariables.ENV_VARIABLES
 import org.hisp.dhis.rules.api.ItemValueType
 import org.hisp.dhis.rules.engine.RuleVariableValue
@@ -80,7 +81,7 @@ class TroubleshootingRepository(
             ProgramRuleValidation(
                 programUid = program.uid(),
                 programName = program.displayName() ?: program.uid(),
-                metadataIconData = metadataIconProvider(program.style()),
+                metadataIconData = metadataIconProvider(program.style(), SurfaceColor.Primary),
                 validations = validationList,
             )
         }.sortedBy { it.programName }
diff --git a/app/src/main/java/org/dhis2/utils/customviews/PeriodDialogInputPeriod.java b/app/src/main/java/org/dhis2/utils/customviews/PeriodDialogInputPeriod.java
index 6dbe31968a..00749b359b 100644
--- a/app/src/main/java/org/dhis2/utils/customviews/PeriodDialogInputPeriod.java
+++ b/app/src/main/java/org/dhis2/utils/customviews/PeriodDialogInputPeriod.java
@@ -68,11 +68,11 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
                 if ((inputPeriodModel.openingDate() == null || (inputPeriodModel.openingDate() != null && (DateUtils.getInstance().getToday().after(inputPeriodModel.openingDate()))) || DateUtils.getInstance().getToday().equals(inputPeriodModel.openingDate()))
                         && (inputPeriodModel.closingDate() == null || (inputPeriodModel.closingDate() != null && DateUtils.getInstance().getToday().before(inputPeriodModel.closingDate())))
                         && (organisationUnit == null || (organisationUnit.openingDate() == null || getCurrentDate().after(organisationUnit.openingDate())) && (organisationUnit.closedDate() == null || getCurrentDate().before(organisationUnit.closedDate())))
-                )
+                ) {
                     if (getCurrentDate().before(inputPeriodModel.endPeriodDate())) {
                         isAllowed = true;
                     }
-                else if (getCurrentDate().before(inputPeriod.get(inputPeriod.size() - 1).initialPeriodDate()) ||
+                } else if (getCurrentDate().before(inputPeriod.get(inputPeriod.size() - 1).initialPeriodDate()) ||
                         getCurrentDate().before(inputPeriodModel.initialPeriodDate()))
                     break;
                 else
diff --git a/app/src/main/java/org/dhis2/utils/granularsync/GranularSyncPresenter.kt b/app/src/main/java/org/dhis2/utils/granularsync/GranularSyncPresenter.kt
index e6c55cd5de..3c651178c5 100644
--- a/app/src/main/java/org/dhis2/utils/granularsync/GranularSyncPresenter.kt
+++ b/app/src/main/java/org/dhis2/utils/granularsync/GranularSyncPresenter.kt
@@ -77,6 +77,7 @@ class GranularSyncPresenter(
     private val smsSyncProvider: SMSSyncProvider,
 ) : ViewModel() {
 
+    private val workerName: String
     private var disposable: CompositeDisposable = CompositeDisposable()
     private lateinit var states: MutableLiveData<List<SmsSendingService.SendingStatus>>
     private lateinit var statesList: ArrayList<SmsSendingService.SendingStatus>
@@ -84,6 +85,10 @@ class GranularSyncPresenter(
     private val _currentState = MutableStateFlow<SyncUiState?>(null)
     val currentState: StateFlow<SyncUiState?> = _currentState
 
+    init {
+        workerName = workerName()
+    }
+
     private fun loadSyncInfo(forcedState: State? = null) {
         viewModelScope.launch(dispatcher.io()) {
             val syncState = async {
@@ -112,6 +117,7 @@ class GranularSyncPresenter(
             PROGRAM,
             DATA_SET,
             -> false
+
             TEI,
             EVENT,
             DATA_VALUES,
@@ -140,26 +146,21 @@ class GranularSyncPresenter(
                         )
                         .build()
                 }
+
             ALL -> { // Do nothing
             }
         }
-        var workName: String
         if (syncContext.conflictType() != ALL) {
-            workName = syncContext.recordUid()
             if (dataToDataValues == null) {
                 dataToDataValues = Data.Builder()
                     .putString(UID, syncContext.recordUid())
                     .putString(CONFLICT_TYPE, conflictTypeData!!.name)
                     .build()
-            } else {
-                workName = with(syncContext as SyncContext.DataSetInstance) {
-                    orgUnitUid + "_" + periodId + "_" + attributeOptionComboUid
-                }
             }
 
             val workerItem =
                 WorkerItem(
-                    workName,
+                    workerName,
                     WorkerType.GRANULAR,
                     data = dataToDataValues,
                     policy = ExistingWorkPolicy.KEEP,
@@ -167,10 +168,23 @@ class GranularSyncPresenter(
 
             workManagerController.beginUniqueWork(workerItem)
         } else {
-            workName = Constants.INITIAL_SYNC
             workManagerController.syncDataForWorker(Constants.DATA_NOW, Constants.INITIAL_SYNC)
         }
-        return workManagerController.getWorkInfosForUniqueWorkLiveData(workName)
+        return observeWorkInfo()
+    }
+
+    fun observeWorkInfo() =
+        workManagerController.getWorkInfosForUniqueWorkLiveData(workerName)
+
+    private fun workerName(): String {
+        return when (syncContext.conflictType()) {
+            ALL -> Constants.INITIAL_SYNC
+            DATA_VALUES -> with(syncContext as SyncContext.DataSetInstance) {
+                orgUnitUid + "_" + periodId + "_" + attributeOptionComboUid
+            }
+
+            else -> syncContext.recordUid()
+        }
     }
 
     // NO PLAY SERVICES
@@ -358,6 +372,7 @@ class GranularSyncPresenter(
                 true -> {
                     updateStatusToSyncedWithSMS()
                 }
+
                 false -> {
                     updateStatusToSentBySMS()
                 }
@@ -400,6 +415,7 @@ class GranularSyncPresenter(
             -> {
                 loadSyncInfo(State.UPLOADING)
             }
+
             WorkInfo.State.SUCCEEDED,
             WorkInfo.State.FAILED,
             WorkInfo.State.CANCELLED,
diff --git a/app/src/main/java/org/dhis2/utils/granularsync/SyncStatusDialog.kt b/app/src/main/java/org/dhis2/utils/granularsync/SyncStatusDialog.kt
index 786e279a7b..088f59c5b0 100644
--- a/app/src/main/java/org/dhis2/utils/granularsync/SyncStatusDialog.kt
+++ b/app/src/main/java/org/dhis2/utils/granularsync/SyncStatusDialog.kt
@@ -21,6 +21,7 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.viewModels
+import androidx.work.WorkInfo
 import com.google.accompanist.themeadapter.material3.Mdc3Theme
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
@@ -61,6 +62,8 @@ class SyncStatusDialog : BottomSheetDialogFragment(), GranularSyncContracts.View
 
     var syncStatusDialogNavigator: SyncStatusDialogNavigator? = null
 
+    var syncProcessListener: (WorkInfo) -> Unit = {}
+
     private var syncing: Boolean = false
 
     private var smsSenderHelper: SMSSenderHelper? = null
@@ -94,6 +97,13 @@ class SyncStatusDialog : BottomSheetDialogFragment(), GranularSyncContracts.View
         container: ViewGroup?,
         savedInstanceState: Bundle?,
     ): View {
+        viewModel.observeWorkInfo().observe(this) { workInfoList ->
+            workInfoList.firstOrNull()?.let {
+                viewModel.manageWorkInfo(it)
+                syncProcessListener(it)
+            }
+        }
+
         return ComposeView(requireContext()).apply {
             setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
             setContent {
@@ -175,6 +185,7 @@ class SyncStatusDialog : BottomSheetDialogFragment(), GranularSyncContracts.View
             networkUtils.isOnline() -> syncGranular()
             viewModel.canSendSMS() &&
                 viewModel.isSMSEnabled(context?.showSMS() == true) -> syncSms()
+
             !networkUtils.isOnline() &&
                 !viewModel.isSMSEnabled(context?.showSMS() == true) -> showSnackbar()
         }
@@ -187,11 +198,7 @@ class SyncStatusDialog : BottomSheetDialogFragment(), GranularSyncContracts.View
 
     private fun syncGranular() {
         syncing = true
-        viewModel.initGranularSync().observe(
-            this,
-        ) { workInfo ->
-            viewModel.manageWorkInfo(workInfo[0])
-        }
+        viewModel.initGranularSync()
     }
 
     private fun syncSms() {
@@ -290,6 +297,7 @@ class SyncStatusDialog : BottomSheetDialogFragment(), GranularSyncContracts.View
                 )
                 syncing = true
             }
+
             SmsSendingService.State.STARTED,
             SmsSendingService.State.CONVERTED,
             SmsSendingService.State.SENDING,
@@ -298,6 +306,7 @@ class SyncStatusDialog : BottomSheetDialogFragment(), GranularSyncContracts.View
             SmsSendingService.State.SENT,
             ->
                 syncing = true
+
             SmsSendingService.State.ITEM_NOT_READY,
             SmsSendingService.State.COUNT_NOT_ACCEPTED,
             SmsSendingService.State.WAITING_RESULT_TIMEOUT,
@@ -346,6 +355,7 @@ class SyncStatusDialog : BottomSheetDialogFragment(), GranularSyncContracts.View
         private lateinit var syncContext: SyncContext
         private var dismissListener: OnDismissListener? = null
         private var noConnectionListener: OnNoConnectionListener? = null
+        private var syncProcessStatusListener: (WorkInfo) -> Unit = {}
 
         fun withContext(
             context: FragmentActivity,
@@ -373,6 +383,11 @@ class SyncStatusDialog : BottomSheetDialogFragment(), GranularSyncContracts.View
             return this
         }
 
+        fun withSyncProcessStatusListener(syncProcessStatusListener: (WorkInfo) -> Unit): Builder {
+            this.syncProcessStatusListener = syncProcessStatusListener
+            return this
+        }
+
         fun withSyncContext(syncContext: SyncContext): Builder {
             this.syncContext = syncContext
             return this
@@ -396,6 +411,7 @@ class SyncStatusDialog : BottomSheetDialogFragment(), GranularSyncContracts.View
                 dismissListenerDialog = dismissListener
                 onNoConnectionListener = noConnectionListener
                 syncStatusDialogNavigator = navigator
+                syncProcessListener = syncProcessStatusListener
             }
         }
 
diff --git a/app/src/main/res/layout/activity_event_capture.xml b/app/src/main/res/layout/activity_event_capture.xml
index b6edbfe393..b6a62c437b 100644
--- a/app/src/main/res/layout/activity_event_capture.xml
+++ b/app/src/main/res/layout/activity_event_capture.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <data>
+
         <variable
             name="presenter"
             type="org.dhis2.usescases.eventsWithoutRegistration.eventCapture.EventCaptureContract.Presenter" />
@@ -61,44 +62,30 @@
                 android:id="@+id/programStageName"
                 style="@style/TextPrimary"
                 android:layout_width="0dp"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:layout_marginStart="12dp"
-                android:layout_marginTop="9dp"
+                android:gravity="center_vertical"
                 android:maxLines="1"
                 android:textColor="?colorAccent"
-                app:layout_constraintBottom_toTopOf="@+id/eventSecundaryInfo"
+                android:textSize="22sp"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@id/syncButton"
                 app:layout_constraintStart_toEndOf="@id/buttonBack"
                 app:layout_constraintTop_toTopOf="parent"
                 tools:text="Program Stage Name" />
 
-            <TextView
-                android:id="@+id/eventSecundaryInfo"
-                style="@style/TextSecondary"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:layout_marginBottom="9dp"
-                android:maxLines="1"
-                android:textColor="?colorAccent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@id/syncButton"
-                app:layout_constraintStart_toEndOf="@id/buttonBack"
-                app:layout_constraintTop_toBottomOf="@+id/programStageName"
-                tools:text="2018-01-07|Org Unit|Cat Option" />
-
             <ImageView
                 android:id="@+id/syncButton"
                 style="@style/ActionIcon"
                 android:onClick="showMoreOptions"
                 android:visibility="gone"
-                app:layout_constraintEnd_toStartOf="@id/completion"
                 app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/completion"
                 app:layout_constraintTop_toTopOf="parent"
                 app:srcCompat="@drawable/ic_sync"
                 app:tint="?colorOnPrimary"
                 tools:ignore="ContentDescription"
-                tools:visibility="visible"/>
+                tools:visibility="visible" />
 
             <androidx.constraintlayout.widget.Guideline
                 android:id="@+id/guideline"
@@ -114,7 +101,7 @@
                 android:layout_height="wrap_content"
                 android:indeterminate="true"
                 android:padding="0dp"
-                app:layout_constraintTop_toBottomOf="@id/guideline"/>
+                app:layout_constraintTop_toBottomOf="@id/guideline" />
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <View
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 9d25b41ef1..d40c34c775 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -277,7 +277,7 @@
                     android:text="@string/manage_accounts"
                     android:onClick="@{() -> presenter.onManageAccountClicked()}"
                     android:visibility="@{presenter.hasAccounts ? View.VISIBLE : View.GONE }"
-                    app:layout_constraintTop_toBottomOf="@id/login"
+                    app:layout_constraintTop_toBottomOf="@id/loginOpenId"
                     tools:text="Manage Accounts" />
 
                 <com.google.android.material.button.MaterialButton
@@ -287,6 +287,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="6dp"
                     android:visibility="gone"
+                    tools:visibility="visible"
                     app:icon="@drawable/ic_dhis"
                     app:layout_constraintTop_toBottomOf="@id/login"
                     tools:text="Log in with google" />
diff --git a/app/src/main/res/layout/fragment_indicators.xml b/app/src/main/res/layout/fragment_indicators.xml
index a5225f4116..cd96abe1a2 100644
--- a/app/src/main/res/layout/fragment_indicators.xml
+++ b/app/src/main/res/layout/fragment_indicators.xml
@@ -10,7 +10,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/white">
+        android:background="@drawable/ic_front_home_backdrop_bg">
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/indicators_recycler"
@@ -18,8 +18,8 @@
             android:layout_height="0dp"
             android:layout_marginStart="16dp"
             android:layout_marginEnd="16dp"
-            android:paddingBottom="200dp"
             android:clipToPadding="false"
+            android:paddingBottom="200dp"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/fragment_notes.xml b/app/src/main/res/layout/fragment_notes.xml
index 0bc22456f4..15b103e129 100644
--- a/app/src/main/res/layout/fragment_notes.xml
+++ b/app/src/main/res/layout/fragment_notes.xml
@@ -9,9 +9,9 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/notesContainer"
-        android:background="@color/white"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:background="@drawable/ic_front_home_backdrop_bg">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/no_permission_layout"
@@ -62,8 +62,8 @@
                 android:id="@+id/notes_recycler"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
-                android:paddingBottom="50dp"
                 android:clipToPadding="false"
+                android:paddingBottom="50dp"
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                 tools:listitem="@layout/item_note" />
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
diff --git a/app/src/main/res/layout/fragment_relationships.xml b/app/src/main/res/layout/fragment_relationships.xml
index 5a438fe3c2..f5faa61b64 100644
--- a/app/src/main/res/layout/fragment_relationships.xml
+++ b/app/src/main/res/layout/fragment_relationships.xml
@@ -3,16 +3,12 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <data>
-
-    </data>
-
 
     <org.dhis2.utils.dialFloatingActionButton.DialFloatingActionButtonLayout
         android:id="@+id/dialFabLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/white"
+        android:background="@drawable/ic_front_home_backdrop_bg"
         app:clipCorners="@{16}"
         app:fab_extra_bottom_margin="@{16}">
 
diff --git a/app/src/main/res/layout/item_dataset.xml b/app/src/main/res/layout/item_dataset.xml
index 5508844bf8..3c1c8778f2 100644
--- a/app/src/main/res/layout/item_dataset.xml
+++ b/app/src/main/res/layout/item_dataset.xml
@@ -26,10 +26,7 @@
         <androidx.compose.ui.platform.ComposeView
             android:id="@+id/composeView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingLeft="@dimen/dp_8"
-            android:paddingRight="@dimen/dp_8"
-            android:paddingBottom="@dimen/dp_8" />
+            android:layout_height="wrap_content" />
 
         <com.google.android.material.card.MaterialCardView
             android:id="@+id/cardView"
diff --git a/app/src/main/res/layout/item_search_tracked_entity.xml b/app/src/main/res/layout/item_search_tracked_entity.xml
index ac482fd8b7..c13d15e919 100644
--- a/app/src/main/res/layout/item_search_tracked_entity.xml
+++ b/app/src/main/res/layout/item_search_tracked_entity.xml
@@ -399,10 +399,7 @@
         <androidx.compose.ui.platform.ComposeView
             android:id="@+id/composeView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingLeft="@dimen/dp_8"
-            android:paddingRight="@dimen/dp_8"
-            android:paddingBottom="@dimen/dp_8"/>
+            android:layout_height="wrap_content"/>
     </LinearLayout>
 
 </layout>
diff --git a/app/src/main/res/layout/section_selector_fragment.xml b/app/src/main/res/layout/section_selector_fragment.xml
index 874479f946..2156c9b390 100644
--- a/app/src/main/res/layout/section_selector_fragment.xml
+++ b/app/src/main/res/layout/section_selector_fragment.xml
@@ -17,15 +17,15 @@
             android:id="@+id/formViewContainer"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:background="@drawable/ic_front_home_backdrop_bg"
             android:clipToPadding="false"
-            android:background="@color/form_field_background"
-            app:layout_constraintBottom_toBottomOf="parent"/>
+            app:layout_constraintBottom_toBottomOf="parent" />
 
         <FrameLayout
             android:id="@+id/header"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:layout_constraintTop_toTopOf="parent"/>
+            app:layout_constraintTop_toTopOf="parent" />
 
 
         <ProgressBar
@@ -58,8 +58,7 @@
             android:id="@+id/editableReasonContainer"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:layout_constraintBottom_toBottomOf="parent"
-            />
+            app:layout_constraintBottom_toBottomOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8d438e4523..63608905d2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -46,7 +46,7 @@
     <string name="add_new">Add new</string>
     <string name="add">Add</string>
     <string name="enter_event_data">Enter %s</string>
-    <string name="enter_cancel_event_data">Enter / Cancel %s</string>
+    <string name="enter_cancel_event_data">Enter / Skip %s</string>
     <string name="schedule_new">Schedule new</string>
     <string name="lorem" translatable="false">Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat</string>
     <string name="referral">Referral</string>
@@ -106,7 +106,6 @@
     <string name="completed">Completed</string>
     <string name="cancelled">Cancelled</string>
     <string name="re_open">re-open</string>
-    <string name="re_open_form">Re-open form</string>
     <string name="activate">Activate</string>
     <string name="active">Active</string>
 
@@ -156,7 +155,7 @@
     <string name="no_options">No options available</string>
 
     <!--TEI Enrollment list-->
-    <string name="enrollment_list">Enrollment List</string>
+    <string name="enrollment_list">Enrollment list</string>
     <string name="active_programs">Active programs</string>
     <string name="to_enroll_programs">Programs to enroll</string>
     <string name="enroll">Enroll</string>
@@ -398,6 +397,7 @@
     <string name="event_completed_title">Events Completed</string>
     <string name="event_completed_message">All events in this program are completed. Would you like to close the program as well?</string>
     <string name="complete_enrollment_message">Would you like to complete the enrollment as well?</string>
+    <string name="complete_enrollment_message_V2">Would you like to complete the %s as well?</string>
     <string name="check_event">Check</string>
 
     <string name="menu_home">Home</string>
@@ -716,7 +716,7 @@
     <string name="download_tei_error">The selected %s could not be downloaded.</string>
     <string name="completed_by">Completed by %s: %s</string>
     <string name="updated_time">Updated: %s</string>
-    <string name="action_done">Done</string>
+    <string name="action_done">Done!</string>
     <string name="validation_internal_error_datasets">We could not check data quality. Contact your administrator</string>
     <string name="are_you_sure">Are you sure?</string>
     <string name="reopen_question">Do you want to re-open the data set?</string>
diff --git a/app/src/test/java/org/dhis2/bindings/DateExtensionsTest.kt b/app/src/test/java/org/dhis2/bindings/DateExtensionsTest.kt
index 434766e453..64f870f3c0 100644
--- a/app/src/test/java/org/dhis2/bindings/DateExtensionsTest.kt
+++ b/app/src/test/java/org/dhis2/bindings/DateExtensionsTest.kt
@@ -11,7 +11,6 @@ import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.whenever
 import java.text.SimpleDateFormat
-import java.time.Instant
 import java.util.Calendar
 import java.util.Date
 import java.util.Locale
@@ -175,7 +174,77 @@ class DateExtensionsTest {
         assert(date.toOverdueOrScheduledUiText(resourceManager, currentDate) == "3 years overdue")
     }
 
+    @Test
+    fun `Should return 'In 1 day', when the scheduled date is 1 day`() {
+        val currentDate = currentCalendar().time
+        val date: Date? = currentCalendar().apply {
+            add(Calendar.DAY_OF_MONTH, 1)
+        }.time
+        whenever(resourceManager.getPlural(R.plurals.schedule_days, 1, 1)) doReturn "In 1 days"
+        assert(date.toOverdueOrScheduledUiText(resourceManager, currentDate) == "In 1 days")
+    }
+
+    @Test
+    fun `Should return 'In 1 day', when the scheduled date is -x hours from current`() {
+        val currentDate = currentCalendar().apply {
+            set(Calendar.HOUR_OF_DAY, -2)
+        }.time
+        val date: Date? = currentCalendar().time
+        whenever(resourceManager.getPlural(R.plurals.schedule_days, 1, 1)) doReturn "In 1 days"
+        assert(date.toOverdueOrScheduledUiText(resourceManager, currentDate) == "In 1 days")
+    }
+
+    @Test
+    fun `Should return 'Today', when the scheduled date is same day with +x hours`() {
+        val currentDate = currentCalendar().apply {
+            set(Calendar.HOUR_OF_DAY, 2)
+        }.time
+        val date: Date? = currentCalendar().time
+        whenever(resourceManager.getString(R.string.overdue_today)) doReturn "Today"
+        assert(date.toOverdueOrScheduledUiText(resourceManager, currentDate) == "Today")
+    }
+
+    @Test
+    fun `Should return 'In x days', when the current date is -x days from the scheduled date and less than 90 days`() {
+        val currentDate = currentCalendar().time
+        val date: Date? = currentCalendar().apply {
+            add(Calendar.DAY_OF_MONTH, 15)
+        }.time
+        whenever(resourceManager.getPlural(R.plurals.schedule_days, 15, 15)) doReturn "In 15 days"
+        assert(date.toOverdueOrScheduledUiText(resourceManager, currentDate) == "In 15 days")
+    }
+
+    @Test
+    fun `Should return 'In x months', when the current date is more than 3 months and less than 1 year from schedule`() {
+        val currentDate = currentCalendar().time
+        val date: Date? = currentCalendar().apply {
+            add(Calendar.MONTH, 4)
+        }.time
+        whenever(resourceManager.getPlural(R.plurals.schedule_months, 4, 4)) doReturn "In 4 months"
+        assert(date.toOverdueOrScheduledUiText(resourceManager, currentDate) == "In 4 months")
+    }
+
+    @Test
+    fun `Should return 'In 1 year', when the scheduled date is in 1 year`() {
+        val currentDate = currentCalendar().time
+        val date: Date? = currentCalendar().apply {
+            add(Calendar.YEAR, 1)
+        }.time
+        whenever(resourceManager.getPlural(R.plurals.schedule_years, 1, 1)) doReturn "In 1 year"
+        assert(date.toOverdueOrScheduledUiText(resourceManager, currentDate) == "In 1 year")
+    }
+
+    @Test
+    fun `Should return 'In x years', when the scheduled date is in more than 1 year`() {
+        val currentDate = currentCalendar().time
+        val date: Date? = currentCalendar().apply {
+            add(Calendar.YEAR, 3)
+        }.time
+        whenever(resourceManager.getPlural(R.plurals.schedule_years, 3, 3)) doReturn "In 3 years"
+        assert(date.toOverdueOrScheduledUiText(resourceManager, currentDate) == "In 3 years")
+    }
+
     private fun currentCalendar() = Calendar.getInstance().apply {
-        time = Date.from(Instant.parse("2020-03-02T00:00:00.00Z"))
+        time = "2020-03-02T00:00:00.00Z".toDate()
     }
 }
diff --git a/app/src/test/java/org/dhis2/bindings/TEICardExtensionsTest.kt b/app/src/test/java/org/dhis2/bindings/TEICardExtensionsTest.kt
index 62d9d5cef9..03c8d7b62c 100644
--- a/app/src/test/java/org/dhis2/bindings/TEICardExtensionsTest.kt
+++ b/app/src/test/java/org/dhis2/bindings/TEICardExtensionsTest.kt
@@ -30,7 +30,7 @@ class TEICardExtensionsTest {
             programs.add(createProgram("uid_$index"))
 
         mockEnrollmentIconsData()
-        val result = programs.getEnrollmentIconsData("uid_1", metadataIconData)
+        val result = programs.getEnrollmentIconsData("uid_1") { metadataIconData }
         assert(result.size == 3)
         result.forEach {
             assert(it.isIcon)
@@ -44,7 +44,7 @@ class TEICardExtensionsTest {
             programs.add(createProgram("uid_$index"))
 
         mockEnrollmentIconsData()
-        val result = programs.getEnrollmentIconsData("uid_1", metadataIconData)
+        val result = programs.getEnrollmentIconsData("uid_1") { metadataIconData }
         assert(result.size == 4)
         result.forEach {
             assert(it.isIcon)
@@ -58,7 +58,7 @@ class TEICardExtensionsTest {
             programs.add(createProgram("uid_$index"))
 
         mockEnrollmentIconsData()
-        val result = programs.getEnrollmentIconsData("uid_5", metadataIconData)
+        val result = programs.getEnrollmentIconsData("uid_5") { metadataIconData }
         assert(result.size == 4)
         result.forEachIndexed { index, item ->
             if (index in 0..result.size - 2) {
@@ -78,7 +78,7 @@ class TEICardExtensionsTest {
             programs.add(createProgram("uid_$index"))
 
         mockEnrollmentIconsData()
-        val result = programs.getEnrollmentIconsData(null, metadataIconData)
+        val result = programs.getEnrollmentIconsData(null) { metadataIconData }
         assert(result.size == 4)
         result.forEachIndexed { index, item ->
             if (index in 0..result.size - 2) {
@@ -98,7 +98,7 @@ class TEICardExtensionsTest {
             programs.add(createProgram("uid_$index"))
 
         mockEnrollmentIconsData()
-        val result = programs.getEnrollmentIconsData("uid_100", metadataIconData)
+        val result = programs.getEnrollmentIconsData("uid_100") { metadataIconData }
         assert(result.size == 4)
         assert(!result.last().isIcon)
         assert(result.last().remainingEnrollments == 99)
diff --git a/app/src/test/java/org/dhis2/data/services/SyncPresenterTest.kt b/app/src/test/java/org/dhis2/data/services/SyncPresenterTest.kt
index f4121f88ea..977ccdf9c3 100644
--- a/app/src/test/java/org/dhis2/data/services/SyncPresenterTest.kt
+++ b/app/src/test/java/org/dhis2/data/services/SyncPresenterTest.kt
@@ -134,7 +134,7 @@ class SyncPresenterTest {
 
         whenever(
             d2.fileResourceModule().fileResourceDownloader()
-                .byDomainType().eq(FileResourceDomainType.CUSTOM_ICON)
+                .byDomainType().eq(FileResourceDomainType.ICON)
                 .download(),
         )doReturn Observable.just(BaseD2Progress.empty(1))
 
@@ -160,7 +160,7 @@ class SyncPresenterTest {
         )doReturn Completable.complete()
         whenever(
             d2.fileResourceModule().fileResourceDownloader()
-                .byDomainType().eq(FileResourceDomainType.CUSTOM_ICON)
+                .byDomainType().eq(FileResourceDomainType.ICON)
                 .download(),
         )doReturn Observable.just(BaseD2Progress.empty(1))
         presenter.syncMetadata { }
@@ -186,7 +186,7 @@ class SyncPresenterTest {
         )doReturn Completable.complete()
         whenever(
             d2.fileResourceModule().fileResourceDownloader()
-                .byDomainType().eq(FileResourceDomainType.CUSTOM_ICON)
+                .byDomainType().eq(FileResourceDomainType.ICON)
                 .download(),
         )doReturn Observable.just(BaseD2Progress.empty(1))
         presenter.syncMetadata { }
@@ -209,7 +209,7 @@ class SyncPresenterTest {
         )doReturn Completable.complete()
         whenever(
             d2.fileResourceModule().fileResourceDownloader()
-                .byDomainType().eq(FileResourceDomainType.CUSTOM_ICON)
+                .byDomainType().eq(FileResourceDomainType.ICON)
                 .download(),
         )doReturn Observable.just(BaseD2Progress.empty(1))
         presenter.syncMetadata { }
diff --git a/app/src/test/java/org/dhis2/usescases/enrollment/EnrollmentPresenterImplTest.kt b/app/src/test/java/org/dhis2/usescases/enrollment/EnrollmentPresenterImplTest.kt
index 4cb7c6f585..2303f140ad 100644
--- a/app/src/test/java/org/dhis2/usescases/enrollment/EnrollmentPresenterImplTest.kt
+++ b/app/src/test/java/org/dhis2/usescases/enrollment/EnrollmentPresenterImplTest.kt
@@ -1,20 +1,21 @@
 package org.dhis2.usescases.enrollment
 
+import io.reactivex.Single
 import io.reactivex.processors.PublishProcessor
 import org.dhis2.commons.matomo.MatomoAnalyticsController
 import org.dhis2.commons.schedulers.SchedulerProvider
 import org.dhis2.data.schedulers.TrampolineSchedulerProvider
 import org.dhis2.form.data.EnrollmentRepository
+import org.dhis2.usescases.enrollment.EnrollmentActivity.EnrollmentMode.CHECK
+import org.dhis2.usescases.enrollment.EnrollmentActivity.EnrollmentMode.NEW
 import org.dhis2.usescases.teiDashboard.TeiAttributesProvider
 import org.dhis2.utils.analytics.AnalyticsHelper
 import org.hisp.dhis.android.core.D2
 import org.hisp.dhis.android.core.arch.repositories.`object`.ReadOnlyOneObjectRepositoryFinalImpl
-import org.hisp.dhis.android.core.category.CategoryCombo
 import org.hisp.dhis.android.core.common.Access
 import org.hisp.dhis.android.core.common.DataAccess
 import org.hisp.dhis.android.core.common.FeatureType
 import org.hisp.dhis.android.core.common.Geometry
-import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.enrollment.EnrollmentAccess
 import org.hisp.dhis.android.core.enrollment.EnrollmentObjectRepository
 import org.hisp.dhis.android.core.enrollment.EnrollmentStatus
@@ -22,7 +23,6 @@ import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.event.EventCollectionRepository
 import org.hisp.dhis.android.core.event.EventStatus
 import org.hisp.dhis.android.core.program.Program
-import org.hisp.dhis.android.core.program.ProgramStage
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceObjectRepository
 import org.junit.Before
@@ -68,30 +68,6 @@ class EnrollmentPresenterImplTest {
         )
     }
 
-    @Test
-    fun `Open initial when needsCatCombo is false and needsCoordinates is false`() {
-        checkCatCombo(true, FeatureType.NONE)
-        assert(!presenter.openInitial(""))
-    }
-
-    @Test
-    fun `Open initial when needsCatCombo is true and needsCoordinates is false`() {
-        checkCatCombo(false, FeatureType.NONE)
-        assert(presenter.openInitial(""))
-    }
-
-    @Test
-    fun `Open initial when needsCatCombo is false and needsCoordinates is true`() {
-        checkCatCombo(true, FeatureType.POINT)
-        assert(presenter.openInitial(""))
-    }
-
-    @Test
-    fun `Open initial when needsCatCombo is true and needsCoordinates is true`() {
-        checkCatCombo(false, FeatureType.POINT)
-        assert(presenter.openInitial(""))
-    }
-
     @Test
     fun `Check updateEnrollmentStatus where write access is granted`() {
         whenever(programRepository.blockingGet()) doReturn Program.builder().uid("")
@@ -233,31 +209,38 @@ class EnrollmentPresenterImplTest {
         assert(!presenter.isEventScheduleOrSkipped("uid"))
     }
 
-    private fun checkCatCombo(catCombo: Boolean, featureType: FeatureType) {
-        whenever(programRepository.blockingGet()) doReturn Program.builder().uid("")
-            .categoryCombo(ObjectWithUid.create("")).build()
+    @Test
+    fun `should create an event right after enrollment creation`() {
+        whenever(enrollmentFormRepository.generateEvents()) doReturn Single.just(
+            Pair(
+                "enrollmentUid",
+                "eventUid",
+            ),
+        )
 
-        whenever(d2.eventModule()) doReturn mock()
-        whenever(d2.eventModule().events()) doReturn mock()
-        whenever(d2.eventModule().events().uid("")) doReturn mock()
-        whenever(d2.eventModule().events().uid("").blockingGet()) doReturn Event.builder()
-            .uid("").programStage("").build()
+        presenter.finish(NEW)
 
-        whenever(d2.programModule()) doReturn mock()
-        whenever(d2.programModule().programStages()) doReturn mock()
-        whenever(d2.programModule().programStages().uid("")) doReturn mock()
-        whenever(
-            d2.programModule().programStages().uid("").blockingGet(),
-        ) doReturn ProgramStage.builder().uid("").featureType(featureType).build()
+        verify(enrollmentView).openEvent("eventUid")
+    }
 
-        whenever(d2.categoryModule()) doReturn mock()
-        whenever(d2.categoryModule().categoryCombos()) doReturn mock()
-        whenever(d2.categoryModule().categoryCombos().uid("")) doReturn mock()
-        whenever(
-            d2.categoryModule().categoryCombos().uid("").blockingGet(),
-        ) doReturn CategoryCombo.builder()
-            .isDefault(catCombo)
-            .uid("")
-            .build()
+    @Test
+    fun `should navigate to enrollment dashboard after enrollment creation`() {
+        whenever(enrollmentFormRepository.generateEvents()) doReturn Single.just(
+            Pair(
+                "enrollmentUid",
+                null,
+            ),
+        )
+
+        presenter.finish(NEW)
+
+        verify(enrollmentView).openDashboard("enrollmentUid")
+    }
+
+    @Test
+    fun `should close enrollment screen if it already exists`() {
+        presenter.finish(CHECK)
+
+        verify(enrollmentView).setResultAndFinish()
     }
 }
diff --git a/app/src/test/java/org/dhis2/usescases/events/ScheduledEventPresenterImplTest.kt b/app/src/test/java/org/dhis2/usescases/events/ScheduledEventPresenterImplTest.kt
index a52c3f80d5..3cea4f794d 100644
--- a/app/src/test/java/org/dhis2/usescases/events/ScheduledEventPresenterImplTest.kt
+++ b/app/src/test/java/org/dhis2/usescases/events/ScheduledEventPresenterImplTest.kt
@@ -1,6 +1,5 @@
 package org.dhis2.usescases.events
 
-import org.dhis2.data.dhislogic.DhisEventUtils
 import org.hisp.dhis.android.core.D2
 import org.junit.Before
 import org.junit.Test
@@ -17,25 +16,21 @@ class ScheduledEventPresenterImplTest {
     lateinit var presenter: ScheduledEventPresenterImpl
     private val d2: D2 = Mockito.mock(D2::class.java, Mockito.RETURNS_DEEP_STUBS)
     private val view: ScheduledEventContract.View = mock()
-    private val eventUtils: DhisEventUtils = mock()
 
     @Before
     fun setUp() {
-        presenter = ScheduledEventPresenterImpl(view, d2, "eventUid", eventUtils)
+        presenter = ScheduledEventPresenterImpl(view, d2, "eventUid")
     }
 
     @Test
-    fun `Should open event initial screen if the event needs extra info`() {
+    fun `Should open event form screen if the event needs extra info`() {
         whenever(
             d2.eventModule().events().uid(any()),
         ) doReturn mock()
-        whenever(
-            eventUtils.newEventNeedsExtraInfo(any()),
-        ) doReturn true
 
         presenter.setEventDate(Date())
 
-        verify(view).openInitialActivity()
+        verify(view).openFormActivity()
     }
 
     @Test
@@ -43,9 +38,6 @@ class ScheduledEventPresenterImplTest {
         whenever(
             d2.eventModule().events().uid(any()),
         ) doReturn mock()
-        whenever(
-            eventUtils.newEventNeedsExtraInfo(any()),
-        ) doReturn false
 
         presenter.setEventDate(Date())
 
diff --git a/app/src/test/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCapturePresenterTest.kt b/app/src/test/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCapturePresenterTest.kt
index 8f7728eb75..51e53df2f2 100644
--- a/app/src/test/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCapturePresenterTest.kt
+++ b/app/src/test/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCapturePresenterTest.kt
@@ -4,7 +4,6 @@ import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import io.reactivex.Flowable
 import io.reactivex.Observable
 import io.reactivex.Single
-import org.dhis2.bindings.canSkipErrorFix
 import org.dhis2.commons.prefs.PreferenceProvider
 import org.dhis2.data.schedulers.TrampolineSchedulerProvider
 import org.dhis2.usescases.eventsWithoutRegistration.eventCapture.domain.ConfigureEventCompletionDialog
@@ -59,7 +58,7 @@ class EventCapturePresenterTest {
         whenever(eventRepository.isEventEditable("eventUid")) doReturn true
 
         presenter.init()
-        verify(view).renderInitialInfo(any(), any(), any(), any())
+        verify(view).renderInitialInfo(any())
 
         verifyNoMoreInteractions(view)
     }
@@ -73,7 +72,7 @@ class EventCapturePresenterTest {
 
         presenter.init()
         verify(view).showEventIntegrityAlert()
-        verify(view).renderInitialInfo(any(), any(), any(), any())
+        verify(view).renderInitialInfo(any())
         verifyNoMoreInteractions(view)
     }
 
@@ -88,7 +87,7 @@ class EventCapturePresenterTest {
     fun `Should return enrollment that is not open`() {
         whenever(eventRepository.isEnrollmentOpen) doReturn false
 
-        val result = presenter.isEnrollmentOpen
+        val result = presenter.isEnrollmentOpen()
         assertTrue(!result)
     }
 
@@ -96,7 +95,7 @@ class EventCapturePresenterTest {
     fun `Should return enrollment that is open`() {
         whenever(eventRepository.isEnrollmentOpen) doReturn true
 
-        val result = presenter.isEnrollmentOpen
+        val result = presenter.isEnrollmentOpen()
         assertTrue(result)
     }
 
@@ -213,7 +212,7 @@ class EventCapturePresenterTest {
     fun `Should show completion percentage`() {
         whenever(eventRepository.showCompletionPercentage()) doReturn true
 
-        val result = presenter.completionPercentageVisibility
+        val result = presenter.getCompletionPercentageVisibility()
         assertTrue(result)
     }
 
@@ -221,7 +220,7 @@ class EventCapturePresenterTest {
     fun `Should hide completion percentage`() {
         whenever(eventRepository.showCompletionPercentage()) doReturn false
 
-        val result = presenter.completionPercentageVisibility
+        val result = presenter.getCompletionPercentageVisibility()
         assertTrue(!result)
     }
 
@@ -259,7 +258,7 @@ class EventCapturePresenterTest {
 
         presenter.attemptFinish(true, null, emptyList(), emptyMap(), emptyList())
 
-        verify(view).SaveAndFinish()
+        verify(view).saveAndFinish()
     }
 
     @Test
@@ -340,11 +339,7 @@ class EventCapturePresenterTest {
             warningFields = emptyList(),
         )
 
-        verify(view).showCompleteActions(
-            any(),
-            any(),
-            any(),
-        )
+        verify(view).showCompleteActions(any())
         verify(view).showNavigationBar()
     }
 
@@ -360,70 +355,12 @@ class EventCapturePresenterTest {
         verify(view).updateNoteBadge(1)
     }
 
-    @Test
-    fun `Should allow skip error if validation strategy is ON_COMPLETE`() {
-        val canSkipErrorFix = ValidationStrategy.ON_COMPLETE.canSkipErrorFix(
-            hasErrorFields = false,
-            hasEmptyMandatoryFields = false,
-        )
-        assertTrue(canSkipErrorFix)
-    }
-
-    @Test
-    fun `Should allow skip error if validation strategy is ON_COMPLETE and has error`() {
-        val canSkipErrorFix = ValidationStrategy.ON_COMPLETE.canSkipErrorFix(
-            hasErrorFields = true,
-            hasEmptyMandatoryFields = false,
-        )
-        assertTrue(canSkipErrorFix)
-    }
-
-    @Test
-    fun `Should allow skip error if validation strategy is ON_COMPLETE and has mandatory`() {
-        val canSkipErrorFix = ValidationStrategy.ON_COMPLETE.canSkipErrorFix(
-            hasErrorFields = false,
-            hasEmptyMandatoryFields = true,
-        )
-        assertTrue(canSkipErrorFix)
-    }
-
-    @Test
-    fun `Should allow skip error if validation strategy is ON_INSERT if no errors`() {
-        val canSkipErrorFix = ValidationStrategy.ON_UPDATE_AND_INSERT.canSkipErrorFix(
-            hasErrorFields = false,
-            hasEmptyMandatoryFields = false,
-        )
-        assertTrue(canSkipErrorFix)
-    }
-
-    @Test
-    fun `Should not allow skip error if validation strategy is ON_INSERT if has errors`() {
-        val canSkipErrorFix = ValidationStrategy.ON_UPDATE_AND_INSERT.canSkipErrorFix(
-            hasErrorFields = true,
-            hasEmptyMandatoryFields = false,
-        )
-        assertTrue(!canSkipErrorFix)
-    }
-
-    @Test
-    fun `Should not allow skip error if ON_INSERT and has mandatory fields`() {
-        val canSkipErrorFix = ValidationStrategy.ON_UPDATE_AND_INSERT.canSkipErrorFix(
-            hasErrorFields = false,
-            hasEmptyMandatoryFields = true,
-        )
-        assertTrue(!canSkipErrorFix)
-    }
-
     private fun initializeMocks() {
         val stage = ProgramStage.builder().uid("stage").displayName("stageName").build()
-        val date = "date"
         val orgUnit = OrganisationUnit.builder().uid("orgUnit").displayName("OrgUnitName").build()
-        val catOption = "catOption"
 
         whenever(eventRepository.programStageName()) doReturn Flowable.just(stage.uid())
-        whenever(eventRepository.eventDate()) doReturn Flowable.just(date)
         whenever(eventRepository.orgUnit()) doReturn Flowable.just(orgUnit)
-        whenever(eventRepository.catOption()) doReturn Flowable.just(catOption)
         doNothing().`when`(preferences).setValue(any(), any())
         whenever(eventRepository.programStage()) doReturn Observable.just(stage.uid())
     }
diff --git a/app/src/test/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureRepositoryImplTest.kt b/app/src/test/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureRepositoryImplTest.kt
index 86b698615e..d0b5766ae2 100644
--- a/app/src/test/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureRepositoryImplTest.kt
+++ b/app/src/test/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureRepositoryImplTest.kt
@@ -5,7 +5,6 @@ import io.reactivex.Single
 import org.dhis2.data.dhislogic.AUTH_ALL
 import org.dhis2.data.dhislogic.AUTH_UNCOMPLETE_EVENT
 import org.hisp.dhis.android.core.D2
-import org.hisp.dhis.android.core.category.CategoryOptionCombo
 import org.hisp.dhis.android.core.dataelement.DataElement
 import org.hisp.dhis.android.core.enrollment.Enrollment
 import org.hisp.dhis.android.core.enrollment.EnrollmentStatus
@@ -172,22 +171,6 @@ class EventCaptureRepositoryImplTest {
             .assertValue { it == stageName }
     }
 
-    @Test
-    fun `Should return event date`() {
-        mockEvent(trackerEventEnrollmentUid)
-        mockEmptySections()
-
-        val repository = EventCaptureRepositoryImpl(
-
-            eventUid,
-            d2,
-        )
-
-        repository.eventDate().test()
-            .assertNoErrors()
-            .assertValue { it == "1/1/2021" }
-    }
-
     @Test
     fun `Should return event org unit`() {
         mockEvent(trackerEventEnrollmentUid)
@@ -210,77 +193,6 @@ class EventCaptureRepositoryImplTest {
             .assertValue { it.uid() == testEventOrgUnitUid }
     }
 
-    @Test
-    fun `Should return attribute option combo name`() {
-        val attrOptionComboUid = "optionComboUid"
-        val attrOptionComboName = "optionComboName"
-        mockEvent(trackerEventEnrollmentUid, attrOptionComboUid)
-        mockEmptySections()
-
-        whenever(
-            d2.categoryModule().categoryOptionCombos().uid(attrOptionComboUid).blockingGet(),
-        ) doReturn CategoryOptionCombo.builder()
-            .uid(attrOptionComboUid)
-            .displayName(attrOptionComboName)
-            .build()
-
-        val repository = EventCaptureRepositoryImpl(
-
-            eventUid,
-            d2,
-        )
-
-        repository.catOption().test()
-            .assertNoErrors()
-            .assertValue { it == attrOptionComboName }
-    }
-
-    @Test
-    fun `Should return empty string if attribute option como is default`() {
-        val attrOptionComboUid = "defaultOptionComboUid"
-        val attrOptionComboName = "default"
-        mockEvent(trackerEventEnrollmentUid, attrOptionComboUid)
-        mockEmptySections()
-
-        whenever(
-            d2.categoryModule().categoryOptionCombos().uid(attrOptionComboUid).blockingGet(),
-        ) doReturn CategoryOptionCombo.builder()
-            .uid(attrOptionComboUid)
-            .displayName(attrOptionComboName)
-            .build()
-
-        val repository = EventCaptureRepositoryImpl(
-
-            eventUid,
-            d2,
-        )
-
-        repository.catOption().test()
-            .assertNoErrors()
-            .assertValue { it.isEmpty() }
-    }
-
-    @Test
-    fun `Should return empty string if cat combo is null`() {
-        val attrOptionComboUid = "optionComboUid"
-        mockEvent(trackerEventEnrollmentUid, attrOptionComboUid)
-        mockEmptySections()
-
-        whenever(
-            d2.categoryModule().categoryOptionCombos().uid(attrOptionComboUid).blockingGet(),
-        ) doReturn null
-
-        val repository = EventCaptureRepositoryImpl(
-
-            eventUid,
-            d2,
-        )
-
-        repository.catOption().test()
-            .assertNoErrors()
-            .assertValue { it.isEmpty() }
-    }
-
     @Ignore("Use EventCaptureFieldProvider in the list method of the repository")
     @Test
     fun `Should return list of fields`() {
diff --git a/app/src/test/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventIntegrationTest.kt b/app/src/test/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventIntegrationTest.kt
index 31afdba378..c2112298ae 100644
--- a/app/src/test/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventIntegrationTest.kt
+++ b/app/src/test/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventIntegrationTest.kt
@@ -6,8 +6,11 @@ import org.dhis2.commons.prefs.PreferenceProvider
 import org.dhis2.commons.resources.ResourceManager
 import org.dhis2.commons.viewmodel.DispatcherProvider
 import org.dhis2.data.schedulers.TrampolineSchedulerProvider
+import org.dhis2.form.data.EventRepository
 import org.dhis2.form.data.FieldsWithErrorResult
 import org.dhis2.form.data.MissingMandatoryResult
+import org.dhis2.form.data.SuccessfulResult
+import org.dhis2.form.model.EventMode
 import org.dhis2.ui.dialogs.bottomsheet.BottomSheetDialogUiModel
 import org.dhis2.ui.dialogs.bottomsheet.DialogButtonStyle
 import org.dhis2.ui.dialogs.bottomsheet.FieldWithIssue
@@ -119,13 +122,9 @@ class EventIntegrationTest {
             onCompleteMessage = null,
             allowDiscard = false,
         )
-        eventCaptureFormPresenter.handleDataIntegrityResult(dataCheckResult)
+        eventCaptureFormPresenter.handleDataIntegrityResult(dataCheckResult, EventMode.CHECK)
 
-        verify(eventCaptureView).showCompleteActions(
-            false,
-            mandatoryFields,
-            expectedDialog,
-        )
+        verify(eventCaptureView).showCompleteActions(expectedDialog)
     }
 
     @Test
@@ -166,11 +165,41 @@ class EventIntegrationTest {
         )
         eventCaptureFormPresenter.handleDataIntegrityResult(dataCheckResult)
 
-        verify(eventCaptureView).showCompleteActions(
-            false,
-            mapOf(),
-            expectedDialog,
+        verify(eventCaptureView).showCompleteActions(expectedDialog)
+    }
+
+    @Test
+    fun `Should set complete options if there are no errors or mandatory`() {
+        whenever(
+            eventRepository.eventStatus(),
+        ) doReturn Flowable.just(EventStatus.ACTIVE)
+
+        whenever(
+            eventRepository.validationStrategy(),
+        ) doReturn ValidationStrategy.ON_UPDATE_AND_INSERT
+
+        val expectedDialog = EventCompletionDialog(
+            bottomSheetDialogUiModel = BottomSheetDialogUiModel(
+                title = "saved",
+                subtitle = null,
+                message = "event_can_be_completed",
+                clickableWord = null,
+                iconResource = 0,
+                mainButton = DialogButtonStyle.CompleteButton,
+                secondaryButton = DialogButtonStyle.SecondaryButton(textResource = 0),
+            ),
+            mainButtonAction = FormBottomDialog.ActionType.COMPLETE,
+            secondaryButtonAction = FormBottomDialog.ActionType.FINISH,
+            fieldsWithIssues = emptyList(),
+        )
+
+        val dataCheckResult = SuccessfulResult(
+            canComplete = false,
+            onCompleteMessage = null,
         )
+        eventCaptureFormPresenter.handleDataIntegrityResult(dataCheckResult)
+
+        verify(eventCaptureView).showCompleteActions(expectedDialog)
     }
 
     @Test
@@ -211,10 +240,144 @@ class EventIntegrationTest {
         )
         eventCaptureFormPresenter.handleDataIntegrityResult(dataCheckResult)
 
-        verify(eventCaptureView).showCompleteActions(
-            false,
-            mapOf(),
-            expectedDialog,
+        verify(eventCaptureView).showCompleteActions(expectedDialog)
+    }
+
+    @Test
+    fun `Should not configure secondary action for new event with event mandatory fields`() {
+        whenever(
+            eventRepository.eventStatus(),
+        ) doReturn Flowable.just(EventStatus.ACTIVE)
+
+        whenever(
+            eventRepository.validationStrategy(),
+        ) doReturn ValidationStrategy.ON_COMPLETE
+
+        val mandatoryFields = mapOf("uid" to EventRepository.EVENT_DETAILS_SECTION_UID)
+        val expectedDialog = EventCompletionDialog(
+            bottomSheetDialogUiModel = BottomSheetDialogUiModel(
+                title = "saved",
+                subtitle = null,
+                message = "missing_mandatory_fields_events",
+                clickableWord = null,
+                iconResource = 0,
+                mainButton = DialogButtonStyle.MainButton(textResource = 0),
+                secondaryButton = null,
+            ),
+            mainButtonAction = FormBottomDialog.ActionType.CHECK_FIELDS,
+            secondaryButtonAction = null,
+            fieldsWithIssues = listOf(
+                FieldWithIssue(
+                    fieldUid = "uid",
+                    fieldName = "uid",
+                    issueType = IssueType.MANDATORY,
+                    message = "field_is_mandatory",
+                ),
+            ),
+        )
+
+        val dataCheckResult = MissingMandatoryResult(
+            mandatoryFields = mandatoryFields,
+            errorFields = listOf(),
+            warningFields = listOf(),
+            canComplete = false,
+            onCompleteMessage = null,
+            allowDiscard = false,
         )
+        eventCaptureFormPresenter.handleDataIntegrityResult(dataCheckResult, EventMode.NEW)
+
+        verify(eventCaptureView).showCompleteActions(expectedDialog)
+    }
+
+    @Test
+    fun `Should configure secondary action for check event with event mandatory fields`() {
+        whenever(
+            eventRepository.eventStatus(),
+        ) doReturn Flowable.just(EventStatus.ACTIVE)
+
+        whenever(
+            eventRepository.validationStrategy(),
+        ) doReturn ValidationStrategy.ON_COMPLETE
+
+        val mandatoryFields = mapOf("uid" to EventRepository.EVENT_DETAILS_SECTION_UID)
+        val expectedDialog = EventCompletionDialog(
+            bottomSheetDialogUiModel = BottomSheetDialogUiModel(
+                title = "saved",
+                subtitle = null,
+                message = "missing_mandatory_fields_events",
+                clickableWord = null,
+                iconResource = 0,
+                mainButton = DialogButtonStyle.MainButton(textResource = 0),
+                secondaryButton = DialogButtonStyle.SecondaryButton(textResource = 0),
+            ),
+            mainButtonAction = FormBottomDialog.ActionType.CHECK_FIELDS,
+            secondaryButtonAction = FormBottomDialog.ActionType.FINISH,
+            fieldsWithIssues = listOf(
+                FieldWithIssue(
+                    fieldUid = "uid",
+                    fieldName = "uid",
+                    issueType = IssueType.MANDATORY,
+                    message = "field_is_mandatory",
+                ),
+            ),
+        )
+
+        val dataCheckResult = MissingMandatoryResult(
+            mandatoryFields = mandatoryFields,
+            errorFields = listOf(),
+            warningFields = listOf(),
+            canComplete = false,
+            onCompleteMessage = null,
+            allowDiscard = false,
+        )
+        eventCaptureFormPresenter.handleDataIntegrityResult(dataCheckResult, EventMode.CHECK)
+
+        verify(eventCaptureView).showCompleteActions(expectedDialog)
+    }
+
+    @Test
+    fun `Should configure secondary action for check event without event mandatory fields`() {
+        whenever(
+            eventRepository.eventStatus(),
+        ) doReturn Flowable.just(EventStatus.ACTIVE)
+
+        whenever(
+            eventRepository.validationStrategy(),
+        ) doReturn ValidationStrategy.ON_COMPLETE
+
+        val mandatoryFields = mapOf("uid" to EventRepository.EVENT_DETAILS_SECTION_UID)
+        val expectedDialog = EventCompletionDialog(
+            bottomSheetDialogUiModel = BottomSheetDialogUiModel(
+                title = "saved",
+                subtitle = null,
+                message = "missing_mandatory_fields_events",
+                clickableWord = null,
+                iconResource = 0,
+                mainButton = DialogButtonStyle.MainButton(textResource = 0),
+                secondaryButton = DialogButtonStyle.SecondaryButton(textResource = 0),
+            ),
+            mainButtonAction = FormBottomDialog.ActionType.CHECK_FIELDS,
+            secondaryButtonAction = FormBottomDialog.ActionType.FINISH,
+            fieldsWithIssues = listOf(
+                FieldWithIssue(
+                    fieldUid = "uid",
+                    fieldName = "uid",
+                    issueType = IssueType.MANDATORY,
+                    message = "field_is_mandatory",
+                ),
+            ),
+        )
+
+        val dataCheckResult = MissingMandatoryResult(
+            mandatoryFields = mandatoryFields,
+            errorFields = listOf(),
+            warningFields = listOf(),
+            canComplete = false,
+            onCompleteMessage = null,
+            allowDiscard = false,
+        )
+        eventCaptureFormPresenter.handleDataIntegrityResult(dataCheckResult, EventMode.CHECK)
+
+        verify(eventCaptureView).showCompleteActions(expectedDialog)
     }
 }
diff --git a/app/src/test/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/eventCaptureFragment/EventCaptureFormPresenterTest.kt b/app/src/test/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/eventCaptureFragment/EventCaptureFormPresenterTest.kt
index 1393473b23..c4e47759dd 100644
--- a/app/src/test/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/eventCaptureFragment/EventCaptureFormPresenterTest.kt
+++ b/app/src/test/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/eventCaptureFragment/EventCaptureFormPresenterTest.kt
@@ -8,6 +8,7 @@ import org.dhis2.form.data.FieldsWithErrorResult
 import org.dhis2.form.data.FieldsWithWarningResult
 import org.dhis2.form.data.MissingMandatoryResult
 import org.dhis2.form.data.SuccessfulResult
+import org.dhis2.form.model.EventMode
 import org.dhis2.ui.dialogs.bottomsheet.FieldWithIssue
 import org.dhis2.ui.dialogs.bottomsheet.IssueType
 import org.dhis2.usescases.eventsWithoutRegistration.eventCapture.EventCaptureContract
@@ -114,6 +115,7 @@ class EventCaptureFormPresenterTest {
                 null,
                 false,
             ),
+            EventMode.NEW,
         )
         verify(activityPresenter).attemptFinish(
             false,
@@ -121,6 +123,7 @@ class EventCaptureFormPresenterTest {
             emptyList(),
             mapOf(Pair("field1", "section")),
             emptyList(),
+            EventMode.NEW,
         )
     }
 
diff --git a/app/src/test/java/org/dhis2/usescases/eventsWithoutRegistration/eventDetails/data/EventDetailsRepositoryTest.kt b/app/src/test/java/org/dhis2/usescases/eventsWithoutRegistration/eventDetails/data/EventDetailsRepositoryTest.kt
index fc36818365..23f21fe462 100644
--- a/app/src/test/java/org/dhis2/usescases/eventsWithoutRegistration/eventDetails/data/EventDetailsRepositoryTest.kt
+++ b/app/src/test/java/org/dhis2/usescases/eventsWithoutRegistration/eventDetails/data/EventDetailsRepositoryTest.kt
@@ -1,16 +1,21 @@
 package org.dhis2.usescases.eventsWithoutRegistration.eventDetails.data
 
+import org.dhis2.commons.data.EventCreationType
 import org.dhis2.form.ui.FieldViewModelFactory
 import org.hisp.dhis.android.core.D2
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope.OrderByDirection.DESC
 import org.hisp.dhis.android.core.event.Event
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
 import org.hisp.dhis.android.core.program.ProgramStage
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
 import org.mockito.Mockito
+import org.mockito.kotlin.any
 import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.mock
+import org.mockito.kotlin.times
+import org.mockito.kotlin.verify
 import org.mockito.kotlin.whenever
 import java.util.Date
 
@@ -35,6 +40,7 @@ class EventDetailsRepositoryTest {
             EVENT_UID,
             PROGRAM_STAGE_UID,
             fieldViewModelFactory,
+            EventCreationType.ADDNEW,
         ) { d2Error -> "" }
 
         whenever(
@@ -154,6 +160,60 @@ class EventDetailsRepositoryTest {
         assertEquals(repository.getStageLastDate(ENROLLMENT_UID), date)
     }
 
+    @Test
+    fun `should use search scope in referral`() {
+        whenever(
+            d2.organisationUnitModule().organisationUnits()
+                .byOrganisationUnitScope(any()),
+        ) doReturn mock()
+        whenever(
+            d2.organisationUnitModule().organisationUnits()
+                .byOrganisationUnitScope(any())
+                .byProgramUids(any()),
+        ) doReturn mock()
+
+        whenever(
+            d2.organisationUnitModule().organisationUnits()
+                .byProgramUids(any()),
+        ) doReturn mock()
+
+        whenever(
+            d2.organisationUnitModule().organisationUnits()
+                .byProgramUids(any())
+                .blockingGet(),
+        ) doReturn listOf()
+
+        whenever(
+            d2.organisationUnitModule().organisationUnits()
+                .byOrganisationUnitScope(any())
+                .byProgramUids(any())
+                .blockingGet(),
+        ) doReturn listOf()
+
+        EventCreationType.entries.forEach { eventCreationType ->
+            repository = EventDetailsRepository(
+                d2,
+                PROGRAM_UID,
+                EVENT_UID,
+                PROGRAM_STAGE_UID,
+                fieldViewModelFactory,
+                eventCreationType,
+            ) { d2Error -> "" }
+
+            repository.getOrganisationUnits()
+        }
+
+        verify(
+            d2.organisationUnitModule().organisationUnits(),
+            times(1),
+        ).byProgramUids(listOf(PROGRAM_UID))
+
+        verify(
+            d2.organisationUnitModule().organisationUnits(),
+            times(3),
+        ).byOrganisationUnitScope(OrganisationUnit.Scope.SCOPE_DATA_CAPTURE)
+    }
+
     companion object {
         const val PROGRAM_UID = "programUid"
         const val EVENT_UID = "eventUid"
diff --git a/app/src/test/java/org/dhis2/usescases/eventsWithoutRegistration/eventInitial/EventInitialRepositoryImplTest.kt b/app/src/test/java/org/dhis2/usescases/eventsWithoutRegistration/eventInitial/EventInitialRepositoryImplTest.kt
index 08af2dad0c..6449152415 100644
--- a/app/src/test/java/org/dhis2/usescases/eventsWithoutRegistration/eventInitial/EventInitialRepositoryImplTest.kt
+++ b/app/src/test/java/org/dhis2/usescases/eventsWithoutRegistration/eventInitial/EventInitialRepositoryImplTest.kt
@@ -9,6 +9,8 @@ import org.hisp.dhis.android.core.common.Access
 import org.hisp.dhis.android.core.common.DataAccess
 import org.hisp.dhis.android.core.common.FeatureType
 import org.hisp.dhis.android.core.common.Geometry
+import org.hisp.dhis.android.core.common.ObjectStyle
+import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.enrollment.Enrollment
 import org.hisp.dhis.android.core.enrollment.EnrollmentStatus
 import org.hisp.dhis.android.core.event.Event
@@ -20,10 +22,10 @@ import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
 import org.mockito.Mockito
+import org.mockito.kotlin.any
 import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.whenever
-import java.util.ArrayList
 
 class EventInitialRepositoryImplTest {
     private lateinit var repository: EventInitialRepositoryImpl
@@ -34,8 +36,27 @@ class EventInitialRepositoryImplTest {
     private val ruleEngineHelper: RuleEngineHelper = mock()
     private val metadataIconProvider: MetadataIconProvider = mock()
 
+    private val mockedStage: ProgramStage = mock {
+        on { program() } doReturn ObjectWithUid.create("programUid")
+    }
+
+    private val mockedProgram: Program = mock {
+        on { style() } doReturn ObjectStyle.builder().build()
+    }
+
     @Before
     fun setUp() {
+        whenever(
+            d2.programModule().programStages()
+                .uid(any())
+                .get(),
+        ) doReturn Single.just(mockedStage)
+        whenever(
+            d2.programModule().programs()
+                .uid(any())
+                .blockingGet(),
+        )doReturn mockedProgram
+
         repository = EventInitialRepositoryImpl(
             eventUid,
             stageUid,
diff --git a/app/src/test/java/org/dhis2/usescases/main/program/ProgramRepositoryImplTest.kt b/app/src/test/java/org/dhis2/usescases/main/program/ProgramRepositoryImplTest.kt
index ce98e1566b..1f0089cf81 100644
--- a/app/src/test/java/org/dhis2/usescases/main/program/ProgramRepositoryImplTest.kt
+++ b/app/src/test/java/org/dhis2/usescases/main/program/ProgramRepositoryImplTest.kt
@@ -51,7 +51,7 @@ class ProgramRepositoryImplTest {
     private val scheduler = TrampolineSchedulerProvider()
     private val resourceManager: ResourceManager = mock()
     private val metadataIconProvider: MetadataIconProvider = mock {
-        on { invoke(any()) } doReturn MetadataIconData.defaultIcon()
+        on { invoke(any(), any()) } doReturn MetadataIconData.defaultIcon()
     }
 
     @Before
diff --git a/app/src/test/java/org/dhis2/usescases/programEventDetail/ProgramEventMapperTest.kt b/app/src/test/java/org/dhis2/usescases/programEventDetail/ProgramEventMapperTest.kt
index b078a1d39b..8dcda3ac60 100644
--- a/app/src/test/java/org/dhis2/usescases/programEventDetail/ProgramEventMapperTest.kt
+++ b/app/src/test/java/org/dhis2/usescases/programEventDetail/ProgramEventMapperTest.kt
@@ -28,7 +28,7 @@ class ProgramEventMapperTest {
     private val d2: D2 = Mockito.mock(D2::class.java, RETURNS_DEEP_STUBS)
     private val periodUtil: DhisPeriodUtils = mock()
     private val metadataIconProvider: MetadataIconProvider = mock {
-        on { invoke(any()) } doReturn MetadataIconData.defaultIcon()
+        on { invoke(any(), any()) } doReturn MetadataIconData.defaultIcon()
     }
 
     @Before
diff --git a/app/src/test/java/org/dhis2/usescases/programEventDetail/usecase/CreateEventUseCaseTest.kt b/app/src/test/java/org/dhis2/usescases/programEventDetail/usecase/CreateEventUseCaseTest.kt
index b911041d7b..dcf82cf4cb 100644
--- a/app/src/test/java/org/dhis2/usescases/programEventDetail/usecase/CreateEventUseCaseTest.kt
+++ b/app/src/test/java/org/dhis2/usescases/programEventDetail/usecase/CreateEventUseCaseTest.kt
@@ -2,6 +2,7 @@ package org.dhis2.usescases.programEventDetail.usecase
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runBlocking
+import org.dhis2.commons.date.DateUtils
 import org.dhis2.commons.viewmodel.DispatcherProvider
 import org.hisp.dhis.android.core.D2
 import org.hisp.dhis.android.core.event.EventCreateProjection
@@ -18,6 +19,7 @@ import org.mockito.kotlin.doThrow
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.verify
 import org.mockito.kotlin.whenever
+import java.util.Date
 
 class CreateEventUseCaseTest {
 
@@ -41,9 +43,14 @@ class CreateEventUseCaseTest {
         on { eventModule() } doReturn eventModule
     }
 
+    private val dateUtils: DateUtils = mock {
+        on { today } doReturn Date()
+    }
+
     private val createEventUseCase: CreateEventUseCase = CreateEventUseCase(
         dispatcher = dispatcherProvider,
         d2 = d2,
+        dateUtils = dateUtils,
     )
 
     @Test
@@ -67,6 +74,8 @@ class CreateEventUseCaseTest {
                     this.organisationUnit() == orgUnitUid
             },
         )
+
+        verify(eventRepository).setEventDate(any<Date>())
     }
 
     @Test
@@ -88,6 +97,8 @@ class CreateEventUseCaseTest {
                     this.organisationUnit() == orgUnitUid
             },
         )
+
+        verify(eventRepository).setEventDate(any<Date>())
     }
 
     @Test
diff --git a/app/src/test/java/org/dhis2/usescases/programstageselection/ProgramStageSelectionPresenterTest.kt b/app/src/test/java/org/dhis2/usescases/programstageselection/ProgramStageSelectionPresenterTest.kt
index cb6996f809..4eade43848 100644
--- a/app/src/test/java/org/dhis2/usescases/programstageselection/ProgramStageSelectionPresenterTest.kt
+++ b/app/src/test/java/org/dhis2/usescases/programstageselection/ProgramStageSelectionPresenterTest.kt
@@ -73,7 +73,7 @@ class ProgramStageSelectionPresenterTest {
     private val rulesUtils: RulesUtilsProvider = mock()
     private val scheduler = TrampolineSchedulerProvider()
     private val metadataIconProvider: MetadataIconProvider = mock {
-        on { invoke(any()) } doReturn MetadataIconData.defaultIcon()
+        on { invoke(any(), any()) } doReturn MetadataIconData.defaultIcon()
     }
     private val dispatcherProvider: DispatcherProvider = mock {
         on { io() } doReturn Dispatchers.Unconfined
diff --git a/app/src/test/java/org/dhis2/usescases/searchTrackEntity/SearchTEIViewModelTest.kt b/app/src/test/java/org/dhis2/usescases/searchTrackEntity/SearchTEIViewModelTest.kt
index ae949453e2..143ca66547 100644
--- a/app/src/test/java/org/dhis2/usescases/searchTrackEntity/SearchTEIViewModelTest.kt
+++ b/app/src/test/java/org/dhis2/usescases/searchTrackEntity/SearchTEIViewModelTest.kt
@@ -14,6 +14,8 @@ import org.dhis2.commons.network.NetworkUtils
 import org.dhis2.commons.resources.ResourceManager
 import org.dhis2.commons.viewmodel.DispatcherProvider
 import org.dhis2.data.search.SearchParametersModel
+import org.dhis2.form.model.FieldUiModel
+import org.dhis2.form.model.FieldUiModelImpl
 import org.dhis2.form.ui.intent.FormIntent
 import org.dhis2.form.ui.provider.DisplayNameProvider
 import org.dhis2.maps.geometry.mapper.EventsByProgramStage
@@ -630,6 +632,149 @@ class SearchTEIViewModelTest {
         verify(repository).setCurrentTheme(null)
     }
 
+    @Test
+    fun `should return user-friendly names on search parameters fields`() {
+        viewModel.uiState = viewModel.uiState.copy(items = getFieldUIModels())
+        val expectedMap = mapOf(
+            "uid1" to "Friendly OrgUnit Name",
+            "uid2" to "Male",
+            "uid3" to "21/2/2024",
+            "uid4" to "21/2/2024 01:00",
+            "uid5" to "Boolean: false",
+            "uid6" to "Yes Only",
+            "uid7" to "Text value",
+            "uid9" to "18%",
+        )
+
+        val formattedMap = viewModel.getFriendlyQueryData()
+
+        assertTrue(expectedMap == formattedMap)
+    }
+
+    @Test
+    fun `should clear uiState when clearing data`() {
+        viewModel.uiState = viewModel.uiState.copy(items = getFieldUIModels())
+        performSearch()
+        viewModel.clearQueryData()
+        assert(viewModel.queryData.isEmpty())
+        assert(viewModel.uiState.items.all { it.value == null })
+        assert(viewModel.uiState.searchedItems.isEmpty())
+    }
+
+    @Test
+    fun `should return date without format`() {
+        viewModel.uiState = viewModel.uiState.copy(items = getMalformedDateFieldUIModels())
+        val expectedMap = mapOf(
+            "uid1" to "04",
+        )
+
+        val formattedMap = viewModel.getFriendlyQueryData()
+
+        assertTrue(expectedMap == formattedMap)
+    }
+
+    private fun getMalformedDateFieldUIModels(): List<FieldUiModel> {
+        return listOf(
+            FieldUiModelImpl(
+                uid = "uid1",
+                layoutId = 3,
+                label = "Date",
+                value = "04",
+                autocompleteList = emptyList(),
+                optionSetConfiguration = null,
+                valueType = ValueType.DATE,
+            ),
+        )
+    }
+
+    private fun getFieldUIModels(): List<FieldUiModel> {
+        return listOf(
+            FieldUiModelImpl(
+                uid = "uid1",
+                layoutId = 1,
+                label = "Org Unit",
+                value = "orgUnitUid",
+                displayName = "Friendly OrgUnit Name",
+                autocompleteList = emptyList(),
+                optionSetConfiguration = null,
+                valueType = ValueType.ORGANISATION_UNIT,
+            ),
+            FieldUiModelImpl(
+                uid = "uid2",
+                layoutId = 2,
+                label = "Gender",
+                value = "M",
+                displayName = "Male",
+                autocompleteList = emptyList(),
+                optionSetConfiguration = null,
+                valueType = ValueType.MULTI_TEXT,
+            ),
+            FieldUiModelImpl(
+                uid = "uid3",
+                layoutId = 3,
+                label = "Date",
+                value = "2024-02-21",
+                autocompleteList = emptyList(),
+                optionSetConfiguration = null,
+                valueType = ValueType.DATE,
+            ),
+            FieldUiModelImpl(
+                uid = "uid4",
+                layoutId = 4,
+                label = "Date and Time",
+                value = "2024-02-21T01:00",
+                autocompleteList = emptyList(),
+                optionSetConfiguration = null,
+                valueType = ValueType.DATETIME,
+            ),
+            FieldUiModelImpl(
+                uid = "uid5",
+                layoutId = 5,
+                label = "Boolean",
+                value = "false",
+                autocompleteList = emptyList(),
+                optionSetConfiguration = null,
+                valueType = ValueType.BOOLEAN,
+            ),
+            FieldUiModelImpl(
+                uid = "uid6",
+                layoutId = 6,
+                label = "Yes Only",
+                value = "true",
+                autocompleteList = emptyList(),
+                optionSetConfiguration = null,
+                valueType = ValueType.TRUE_ONLY,
+            ),
+            FieldUiModelImpl(
+                uid = "uid7",
+                layoutId = 7,
+                label = "Text",
+                value = "Text value",
+                autocompleteList = emptyList(),
+                optionSetConfiguration = null,
+                valueType = ValueType.TEXT,
+            ),
+            FieldUiModelImpl(
+                uid = "uid8",
+                layoutId = 8,
+                label = "Other field",
+                value = null,
+                autocompleteList = emptyList(),
+                optionSetConfiguration = null,
+                valueType = ValueType.TEXT,
+            ),
+            FieldUiModelImpl(
+                uid = "uid9",
+                layoutId = 9,
+                label = "Percentage",
+                value = "18",
+                autocompleteList = emptyList(),
+                optionSetConfiguration = null,
+                valueType = ValueType.PERCENTAGE,
+            ),
+        )
+    }
+
     private fun testingProgram(
         displayFrontPageList: Boolean = true,
         minAttributesToSearch: Int = 1,
diff --git a/app/src/test/java/org/dhis2/usescases/teiDashboard/DashboardViewModelTest.kt b/app/src/test/java/org/dhis2/usescases/teiDashboard/DashboardViewModelTest.kt
index 952b190c9a..c40aef0da8 100644
--- a/app/src/test/java/org/dhis2/usescases/teiDashboard/DashboardViewModelTest.kt
+++ b/app/src/test/java/org/dhis2/usescases/teiDashboard/DashboardViewModelTest.kt
@@ -121,6 +121,7 @@ class DashboardViewModelTest {
                 StatusChangeResultCode.CHANGED,
             )
             updateEnrollmentStatus(EnrollmentStatus.COMPLETED)
+            testingDispatcher.scheduler.advanceUntilIdle()
             verify(repository).updateEnrollmentStatus("enrollmentUid", EnrollmentStatus.COMPLETED)
             assertTrue(showStatusBar.value == EnrollmentStatus.COMPLETED)
             assertTrue(syncNeeded.value)
@@ -139,6 +140,7 @@ class DashboardViewModelTest {
                 StatusChangeResultCode.FAILED,
             )
             updateEnrollmentStatus(EnrollmentStatus.COMPLETED)
+            testingDispatcher.scheduler.advanceUntilIdle()
             assertTrue(showStatusErrorMessages.value == StatusChangeResultCode.FAILED)
         }
     }
diff --git a/app/src/test/java/org/dhis2/usescases/teiDashboard/dashboardfragments/data/TeiDataPresenterTest.kt b/app/src/test/java/org/dhis2/usescases/teiDashboard/dashboardfragments/data/TeiDataPresenterTest.kt
index 7cd12c1873..eac4caf151 100644
--- a/app/src/test/java/org/dhis2/usescases/teiDashboard/dashboardfragments/data/TeiDataPresenterTest.kt
+++ b/app/src/test/java/org/dhis2/usescases/teiDashboard/dashboardfragments/data/TeiDataPresenterTest.kt
@@ -106,38 +106,14 @@ class TeiDataPresenterTest {
 
     @Test
     fun `Should return false if orgUnit does not belong to the capture scope`() {
-        mockEnrollmentOrgUnitInCaptureScope(false)
+        whenever(
+            teiDataRepository.enrollmentOrgUnitInCaptureScope("orgUnitUid"),
+        ) doReturn false
         assertTrue(
-            teiDataPresenter.enrollmentOrgUnitInCaptureScope("orgUnitUid"),
+            !teiDataPresenter.enrollmentOrgUnitInCaptureScope("orgUnitUid"),
         )
     }
 
-    private fun mockEnrollmentOrgUnitInCaptureScope(returnValue: Boolean) {
-        whenever(
-            d2.organisationUnitModule().organisationUnits(),
-        ) doReturn mock()
-        whenever(
-            d2.organisationUnitModule().organisationUnits()
-                .byOrganisationUnitScope(OrganisationUnit.Scope.SCOPE_DATA_CAPTURE),
-        ) doReturn mock()
-        whenever(
-            d2.organisationUnitModule().organisationUnits()
-                .byOrganisationUnitScope(OrganisationUnit.Scope.SCOPE_DATA_CAPTURE)
-                .byUid(),
-        ) doReturn mock()
-        whenever(
-            d2.organisationUnitModule().organisationUnits()
-                .byOrganisationUnitScope(OrganisationUnit.Scope.SCOPE_DATA_CAPTURE)
-                .byUid().eq("orgUnitUid"),
-        ) doReturn mock()
-        whenever(
-            d2.organisationUnitModule().organisationUnits()
-                .byOrganisationUnitScope(OrganisationUnit.Scope.SCOPE_DATA_CAPTURE)
-                .byUid().eq("orgUnitUid")
-                .blockingIsEmpty(),
-        ) doReturn returnValue
-    }
-
     @Test
     fun `Should show category combo dialog`() {
         whenever(
@@ -187,7 +163,7 @@ class TeiDataPresenterTest {
             on { organisationUnit() } doReturn "orgUnitUid"
         }
         whenever(teiDataRepository.getEnrollment()) doReturn Single.just(mockedEnrollment)
-        mockEnrollmentOrgUnitInCaptureScope(false)
+        whenever(teiDataRepository.enrollmentOrgUnitInCaptureScope("orgUnitUid")) doReturn false
         teiDataPresenter.onEventCreationClick(EventCreationOptionsMapper.ADD_NEW_ID)
         contractLiveData.value = Unit
     }
@@ -199,7 +175,7 @@ class TeiDataPresenterTest {
         }
         whenever(d2.enrollment(enrollmentUid)) doReturn mockedEnrollment
         whenever(d2.canCreateEventInEnrollment(enrollmentUid, emptyList())) doReturn false
-        teiDataPresenter.updateCreateEventButtonVisibility(false)
+        teiDataPresenter.updateCreateEventButtonVisibility()
         assertTrue(teiDataPresenter.shouldDisplayEventCreationButton.value == false)
     }
 
@@ -210,7 +186,7 @@ class TeiDataPresenterTest {
         }
         whenever(d2.enrollment(enrollmentUid)) doReturn mockedEnrollment
         whenever(d2.canCreateEventInEnrollment(enrollmentUid, emptyList())) doReturn true
-        teiDataPresenter.updateCreateEventButtonVisibility(false)
+        teiDataPresenter.updateCreateEventButtonVisibility()
         assertTrue(teiDataPresenter.shouldDisplayEventCreationButton.value == false)
     }
 
@@ -244,6 +220,59 @@ class TeiDataPresenterTest {
         verify(view).showDialogCloseProgram()
     }
 
+    @Test
+    fun `Should not show ORG unit selector dialog when org count is 1`() = runBlocking {
+        val orgUnitUid = "orgUnitUid"
+        val programStageUid = "programStageUid"
+        val eventUid = "eventUid"
+
+        val orgUnit = OrganisationUnit.builder()
+            .uid(orgUnitUid)
+            .build()
+
+        whenever(
+            teiDataRepository.programOrgListInCaptureScope(programUid),
+        ) doReturn listOf(orgUnit)
+
+        whenever(
+            createEventUseCase.invoke(
+                programUid,
+                orgUnitUid,
+                programStageUid,
+                enrollmentUid,
+            ),
+        ) doReturn (Result.success(eventUid))
+
+        teiDataPresenter.checkOrgUnitCount(programUid, programStageUid)
+
+        verify(view).goToEventDetails(eventUid, EventMode.NEW, programUid)
+        verifyNoMoreInteractions(view)
+    }
+
+    @Test
+    fun `Should show ORG unit selector dialog when org count is greater than 1`() = runBlocking {
+        val orgUnitUid1 = "orgUnitUid 1"
+        val orgUnitUid2 = "orgUnitUid 2"
+        val programStageUid = "programStageUid"
+
+        val orgUnit1 = OrganisationUnit.builder()
+            .uid(orgUnitUid1)
+            .build()
+
+        val orgUnit2 = OrganisationUnit.builder()
+            .uid(orgUnitUid2)
+            .build()
+
+        whenever(
+            teiDataRepository.programOrgListInCaptureScope(programUid),
+        ) doReturn listOf(orgUnit1, orgUnit2)
+
+        teiDataPresenter.checkOrgUnitCount(programUid, programStageUid)
+
+        verify(view).displayOrgUnitSelectorForNewEvent(programUid, programStageUid)
+        verifyNoMoreInteractions(view)
+    }
+
     @Test
     fun `onOrgUnitForNewEventSelected success`() = runBlocking {
         val orgUnitUid = "orgUnitUid"
diff --git a/app/src/test/java/org/dhis2/usescases/teiDashboard/dialogs/scheduling/SchedulingViewModelTest.kt b/app/src/test/java/org/dhis2/usescases/teiDashboard/dialogs/scheduling/SchedulingViewModelTest.kt
new file mode 100644
index 0000000000..2eacb1f7e2
--- /dev/null
+++ b/app/src/test/java/org/dhis2/usescases/teiDashboard/dialogs/scheduling/SchedulingViewModelTest.kt
@@ -0,0 +1,53 @@
+package org.dhis2.usescases.teiDashboard.dialogs.scheduling
+
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.StandardTestDispatcher
+import kotlinx.coroutines.test.setMain
+import org.hisp.dhis.android.core.arch.helpers.DateUtils
+import org.hisp.dhis.android.core.enrollment.Enrollment
+import org.hisp.dhis.android.core.program.ProgramStage
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mockito.spy
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
+
+class SchedulingViewModelTest {
+
+    private val enrollment = Enrollment.builder().uid("enrollmentUid").build()
+    private val programStage = ProgramStage.builder().uid("programStage").build()
+
+    private lateinit var schedulingViewModel: SchedulingViewModel
+
+    private val testingDispatcher = StandardTestDispatcher()
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    @Before
+    fun setUp() {
+        Dispatchers.setMain(testingDispatcher)
+        schedulingViewModel = SchedulingViewModel(
+            enrollment = enrollment,
+            programStages = listOf(programStage),
+            d2 = mock(),
+            resourceManager = mock(),
+            periodUtils = mock(),
+        )
+    }
+
+    @Test
+    fun shouldSetReportDate() {
+        val date = DateUtils.DATE_FORMAT.parse("2024-04-14T00:00:00.000")
+        val spy = spy(schedulingViewModel)
+        spy.onDateSet(2024, 4, 14)
+        verify(spy).setUpEventReportDate(date)
+    }
+
+    @Test
+    fun shouldSetReportDateForIncreasedNumberOfMonth() {
+        val date = DateUtils.DATE_FORMAT.parse("2025-01-31T00:00:00.000")
+        val spy = spy(schedulingViewModel)
+        spy.onDateSet(2024, 13, 31)
+        verify(spy).setUpEventReportDate(date)
+    }
+}
diff --git a/app/src/test/java/org/dhis2/utils/filters/FilterManagerTest.kt b/app/src/test/java/org/dhis2/utils/filters/FilterManagerTest.kt
index 85cb8db4cd..12c6c40c7a 100644
--- a/app/src/test/java/org/dhis2/utils/filters/FilterManagerTest.kt
+++ b/app/src/test/java/org/dhis2/utils/filters/FilterManagerTest.kt
@@ -198,6 +198,9 @@ class FilterManagerTest {
             eventStatusList = listOf(),
             eventDateList = listOf("date"),
             assignedToMe = listOf(),
+            filters = mapOf(),
+            stageUid = "stageUid",
+            dataValues = mapOf(),
         )
         filterManager.setWorkingListScope(workingListScope)
 
diff --git a/commons/src/main/java/org/dhis2/commons/bindings/FileExtensions.kt b/commons/src/main/java/org/dhis2/commons/bindings/FileExtensions.kt
index a3eacb2a0a..0fd8441505 100644
--- a/commons/src/main/java/org/dhis2/commons/bindings/FileExtensions.kt
+++ b/commons/src/main/java/org/dhis2/commons/bindings/FileExtensions.kt
@@ -15,12 +15,6 @@ import org.apache.commons.io.FileUtils
 import org.hisp.dhis.android.core.arch.helpers.FileResourceDirectoryHelper
 import java.io.File
 
-fun File.widthAndHeight(minimum: Int? = null): Pair<Int, Int> {
-    BitmapFactory.decodeFile(this.absolutePath).apply {
-        return resizeToMinimum(minimum, width, height)
-    }
-}
-
 fun resizeToMinimum(minimum: Int? = null, width: Int, height: Int): Pair<Int, Int> {
     val ratio = width.toFloat() / height.toFloat()
 
@@ -103,9 +97,10 @@ private fun getFilePath(context: Context, uri: Uri): String? {
                 if (id.startsWith("raw:")) {
                     return id.replaceFirst("raw:", "")
                 }
+                val splitIndex = if (split.size > 1) 1 else 0
                 copy = ContentUris.withAppendedId(
                     Uri.parse("content://downloads/public_downloads"),
-                    split[1].toLong(),
+                    split[splitIndex].toLong(),
                 )
             }
             isExternalStorageDocument(copy) -> {
diff --git a/commons/src/main/java/org/dhis2/commons/bindings/TEICardExtensions.kt b/commons/src/main/java/org/dhis2/commons/bindings/TEICardExtensions.kt
index 55d0512146..fdf79acc04 100644
--- a/commons/src/main/java/org/dhis2/commons/bindings/TEICardExtensions.kt
+++ b/commons/src/main/java/org/dhis2/commons/bindings/TEICardExtensions.kt
@@ -56,7 +56,7 @@ fun List<Enrollment>.hasFollowUp(): Boolean {
 
 fun List<Program>.getEnrollmentIconsData(
     currentProgram: String?,
-    metadataIconData: MetadataIconData,
+    provideMetadataIconData: (String) -> MetadataIconData,
 ): List<EnrollmentIconData> {
     val enrollmentIconDataList: MutableList<EnrollmentIconData> = mutableListOf()
 
@@ -64,10 +64,14 @@ fun List<Program>.getEnrollmentIconsData(
     this.filter { it.uid() != currentProgram }
         .forEachIndexed { index, program ->
             if (filteredList.size <= 4) {
-                enrollmentIconDataList.add(EnrollmentIconData(0, 0, true, 0, metadataIconData))
+                enrollmentIconDataList.add(
+                    EnrollmentIconData(0, 0, true, 0, provideMetadataIconData(program.uid())),
+                )
             } else {
                 if (index in 0..2) {
-                    enrollmentIconDataList.add(EnrollmentIconData(0, 0, true, 0, metadataIconData))
+                    enrollmentIconDataList.add(
+                        EnrollmentIconData(0, 0, true, 0, provideMetadataIconData(program.uid())),
+                    )
                 }
                 if (index == 3) {
                     enrollmentIconDataList.add(
@@ -76,7 +80,7 @@ fun List<Program>.getEnrollmentIconsData(
                             0,
                             false,
                             getRemainingEnrollmentsForTei(filteredList.size),
-                            metadataIconData,
+                            provideMetadataIconData(program.uid()),
                         ),
                     )
                 }
diff --git a/commons/src/main/java/org/dhis2/commons/data/EventViewModel.kt b/commons/src/main/java/org/dhis2/commons/data/EventViewModel.kt
index d5d5869ac4..0b48f455ca 100644
--- a/commons/src/main/java/org/dhis2/commons/data/EventViewModel.kt
+++ b/commons/src/main/java/org/dhis2/commons/data/EventViewModel.kt
@@ -25,8 +25,9 @@ data class EventViewModel(
     val displayDate: String?,
     val nameCategoryOptionCombo: String?,
     val metadataIconData: MetadataIconData,
+    val editable: Boolean = true,
+    val displayOrgUnit: Boolean = true,
 ) {
-    var isClicked: Boolean = false
     fun toggleValueList() {
         this.valueListIsOpen = !valueListIsOpen
     }
diff --git a/commons/src/main/java/org/dhis2/commons/data/SearchTeiModel.java b/commons/src/main/java/org/dhis2/commons/data/SearchTeiModel.java
index 2d164b56ea..d3c9597a70 100644
--- a/commons/src/main/java/org/dhis2/commons/data/SearchTeiModel.java
+++ b/commons/src/main/java/org/dhis2/commons/data/SearchTeiModel.java
@@ -191,7 +191,7 @@ public List<Program> getProgramInfo() {
         }
     }
 
-    public MetadataIconData getMetadataIconData(String programUid) {
+    public MetadataIconData getMetadataIconData(@Nullable String programUid) {
         MetadataIconData iconData = metadataIconDataMap.get(programUid);
         if (iconData != null) {
             return iconData;
diff --git a/commons/src/main/java/org/dhis2/commons/date/DateExtensions.kt b/commons/src/main/java/org/dhis2/commons/date/DateExtensions.kt
index d3dce6dad5..f2258133e6 100644
--- a/commons/src/main/java/org/dhis2/commons/date/DateExtensions.kt
+++ b/commons/src/main/java/org/dhis2/commons/date/DateExtensions.kt
@@ -87,16 +87,20 @@ fun Date?.toOverdueOrScheduledUiText(
             isOverdue,
         )
     }
+    val currentDay = with(DateUtils.getInstance()) {
+        setCurrentDate(currentDate)
+        calendar.time
+    }
 
     if (this == null) return ""
     val isOverdue: Boolean
 
-    val period = if (this.time > currentDate.time) {
+    val period = if (this.time > currentDay.time) {
         isOverdue = false
-        Interval(currentDate.time, this.time)
+        Interval(currentDay.time, this.time)
     } else {
         isOverdue = true
-        Interval(this.time, currentDate.time)
+        Interval(this.time, currentDay.time)
     }.toPeriod(PeriodType.yearMonthDayTime())
 
     return when {
@@ -121,10 +125,10 @@ fun Date?.toOverdueOrScheduledUiText(
         }
 
         period.days in 1..89 -> {
-            val intervalDays = if (this.time > currentDate.time) {
-                Interval(currentDate.time, this.time)
+            val intervalDays = if (this.time > currentDay.time) {
+                Interval(currentDay.time, this.time)
             } else {
-                Interval(this.time, currentDate.time)
+                Interval(this.time, currentDay.time)
             }.toDuration().toStandardDays().days
 
             getOverdueDaysString(intervalDays, isOverdue)
diff --git a/commons/src/main/java/org/dhis2/commons/date/DateUtils.java b/commons/src/main/java/org/dhis2/commons/date/DateUtils.java
index 8cadc3c60d..70f5d4a4cf 100644
--- a/commons/src/main/java/org/dhis2/commons/date/DateUtils.java
+++ b/commons/src/main/java/org/dhis2/commons/date/DateUtils.java
@@ -36,6 +36,7 @@ public static DateUtils getInstance() {
     public static final String SIMPLE_DATE_FORMAT = "d/M/yyyy";
     public static final String TIME_12H_EXPRESSION = "hh:mm a";
     public static final String UI_LIBRARY_FORMAT = "ddMMyyyy";
+    public static final String SIMPLE_DATE_TIME_FORMAT = "d/M/yyyy HH:mm";
 
     public Date[] getDateFromDateAndPeriod(Date date, Period period) {
         switch (period) {
@@ -220,6 +221,11 @@ public static SimpleDateFormat twelveHourTimeFormat() {
         return new SimpleDateFormat(TIME_12H_EXPRESSION, Locale.US);
     }
 
+    @NonNull
+    public static SimpleDateFormat uiDateTimeFormat() {
+        return new SimpleDateFormat(SIMPLE_DATE_TIME_FORMAT, Locale.US);
+    }
+
 
     /**********************
      FORMAT REGION*/
diff --git a/commons/src/main/java/org/dhis2/commons/filters/data/TeiWorkingListScope.kt b/commons/src/main/java/org/dhis2/commons/filters/data/TeiWorkingListScope.kt
index d533a7e118..ae7e0623e0 100644
--- a/commons/src/main/java/org/dhis2/commons/filters/data/TeiWorkingListScope.kt
+++ b/commons/src/main/java/org/dhis2/commons/filters/data/TeiWorkingListScope.kt
@@ -42,6 +42,9 @@ data class TeiWorkingListScope(
     val eventStatusList: List<String>?,
     val eventDateList: List<String>?,
     val assignedToMe: List<AssignedUserMode>?,
+    val filters: Map<String, String>?,
+    val stageUid: String?,
+    val dataValues: Map<String, String>?,
 ) : WorkingListScope() {
     override fun isAssignedActive(): Boolean = assignedToMe?.isNotEmpty() == true
     override fun isAssignedToMeActive(): Boolean =
@@ -109,6 +112,9 @@ fun TrackedEntityInstanceQueryRepositoryScope.mapToWorkingListScope(
         eventFilters().mapNotNull { it.eventDate() }
             .mapNotNull { resources.dateFilterPeriodToText(it) },
         eventFilters().mapNotNull { it.assignedUserMode() }.distinct(),
+        filter().associateBy({ it.key() }, { it.value() }),
+        programStage(),
+        dataValue().associateBy({ it.key() }, { it.value() }),
     )
 }
 
diff --git a/commons/src/main/java/org/dhis2/commons/orgunitselector/OUTreeFragment.kt b/commons/src/main/java/org/dhis2/commons/orgunitselector/OUTreeFragment.kt
index 2c596f879d..63bf190731 100644
--- a/commons/src/main/java/org/dhis2/commons/orgunitselector/OUTreeFragment.kt
+++ b/commons/src/main/java/org/dhis2/commons/orgunitselector/OUTreeFragment.kt
@@ -143,9 +143,9 @@ class OUTreeFragment private constructor() : DialogFragment() {
                             override val onOpenOrgUnit: (orgUnitUid: String) -> Unit
                                 get() = presenter::onOpenChildren
                             override val onDoneClick: () -> Unit
-                                get() = this@OUTreeFragment::exitOuSelection
+                                get() = this@OUTreeFragment::confirmOuSelection
                             override val onCancelClick: () -> Unit
-                                get() = this@OUTreeFragment::dismiss
+                                get() = this@OUTreeFragment::cancelOuSelection
                             override val onClearClick: () -> Unit
                                 get() = presenter::clearAll
                         },
@@ -164,8 +164,17 @@ class OUTreeFragment private constructor() : DialogFragment() {
 
     private fun showAsDialog() = arguments?.getBoolean(ARG_SHOW_AS_DIALOG, false) ?: false
 
-    private fun exitOuSelection() {
+    private fun confirmOuSelection() {
         selectionCallback(presenter.getOrgUnits())
+        exitOuSelection()
+    }
+
+    private fun cancelOuSelection() {
+        selectionCallback(emptyList())
+        exitOuSelection()
+    }
+
+    private fun exitOuSelection() {
         if (showAsDialog()) {
             dismiss()
         } else {
diff --git a/commons/src/main/java/org/dhis2/commons/resources/MetadataIconProvider.kt b/commons/src/main/java/org/dhis2/commons/resources/MetadataIconProvider.kt
index 506c5e2778..a6d72c8c1a 100644
--- a/commons/src/main/java/org/dhis2/commons/resources/MetadataIconProvider.kt
+++ b/commons/src/main/java/org/dhis2/commons/resources/MetadataIconProvider.kt
@@ -11,10 +11,14 @@ import org.hisp.dhis.android.core.D2
 import org.hisp.dhis.android.core.common.ObjectStyle
 import org.hisp.dhis.android.core.icon.Icon
 import org.hisp.dhis.mobile.ui.designsystem.component.internal.ImageCardData
+import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor
 import timber.log.Timber
 import java.io.File
+
 class MetadataIconProvider(private val d2: D2) {
-    operator fun invoke(style: ObjectStyle) = style.icon()?.let {
+    operator fun invoke(style: ObjectStyle) = invoke(style, SurfaceColor.Primary)
+
+    operator fun invoke(style: ObjectStyle, defaultColor: Color?) = style.icon()?.let {
         d2.iconModule().icons().key(it).blockingGet()
     }.let { icon ->
         val imageCardData = when {
@@ -29,7 +33,7 @@ class MetadataIconProvider(private val d2: D2) {
                     uid = "",
                     label = "",
                     iconRes = FILE_NOT_LOADED,
-                    iconTint = style.color()?.toColor() ?: Color.Unspecified,
+                    iconTint = style.color()?.toColor() ?: defaultColor ?: Color.Unspecified,
                 )
             }
 
@@ -42,7 +46,7 @@ class MetadataIconProvider(private val d2: D2) {
         }
         MetadataIconData(
             imageCardData = imageCardData,
-            color = style.color()?.toColor() ?: Color.Unspecified,
+            color = style.color()?.toColor() ?: defaultColor ?: Color.Unspecified,
         )
     }
 
diff --git a/compose-table/src/main/java/org/dhis2/composetable/ui/ItemValues.kt b/compose-table/src/main/java/org/dhis2/composetable/ui/ItemValues.kt
index a7496749fb..414bd52edc 100644
--- a/compose-table/src/main/java/org/dhis2/composetable/ui/ItemValues.kt
+++ b/compose-table/src/main/java/org/dhis2/composetable/ui/ItemValues.kt
@@ -9,6 +9,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.key
 import androidx.compose.ui.Modifier
 import org.dhis2.composetable.model.TableCell
+import org.dhis2.composetable.model.TableHeader
 import org.dhis2.composetable.ui.semantics.CELL_TEST_TAG
 
 @Composable
@@ -18,7 +19,7 @@ fun ItemValues(
     maxLines: Int,
     cellValues: Map<Int, TableCell>,
     overridenValues: Map<Int, TableCell>,
-    headerExtraSize: Int,
+    tableHeaderModel: TableHeader,
     options: List<String>,
     headerLabel: String,
 ) {
@@ -41,7 +42,12 @@ fun ItemValues(
                         tableId = tableId,
                         cell = cellValue,
                         maxLines = maxLines,
-                        headerExtraSize = headerExtraSize,
+                        headerExtraSize = TableTheme.dimensions.extraSize(
+                            tableId,
+                            tableHeaderModel.tableMaxColumns(),
+                            tableHeaderModel.hasTotals,
+                            columnIndex,
+                        ),
                         options = options,
                         headerLabel = headerLabel,
                     )
diff --git a/compose-table/src/main/java/org/dhis2/composetable/ui/MultiOptionSelector.kt b/compose-table/src/main/java/org/dhis2/composetable/ui/MultiOptionSelector.kt
index 41b978816f..a7e8bf5572 100644
--- a/compose-table/src/main/java/org/dhis2/composetable/ui/MultiOptionSelector.kt
+++ b/compose-table/src/main/java/org/dhis2/composetable/ui/MultiOptionSelector.kt
@@ -21,7 +21,7 @@ fun MultiOptionSelector(
             val label = option.split("_")[1]
             CheckBoxData(
                 uid = code,
-                checked = cell.value?.contains(label) == true,
+                checked = cell.value?.split(", ")?.contains(label) == true,
                 enabled = cell.editable,
                 textInput = label,
             )
diff --git a/compose-table/src/main/java/org/dhis2/composetable/ui/TableDimensions.kt b/compose-table/src/main/java/org/dhis2/composetable/ui/TableDimensions.kt
index 3696d043f7..f91e19ffc9 100644
--- a/compose-table/src/main/java/org/dhis2/composetable/ui/TableDimensions.kt
+++ b/compose-table/src/main/java/org/dhis2/composetable/ui/TableDimensions.kt
@@ -69,11 +69,11 @@ data class TableDimensions(
                 val minColumn = rowHeaderRatio * column
                 (minColumn..maxColumn).sumOf {
                     columnWidthWithTableExtra(tableId, it) +
-                        extraSize(tableId, totalColumns, hasTotal)
+                        extraSize(tableId, totalColumns, hasTotal, column)
                 }
             }
             else -> columnWidthWithTableExtra(tableId, column) +
-                extraSize(tableId, totalColumns, hasTotal)
+                extraSize(tableId, totalColumns, hasTotal, column)
         }
         return result
     }
@@ -84,11 +84,14 @@ data class TableDimensions(
         return fullWidth / headerRowColumns
     }
 
-    fun extraSize(tableId: String, totalColumns: Int, hasTotal: Boolean): Int {
+    fun extraSize(tableId: String, totalColumns: Int, hasTotal: Boolean, column: Int? = null): Int {
         val screenWidth = totalWidth
         val tableWidth = tableWidth(tableId, totalColumns, hasTotal)
+        val columnHasResizedValue = column?.let {
+            columnWidth[tableId]?.containsKey(it)
+        }
 
-        return if (tableWidth < screenWidth && columnWidth[tableId]?.isEmpty() != false) {
+        return if (tableWidth < screenWidth && columnHasResizedValue != true) {
             val totalColumnCount = 1.takeIf { hasTotal } ?: 0
             val columnsCount = totalColumns + totalColumnCount
             ((screenWidth - tableWidth) / columnsCount).also {
@@ -120,8 +123,11 @@ data class TableDimensions(
     }
 
     fun updateColumnWidth(tableId: String, column: Int, widthOffset: Float): TableDimensions {
-        val newWidth = (columnWidth[tableId]?.get(column) ?: defaultCellWidth) + widthOffset - 11 +
-            (currentExtraSize[tableId] ?: 0)
+        val newWidth = (
+            columnWidth[tableId]?.get(column)
+                ?: (defaultCellWidth + (currentExtraSize[tableId] ?: 0))
+            ) + widthOffset - 11
+
         val newMap = columnWidth.toMutableMap()
         val tableColumnMap = columnWidth[tableId]?.toMutableMap() ?: mutableMapOf()
         tableColumnMap[column] = newWidth.toInt()
@@ -169,7 +175,12 @@ data class TableDimensions(
         return desiredDimension.columnWidthWithTableExtra(
             tableId,
             columnIndex,
-        ) + extraSize(tableId, totalColumns, hasTotal) in minColumnWidth..maxColumnWidth
+        ) + extraSize(
+            tableId = tableId,
+            totalColumns = totalColumns,
+            hasTotal = hasTotal,
+            column = columnIndex,
+        ) in minColumnWidth..maxColumnWidth
     }
 
     fun canUpdateAllWidths(tableId: String, widthOffset: Float): Boolean {
diff --git a/compose-table/src/main/java/org/dhis2/composetable/ui/TableItemRow.kt b/compose-table/src/main/java/org/dhis2/composetable/ui/TableItemRow.kt
index b2531de9bd..c33ab575f7 100644
--- a/compose-table/src/main/java/org/dhis2/composetable/ui/TableItemRow.kt
+++ b/compose-table/src/main/java/org/dhis2/composetable/ui/TableItemRow.kt
@@ -68,11 +68,7 @@ fun TableItemRow(
                 cellValues = rowModel.values,
                 overridenValues = tableModel.overwrittenValues,
                 maxLines = rowModel.maxLines,
-                headerExtraSize = TableTheme.dimensions.extraSize(
-                    tableModel.id ?: "",
-                    tableModel.tableHeaderModel.tableMaxColumns(),
-                    tableModel.tableHeaderModel.hasTotals,
-                ),
+                tableHeaderModel = tableModel.tableHeaderModel,
                 options = rowModel.dropDownOptions ?: emptyList(),
                 headerLabel = rowModel.rowHeader.title,
             )
diff --git a/compose-table/src/main/java/org/dhis2/composetable/ui/extensions/LazyListScopeExtensions.kt b/compose-table/src/main/java/org/dhis2/composetable/ui/extensions/LazyListScopeExtensions.kt
index afd3c86e83..300d871025 100644
--- a/compose-table/src/main/java/org/dhis2/composetable/ui/extensions/LazyListScopeExtensions.kt
+++ b/compose-table/src/main/java/org/dhis2/composetable/ui/extensions/LazyListScopeExtensions.kt
@@ -13,8 +13,8 @@ fun LazyListScope.fixedStickyHeader(
     content: @Composable LazyItemScope.() -> Unit,
 ) {
     if (fixHeader) {
-        stickyHeader(key, contentType = contentType, content = content)
+        stickyHeader("${key}_sticky", contentType = contentType, content = content)
     } else {
-        item(key, contentType = contentType, content = content)
+        item("${key}_non_sticky", contentType = contentType, content = content)
     }
 }
diff --git a/dhis2-mobile-program-rules/src/main/java/org/dhis2/mobileProgramRules/RuleEngineExtensions.kt b/dhis2-mobile-program-rules/src/main/java/org/dhis2/mobileProgramRules/RuleEngineExtensions.kt
index 79ec284a05..c521196cd4 100644
--- a/dhis2-mobile-program-rules/src/main/java/org/dhis2/mobileProgramRules/RuleEngineExtensions.kt
+++ b/dhis2-mobile-program-rules/src/main/java/org/dhis2/mobileProgramRules/RuleEngineExtensions.kt
@@ -424,12 +424,12 @@ fun getOptions(
         dataElementRepository.uid(dataElementUid).blockingGet()?.optionSet()?.uid()
             ?.let { optionSetUid ->
                 optionRepository.byOptionSetUid().eq(optionSetUid).blockingGet()
-            }?.map { option -> Option(option.name()!!, option.code()!!) } ?: emptyList()
+            }?.map { option -> Option(option.name()!!, option.code() ?: "") } ?: emptyList()
     } else if (trackedEntityAttributeUid != null) {
         attributeRepository.uid(trackedEntityAttributeUid).blockingGet()?.optionSet()?.uid()
             ?.let { optionSetUid ->
                 optionRepository.byOptionSetUid().eq(optionSetUid).blockingGet()
-            }?.map { option -> Option(option.name()!!, option.code()!!) } ?: emptyList()
+            }?.map { option -> Option(option.name()!!, option.code() ?: "") } ?: emptyList()
     } else {
         emptyList()
     }
diff --git a/dhis2-mobile-program-rules/src/main/java/org/dhis2/mobileProgramRules/RulesRepository.kt b/dhis2-mobile-program-rules/src/main/java/org/dhis2/mobileProgramRules/RulesRepository.kt
index b0a3b0763e..73e75d0c98 100644
--- a/dhis2-mobile-program-rules/src/main/java/org/dhis2/mobileProgramRules/RulesRepository.kt
+++ b/dhis2-mobile-program-rules/src/main/java/org/dhis2/mobileProgramRules/RulesRepository.kt
@@ -40,10 +40,8 @@ class RulesRepository(private val d2: D2) {
             .withOrganisationUnitGroups().uid(orgUnitUid).blockingGet()
             .let { orgUnit ->
                 orgUnit?.organisationUnitGroups()?.map {
-                    if (it.code() != null) {
-                        supData[it.code()!!] = arrayListOf(orgUnit.uid())
-                    }
-                    supData[it.uid()!!] = arrayListOf(orgUnit.uid())
+                    it.code()?.let { code -> supData[code] = arrayListOf(orgUnit.uid()) }
+                    supData[it.uid()] = arrayListOf(orgUnit.uid())
                 }
             }
 
@@ -131,7 +129,7 @@ class RulesRepository(private val d2: D2) {
                             organisationUnitCode = d2.organisationUnitModule().organisationUnits()
                                 .uid(
                                     event.organisationUnit(),
-                                ).blockingGet()!!.code(),
+                                ).blockingGet()?.code(),
                             dataValues = event.trackedEntityDataValues()?.toRuleDataValue(
                                 event,
                                 d2.dataElementModule().dataElements(),
@@ -218,7 +216,7 @@ class RulesRepository(private val d2: D2) {
                     organisationUnit = event.organisationUnit()!!,
                     organisationUnitCode = d2.organisationUnitModule()
                         .organisationUnits().uid(event.organisationUnit())
-                        .blockingGet()!!.code(),
+                        .blockingGet()?.code(),
                     dataValues =
                     event.trackedEntityDataValues()?.toRuleDataValue(
                         event,
@@ -235,7 +233,7 @@ class RulesRepository(private val d2: D2) {
 
         val ouCode = d2.organisationUnitModule().organisationUnits()
             .uid(event.organisationUnit())
-            .blockingGet()!!.code()
+            .blockingGet()?.code() ?: ""
         val programName =
             d2.programModule().programs().uid(event.program()).blockingGet()!!.name()
         return if (event.enrollment() == null) {
@@ -246,7 +244,7 @@ class RulesRepository(private val d2: D2) {
                 Calendar.getInstance().time.toRuleEngineLocalDate(),
                 RuleEnrollment.Status.CANCELLED,
                 event.organisationUnit()!!,
-                ouCode!!,
+                ouCode,
                 ArrayList(),
             )
         } else {
@@ -259,7 +257,7 @@ class RulesRepository(private val d2: D2) {
                 enrollment.enrollmentDate()!!.toRuleEngineLocalDate(),
                 RuleEnrollment.Status.valueOf(enrollment.status()!!.name),
                 event.organisationUnit()!!,
-                ouCode!!,
+                ouCode,
                 getAttributesValues(enrollment),
             )
         }
@@ -319,7 +317,7 @@ class RulesRepository(private val d2: D2) {
             status = RuleEnrollment.Status.valueOf(enrollment.status()!!.name),
             organisationUnit = enrollment.organisationUnit()!!,
             organisationUnitCode = d2.organisationUnit(enrollment.organisationUnit()!!)
-                ?.code()!!,
+                ?.code() ?: "",
             attributeValues = emptyList(),
         )
     }
@@ -335,7 +333,7 @@ class RulesRepository(private val d2: D2) {
             dueDate = event.dueDate()?.toRuleEngineLocalDate(),
             completedDate = event.completedDate()?.toRuleEngineLocalDate(),
             organisationUnit = event.organisationUnit()!!,
-            organisationUnitCode = d2.organisationUnit(event.organisationUnit()!!)?.code()!!,
+            organisationUnitCode = d2.organisationUnit(event.organisationUnit()!!)?.code(),
             dataValues = emptyList(),
         )
     }
diff --git a/dhis2_android_maps/src/main/java/org/dhis2/maps/carousel/CarouselTeiHolder.kt b/dhis2_android_maps/src/main/java/org/dhis2/maps/carousel/CarouselTeiHolder.kt
index d436434890..7f21108255 100644
--- a/dhis2_android_maps/src/main/java/org/dhis2/maps/carousel/CarouselTeiHolder.kt
+++ b/dhis2_android_maps/src/main/java/org/dhis2/maps/carousel/CarouselTeiHolder.kt
@@ -67,8 +67,7 @@ class CarouselTeiHolder(
             val enrollmentIconDataList: List<EnrollmentIconData> =
                 programInfo.getEnrollmentIconsData(
                     if (selectedEnrollment != null) selectedEnrollment.program() else null,
-                    getMetadataIconData(selectedEnrollment.program()),
-                )
+                ) { programUid -> getMetadataIconData(programUid) }
             enrollmentIconDataList.paintAllEnrollmentIcons(
                 binding.composeProgramList,
             )
diff --git a/dhis_android_analytics/src/main/java/dhis2/org/analytics/charts/Charts.kt b/dhis_android_analytics/src/main/java/dhis2/org/analytics/charts/Charts.kt
index 753b1a13f0..c9a80ebc66 100644
--- a/dhis_android_analytics/src/main/java/dhis2/org/analytics/charts/Charts.kt
+++ b/dhis_android_analytics/src/main/java/dhis2/org/analytics/charts/Charts.kt
@@ -5,6 +5,7 @@ import dhis2.org.analytics.charts.data.Graph
 import dhis2.org.analytics.charts.ui.OrgUnitFilterType
 import org.dhis2.commons.featureconfig.data.FeatureConfigRepository
 import org.dhis2.commons.resources.ColorUtils
+import org.dhis2.commons.viewmodel.DispatcherProvider
 import org.hisp.dhis.android.core.D2
 import org.hisp.dhis.android.core.common.RelativePeriod
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
@@ -51,5 +52,6 @@ interface Charts {
         fun getD2(): D2
         fun getFeatureConfigRepository(): FeatureConfigRepository
         fun getColorUtils(): ColorUtils
+        fun getChartDispatcher(): DispatcherProvider
     }
 }
diff --git a/dhis_android_analytics/src/main/java/dhis2/org/analytics/charts/data/Chart.kt b/dhis_android_analytics/src/main/java/dhis2/org/analytics/charts/data/Chart.kt
index 7a7ed7c668..f333b7dbe1 100644
--- a/dhis_android_analytics/src/main/java/dhis2/org/analytics/charts/data/Chart.kt
+++ b/dhis_android_analytics/src/main/java/dhis2/org/analytics/charts/data/Chart.kt
@@ -4,12 +4,12 @@ import android.content.Context
 import android.view.View
 import androidx.compose.runtime.Composable
 import dhis2.org.analytics.charts.mappers.GraphToBarChart
+import dhis2.org.analytics.charts.mappers.GraphToIndicator
 import dhis2.org.analytics.charts.mappers.GraphToLineChart
 import dhis2.org.analytics.charts.mappers.GraphToNutritionChart
 import dhis2.org.analytics.charts.mappers.GraphToPieChart
 import dhis2.org.analytics.charts.mappers.GraphToRadarChart
 import dhis2.org.analytics.charts.mappers.GraphToTable
-import dhis2.org.analytics.charts.mappers.GraphToValue
 
 class Chart private constructor(
     private val chartType: ChartType,
@@ -22,7 +22,7 @@ class Chart private constructor(
     }
     private val graphToBarChartMapper: GraphToBarChart by lazy { GraphToBarChart() }
     private val graphToTableMapper: GraphToTable by lazy { GraphToTable() }
-    private val graphToValueMapper: GraphToValue by lazy { GraphToValue() }
+    private val graphToIndicator: GraphToIndicator by lazy { GraphToIndicator() }
     private val graphToRadarMapper: GraphToRadarChart by lazy { GraphToRadarChart() }
     private val graphToPieChartMapper: GraphToPieChart by lazy { GraphToPieChart() }
 
@@ -31,7 +31,7 @@ class Chart private constructor(
             ChartType.LINE_CHART -> graphToLineChartMapper.map(context, graphData)
             ChartType.NUTRITION -> graphToNutritionChartMapper.map(context, graphData)
             ChartType.BAR_CHART -> graphToBarChartMapper.map(context, graphData)
-            ChartType.SINGLE_VALUE -> graphToValueMapper.map(context, graphData)
+            ChartType.SINGLE_VALUE -> graphToIndicator.map(context, graphData)
             ChartType.RADAR -> graphToRadarMapper.map(context, graphData)
             ChartType.PIE_CHART -> graphToPieChartMapper.map(context, graphData)
             else -> graphToLineChartMapper.map(context, graphData)
diff --git a/dhis_android_analytics/src/main/java/dhis2/org/analytics/charts/di/ChartsInjector.kt b/dhis_android_analytics/src/main/java/dhis2/org/analytics/charts/di/ChartsInjector.kt
index f90b9aa0aa..6469d03433 100644
--- a/dhis_android_analytics/src/main/java/dhis2/org/analytics/charts/di/ChartsInjector.kt
+++ b/dhis_android_analytics/src/main/java/dhis2/org/analytics/charts/di/ChartsInjector.kt
@@ -25,6 +25,7 @@ import dhis2.org.analytics.charts.providers.PeriodStepProviderImpl
 import dhis2.org.analytics.charts.providers.RuleEngineNutritionDataProviderImpl
 import org.dhis2.commons.resources.ColorUtils
 import org.dhis2.commons.resources.ResourceManager
+import org.dhis2.commons.viewmodel.DispatcherProvider
 import org.hisp.dhis.android.core.D2
 import javax.inject.Singleton
 
@@ -120,8 +121,11 @@ class ChartsModule {
     }
 
     @Provides
-    internal fun periodStepProvider(d2: D2): PeriodStepProvider {
-        return PeriodStepProviderImpl(d2)
+    internal fun periodStepProvider(
+        d2: D2,
+        dispatcherProvider: DispatcherProvider,
+    ): PeriodStepProvider {
+        return PeriodStepProviderImpl(d2, dispatcherProvider)
     }
 
     @Provides
diff --git a/dhis_android_analytics/src/main/java/dhis2/org/analytics/charts/mappers/GraphToIndicator.kt b/dhis_android_analytics/src/main/java/dhis2/org/analytics/charts/mappers/GraphToIndicator.kt
new file mode 100644
index 0000000000..11f725993a
--- /dev/null
+++ b/dhis_android_analytics/src/main/java/dhis2/org/analytics/charts/mappers/GraphToIndicator.kt
@@ -0,0 +1,55 @@
+package dhis2.org.analytics.charts.mappers
+
+import android.content.Context
+import android.view.View
+import android.widget.TextView
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.platform.ViewCompositionStrategy
+import androidx.compose.ui.unit.dp
+import dhis2.org.R
+import dhis2.org.analytics.charts.data.ChartType
+import dhis2.org.analytics.charts.data.Graph
+import org.hisp.dhis.mobile.ui.designsystem.component.IndicatorInput
+import org.hisp.dhis.mobile.ui.designsystem.theme.DHIS2Theme
+import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor
+
+class GraphToIndicator {
+    fun map(context: Context, graph: Graph): View {
+        if (graph.series.isEmpty()) {
+            return TextView(context).apply {
+                text = context.getString(R.string.no_data)
+            }
+        }
+        return ComposeView(context).apply {
+            setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
+            setContent {
+                val series = if (graph.chartType == ChartType.NUTRITION) {
+                    listOf(graph.series.last())
+                } else {
+                    graph.series
+                }
+                DHIS2Theme {
+                    Column(
+                        verticalArrangement = Arrangement.spacedBy(16.dp),
+                    ) {
+                        series.forEach {
+                            val coordinate = it.coordinates.lastOrNull()
+                            IndicatorInput(
+                                title = it.fieldName,
+                                content = it.coordinates.lastOrNull()?.textValue() ?: "",
+                                indicatorColor = if (coordinate?.legendValue?.color != null) {
+                                    Color(coordinate.legendValue.color)
+                                } else {
+                                    SurfaceColor.Container
+                                },
+                            )
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/dhis_android_analytics/src/main/java/dhis2/org/analytics/charts/mappers/GraphToValue.kt b/dhis_android_analytics/src/main/java/dhis2/org/analytics/charts/mappers/GraphToValue.kt
deleted file mode 100644
index 9f2d8f6f93..0000000000
--- a/dhis_android_analytics/src/main/java/dhis2/org/analytics/charts/mappers/GraphToValue.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-package dhis2.org.analytics.charts.mappers
-
-import android.content.Context
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.LinearLayout
-import android.widget.TextView
-import androidx.core.content.ContextCompat
-import dhis2.org.R
-import dhis2.org.analytics.charts.data.ChartType
-import dhis2.org.analytics.charts.data.Graph
-import dhis2.org.databinding.ItemSingleValueBinding
-
-class GraphToValue {
-    fun map(context: Context, graph: Graph): View {
-        if (graph.series.isEmpty()) {
-            return TextView(context).apply {
-                text = context.getString(R.string.no_data)
-            }
-        }
-        return LinearLayout(context).apply {
-            orientation = LinearLayout.VERTICAL
-            layoutParams = ViewGroup.LayoutParams(
-                LinearLayout.LayoutParams.MATCH_PARENT,
-                LinearLayout.LayoutParams.WRAP_CONTENT,
-            )
-            val series = if (graph.chartType == ChartType.NUTRITION) {
-                listOf(graph.series.last())
-            } else {
-                graph.series
-            }
-            series.forEach {
-                addView(
-                    ItemSingleValueBinding.inflate(LayoutInflater.from(this.context)).apply {
-                        singleValueTitle.text = it.fieldName
-                        singleValue.text = it.coordinates.lastOrNull()?.textValue() ?: ""
-
-                        val coordinate = it.coordinates.lastOrNull()
-
-                        if (coordinate?.legendValue != null) {
-                            singleValueLegend.setBackgroundColor(coordinate?.legendValue.color)
-                        } else {
-                            singleValueLegend.setBackgroundColor(
-                                (ContextCompat.getColor(context, R.color.gray_e7e)),
-                            )
-                        }
-                    }.root,
-                )
-            }
-        }
-    }
-}
diff --git a/dhis_android_analytics/src/main/java/dhis2/org/analytics/charts/providers/PeriodStepProviderImpl.kt b/dhis_android_analytics/src/main/java/dhis2/org/analytics/charts/providers/PeriodStepProviderImpl.kt
index 1ce419d826..0a846ca254 100644
--- a/dhis_android_analytics/src/main/java/dhis2/org/analytics/charts/providers/PeriodStepProviderImpl.kt
+++ b/dhis_android_analytics/src/main/java/dhis2/org/analytics/charts/providers/PeriodStepProviderImpl.kt
@@ -1,6 +1,12 @@
 package dhis2.org.analytics.charts.providers
 
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.async
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
 import org.apache.commons.text.WordUtils
+import org.dhis2.commons.viewmodel.DispatcherProvider
 import org.hisp.dhis.android.core.D2
 import org.hisp.dhis.android.core.period.Period
 import org.hisp.dhis.android.core.period.PeriodType
@@ -13,33 +19,53 @@ import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
 import java.util.regex.Pattern
+import kotlin.coroutines.CoroutineContext
+
+class PeriodStepProviderImpl(
+    val d2: D2,
+    val dispatcherProvider: DispatcherProvider,
+) :
+    PeriodStepProvider, CoroutineScope {
+
+    private var job = Job()
+    override val coroutineContext: CoroutineContext
+        get() = job + dispatcherProvider.io()
 
-class PeriodStepProviderImpl(val d2: D2) : PeriodStepProvider {
     override fun periodStep(periodType: PeriodType?): Long {
         val currentDate = Date()
-        val initialPeriodDate = getPeriodForPeriodTypeAndDate(
-            periodType ?: PeriodType.Daily,
-            currentDate,
-            -1,
-        ).startDate()?.time ?: 0L
-        val currentPeriodDate = getPeriodForPeriodTypeAndDate(
-            periodType ?: PeriodType.Daily,
-            currentDate,
-            0,
-        ).startDate()?.time ?: 0L
-        return currentPeriodDate - initialPeriodDate
+        val result = async(dispatcherProvider.io()) {
+            val initialPeriodDate =
+                getPeriodForPeriodTypeAndDate(
+                    periodType ?: PeriodType.Daily,
+                    currentDate,
+                    -1,
+                ).startDate()?.time ?: 0L
+
+            val currentPeriodDate =
+                getPeriodForPeriodTypeAndDate(
+                    periodType ?: PeriodType.Daily,
+                    currentDate,
+                    0,
+                ).startDate()?.time ?: 0L
+
+            initialPeriodDate - currentPeriodDate
+        }
+
+        return runBlocking { result.await() }
     }
 
-    private fun getPeriodForPeriodTypeAndDate(
+    private suspend fun getPeriodForPeriodTypeAndDate(
         periodType: PeriodType,
         currentDate: Date,
         offset: Int,
     ): Period {
-        return d2.periodModule().periodHelper().blockingGetPeriodForPeriodTypeAndDate(
-            periodType,
-            currentDate,
-            offset,
-        )
+        return withContext(dispatcherProvider.io()) {
+            d2.periodModule().periodHelper().blockingGetPeriodForPeriodTypeAndDate(
+                periodType,
+                currentDate,
+                offset,
+            )
+        }
     }
 
     override fun periodUIString(locale: Locale, period: Period): String {
@@ -65,15 +91,18 @@ class PeriodStepProviderImpl(val d2: D2) : PeriodStepProvider {
                     ).format(period.endDate()!!),
                 )
             }
+
             PeriodType.BiWeekly -> {
                 formattedDate = ""
             }
+
             PeriodType.Monthly ->
                 formattedDate =
                     SimpleDateFormat(
                         MONTHLY_FORMAT_EXPRESSION,
                         locale,
                     ).format(period.startDate()!!)
+
             PeriodType.BiMonthly,
             PeriodType.Quarterly,
             PeriodType.SixMonthly,
@@ -91,12 +120,14 @@ class PeriodStepProviderImpl(val d2: D2) : PeriodStepProvider {
                     locale,
                 ).format(period.endDate()!!),
             )
+
             PeriodType.Yearly ->
                 formattedDate =
                     SimpleDateFormat(
                         YEARLY_FORMAT_EXPRESSION,
                         locale,
                     ).format(period.startDate()!!)
+
             else ->
                 formattedDate =
                     SimpleDateFormat(
@@ -124,6 +155,7 @@ class PeriodStepProviderImpl(val d2: D2) : PeriodStepProvider {
                 DateTime(initialPeriod.startDate()),
                 DateTime(currentPeriod.startDate()),
             ).days
+
             PeriodType.Weekly,
             PeriodType.WeeklyWednesday,
             PeriodType.WeeklyThursday,
@@ -133,22 +165,27 @@ class PeriodStepProviderImpl(val d2: D2) : PeriodStepProvider {
                 DateTime(initialPeriod.startDate()),
                 DateTime(currentPeriod.startDate()),
             ).weeks
+
             PeriodType.BiWeekly -> Weeks.weeksBetween(
                 DateTime(initialPeriod.startDate()),
                 DateTime(currentPeriod.startDate()),
             ).weeks / 2
+
             PeriodType.Monthly -> Months.monthsBetween(
                 DateTime(initialPeriod.startDate()),
                 DateTime(currentPeriod.startDate()),
             ).months
+
             PeriodType.BiMonthly -> Months.monthsBetween(
                 DateTime(initialPeriod.startDate()),
                 DateTime(currentPeriod.startDate()),
             ).months / 2
+
             PeriodType.Quarterly -> Months.monthsBetween(
                 DateTime(initialPeriod.startDate()),
                 DateTime(currentPeriod.startDate()),
             ).months / 3
+
             PeriodType.SixMonthly,
             PeriodType.SixMonthlyApril,
             PeriodType.SixMonthlyNov,
@@ -157,6 +194,7 @@ class PeriodStepProviderImpl(val d2: D2) : PeriodStepProvider {
                     DateTime(initialPeriod.startDate()),
                     DateTime(currentPeriod.startDate()),
                 ).months / 6
+
             PeriodType.Yearly,
             PeriodType.FinancialApril,
             PeriodType.FinancialJuly,
@@ -166,6 +204,7 @@ class PeriodStepProviderImpl(val d2: D2) : PeriodStepProvider {
                 DateTime(initialPeriod.startDate()),
                 DateTime(currentPeriod.startDate()),
             ).years
+
             null -> 0
         }
     }
diff --git a/dhis_android_analytics/src/main/java/dhis2/org/analytics/charts/ui/AnalyticsAdapter.kt b/dhis_android_analytics/src/main/java/dhis2/org/analytics/charts/ui/AnalyticsAdapter.kt
index 2129b57787..fd2bf4c752 100644
--- a/dhis_android_analytics/src/main/java/dhis2/org/analytics/charts/ui/AnalyticsAdapter.kt
+++ b/dhis_android_analytics/src/main/java/dhis2/org/analytics/charts/ui/AnalyticsAdapter.kt
@@ -6,7 +6,6 @@ import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import dhis2.org.databinding.ItemChartBinding
-import dhis2.org.databinding.ItemIndicatorBinding
 import dhis2.org.databinding.ItemSectionTittleBinding
 import org.hisp.dhis.android.core.common.RelativePeriod
 
@@ -52,10 +51,8 @@ class AnalyticsAdapter :
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        return when (AnalyticType.values()[viewType]) {
-            AnalyticType.INDICATOR -> IndicatorViewHolder(
-                ItemIndicatorBinding.inflate(LayoutInflater.from(parent.context), parent, false),
-            )
+        return when (AnalyticType.entries[viewType]) {
+            AnalyticType.INDICATOR -> IndicatorViewHolder(parent)
 
             AnalyticType.CHART ->
                 ChartViewHolder(
diff --git a/dhis_android_analytics/src/main/java/dhis2/org/analytics/charts/ui/IndicatorViewHolder.kt b/dhis_android_analytics/src/main/java/dhis2/org/analytics/charts/ui/IndicatorViewHolder.kt
index 3d711b0537..b8ccc1d764 100644
--- a/dhis_android_analytics/src/main/java/dhis2/org/analytics/charts/ui/IndicatorViewHolder.kt
+++ b/dhis_android_analytics/src/main/java/dhis2/org/analytics/charts/ui/IndicatorViewHolder.kt
@@ -1,31 +1,89 @@
 package dhis2.org.analytics.charts.ui
 
+import android.view.ViewGroup
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.ripple.rememberRipple
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.unit.dp
 import androidx.recyclerview.widget.RecyclerView
 import dhis2.org.R
-import dhis2.org.databinding.ItemIndicatorBinding
 import org.dhis2.commons.dialogs.CustomDialog
 import org.hisp.dhis.android.core.program.ProgramIndicator
+import org.hisp.dhis.mobile.ui.designsystem.component.IndicatorInput
+import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor
 
 class IndicatorViewHolder(
-    val binding: ItemIndicatorBinding,
-) : RecyclerView.ViewHolder(binding.root) {
+    val parent: ViewGroup,
+) : RecyclerView.ViewHolder(ComposeView(parent.context)) {
 
     fun bind(programIndicatorModel: IndicatorModel) {
-        binding.indicatorModel = programIndicatorModel
-        binding.descriptionLabel.setOnClickListener {
-            showDescription(programIndicatorModel.programIndicator!!)
+        val view = itemView as ComposeView
+        view.apply {
+            layoutParams = ViewGroup.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.WRAP_CONTENT,
+            )
+
+            setContent {
+                Column(
+                    Modifier
+                        .fillMaxSize()
+                        .then(
+                            if (programIndicatorModel.programIndicator?.description() != null) {
+                                Modifier.clickable(
+                                    interactionSource = MutableInteractionSource(),
+                                    indication = rememberRipple(),
+                                    onClick = { showDescription(programIndicatorModel.programIndicator) },
+                                )
+                            } else {
+                                Modifier
+                            },
+                        ),
+                ) {
+                    IndicatorInput(
+                        title = programIndicatorModel.label(),
+                        indicatorColor = if (!programIndicatorModel.color.isNullOrEmpty()) {
+                            Color(programIndicatorModel.color())
+                        } else {
+                            SurfaceColor.Container
+                        },
+                        content = programIndicatorModel.value ?: "",
+                        modifier = Modifier.then(
+                            if (programIndicatorModel.programIndicator?.description() != null) {
+                                Modifier.clickable(
+                                    interactionSource = MutableInteractionSource(),
+                                    indication = rememberRipple(),
+                                    onClick = { showDescription(programIndicatorModel.programIndicator) },
+                                )
+                            } else {
+                                Modifier
+                            },
+                        ),
+                    )
+                    Spacer(modifier = Modifier.size(16.dp))
+                }
+            }
         }
     }
 
-    private fun showDescription(programIndicatorModel: ProgramIndicator) {
-        CustomDialog(
-            itemView.context,
-            programIndicatorModel.displayName()!!,
-            programIndicatorModel.displayDescription()!!,
-            itemView.context.getString(R.string.action_accept),
-            null,
-            CustomDialog.DESCRIPTION_DIALOG,
-            null,
-        ).show()
+    private fun showDescription(programIndicatorModel: ProgramIndicator?) {
+        programIndicatorModel?.let {
+            CustomDialog(
+                itemView.context,
+                it.displayName() ?: "",
+                it.displayDescription() ?: "",
+                itemView.context.getString(R.string.action_accept),
+                null,
+                CustomDialog.DESCRIPTION_DIALOG,
+                null,
+            ).show()
+        }
     }
 }
diff --git a/dhis_android_analytics/src/main/res/layout/item_indicator.xml b/dhis_android_analytics/src/main/res/layout/item_indicator.xml
deleted file mode 100644
index 11055aee3d..0000000000
--- a/dhis_android_analytics/src/main/res/layout/item_indicator.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <data>
-
-        <import type="android.view.View" />
-
-        <variable
-            name="indicatorModel"
-            type="dhis2.org.analytics.charts.ui.IndicatorModel" />
-    </data>
-
-    <androidx.cardview.widget.CardView
-        android:layout_width="match_parent"
-        android:layout_height="51dp"
-        app:cardCornerRadius="3dp"
-        app:cardUseCompatPadding="true"
-        app:elevation="8dp"
-        tools:style="@style/CardView">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="48dp">
-
-            <TextView
-                android:id="@+id/indicator_name"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="5dp"
-                android:layout_marginEnd="10dp"
-                android:gravity="bottom|start"
-                android:maxLines="2"
-                android:text='@{indicatorModel.label()}'
-                android:textColor="@color/textPrimary"
-                android:textSize="14sp"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:text="Indicator Name" />
-
-            <TextView
-                android:id="@+id/indicator_value"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="2dp"
-                android:gravity="top"
-                android:text="@{indicatorModel.value}"
-                android:textColor="@color/textSecondary"
-                android:textSize="12sp"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/indicator_name"
-                tools:text="James Johnson" />
-
-            <View
-                android:id="@+id/indicator_legend"
-                android:layout_width="15dp"
-                android:layout_height="0dp"
-                android:background="@{indicatorModel.color()!=-1? indicatorModel.color() : @color/gray_e7e}"
-                app:fromResBgColor="@{indicatorModel.color()!=-1? indicatorModel.color() : @color/gray_e7e}"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:background="#ff1" />
-
-            <ImageView
-                android:id="@+id/descriptionLabel"
-                style="@style/ActionIconUnwrap"
-                android:layout_width="16dp"
-                android:layout_height="16dp"
-                android:layout_marginStart="5dp"
-                android:visibility="@{indicatorModel.description() != null? View.VISIBLE: View.GONE}"
-                app:layout_constraintBottom_toBottomOf="@id/indicator_name"
-                app:layout_constraintStart_toEndOf="@id/indicator_name"
-                app:layout_constraintTop_toTopOf="@id/indicator_name"
-                app:srcCompat="@drawable/ic_info_outline"
-                app:tint="?colorPrimary" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </androidx.cardview.widget.CardView>
-</layout>
\ No newline at end of file
diff --git a/dhis_android_analytics/src/test/java/dhis2/org/analytics/charts/providers/PeriodStepProviderImplTest.kt b/dhis_android_analytics/src/test/java/dhis2/org/analytics/charts/providers/PeriodStepProviderImplTest.kt
index 3cca2c86dc..e5b5761820 100644
--- a/dhis_android_analytics/src/test/java/dhis2/org/analytics/charts/providers/PeriodStepProviderImplTest.kt
+++ b/dhis_android_analytics/src/test/java/dhis2/org/analytics/charts/providers/PeriodStepProviderImplTest.kt
@@ -1,20 +1,43 @@
 package dhis2.org.analytics.charts.providers
 
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.UnconfinedTestDispatcher
+import kotlinx.coroutines.test.setMain
+import org.dhis2.commons.viewmodel.DispatcherProvider
 import org.hisp.dhis.android.core.D2
 import org.hisp.dhis.android.core.period.Period
 import org.hisp.dhis.android.core.period.PeriodType
 import org.junit.Assert.assertTrue
+import org.junit.Before
+import org.junit.Rule
 import org.junit.Test
 import org.mockito.Mockito
 import org.mockito.kotlin.any
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
 import org.mockito.kotlin.times
 import org.mockito.kotlin.verify
 import java.util.Date
 import java.util.GregorianCalendar
 
+@ExperimentalCoroutinesApi
 class PeriodStepProviderImplTest {
+    @Rule
+    @JvmField
+    var instantExecutorRule = InstantTaskExecutorRule()
+
     private val d2: D2 = Mockito.mock(D2::class.java, Mockito.RETURNS_DEEP_STUBS)
-    private val periodStepProvider = PeriodStepProviderImpl(d2)
+    private val dispatchers: DispatcherProvider = mock {
+        on { io() } doReturn Dispatchers.IO
+    }
+    private val periodStepProvider = PeriodStepProviderImpl(d2, dispatchers)
+
+    @Before
+    fun setUp() {
+        Dispatchers.setMain(UnconfinedTestDispatcher())
+    }
 
     @Test
     fun `Should get correct period step`() {
diff --git a/form/src/main/java/org/dhis2/form/bindings/RuleExtensions.kt b/form/src/main/java/org/dhis2/form/bindings/RuleExtensions.kt
index 10ccbafee0..22a9c6e33d 100644
--- a/form/src/main/java/org/dhis2/form/bindings/RuleExtensions.kt
+++ b/form/src/main/java/org/dhis2/form/bindings/RuleExtensions.kt
@@ -438,12 +438,12 @@ fun getOptions(
         dataElementRepository.uid(dataElementUid).blockingGet()?.optionSet()?.uid()
             ?.let { optionSetUid ->
                 optionRepository.byOptionSetUid().eq(optionSetUid).blockingGet()
-            }?.map { option -> Option(option.name()!!, option.code()!!) } ?: emptyList()
+            }?.map { option -> Option(option.name()!!, option.code() ?: "") } ?: emptyList()
     } else if (trackedEntityAttributeUid != null) {
         attributeRepository.uid(trackedEntityAttributeUid).blockingGet()?.optionSet()?.uid()
             ?.let { optionSetUid ->
                 optionRepository.byOptionSetUid().eq(optionSetUid).blockingGet()
-            }?.map { option -> Option(option.name()!!, option.code()!!) } ?: emptyList()
+            }?.map { option -> Option(option.name()!!, option.code() ?: "") } ?: emptyList()
     } else {
         emptyList()
     }
diff --git a/form/src/main/java/org/dhis2/form/data/EventRepository.kt b/form/src/main/java/org/dhis2/form/data/EventRepository.kt
index 7af3b2764a..06eb6fda4d 100644
--- a/form/src/main/java/org/dhis2/form/data/EventRepository.kt
+++ b/form/src/main/java/org/dhis2/form/data/EventRepository.kt
@@ -5,9 +5,11 @@ import io.reactivex.Flowable
 import io.reactivex.Single
 import org.dhis2.bindings.blockingGetValueCheck
 import org.dhis2.bindings.userFriendlyValue
+import org.dhis2.commons.bindings.program
 import org.dhis2.commons.date.DateUtils
 import org.dhis2.commons.extensions.inDateRange
 import org.dhis2.commons.extensions.inOrgUnit
+import org.dhis2.commons.orgunitselector.OrgUnitSelectorScope
 import org.dhis2.commons.resources.MetadataIconProvider
 import org.dhis2.commons.resources.ResourceManager
 import org.dhis2.form.R
@@ -19,6 +21,7 @@ import org.dhis2.form.model.FieldUiModel
 import org.dhis2.form.model.OptionSetConfiguration
 import org.dhis2.form.model.PeriodSelector
 import org.dhis2.form.ui.FieldViewModelFactory
+import org.dhis2.ui.toColor
 import org.hisp.dhis.android.core.D2
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.category.Category
@@ -36,6 +39,7 @@ import org.hisp.dhis.android.core.program.Program
 import org.hisp.dhis.android.core.program.ProgramStageDataElement
 import org.hisp.dhis.android.core.program.ProgramStageSection
 import org.hisp.dhis.android.core.program.SectionRenderingType
+import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor
 import java.util.Date
 
 class EventRepository(
@@ -60,9 +64,18 @@ class EventRepository(
             .blockingGet()
     }
 
+    private val defaultStyleColor by lazy {
+        programStage?.program()?.uid()?.let {
+            d2.program(it)?.style()?.color()?.toColor()
+        } ?: SurfaceColor.Primary
+    }
+
     override fun firstSectionToOpen(): String? {
         return when (eventMode) {
-            EventMode.NEW -> super.firstSectionToOpen()
+            EventMode.NEW,
+            EventMode.SCHEDULE,
+            -> super.firstSectionToOpen()
+
             EventMode.CHECK -> firstSectionToOpenForEvent()
         }
     }
@@ -359,6 +372,7 @@ class EventRepository(
             programStageSection = EVENT_DETAILS_SECTION_UID,
             editable = eventMode == EventMode.NEW,
             description = null,
+            orgUnitSelectorScope = programUid?.let { OrgUnitSelectorScope.ProgramCaptureScope(it) },
         )
     }
 
@@ -558,7 +572,7 @@ class EventRepository(
                     .orderBySortOrder(RepositoryScope.OrderByDirection.ASC).blockingGet()
 
                 val metadataIconMap =
-                    options.associate { it.uid() to metadataIconProvider(it.style()) }
+                    options.associate { it.uid() to metadataIconProvider(it.style(), defaultStyleColor) }
 
                 OptionSetConfiguration.OptionConfigData(
                     options = options,
diff --git a/form/src/main/java/org/dhis2/form/data/FormRepositoryImpl.kt b/form/src/main/java/org/dhis2/form/data/FormRepositoryImpl.kt
index 4c49c4a7b8..85cf041844 100644
--- a/form/src/main/java/org/dhis2/form/data/FormRepositoryImpl.kt
+++ b/form/src/main/java/org/dhis2/form/data/FormRepositoryImpl.kt
@@ -332,9 +332,7 @@ class FormRepositoryImpl(
     }
 
     private fun updateField(fieldUiModel: FieldUiModel): FieldUiModel {
-        val needsMandatoryWarning = fieldUiModel.mandatory &&
-            fieldUiModel.value.isNullOrEmpty()
-
+        val needsMandatoryWarning = hasMandatoryWarnings(fieldUiModel)
         if (needsMandatoryWarning) {
             mandatoryItemsWithoutValue[fieldUiModel.label] = fieldUiModel.programStageSection ?: ""
         }
@@ -350,6 +348,20 @@ class FormRepositoryImpl(
         )
     }
 
+    private fun hasMandatoryWarnings(fieldUiModel: FieldUiModel): Boolean {
+        return if (fieldUiModel.uid.contains(EventRepository.EVENT_CATEGORY_COMBO_UID)) {
+            fieldUiModel.mandatory &&
+                (
+                    fieldUiModel.value.isNullOrEmpty() ||
+                        fieldUiModel.value?.split(",")?.size !=
+                        fieldUiModel.eventCategories?.size
+                    )
+        } else {
+            fieldUiModel.mandatory &&
+                fieldUiModel.value.isNullOrEmpty()
+        }
+    }
+
     private fun getNextItem(currentItemUid: String): String? {
         itemList.let { fields ->
             val oldItem = fields.find { it.uid == currentItemUid }
@@ -444,7 +456,7 @@ class FormRepositoryImpl(
     ): List<FieldUiModel> {
         mandatoryItemsWithoutValue.clear()
         val mergedList = this.map { item ->
-            if (item.mandatory && item.value.isNullOrEmpty()) {
+            if (hasMandatoryWarnings(item)) {
                 mandatoryItemsWithoutValue[item.label] = item.programStageSection ?: ""
             }
             fieldsWithError.find { it.id == item.uid }?.let { action ->
diff --git a/form/src/main/java/org/dhis2/form/data/FormValueStore.kt b/form/src/main/java/org/dhis2/form/data/FormValueStore.kt
index 75fc5f51dd..208656042d 100644
--- a/form/src/main/java/org/dhis2/form/data/FormValueStore.kt
+++ b/form/src/main/java/org/dhis2/form/data/FormValueStore.kt
@@ -63,34 +63,33 @@ class FormValueStore(
     ): Flowable<StoreResult> {
         return when (uid) {
             EVENT_REPORT_DATE_UID -> {
-                eventRepository?.setEventDate(value?.toDate())
-
-                Flowable.just(
+                val storeResult = value?.toDate()?.let {
+                    eventRepository?.setEventDate(it)
                     StoreResult(
                         EVENT_REPORT_DATE_UID,
                         ValueStoreResult.VALUE_CHANGED,
-                    ),
+                    )
+                } ?: StoreResult(
+                    EVENT_REPORT_DATE_UID,
+                    ValueStoreResult.VALUE_HAS_NOT_CHANGED,
                 )
+
+                Flowable.just(storeResult)
             }
 
             EVENT_ORG_UNIT_UID -> {
-                try {
-                    eventRepository?.setOrganisationUnitUid(value)
-
-                    Flowable.just(
-                        StoreResult(
-                            EVENT_ORG_UNIT_UID,
-                            ValueStoreResult.VALUE_CHANGED,
-                        ),
-                    )
-                } catch (e: Exception) {
-                    Flowable.just(
-                        StoreResult(
-                            EVENT_ORG_UNIT_UID,
-                            ValueStoreResult.ERROR_UPDATING_VALUE,
-                        ),
+                val storeResult = value?.takeIf { it.isNotEmpty() }?.let {
+                    eventRepository?.setOrganisationUnitUid(it)
+                    StoreResult(
+                        EVENT_ORG_UNIT_UID,
+                        ValueStoreResult.VALUE_CHANGED,
                     )
-                }
+                } ?: StoreResult(
+                    EVENT_ORG_UNIT_UID,
+                    ValueStoreResult.VALUE_HAS_NOT_CHANGED,
+                )
+
+                Flowable.just(storeResult)
             }
 
             EVENT_COORDINATE_UID -> {
@@ -126,14 +125,18 @@ class FormValueStore(
             }
         }
 
-        eventRepository?.setAttributeOptionComboUid(categoryOptionComboUid)
-
-        return Flowable.just(
+        val storeResult = categoryOptionComboUid?.let {
+            eventRepository?.setAttributeOptionComboUid(categoryOptionComboUid)
             StoreResult(
                 EVENT_CATEGORY_COMBO_UID,
                 ValueStoreResult.VALUE_CHANGED,
-            ),
+            )
+        } ?: StoreResult(
+            EVENT_CATEGORY_COMBO_UID,
+            ValueStoreResult.VALUE_HAS_NOT_CHANGED,
         )
+
+        return Flowable.just(storeResult)
     }
 
     private fun storeEventCoordinateAttribute(
@@ -549,7 +552,7 @@ class FormValueStore(
                 .uid(optionGroupUid)
                 .blockingGet()
                 ?.options()
-                ?.map { d2.optionModule().options().uid(it.uid()).blockingGet()?.code()!! }
+                ?.mapNotNull { d2.optionModule().options().uid(it.uid()).blockingGet()?.code() }
                 ?: arrayListOf()
         return when (entryMode) {
             EntryMode.DE -> deleteDataElementValueIfNotInGroup(
diff --git a/form/src/main/java/org/dhis2/form/data/RulesRepository.kt b/form/src/main/java/org/dhis2/form/data/RulesRepository.kt
index 1efd2ae0d4..87d6f8aed0 100644
--- a/form/src/main/java/org/dhis2/form/data/RulesRepository.kt
+++ b/form/src/main/java/org/dhis2/form/data/RulesRepository.kt
@@ -148,7 +148,7 @@ class RulesRepository(private val d2: D2) {
                             organisationUnitCode = d2.organisationUnitModule().organisationUnits()
                                 .uid(
                                     event.organisationUnit(),
-                                ).blockingGet()!!.code(),
+                                ).blockingGet()?.code(),
                             dataValues = event.trackedEntityDataValues()?.toRuleDataValue(
                                 event,
                                 d2.dataElementModule().dataElements(),
@@ -236,7 +236,7 @@ class RulesRepository(private val d2: D2) {
                     organisationUnit = event.organisationUnit()!!,
                     organisationUnitCode = d2.organisationUnitModule()
                         .organisationUnits().uid(event.organisationUnit())
-                        .blockingGet()!!.code(),
+                        .blockingGet()?.code(),
                     dataValues =
                     event.trackedEntityDataValues()?.toRuleDataValue(
                         event,
@@ -253,7 +253,7 @@ class RulesRepository(private val d2: D2) {
             .flatMap { event ->
                 val ouCode = d2.organisationUnitModule().organisationUnits()
                     .uid(event.organisationUnit())
-                    .blockingGet()!!.code()
+                    .blockingGet()?.code() ?: ""
                 val programName =
                     d2.programModule().programs().uid(event.program()).blockingGet()!!.name()
                 if (event.enrollment() == null) {
@@ -265,7 +265,7 @@ class RulesRepository(private val d2: D2) {
                             Calendar.getInstance().time.toRuleEngineLocalDate(),
                             RuleEnrollment.Status.CANCELLED,
                             event.organisationUnit()!!,
-                            ouCode!!,
+                            ouCode,
                             ArrayList(),
                         ),
                     )
@@ -280,7 +280,7 @@ class RulesRepository(private val d2: D2) {
                                 enrollment.enrollmentDate()!!.toRuleEngineLocalDate(),
                                 RuleEnrollment.Status.valueOf(enrollment.status()!!.name),
                                 event.organisationUnit()!!,
-                                ouCode!!,
+                                ouCode,
                                 getAttributesValues(enrollment),
                             )
                         }
diff --git a/form/src/main/java/org/dhis2/form/data/metadata/EnrollmentConfiguration.kt b/form/src/main/java/org/dhis2/form/data/metadata/EnrollmentConfiguration.kt
index 8843c735c1..eb76c339ee 100644
--- a/form/src/main/java/org/dhis2/form/data/metadata/EnrollmentConfiguration.kt
+++ b/form/src/main/java/org/dhis2/form/data/metadata/EnrollmentConfiguration.kt
@@ -9,10 +9,12 @@ import org.dhis2.commons.bindings.teiAttribute
 import org.dhis2.commons.bindings.trackedEntityType
 import org.dhis2.commons.resources.MetadataIconProvider
 import org.dhis2.form.model.OptionSetConfiguration
+import org.dhis2.ui.toColor
 import org.hisp.dhis.android.core.D2
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.enrollment.Enrollment
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
+import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor
 
 class EnrollmentConfiguration(
     private val d2: D2,
@@ -30,6 +32,10 @@ class EnrollmentConfiguration(
         d2.program(it)
     }
 
+    private val defaultStyleColor by lazy {
+        program()?.style()?.color()?.toColor() ?: SurfaceColor.Primary
+    }
+
     fun tei() = enrollment()?.trackedEntityInstance()?.let { d2.tei(it) }
     fun trackedEntityType() = d2.trackedEntityType(program()?.trackedEntityType()?.uid()!!)
     fun sections() = d2.programModule().programSections()
@@ -126,7 +132,7 @@ class EnrollmentConfiguration(
                         .orderBySortOrder(RepositoryScope.OrderByDirection.ASC)
                         .blockingGet()
 
-                    val metadataIconMap = options.associate { it.uid() to metadataIconProvider(it.style()) }
+                    val metadataIconMap = options.associate { it.uid() to metadataIconProvider(it.style(), defaultStyleColor) }
 
                     OptionSetConfiguration.OptionConfigData(
                         options = options,
diff --git a/form/src/main/java/org/dhis2/form/extensions/FieldUiModelExtensions.kt b/form/src/main/java/org/dhis2/form/extensions/FieldUiModelExtensions.kt
index 56a1bc74e9..e5b4544f3c 100644
--- a/form/src/main/java/org/dhis2/form/extensions/FieldUiModelExtensions.kt
+++ b/form/src/main/java/org/dhis2/form/extensions/FieldUiModelExtensions.kt
@@ -51,8 +51,8 @@ fun FieldUiModel.orientation() = when (renderingType) {
 }
 
 fun FieldUiModel.inputState() = when {
-    error != null -> InputShellState.ERROR
     !editable -> InputShellState.DISABLED
+    error != null -> InputShellState.ERROR
     focused -> InputShellState.FOCUSED
     else -> InputShellState.UNFOCUSED
 }
diff --git a/form/src/main/java/org/dhis2/form/model/EventMode.kt b/form/src/main/java/org/dhis2/form/model/EventMode.kt
index 1af4cfa552..44a481f0d3 100644
--- a/form/src/main/java/org/dhis2/form/model/EventMode.kt
+++ b/form/src/main/java/org/dhis2/form/model/EventMode.kt
@@ -3,4 +3,5 @@ package org.dhis2.form.model
 enum class EventMode {
     NEW,
     CHECK,
+    SCHEDULE,
 }
diff --git a/form/src/main/java/org/dhis2/form/ui/Form.kt b/form/src/main/java/org/dhis2/form/ui/Form.kt
index 01df0adbc0..7056344e33 100644
--- a/form/src/main/java/org/dhis2/form/ui/Form.kt
+++ b/form/src/main/java/org/dhis2/form/ui/Form.kt
@@ -22,7 +22,6 @@ import androidx.compose.material.icons.outlined.ErrorOutline
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
@@ -90,14 +89,6 @@ fun Form(
                 items = sections,
                 key = { _, fieldUiModel -> fieldUiModel.uid },
             ) { _, section ->
-                val isSectionOpen = remember(section.state) {
-                    derivedStateOf { section.state == SectionState.OPEN }
-                }
-
-                LaunchIfTrue(isSectionOpen.value) {
-                    scrollState.animateScrollToItem(sections.indexOf(section))
-                    focusManager.moveFocusNext(focusNext)
-                }
 
                 val onNextSection: () -> Unit = {
                     getNextSection(section, sections)?.let {
diff --git a/form/src/main/java/org/dhis2/form/ui/provider/inputfield/CheckBoxProvider.kt b/form/src/main/java/org/dhis2/form/ui/provider/inputfield/CheckBoxProvider.kt
index c0bfdea890..cb82e88131 100644
--- a/form/src/main/java/org/dhis2/form/ui/provider/inputfield/CheckBoxProvider.kt
+++ b/form/src/main/java/org/dhis2/form/ui/provider/inputfield/CheckBoxProvider.kt
@@ -2,7 +2,6 @@ package org.dhis2.form.ui.provider.inputfield
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.FocusRequester
 import org.dhis2.commons.resources.ResourceManager
 import org.dhis2.form.R
 import org.dhis2.form.extensions.inputState
@@ -22,7 +21,6 @@ internal fun ProvideCheckBoxInput(
     inputStyle: InputStyle,
     fieldUiModel: FieldUiModel,
     intentHandler: (FormIntent) -> Unit,
-    focusRequester: FocusRequester,
 ) {
     val data = fieldUiModel.optionSetConfiguration?.optionsToDisplay()?.map { option ->
         CheckBoxData(
@@ -44,7 +42,6 @@ internal fun ProvideCheckBoxInput(
         legendData = fieldUiModel.legend(),
         isRequired = fieldUiModel.mandatory,
         onItemChange = { item ->
-            focusRequester.requestFocus()
             intentHandler(
                 FormIntent.OnSave(
                     fieldUiModel.uid,
@@ -55,7 +52,6 @@ internal fun ProvideCheckBoxInput(
             )
         },
         onClearSelection = {
-            focusRequester.requestFocus()
             intentHandler(
                 FormIntent.ClearValue(fieldUiModel.uid),
             )
@@ -70,7 +66,6 @@ internal fun ProvideYesNoCheckBoxInput(
     fieldUiModel: FieldUiModel,
     intentHandler: (FormIntent) -> Unit,
     resources: ResourceManager,
-    focusRequester: FocusRequester,
 ) {
     val data = listOf(
         CheckBoxData(
@@ -98,7 +93,6 @@ internal fun ProvideYesNoCheckBoxInput(
         legendData = fieldUiModel.legend(),
         isRequired = fieldUiModel.mandatory,
         onItemChange = { item ->
-            focusRequester.requestFocus()
             when (item.uid) {
                 "true" -> {
                     intentHandler(
@@ -124,7 +118,6 @@ internal fun ProvideYesNoCheckBoxInput(
             }
         },
         onClearSelection = {
-            focusRequester.requestFocus()
             intentHandler(
                 FormIntent.ClearValue(fieldUiModel.uid),
             )
@@ -138,7 +131,6 @@ internal fun ProvideYesOnlyCheckBoxInput(
     inputStyle: InputStyle,
     fieldUiModel: FieldUiModel,
     intentHandler: (FormIntent) -> Unit,
-    focusRequester: FocusRequester,
 ) {
     val cbData = CheckBoxData(
         uid = "",
@@ -156,7 +148,6 @@ internal fun ProvideYesOnlyCheckBoxInput(
         legendData = fieldUiModel.legend(),
         isRequired = fieldUiModel.mandatory,
         onClick = {
-            focusRequester.requestFocus()
             if (!fieldUiModel.isAffirmativeChecked) {
                 intentHandler(
                     FormIntent.OnSave(
diff --git a/form/src/main/java/org/dhis2/form/ui/provider/inputfield/CoordinatesProvider.kt b/form/src/main/java/org/dhis2/form/ui/provider/inputfield/CoordinatesProvider.kt
index 854ae703e4..06593a32fd 100644
--- a/form/src/main/java/org/dhis2/form/ui/provider/inputfield/CoordinatesProvider.kt
+++ b/form/src/main/java/org/dhis2/form/ui/provider/inputfield/CoordinatesProvider.kt
@@ -2,7 +2,6 @@ package org.dhis2.form.ui.provider.inputfield
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.FocusRequester
 import org.dhis2.commons.resources.ResourceManager
 import org.dhis2.form.R
 import org.dhis2.form.extensions.inputState
@@ -44,7 +43,6 @@ fun ProvideInputCoordinate(
     intentHandler: (FormIntent) -> Unit,
     uiEventHandler: (RecyclerViewUiEvents) -> Unit,
     resources: ResourceManager,
-    focusRequester: FocusRequester,
 ) {
     InputCoordinate(
         title = fieldUiModel.label,
@@ -58,7 +56,6 @@ fun ProvideInputCoordinate(
         isRequired = fieldUiModel.mandatory,
         modifier = modifier,
         onResetButtonClicked = {
-            focusRequester.requestFocus()
             intentHandler.invoke(
                 FormIntent.OnSave(
                     uid = fieldUiModel.uid,
@@ -68,7 +65,6 @@ fun ProvideInputCoordinate(
             )
         },
         onUpdateButtonClicked = {
-            focusRequester.requestFocus()
             uiEventHandler.invoke(
                 RecyclerViewUiEvents.RequestLocationByMap(
                     uid = fieldUiModel.uid,
diff --git a/form/src/main/java/org/dhis2/form/ui/provider/inputfield/FieldProvider.kt b/form/src/main/java/org/dhis2/form/ui/provider/inputfield/FieldProvider.kt
index 980ae2b70a..6106f2072f 100644
--- a/form/src/main/java/org/dhis2/form/ui/provider/inputfield/FieldProvider.kt
+++ b/form/src/main/java/org/dhis2/form/ui/provider/inputfield/FieldProvider.kt
@@ -109,7 +109,6 @@ fun FieldProvider(
             inputStyle = inputStyle,
             fieldUiModel = fieldUiModel,
             intentHandler = intentHandler,
-            focusRequester = focusRequester,
             context = context,
         )
 
@@ -260,7 +259,6 @@ fun ProvideByValueType(
                 fieldUiModel = fieldUiModel,
                 uiEventHandler = uiEventHandler,
                 intentHandler = intentHandler,
-                focusRequester = focusRequester,
             )
         }
 
@@ -320,7 +318,6 @@ fun ProvideByValueType(
                         fieldUiModel = fieldUiModel,
                         intentHandler = intentHandler,
                         resources = resources,
-                        focusRequester = focusRequester,
                     )
                 }
 
@@ -331,7 +328,6 @@ fun ProvideByValueType(
                         fieldUiModel = fieldUiModel,
                         intentHandler = intentHandler,
                         resources = resources,
-                        focusRequester = focusRequester,
                     )
                 }
             }
@@ -354,7 +350,6 @@ fun ProvideByValueType(
                         inputStyle = inputStyle,
                         fieldUiModel = fieldUiModel,
                         intentHandler = intentHandler,
-                        focusRequester = focusRequester,
                     )
                 }
             }
@@ -437,7 +432,6 @@ fun ProvideByValueType(
                         intentHandler = intentHandler,
                         uiEventHandler = uiEventHandler,
                         resources = resources,
-                        focusRequester = focusRequester,
                     )
                 }
             }
@@ -478,7 +472,6 @@ fun ProvideByOptionSet(
     inputStyle: InputStyle,
     fieldUiModel: FieldUiModel,
     intentHandler: (FormIntent) -> Unit,
-    focusRequester: FocusRequester,
     context: Context,
 ) {
     when (fieldUiModel.renderingType) {
@@ -490,7 +483,6 @@ fun ProvideByOptionSet(
                 inputStyle = inputStyle,
                 fieldUiModel = fieldUiModel,
                 intentHandler = intentHandler,
-                focusRequester = focusRequester,
             )
         }
 
@@ -502,7 +494,6 @@ fun ProvideByOptionSet(
                 inputStyle = inputStyle,
                 fieldUiModel = fieldUiModel,
                 intentHandler = intentHandler,
-                focusRequester = focusRequester,
             )
         }
 
@@ -1056,7 +1047,6 @@ private fun ProvideOrgUnitInput(
     fieldUiModel: FieldUiModel,
     uiEventHandler: (RecyclerViewUiEvents) -> Unit,
     intentHandler: (FormIntent) -> Unit,
-    focusRequester: FocusRequester,
 ) {
     var inputFieldValue by remember(
         fieldUiModel,
@@ -1075,7 +1065,6 @@ private fun ProvideOrgUnitInput(
         isRequiredField = fieldUiModel.mandatory,
         onValueChanged = {
             inputFieldValue = it
-            focusRequester.requestFocus()
             intentHandler(
                 FormIntent.OnSave(
                     fieldUiModel.uid,
@@ -1085,7 +1074,6 @@ private fun ProvideOrgUnitInput(
             )
         },
         onOrgUnitActionCLicked = {
-            focusRequester.requestFocus()
             uiEventHandler.invoke(
                 RecyclerViewUiEvents.OpenOrgUnitDialog(
                     fieldUiModel.uid,
diff --git a/form/src/main/java/org/dhis2/form/ui/provider/inputfield/MultiSelectionInputProvider.kt b/form/src/main/java/org/dhis2/form/ui/provider/inputfield/MultiSelectionInputProvider.kt
index 02da27dbe9..18ea54e79b 100644
--- a/form/src/main/java/org/dhis2/form/ui/provider/inputfield/MultiSelectionInputProvider.kt
+++ b/form/src/main/java/org/dhis2/form/ui/provider/inputfield/MultiSelectionInputProvider.kt
@@ -20,7 +20,7 @@ internal fun ProvideMultiSelectionInput(
     val data = optionsToDisplay.map { option ->
         CheckBoxData(
             uid = option.uid(),
-            checked = option.code()?.let { fieldUiModel.value?.contains(it) } ?: false,
+            checked = option.code()?.let { fieldUiModel.value?.split(",")?.contains(it) } ?: false,
             enabled = true,
             textInput = option.displayName() ?: "",
         )
diff --git a/form/src/main/java/org/dhis2/form/ui/provider/inputfield/RadioButtonProvider.kt b/form/src/main/java/org/dhis2/form/ui/provider/inputfield/RadioButtonProvider.kt
index c74c48149c..5ce3379166 100644
--- a/form/src/main/java/org/dhis2/form/ui/provider/inputfield/RadioButtonProvider.kt
+++ b/form/src/main/java/org/dhis2/form/ui/provider/inputfield/RadioButtonProvider.kt
@@ -2,7 +2,6 @@ package org.dhis2.form.ui.provider.inputfield
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.FocusRequester
 import org.dhis2.commons.resources.ResourceManager
 import org.dhis2.form.R
 import org.dhis2.form.extensions.inputState
@@ -21,7 +20,6 @@ internal fun ProvideRadioButtonInput(
     inputStyle: InputStyle,
     fieldUiModel: FieldUiModel,
     intentHandler: (FormIntent) -> Unit,
-    focusRequester: FocusRequester,
 ) {
     val data = fieldUiModel.optionSetConfiguration?.optionsToDisplay()?.map { option ->
         RadioButtonData(
@@ -44,7 +42,6 @@ internal fun ProvideRadioButtonInput(
         isRequired = fieldUiModel.mandatory,
         itemSelected = data.find { it.selected },
         onItemChange = { item ->
-            focusRequester.requestFocus()
             intentHandler(
                 FormIntent.OnSave(
                     fieldUiModel.uid,
@@ -64,7 +61,6 @@ internal fun ProvideYesNoRadioButtonInput(
     fieldUiModel: FieldUiModel,
     intentHandler: (FormIntent) -> Unit,
     resources: ResourceManager,
-    focusRequester: FocusRequester,
 ) {
     val data = listOf(
         RadioButtonData(
@@ -93,7 +89,6 @@ internal fun ProvideYesNoRadioButtonInput(
         isRequired = fieldUiModel.mandatory,
         itemSelected = data.find { it.selected },
         onItemChange = { item ->
-            focusRequester.requestFocus()
             when (item?.uid) {
                 "true" -> {
                     intentHandler(
diff --git a/form/src/test/java/org/dhis2/form/data/FormRepositoryImplTest.kt b/form/src/test/java/org/dhis2/form/data/FormRepositoryImplTest.kt
index 69cad19d91..586117cdc7 100644
--- a/form/src/test/java/org/dhis2/form/data/FormRepositoryImplTest.kt
+++ b/form/src/test/java/org/dhis2/form/data/FormRepositoryImplTest.kt
@@ -3,6 +3,7 @@ package org.dhis2.form.data
 import androidx.databinding.ObservableField
 import io.reactivex.Flowable
 import org.dhis2.form.model.ActionType
+import org.dhis2.form.model.EventCategory
 import org.dhis2.form.model.FieldUiModel
 import org.dhis2.form.model.FieldUiModelImpl
 import org.dhis2.form.model.RowAction
@@ -288,6 +289,20 @@ class FormRepositoryImplTest {
         }
     }
 
+    @Test
+    fun `Should show mandatory warning when some cat combo is missing`() {
+        whenever(
+            dataEntryRepository.list(),
+        ) doReturn Flowable.just(provideMandatoryListWithCategoryCombo("option1"))
+        repository.fetchFormItems()
+        assertTrue(repository.runDataIntegrityCheck(false) is MissingMandatoryResult)
+        whenever(
+            dataEntryRepository.list(),
+        ) doReturn Flowable.just(provideMandatoryListWithCategoryCombo("option1,option2"))
+        repository.fetchFormItems()
+        assertTrue(repository.runDataIntegrityCheck(false) is SuccessfulResult)
+    }
+
     private fun mockedSections() = listOf(
         "section1",
     )
@@ -383,6 +398,27 @@ class FormRepositoryImplTest {
         section2(),
     )
 
+    private fun provideMandatoryListWithCategoryCombo(value: String) = listOf(
+        section1(),
+        FieldUiModelImpl(
+            uid = "EVENT_CATEGORY_COMBO_UID-uid001",
+            layoutId = 1,
+            value = value,
+            displayName = "displayValue",
+            label = "field1",
+            valueType = ValueType.TEXT,
+            programStageSection = "section1",
+            uiEventFactory = null,
+            mandatory = true,
+            optionSetConfiguration = null,
+            autocompleteList = null,
+            eventCategories = listOf(
+                EventCategory("categoryUid1", "Category1", emptyList()),
+                EventCategory("categoryUid2", "Category2", emptyList()),
+            ),
+        ),
+    )
+
     private fun provideMandatoryItemList() = listOf(
         section1(),
         FieldUiModelImpl(
diff --git a/form/src/test/java/org/dhis2/form/data/FormValueStoreTest.kt b/form/src/test/java/org/dhis2/form/data/FormValueStoreTest.kt
index e5eea4452a..d2e4140ef6 100644
--- a/form/src/test/java/org/dhis2/form/data/FormValueStoreTest.kt
+++ b/form/src/test/java/org/dhis2/form/data/FormValueStoreTest.kt
@@ -1,6 +1,7 @@
 package org.dhis2.form.data
 
 import org.dhis2.commons.data.EntryMode
+import org.dhis2.commons.extensions.toDate
 import org.dhis2.commons.network.NetworkUtils
 import org.dhis2.commons.reporting.CrashReportController
 import org.dhis2.commons.resources.ResourceManager
@@ -33,9 +34,9 @@ import org.mockito.Mockito
 import org.mockito.kotlin.any
 import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.doThrow
-import org.mockito.kotlin.isNull
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.verify
+import org.mockito.kotlin.verifyNoInteractions
 import org.mockito.kotlin.whenever
 import java.io.File
 
@@ -974,15 +975,45 @@ class FormValueStoreTest {
     }
 
     @Test
-    fun `should clear event details category option combo`() {
+    fun `should not save value when clear event details category option combo`() {
         val uid = "categoryComboUid"
 
         val result = deValueStore.save("EVENT_CATEGORY_COMBO_UID-$uid", null, null)
 
-        verify(eventRepository).setAttributeOptionComboUid(isNull())
+        verifyNoInteractions(eventRepository)
+        assertEquals(result.valueStoreResult, ValueStoreResult.VALUE_HAS_NOT_CHANGED)
+    }
+
+    @Test
+    fun `should save event details report date`() {
+        val uid = EventRepository.EVENT_REPORT_DATE_UID
+        val dateValue = "2023-01-01'T'00:00:00"
+        val result = deValueStore.save(uid, dateValue, null)
+
+        verify(eventRepository).setEventDate(dateValue.toDate())
         assertEquals(result.valueStoreResult, VALUE_CHANGED)
     }
 
+    @Test
+    fun `should not save value when clear event details report date`() {
+        val uid = EventRepository.EVENT_REPORT_DATE_UID
+
+        val result = deValueStore.save(uid, null, null)
+
+        verifyNoInteractions(eventRepository)
+        assertEquals(result.valueStoreResult, ValueStoreResult.VALUE_HAS_NOT_CHANGED)
+    }
+
+    @Test
+    fun `should not save value when clear event details org unit`() {
+        val uid = EventRepository.EVENT_ORG_UNIT_UID
+
+        val result = deValueStore.save(uid, null, null)
+
+        verifyNoInteractions(eventRepository)
+        assertEquals(result.valueStoreResult, ValueStoreResult.VALUE_HAS_NOT_CHANGED)
+    }
+
     private fun mockGetCategoryOptionComboUid(
         categoryComboUid: String,
         categoryOptionsUids: List<String>,
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index dc22502d04..5495d0e006 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,15 +3,15 @@ ndk = "21.4.7075529"
 sdk = "34"
 minSdk = "21"
 vCode = "130"
-vName = "2.10-DEV"
+vName = "3.0-RC1"
 kotlinCompilerExtensionVersion = "1.5.6"
 gradle = "8.2.2"
 kotlin = '1.9.21'
 hilt = '2.47'
 hiltCompiler = '1.0.0'
 jacoco = '0.8.10'
-designSystem = "0.2-20240314.101140-42"
-dhis2sdk = "1.10.0-20240318.115339-36"
+designSystem = "0.2-20240426.091900-58"
+dhis2sdk = "1.10.0-20240322.092247-38"
 ruleEngine = "3.0.0-20240119.134348-12"
 expressionParser = "1.1.0-20240219.115041-14"
 appcompat = "1.6.1"
@@ -230,7 +230,6 @@ dispatcher-dispatchCore = { group = "com.rickbusarow.dispatch", name = "dispatch
 dispatcher-dispatchEspresso = { group = "com.rickbusarow.dispatch", name = "dispatch-android-espresso", version = "1.0.0-beta10" }
 deprecated-autoValueParcel = { group = "com.ryanharter.auto.value", name = "auto-value-parcel", version.ref = "autovalueparcel" } #TODO: Remove alongside AutoValue
 [plugins]
-
 [bundles]
 uicomponents-implementation = ["androidx-coreKtx", "androidx-appcompat", "androidx-activity-compose", "androidx-material3", "google-material", "lottie-compose", "dhis2-mobile-designsystem"]
 uicomponents-api = ["dhis2-mobile-designsystem", "androidx-compose-constraintlayout", "androidx-compose-preview", "androidx-compose-ui", "androidx-compose-viewbinding", "androidx-compose-livedata", "google-material-themeadapter", "google-material3-themeadapter"]
@@ -240,7 +239,7 @@ uicomponents-androidtest = ["test-junit-ext", "test-espresso"]
 analytics-implementation = ["androidx-cardview", "androidx-constraintlayout"]
 analytics-api = ["github-charts"]
 analytics-kapt = ["dagger-compiler"]
-analytics-test = ["test-mockitoCore", "test-mockitoInline", "test-mockitoKotlin"]
+analytics-test = ["test-mockitoCore", "test-mockitoInline", "test-mockitoKotlin", "test-kotlinCoroutines", "test-archCoreTesting"]
 form-test = ["test-mockitoCore", "test-mockitoInline", "test-mockitoKotlin", "test-turbine", "test-testCore", "test-rules", "test-archCoreTesting", "test-kotlinCoroutines"]
 form-androidTest = ["test-espresso-idlingresource"]
 map-test = ["test-mockitoCore", "test-mockitoInline", "test-mockitoKotlin"]
diff --git a/scripts/browserstackJenkins.sh b/scripts/browserstackJenkins.sh
index 1b8adebcd8..9cd300663a 100644
--- a/scripts/browserstackJenkins.sh
+++ b/scripts/browserstackJenkins.sh
@@ -30,9 +30,10 @@ json=$(jq -n \
                 --arg language "$browserstack_language" \
                 --arg locale "$browserstack_locale" \
                 --arg deviceLogs "$browserstack_deviceLogs" \
-                --arg allowDeviceMockServer  "$browserstack_allowDeviceMockServer" \
+                --arg allowDeviceMockServer "$browserstack_allowDeviceMockServer" \
                 --argjson shards "$shards" \
-                '{devices: $devices, app: $app_url, testSuite: $test_url, class: $class, logs: $logs, video: $video, local: $loc, localIdentifier: $locId, gpsLocation: $gpsLocation, language: $language, locale: $locale, deviceLogs: $deviceLogs, allowDeviceMockServer: $allowDeviceMockServer, shards: $shards}')
+                --arg buildTag "$buildTag" \
+                '{devices: $devices, app: $app_url, testSuite: $test_url, class: $class, logs: $logs, video: $video, local: $loc, localIdentifier: $locId, gpsLocation: $gpsLocation, language: $language, locale: $locale, deviceLogs: $deviceLogs, allowDeviceMockServer: $allowDeviceMockServer, shards: $shards, buildTag: $buildTag}')
 
 test_execution_response="$(curl -X POST https://api-cloud.browserstack.com/app-automate/espresso/v2/build -d \ "$json" -H "Content-Type: application/json" -u "$BROWSERSTACK_USR:$BROWSERSTACK_PSW")"
 
diff --git a/scripts/browserstackJenkinsCompose.sh b/scripts/browserstackJenkinsCompose.sh
index c1565649b1..e23271abf3 100644
--- a/scripts/browserstackJenkinsCompose.sh
+++ b/scripts/browserstackJenkinsCompose.sh
@@ -13,7 +13,8 @@ json=$(jq -n \
                 --argjson devices ["$browserstack_device_list"] \
                 --arg video "$browserstack_video" \
                 --arg deviceLogs "$browserstack_deviceLogs" \
-                '{devices: $devices, testSuite: $module_url, video: $video, deviceLogs: $deviceLogs'})
+                --arg buildTag "$buildTag" \
+                '{devices: $devices, testSuite: $module_url, video: $video, deviceLogs: $deviceLogs, buildTag: $buildTag}')
 
 test_execution_response="$(curl -X POST https://api-cloud.browserstack.com/app-automate/espresso/v2/module-build -d \ "$json" -H "Content-Type: application/json" -u "$BROWSERSTACK_USR:$BROWSERSTACK_PSW")"
 
diff --git a/scripts/browserstackJenkinsForm.sh b/scripts/browserstackJenkinsForm.sh
index c486265641..1864b5452a 100644
--- a/scripts/browserstackJenkinsForm.sh
+++ b/scripts/browserstackJenkinsForm.sh
@@ -15,7 +15,8 @@ json=$(jq -n \
                 --argjson devices ["$browserstack_device_list"] \
                 --arg video "$browserstack_video" \
                 --arg deviceLogs "$browserstack_deviceLogs" \
-                '{devices: $devices, testSuite: $module_url, video: $video, deviceLogs: $deviceLogs'})
+                --arg buildTag "$buildTag" \
+                '{devices: $devices, testSuite: $module_url, video: $video, deviceLogs: $deviceLogs, buildTag: $buildTag}')
 
 test_execution_response="$(curl -X POST https://api-cloud.browserstack.com/app-automate/espresso/v2/module-build -d \ "$json" -H "Content-Type: application/json" -u "$BROWSERSTACK_USR:$BROWSERSTACK_PSW")"
 
diff --git a/stock-usecase/src/main/java/org/dhis2/android/rtsm/services/rules/RuleValidationHelperImpl.kt b/stock-usecase/src/main/java/org/dhis2/android/rtsm/services/rules/RuleValidationHelperImpl.kt
index 42036adc59..7b649394b9 100644
--- a/stock-usecase/src/main/java/org/dhis2/android/rtsm/services/rules/RuleValidationHelperImpl.kt
+++ b/stock-usecase/src/main/java/org/dhis2/android/rtsm/services/rules/RuleValidationHelperImpl.kt
@@ -240,7 +240,7 @@ class RuleValidationHelperImpl @Inject constructor(
                     event.organisationUnit()!!,
                     d2.organisationUnitModule()
                         .organisationUnits().uid(event.organisationUnit())
-                        .blockingGet()!!.code(),
+                        .blockingGet()?.code(),
                     event.trackedEntityDataValues()?.toRuleDataValue(
                         event,
                         d2.dataElementModule().dataElements(),
diff --git a/stock-usecase/src/main/java/org/dhis2/android/rtsm/utils/RuleExtensions.kt b/stock-usecase/src/main/java/org/dhis2/android/rtsm/utils/RuleExtensions.kt
index b8ebad595f..6ee806ef97 100644
--- a/stock-usecase/src/main/java/org/dhis2/android/rtsm/utils/RuleExtensions.kt
+++ b/stock-usecase/src/main/java/org/dhis2/android/rtsm/utils/RuleExtensions.kt
@@ -266,12 +266,12 @@ fun getOptions(
         dataElementRepository.uid(dataElementUid).blockingGet()?.optionSet()?.uid()
             ?.let { optionSetUid ->
                 optionRepository.byOptionSetUid().eq(optionSetUid).blockingGet()
-            }?.map { option -> Option(option.name()!!, option.code()!!) } ?: emptyList()
+            }?.map { option -> Option(option.name()!!, option.code() ?: "") } ?: emptyList()
     } else if (trackedEntityAttributeUid != null) {
         attributeRepository.uid(trackedEntityAttributeUid).blockingGet()?.optionSet()?.uid()
             ?.let { optionSetUid ->
                 optionRepository.byOptionSetUid().eq(optionSetUid).blockingGet()
-            }?.map { option -> Option(option.name()!!, option.code()!!) } ?: emptyList()
+            }?.map { option -> Option(option.name()!!, option.code() ?: "") } ?: emptyList()
     } else {
         emptyList()
     }
diff --git a/ui-components/src/main/java/org/dhis2/ui/MetadataIcon.kt b/ui-components/src/main/java/org/dhis2/ui/MetadataIcon.kt
index 604ff7ed1c..19b3b99cdd 100644
--- a/ui-components/src/main/java/org/dhis2/ui/MetadataIcon.kt
+++ b/ui-components/src/main/java/org/dhis2/ui/MetadataIcon.kt
@@ -29,7 +29,11 @@ import org.hisp.dhis.mobile.ui.designsystem.component.MetadataAvatar
 import org.hisp.dhis.mobile.ui.designsystem.component.internal.ImageCardData
 
 @Composable
-fun MetadataIcon(modifier: Modifier = Modifier, metadataIconData: MetadataIconData) {
+fun MetadataIcon(
+    modifier: Modifier = Modifier,
+    metadataIconData: MetadataIconData,
+    size: AvatarSize = AvatarSize.Normal,
+) {
     MetadataAvatar(
         icon = {
             if (metadataIconData.isFileLoaded()) {
@@ -44,7 +48,7 @@ fun MetadataIcon(modifier: Modifier = Modifier, metadataIconData: MetadataIconDa
             }
         },
         iconTint = metadataIconData.color,
-        size = AvatarSize.Normal,
+        size = size,
     )
 }
 
diff --git a/ui-components/src/main/java/org/dhis2/ui/MetadataIconData.kt b/ui-components/src/main/java/org/dhis2/ui/MetadataIconData.kt
index b72feb57b7..27f346b26a 100644
--- a/ui-components/src/main/java/org/dhis2/ui/MetadataIconData.kt
+++ b/ui-components/src/main/java/org/dhis2/ui/MetadataIconData.kt
@@ -21,7 +21,7 @@ data class MetadataIconData(
             imageCardData = ImageCardData.IconCardData(
                 "",
                 "",
-                "ic_default_icon",
+                "",
                 Color.Unspecified,
             ),
             color = Color.Unspecified,
diff --git a/ui-components/src/main/java/org/dhis2/ui/dialogs/bottomsheet/BottomSheetDialogContent.kt b/ui-components/src/main/java/org/dhis2/ui/dialogs/bottomsheet/BottomSheetDialogContent.kt
index a78ea810de..00d32aac81 100644
--- a/ui-components/src/main/java/org/dhis2/ui/dialogs/bottomsheet/BottomSheetDialogContent.kt
+++ b/ui-components/src/main/java/org/dhis2/ui/dialogs/bottomsheet/BottomSheetDialogContent.kt
@@ -273,7 +273,7 @@ fun DialogPreview2() {
             title = "Saved",
             message = "Do you want to mark this form as complete?",
             iconResource = R.drawable.ic_saved_check,
-            mainButton = DialogButtonStyle.CompleteButton(),
+            mainButton = DialogButtonStyle.CompleteButton,
             secondaryButton = DialogButtonStyle.SecondaryButton(R.string.not_now),
         ),
         onMainButtonClicked = {},
diff --git a/ui-components/src/main/java/org/dhis2/ui/dialogs/bottomsheet/DialogButtonStyle.kt b/ui-components/src/main/java/org/dhis2/ui/dialogs/bottomsheet/DialogButtonStyle.kt
index 36f85fe461..17ba5de9e5 100644
--- a/ui-components/src/main/java/org/dhis2/ui/dialogs/bottomsheet/DialogButtonStyle.kt
+++ b/ui-components/src/main/java/org/dhis2/ui/dialogs/bottomsheet/DialogButtonStyle.kt
@@ -31,7 +31,7 @@ sealed class DialogButtonStyle(
         colorResource = colorPrimary,
     )
 
-    class CompleteButton : DialogButtonStyle(
+    data object CompleteButton : DialogButtonStyle(
         textResource = R.string.complete,
         colorResource = Color.White,
         iconResource = R.drawable.ic_event_status_complete,