diff --git a/app/src/main/res/layout-land/activity_dashboard_mobile.xml b/app/src/main/res/layout-land/activity_dashboard_mobile.xml
index 9e8320ffe8..f072c35bcc 100644
--- a/app/src/main/res/layout-land/activity_dashboard_mobile.xml
+++ b/app/src/main/res/layout-land/activity_dashboard_mobile.xml
@@ -15,179 +15,187 @@
         android:layout_height="match_parent">
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/toolbar"
+            android:id="@+id/backdropLayout"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?colorPrimary"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <ImageView
-                android:id="@+id/backArrow"
-                style="@style/ActionIcon"
-                android:onClick='@{()->presenter.onBackPressed()}'
-                android:padding="@dimen/default_start_margin"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:srcCompat="@drawable/ic_arrow_back"
-                tools:ignore="ContentDescription" />
-
-            <ImageView
-                android:id="@+id/syncButton"
-                style="@style/ActionIcon"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@id/relationshipMapIcon"
-                app:layout_constraintTop_toTopOf="parent"
-                app:srcCompat="@drawable/ic_sync"
-                app:tint="?colorOnPrimary"
-                tools:ignore="ContentDescription" />
-
-            <ImageView
-                android:id="@+id/relationshipMapIcon"
-                style="@style/ActionIcon"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@id/moreOptions"
-                app:layout_constraintTop_toTopOf="parent"
-                app:srcCompat="@drawable/ic_map"
-                app:tint="@color/white"
-                tools:ignore="ContentDescription"
-                tools:visibility="visible" />
-
-            <ImageView
-                android:id="@+id/moreOptions"
-                style="@style/ActionIcon"
-                android:layout_height="match_parent"
-                android:onClick="showMoreOptions"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:srcCompat="@drawable/ic_more"
-                tools:ignore="ContentDescription" />
-
-            <androidx.constraintlayout.widget.Guideline
-                android:id="@+id/progressGuideline"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                app:layout_constraintGuide_end="10dp" />
-
-            <androidx.core.widget.ContentLoadingProgressBar
-                android:id="@+id/toolbarProgress"
-                style="?android:attr/progressBarStyleHorizontal"
+            android:layout_height="match_parent"
+            android:background="?colorPrimary">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/toolbar"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:indeterminate="true"
-                android:padding="0dp"
-                android:visibility="gone"
-                app:layout_constraintTop_toBottomOf="@id/progressGuideline"
-                tools:visibility="visible" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
+                android:layout_height="?attr/actionBarSize"
+                android:background="?colorPrimary"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/main_view"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:background="@color/white"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/toolbar">
-
-            <androidx.constraintlayout.widget.Guideline
-                android:id="@+id/guideline25"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:orientation="vertical"
-                app:layout_constraintGuide_percent=".3" />
-
-            <androidx.constraintlayout.widget.Guideline
-                android:id="@+id/guideline"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:orientation="vertical"
-                app:layout_constraintGuide_percent=".50" />
-
-            <androidx.constraintlayout.widget.Guideline
-                android:id="@+id/guideline625"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:orientation="vertical"
-                app:layout_constraintGuide_percent=".70" />
-
-            <androidx.constraintlayout.widget.Guideline
-                android:id="@+id/guideline75"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:orientation="vertical"
-                app:layout_constraintGuide_percent=".75" />
+                <ImageView
+                    android:id="@+id/backArrow"
+                    style="@style/ActionIcon"
+                    android:onClick='@{()->presenter.onBackPressed()}'
+                    android:padding="@dimen/default_start_margin"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:srcCompat="@drawable/ic_arrow_back"
+                    tools:ignore="ContentDescription" />
+
+                <ImageView
+                    android:id="@+id/syncButton"
+                    style="@style/ActionIcon"
+                    android:visibility="gone"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toStartOf="@id/relationshipMapIcon"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:srcCompat="@drawable/ic_sync"
+                    app:tint="?colorOnPrimary"
+                    tools:ignore="ContentDescription" />
+
+                <ImageView
+                    android:id="@+id/relationshipMapIcon"
+                    style="@style/ActionIcon"
+                    android:visibility="gone"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toStartOf="@id/moreOptions"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:srcCompat="@drawable/ic_map"
+                    app:tint="@color/white"
+                    tools:ignore="ContentDescription"
+                    tools:visibility="visible" />
+
+                <ImageView
+                    android:id="@+id/moreOptions"
+                    style="@style/ActionIcon"
+                    android:layout_height="match_parent"
+                    android:onClick="showMoreOptions"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:srcCompat="@drawable/ic_more"
+                    tools:ignore="ContentDescription" />
+
+                <androidx.constraintlayout.widget.Guideline
+                    android:id="@+id/progressGuideline"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    app:layout_constraintGuide_end="10dp" />
+
+                <androidx.core.widget.ContentLoadingProgressBar
+                    android:id="@+id/toolbarProgress"
+                    style="?android:attr/progressBarStyleHorizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:indeterminate="true"
+                    android:padding="0dp"
+                    android:visibility="gone"
+                    app:layout_constraintTop_toBottomOf="@id/progressGuideline"
+                    tools:visibility="visible" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
 
             <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/tei_primary_color_view"
-                android:layout_width="0dp"
+                android:id="@+id/main_view"
+                android:layout_width="match_parent"
                 android:layout_height="0dp"
+                android:background="@drawable/ic_front_home_backdrop_bg"
+                android:clipToOutline="true"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@id/guideline25"
+                app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
+                app:layout_constraintTop_toBottomOf="@id/toolbar">
 
-                <FrameLayout
-                    android:id="@+id/tei_main_view"
+                <androidx.constraintlayout.widget.Guideline
+                    android:id="@+id/guideline25"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical"
+                    app:layout_constraintGuide_percent=".3" />
+
+                <androidx.constraintlayout.widget.Guideline
+                    android:id="@+id/guideline"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical"
+                    app:layout_constraintGuide_percent=".50" />
+
+                <androidx.constraintlayout.widget.Guideline
+                    android:id="@+id/guideline625"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical"
+                    app:layout_constraintGuide_percent=".70" />
+
+                <androidx.constraintlayout.widget.Guideline
+                    android:id="@+id/guideline75"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical"
+                    app:layout_constraintGuide_percent=".75" />
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/tei_primary_color_view"
                     android:layout_width="0dp"
                     android:layout_height="0dp"
                     app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintEnd_toStartOf="@id/guideline25"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
+                    app:layout_constraintTop_toTopOf="parent">
 
-            </androidx.constraintlayout.widget.ConstraintLayout>
+                    <FrameLayout
+                        android:id="@+id/tei_main_view"
+                        android:layout_width="0dp"
+                        android:layout_height="0dp"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
 
+                </androidx.constraintlayout.widget.ConstraintLayout>
 
-            <FrameLayout
-                android:id="@+id/tei_form_view"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:background="@color/white"
-                android:elevation="3dp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@id/guideline625"
-                app:layout_constraintStart_toEndOf="@id/guideline25"
-                app:layout_constraintTop_toTopOf="parent">
 
-                <com.google.android.material.floatingactionbutton.FloatingActionButton
-                    android:id="@+id/saveLand"
-                    style="@style/Widget.MaterialComponents.FloatingActionButton"
-                    android:layout_width="wrap_content"
+                <FrameLayout
+                    android:id="@+id/tei_form_view"
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    android:background="@color/white"
+                    android:elevation="3dp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toStartOf="@id/guideline625"
+                    app:layout_constraintStart_toEndOf="@id/guideline25"
+                    app:layout_constraintTop_toTopOf="parent">
+
+                    <com.google.android.material.floatingactionbutton.FloatingActionButton
+                        android:id="@+id/saveLand"
+                        style="@style/Widget.MaterialComponents.FloatingActionButton"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="bottom|end"
+                        android:layout_margin="16dp"
+                        app:backgroundTint="?colorPrimary"
+                        app:srcCompat="@drawable/ic_save"
+                        app:tint="@color/white" />
+                </FrameLayout>
+
+                <androidx.viewpager2.widget.ViewPager2
+                    android:id="@+id/tei_table_pager"
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    app:layout_constraintBottom_toTopOf="@id/navigationBar"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@id/guideline625"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <org.dhis2.utils.customviews.navigationbar.NavigationBottomBar
+                    android:id="@+id/navigationBar"
+                    style="@style/DhisBottomNavigationView"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="bottom|end"
-                    android:layout_margin="16dp"
-                    app:backgroundTint="?colorPrimary"
-                    app:srcCompat="@drawable/ic_save"
-                    app:tint="@color/white" />
-            </FrameLayout>
-
-            <androidx.viewpager2.widget.ViewPager2
-                android:id="@+id/tei_table_pager"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                app:layout_constraintBottom_toTopOf="@id/navigationBar"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/guideline625"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <org.dhis2.utils.customviews.navigationbar.NavigationBottomBar
-                android:id="@+id/navigationBar"
-                style="@style/DhisBottomNavigationView"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                app:forceShowAnalytics="true"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="@id/guideline625"
-                app:menu="@menu/navigation_dashboard_landscape_menu" />
+                    app:forceShowAnalytics="true"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="@id/guideline625"
+                    app:menu="@menu/navigation_dashboard_landscape_menu" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/activity_event_capture.xml b/app/src/main/res/layout-land/activity_event_capture.xml
index ed0da89ffa..89420b899c 100644
--- a/app/src/main/res/layout-land/activity_event_capture.xml
+++ b/app/src/main/res/layout-land/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" />
@@ -15,236 +16,244 @@
         android:layout_height="match_parent">
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/activityToolbar"
+            android:id="@+id/backdropLayout"
             android:layout_width="match_parent"
-            android:layout_height="?android:attr/actionBarSize"
-            android:background="?colorPrimary"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <ImageView
-                android:id="@+id/buttonBack"
-                style="@style/ActionIcon"
-                android:onClick="@{()->presenter.onBackClick()}"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:srcCompat="@drawable/ic_arrow_back" />
+            android:layout_height="match_parent"
+            android:background="?colorPrimary">
 
-            <ImageView
-                android:id="@+id/moreOptions"
-                style="@style/ActionIcon"
-                android:onClick="showMoreOptions"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:srcCompat="@drawable/ic_more"
-                tools:ignore="ContentDescription" />
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/activityToolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?android:attr/actionBarSize"
+                android:background="?colorPrimary"
+                app:layout_constraintTop_toTopOf="parent">
 
-            <org.dhis2.utils.customviews.CircularCompletionView
-                android:id="@+id/completion"
-                android:layout_width="wrap_content"
-                android:layout_height="0dp"
-                app:circleColor="@color/circleColor"
-                app:completionColor="@color/completionColor"
-                app:layout_constraintBottom_toBottomOf="@+id/moreOptions"
-                app:layout_constraintEnd_toStartOf="@id/moreOptions"
-                app:layout_constraintTop_toTopOf="@+id/moreOptions"
-                app:percentageColor="@color/percentageColor"
-                app:percentageSize="13sp"
-                app:secondaryColor="@color/secondaryColor"
-                app:strokeSize="3dp"
-                tools:initialPercentage="0.1"
-                tools:initialSecondaryPercentage="0.2" />
-
-            <TextView
-                android:id="@+id/programStageName"
-                style="@style/TextPrimary"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:layout_marginTop="9dp"
-                android:maxLines="1"
-                android:textColor="?colorAccent"
-                app:layout_constraintBottom_toTopOf="@+id/eventSecundaryInfo"
-                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_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" />
-
-            <androidx.constraintlayout.widget.Guideline
-                android:id="@+id/guideline"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                app:layout_constraintGuide_end="10dp" />
+                <ImageView
+                    android:id="@+id/buttonBack"
+                    style="@style/ActionIcon"
+                    android:onClick="@{()->presenter.onBackClick()}"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:srcCompat="@drawable/ic_arrow_back" />
 
-            <androidx.core.widget.ContentLoadingProgressBar
-                android:id="@+id/toolbarProgress"
-                style="?android:attr/progressBarStyleHorizontal"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:indeterminate="true"
-                android:padding="0dp"
-                app:layout_constraintTop_toBottomOf="@id/guideline" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
+                <ImageView
+                    android:id="@+id/moreOptions"
+                    style="@style/ActionIcon"
+                    android:onClick="showMoreOptions"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:srcCompat="@drawable/ic_more"
+                    tools:ignore="ContentDescription" />
 
-        <View
-            android:id="@+id/top_dummy_view"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:background="?colorPrimary"
-            app:layout_constraintBottom_toTopOf="@id/bottom_dummy_view"
-            app:layout_constraintTop_toBottomOf="@id/activityToolbar" />
+                <org.dhis2.utils.customviews.CircularCompletionView
+                    android:id="@+id/completion"
+                    android:layout_width="wrap_content"
+                    android:layout_height="0dp"
+                    app:circleColor="@color/circleColor"
+                    app:completionColor="@color/completionColor"
+                    app:layout_constraintBottom_toBottomOf="@+id/moreOptions"
+                    app:layout_constraintEnd_toStartOf="@id/moreOptions"
+                    app:layout_constraintTop_toTopOf="@+id/moreOptions"
+                    app:percentageColor="@color/percentageColor"
+                    app:percentageSize="13sp"
+                    app:secondaryColor="@color/secondaryColor"
+                    app:strokeSize="3dp"
+                    tools:initialPercentage="0.1"
+                    tools:initialSecondaryPercentage="0.2" />
 
-        <View
-            android:id="@+id/bottom_dummy_view"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:background="@color/form_field_background"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/top_dummy_view" />
-
-        <include
-            android:id="@+id/calculationIndicator"
-            layout="@layout/indicator_progress"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:visibility="gone"
-            app:layout_constraintBottom_toTopOf="@+id/layoutContainer"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+                <TextView
+                    android:id="@+id/programStageName"
+                    style="@style/TextPrimary"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="12dp"
+                    android:layout_marginTop="9dp"
+                    android:maxLines="1"
+                    android:textColor="?colorAccent"
+                    app:layout_constraintBottom_toTopOf="@+id/eventSecundaryInfo"
+                    app:layout_constraintEnd_toStartOf="@id/syncButton"
+                    app:layout_constraintStart_toEndOf="@id/buttonBack"
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:text="Program Stage Name" />
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/layoutContainer"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:background="@color/white"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/activityToolbar"
-            app:layout_constraintBottom_toBottomOf="parent">
-
-            <androidx.constraintlayout.widget.Guideline
-                android:id="@+id/guideline25"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:orientation="vertical"
-                app:layout_constraintGuide_percent=".3" />
-
-            <androidx.constraintlayout.widget.Guideline
-                android:id="@+id/guideline_50"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:orientation="vertical"
-                app:layout_constraintGuide_percent=".50" />
-
-            <androidx.constraintlayout.widget.Guideline
-                android:id="@+id/guideline625"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:orientation="vertical"
-                app:layout_constraintGuide_percent=".70" />
-
-            <androidx.constraintlayout.widget.Guideline
-                android:id="@+id/guideline75"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:orientation="vertical"
-                app:layout_constraintGuide_percent=".75" />
+                <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" />
 
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/tei_column"
-                android:layout_width="0dp"
+                <ImageView
+                    android:id="@+id/syncButton"
+                    style="@style/ActionIcon"
+                    android:onClick="showMoreOptions"
+                    android:visibility="gone"
+                    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" />
+
+                <androidx.constraintlayout.widget.Guideline
+                    android:id="@+id/guideline"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    app:layout_constraintGuide_end="10dp" />
+
+                <androidx.core.widget.ContentLoadingProgressBar
+                    android:id="@+id/toolbarProgress"
+                    style="?android:attr/progressBarStyleHorizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:indeterminate="true"
+                    android:padding="0dp"
+                    app:layout_constraintTop_toBottomOf="@id/guideline" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <View
+                android:id="@+id/top_dummy_view"
+                android:layout_width="match_parent"
                 android:layout_height="0dp"
-                app:layout_constraintEnd_toStartOf="@id/guideline25"
-                app:layout_constraintStart_toStartOf="parent"
+                android:background="?colorPrimary"
+                app:layout_constraintBottom_toTopOf="@id/bottom_dummy_view"
+                app:layout_constraintTop_toBottomOf="@id/activityToolbar" />
+
+            <View
+                android:id="@+id/bottom_dummy_view"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:background="@color/form_field_background"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-            </androidx.constraintlayout.widget.ConstraintLayout>
+                app:layout_constraintTop_toBottomOf="@id/top_dummy_view" />
+
+            <include
+                android:id="@+id/calculationIndicator"
+                layout="@layout/indicator_progress"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:visibility="gone"
+                app:layout_constraintBottom_toTopOf="@+id/layoutContainer"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
             <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/form_column"
-                android:layout_width="0dp"
+                android:id="@+id/layoutContainer"
+                android:layout_width="match_parent"
                 android:layout_height="0dp"
-                android:elevation="3dp"
-                android:background="@color/white"
+                android:background="@drawable/ic_front_backdrop_bg"
+                android:clipToOutline="true"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@id/guideline625"
-                app:layout_constraintStart_toEndOf="@id/guideline25"
-                app:layout_constraintTop_toTopOf="parent" >
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/activityToolbar">
 
+                <androidx.constraintlayout.widget.Guideline
+                    android:id="@+id/guideline25"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical"
+                    app:layout_constraintGuide_percent=".3" />
 
-                <FrameLayout
-                    android:id="@+id/event_form"
+                <androidx.constraintlayout.widget.Guideline
+                    android:id="@+id/guideline_50"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical"
+                    app:layout_constraintGuide_percent=".50" />
+
+                <androidx.constraintlayout.widget.Guideline
+                    android:id="@+id/guideline625"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical"
+                    app:layout_constraintGuide_percent=".70" />
+
+                <androidx.constraintlayout.widget.Guideline
+                    android:id="@+id/guideline75"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical"
+                    app:layout_constraintGuide_percent=".75" />
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/tei_column"
                     android:layout_width="0dp"
                     android:layout_height="0dp"
                     app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintEnd_toStartOf="@id/guideline25"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"/>
+                    app:layout_constraintTop_toTopOf="parent"></androidx.constraintlayout.widget.ConstraintLayout>
 
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/stats_column"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/guideline625"
-                app:layout_constraintTop_toTopOf="parent" >
-
-                <androidx.viewpager2.widget.ViewPager2
-                    android:id="@+id/eventViewLandPager"
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/form_column"
                     android:layout_width="0dp"
                     android:layout_height="0dp"
-                    app:layout_constraintBottom_toTopOf="@+id/navigationBar"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
+                    android:background="@color/white"
+                    android:elevation="3dp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toStartOf="@id/guideline625"
+                    app:layout_constraintStart_toEndOf="@id/guideline25"
+                    app:layout_constraintTop_toTopOf="parent">
+
+
+                    <FrameLayout
+                        android:id="@+id/event_form"
+                        android:layout_width="0dp"
+                        android:layout_height="0dp"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
 
-                <org.dhis2.utils.customviews.navigationbar.NavigationBottomBar
-                    android:id="@+id/navigationBar"
-                    style="@style/DhisBottomNavigationView"
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/stats_column"
                     android:layout_width="0dp"
-                    android:layout_height="53dp"
-                    app:forceShowAnalytics="true"
-                    app:initialPage="0"
+                    android:layout_height="0dp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:menu="@menu/navigation_event_menu" />
+                    app:layout_constraintStart_toEndOf="@id/guideline625"
+                    app:layout_constraintTop_toTopOf="parent">
+
+                    <androidx.viewpager2.widget.ViewPager2
+                        android:id="@+id/eventViewLandPager"
+                        android:layout_width="0dp"
+                        android:layout_height="0dp"
+                        app:layout_constraintBottom_toTopOf="@+id/navigationBar"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
 
+                    <org.dhis2.utils.customviews.navigationbar.NavigationBottomBar
+                        android:id="@+id/navigationBar"
+                        style="@style/DhisBottomNavigationView"
+                        android:layout_width="0dp"
+                        android:layout_height="53dp"
+                        app:forceShowAnalytics="true"
+                        app:initialPage="0"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:menu="@menu/navigation_event_menu" />
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
             </androidx.constraintlayout.widget.ConstraintLayout>
+
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_dashboard_mobile.xml b/app/src/main/res/layout/activity_dashboard_mobile.xml
index 4d19f002f0..69d365c0c3 100644
--- a/app/src/main/res/layout/activity_dashboard_mobile.xml
+++ b/app/src/main/res/layout/activity_dashboard_mobile.xml
@@ -21,118 +21,126 @@
         android:layout_height="match_parent">
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/toolbar"
+            android:id="@+id/backdropLayout"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?colorPrimary"
-            android:clipToPadding="false"
-            android:elevation="8dp"
-            app:elevation="8dp"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <ImageView
-                android:id="@+id/back"
-                style="@style/ActionIcon"
-                android:onClick='@{()->presenter.onBackPressed()}'
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:srcCompat="@drawable/ic_arrow_back"
-                tools:ignore="ContentDescription" />
-
-            <TextView
-                android:id="@+id/toolbar_title"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:gravity="center_vertical"
-                android:text='@{title}'
-                android:textColor="?colorAccent"
-                android:textSize="20sp"
-                android:ellipsize="end"
-                android:maxLines="1"
-                app:layout_constraintEnd_toStartOf="@id/editButton"
-                app:layout_constraintStart_toEndOf="@id/back"
-                tools:text="TEI NAME" />
-
-            <androidx.compose.ui.platform.ComposeView
-                android:id="@+id/editButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:visibility="@{presenter.getProgramUid() == null ? View.GONE : View.VISIBLE}"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@id/moreOptions"
-                app:layout_constraintTop_toTopOf="parent"/>
+            android:layout_height="match_parent"
+            android:background="?colorPrimary">
 
-            <ImageView
-                android:id="@+id/syncButton"
-                style="@style/ActionIcon"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@id/relationshipMapIcon"
-                app:layout_constraintTop_toTopOf="parent"
-                app:srcCompat="@drawable/ic_sync"
-                app:tint="?colorOnPrimary"
-                tools:ignore="ContentDescription"
-                tools:visibility="gone"/>
-
-            <ImageView
-                android:id="@+id/relationshipMapIcon"
-                style="@style/ActionIcon"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@id/moreOptions"
-                app:layout_constraintTop_toTopOf="parent"
-                app:srcCompat="@drawable/ic_map"
-                app:tint="@color/white"
-                tools:ignore="ContentDescription"
-                tools:visibility="gone"/>
-
-            <ImageView
-                android:id="@+id/moreOptions"
-                style="@style/ActionIcon"
-                android:onClick="showMoreOptions"
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:background="?colorPrimary"
+                android:clipToPadding="false"
+                android:elevation="8dp"
+                app:elevation="8dp"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <ImageView
+                    android:id="@+id/back"
+                    style="@style/ActionIcon"
+                    android:onClick='@{()->presenter.onBackPressed()}'
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:srcCompat="@drawable/ic_arrow_back"
+                    tools:ignore="ContentDescription" />
+
+                <TextView
+                    android:id="@+id/toolbar_title"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:ellipsize="end"
+                    android:gravity="center_vertical"
+                    android:maxLines="1"
+                    android:text='@{title}'
+                    android:textColor="?colorAccent"
+                    android:textSize="20sp"
+                    app:layout_constraintEnd_toStartOf="@id/editButton"
+                    app:layout_constraintStart_toEndOf="@id/back"
+                    tools:text="TEI NAME" />
+
+                <androidx.compose.ui.platform.ComposeView
+                    android:id="@+id/editButton"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:visibility="@{presenter.getProgramUid() == null ? View.GONE : View.VISIBLE}"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toStartOf="@id/moreOptions"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <ImageView
+                    android:id="@+id/syncButton"
+                    style="@style/ActionIcon"
+                    android:visibility="gone"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toStartOf="@id/relationshipMapIcon"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:srcCompat="@drawable/ic_sync"
+                    app:tint="?colorOnPrimary"
+                    tools:ignore="ContentDescription"
+                    tools:visibility="gone" />
+
+                <ImageView
+                    android:id="@+id/relationshipMapIcon"
+                    style="@style/ActionIcon"
+                    android:visibility="gone"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toStartOf="@id/moreOptions"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:srcCompat="@drawable/ic_map"
+                    app:tint="@color/white"
+                    tools:ignore="ContentDescription"
+                    tools:visibility="gone" />
+
+                <ImageView
+                    android:id="@+id/moreOptions"
+                    style="@style/ActionIcon"
+                    android:onClick="showMoreOptions"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:srcCompat="@drawable/ic_more"
+                    tools:ignore="ContentDescription" />
+
+                <androidx.constraintlayout.widget.Guideline
+                    android:id="@+id/guideline"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    app:layout_constraintGuide_end="10dp" />
+
+                <androidx.core.widget.ContentLoadingProgressBar
+                    android:id="@+id/toolbarProgress"
+                    style="?android:attr/progressBarStyleHorizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:indeterminate="true"
+                    android:padding="0dp"
+                    android:visibility="gone"
+                    app:layout_constraintTop_toBottomOf="@id/guideline"
+                    tools:visibility="visible" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <androidx.viewpager2.widget.ViewPager2
+                android:id="@+id/tei_pager"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_marginBottom="40dp"
+                android:background="@drawable/ic_front_home_backdrop_bg"
+                android:clipToOutline="true"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:srcCompat="@drawable/ic_more"
-                tools:ignore="ContentDescription" />
-
-            <androidx.constraintlayout.widget.Guideline
-                android:id="@+id/guideline"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                app:layout_constraintGuide_end="10dp" />
+                app:layout_constraintTop_toBottomOf="@id/toolbar" />
 
-            <androidx.core.widget.ContentLoadingProgressBar
-                android:id="@+id/toolbarProgress"
-                style="?android:attr/progressBarStyleHorizontal"
+            <org.dhis2.utils.customviews.navigationbar.NavigationBottomBar
+                android:id="@+id/navigationBar"
+                style="@style/DhisBottomNavigationView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:indeterminate="true"
-                android:padding="0dp"
-                android:visibility="gone"
-                app:layout_constraintTop_toBottomOf="@id/guideline"
-                tools:visibility="visible" />
-
+                app:forceShowAnalytics="true"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:menu="@menu/navigation_dashboard_menu" />
         </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <androidx.viewpager2.widget.ViewPager2
-            android:id="@+id/tei_pager"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_marginBottom="40dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/toolbar" />
-
-        <org.dhis2.utils.customviews.navigationbar.NavigationBottomBar
-            android:id="@+id/navigationBar"
-            style="@style/DhisBottomNavigationView"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:forceShowAnalytics="true"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:menu="@menu/navigation_dashboard_menu" />
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_event_capture.xml b/app/src/main/res/layout/activity_event_capture.xml
index b6a62c437b..c9a1c21015 100644
--- a/app/src/main/res/layout/activity_event_capture.xml
+++ b/app/src/main/res/layout/activity_event_capture.xml
@@ -16,135 +16,143 @@
         android:layout_height="match_parent">
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/activityToolbar"
+            android:id="@+id/backdropLayout"
             android:layout_width="match_parent"
-            android:layout_height="?android:attr/actionBarSize"
-            android:background="?colorPrimary"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <ImageView
-                android:id="@+id/buttonBack"
-                style="@style/ActionIcon"
-                android:onClick="@{()->presenter.onBackClick()}"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:srcCompat="@drawable/ic_arrow_back" />
-
-            <ImageView
-                android:id="@+id/moreOptions"
-                style="@style/ActionIcon"
-                android:onClick="showMoreOptions"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:srcCompat="@drawable/ic_more"
-                tools:ignore="ContentDescription" />
+            android:layout_height="match_parent"
+            android:background="?colorPrimary">
 
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/activityToolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?android:attr/actionBarSize"
+                android:background="?colorPrimary"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <ImageView
+                    android:id="@+id/buttonBack"
+                    style="@style/ActionIcon"
+                    android:onClick="@{()->presenter.onBackClick()}"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:srcCompat="@drawable/ic_arrow_back" />
+
+                <ImageView
+                    android:id="@+id/moreOptions"
+                    style="@style/ActionIcon"
+                    android:onClick="showMoreOptions"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:srcCompat="@drawable/ic_more"
+                    tools:ignore="ContentDescription" />
+
+
+                <org.dhis2.utils.customviews.CircularCompletionView
+                    android:id="@+id/completion"
+                    android:layout_width="wrap_content"
+                    android:layout_height="0dp"
+                    app:circleColor="@color/circleColor"
+                    app:completionColor="@color/completionColor"
+                    app:layout_constraintBottom_toBottomOf="@+id/moreOptions"
+                    app:layout_constraintEnd_toStartOf="@id/moreOptions"
+                    app:layout_constraintTop_toTopOf="@+id/moreOptions"
+                    app:percentageColor="@color/percentageColor"
+                    app:percentageSize="13sp"
+                    app:secondaryColor="@color/secondaryColor"
+                    app:strokeSize="3dp"
+                    tools:initialPercentage="0.1"
+                    tools:initialSecondaryPercentage="0.2" />
+
+                <TextView
+                    android:id="@+id/programStageName"
+                    style="@style/TextPrimary"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="12dp"
+                    android:gravity="center_vertical"
+                    android:maxLines="1"
+                    android:textColor="?colorAccent"
+                    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" />
+
+                <ImageView
+                    android:id="@+id/syncButton"
+                    style="@style/ActionIcon"
+                    android:onClick="showMoreOptions"
+                    android:visibility="gone"
+                    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" />
+
+                <androidx.constraintlayout.widget.Guideline
+                    android:id="@+id/guideline"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    app:layout_constraintGuide_end="10dp" />
+
+                <androidx.core.widget.ContentLoadingProgressBar
+                    android:id="@+id/toolbarProgress"
+                    style="?android:attr/progressBarStyleHorizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:indeterminate="true"
+                    android:padding="0dp"
+                    app:layout_constraintTop_toBottomOf="@id/guideline" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <View
+                android:id="@+id/top_dummy_view"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:background="?colorPrimary"
+                app:layout_constraintBottom_toTopOf="@id/bottom_dummy_view"
+                app:layout_constraintTop_toBottomOf="@id/activityToolbar" />
 
-            <org.dhis2.utils.customviews.CircularCompletionView
-                android:id="@+id/completion"
-                android:layout_width="wrap_content"
+            <View
+                android:id="@+id/bottom_dummy_view"
+                android:layout_width="match_parent"
                 android:layout_height="0dp"
-                app:circleColor="@color/circleColor"
-                app:completionColor="@color/completionColor"
-                app:layout_constraintBottom_toBottomOf="@+id/moreOptions"
-                app:layout_constraintEnd_toStartOf="@id/moreOptions"
-                app:layout_constraintTop_toTopOf="@+id/moreOptions"
-                app:percentageColor="@color/percentageColor"
-                app:percentageSize="13sp"
-                app:secondaryColor="@color/secondaryColor"
-                app:strokeSize="3dp"
-                tools:initialPercentage="0.1"
-                tools:initialSecondaryPercentage="0.2" />
-
-            <TextView
-                android:id="@+id/programStageName"
-                style="@style/TextPrimary"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_marginStart="12dp"
-                android:gravity="center_vertical"
-                android:maxLines="1"
-                android:textColor="?colorAccent"
-                android:textSize="22sp"
+                android:background="@color/form_field_background"
                 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" />
-
-            <ImageView
-                android:id="@+id/syncButton"
-                style="@style/ActionIcon"
-                android:onClick="showMoreOptions"
-                android:visibility="gone"
-                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" />
-
-            <androidx.constraintlayout.widget.Guideline
-                android:id="@+id/guideline"
-                android:layout_width="wrap_content"
+                app:layout_constraintTop_toBottomOf="@id/top_dummy_view" />
+
+            <androidx.viewpager2.widget.ViewPager2
+                android:id="@+id/eventViewPager"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:background="@drawable/ic_front_backdrop_bg"
+                android:clipToOutline="true"
+                app:layout_constraintBottom_toTopOf="@id/navigationBar"
+                app:layout_constraintTop_toBottomOf="@id/activityToolbar" />
+
+            <org.dhis2.utils.customviews.navigationbar.NavigationBottomBar
+                android:id="@+id/navigationBar"
+                style="@style/DhisBottomNavigationView"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                app:layout_constraintGuide_end="10dp" />
+                app:forceShowAnalytics="true"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:menu="@menu/navigation_event_menu" />
 
-            <androidx.core.widget.ContentLoadingProgressBar
-                android:id="@+id/toolbarProgress"
-                style="?android:attr/progressBarStyleHorizontal"
+            <include
+                android:id="@+id/calculationIndicator"
+                layout="@layout/indicator_progress"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:indeterminate="true"
-                android:padding="0dp"
-                app:layout_constraintTop_toBottomOf="@id/guideline" />
+                android:layout_marginTop="10dp"
+                android:visibility="gone"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="@id/eventViewPager" />
         </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <View
-            android:id="@+id/top_dummy_view"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:background="?colorPrimary"
-            app:layout_constraintBottom_toTopOf="@id/bottom_dummy_view"
-            app:layout_constraintTop_toBottomOf="@id/activityToolbar" />
-
-        <View
-            android:id="@+id/bottom_dummy_view"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:background="@color/form_field_background"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/top_dummy_view" />
-
-        <androidx.viewpager2.widget.ViewPager2
-            android:id="@+id/eventViewPager"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            app:layout_constraintBottom_toTopOf="@id/navigationBar"
-            app:layout_constraintTop_toBottomOf="@id/activityToolbar" />
-
-        <org.dhis2.utils.customviews.navigationbar.NavigationBottomBar
-            android:id="@+id/navigationBar"
-            style="@style/DhisBottomNavigationView"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:forceShowAnalytics="true"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:menu="@menu/navigation_event_menu" />
-
-        <include
-            android:id="@+id/calculationIndicator"
-            layout="@layout/indicator_progress"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:visibility="gone"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@id/eventViewPager" />
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file