diff --git a/android/navi-amc/src/main/java/com/navi/amc/portfolio/fragments/PortfolioFragment.kt b/android/navi-amc/src/main/java/com/navi/amc/portfolio/fragments/PortfolioFragment.kt
index 253445d37c..8108529c7a 100644
--- a/android/navi-amc/src/main/java/com/navi/amc/portfolio/fragments/PortfolioFragment.kt
+++ b/android/navi-amc/src/main/java/com/navi/amc/portfolio/fragments/PortfolioFragment.kt
@@ -197,14 +197,16 @@ class PortfolioFragment() : AmcBaseFragment() {
                     View.VISIBLE
                 } ?: run { View.INVISIBLE }
             data.actionData?.primaryAction?.let { action ->
+                buttonLayout.visibility = View.VISIBLE
                 primaryBtn.visibility = View.VISIBLE
                 primaryBtn.isEnabled = action.disabled.orFalse().not()
                 primaryBtn.text = action.title
                 primaryBtn.setOnClickListener { navigate(action) }
             } ?: run { primaryBtn.visibility = View.GONE }
             data.actionData?.secondaryAction?.let { action ->
+                buttonLayout.visibility = View.VISIBLE
                 secondaryBtn.visibility = View.VISIBLE
-                secondaryBtn.isEnabled = !action.disabled.orFalse().not()
+                secondaryBtn.isEnabled = action.disabled.orFalse().not()
                 secondaryBtn.text = action.title
                 secondaryBtn.setOnClickListener { navigate(action) }
             } ?: run { secondaryBtn.visibility = View.GONE }
diff --git a/android/navi-amc/src/main/res/layout/fund_graph_layout.xml b/android/navi-amc/src/main/res/layout/fund_graph_layout.xml
index 25995a9d13..0b5eaf835b 100644
--- a/android/navi-amc/src/main/res/layout/fund_graph_layout.xml
+++ b/android/navi-amc/src/main/res/layout/fund_graph_layout.xml
@@ -118,7 +118,7 @@
             android:layout_marginTop="@dimen/dp_16"
             android:layout_marginBottom="@dimen/dp_36"
             app:layout_constraintTop_toTopOf="@id/chart"
-            app:layout_constraintBottom_toTopOf="@id/options"
+            app:layout_constraintBottom_toTopOf="@id/chip_group"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             android:background="#FFFCEC"
@@ -162,20 +162,31 @@
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
+        <LinearLayout
+            android:id = "@+id/chip_group"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:paddingTop="@dimen/dp_8"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/chart_label_barrier">
 
             <com.google.android.material.chip.ChipGroup
                 android:id="@+id/options"
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                app:layout_constraintTop_toBottomOf="@id/chart_label_barrier"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
                 android:layout_gravity="center"
                 android:paddingTop="@dimen/dp_8"
-                app:singleLine="true"
+                android:layout_marginHorizontal="@dimen/dp_8"
+                app:chipSpacingHorizontal="@dimen/dp_16"
                 app:selectionRequired="true"
+                app:singleLine="true"
                 app:singleSelection="true" />
 
+        </LinearLayout>
+
+
         <com.navi.amc.common.view.FundInvestmentDetailsView
             android:id="@+id/fund_investment_details"
             android:layout_width="match_parent"
@@ -184,6 +195,6 @@
             android:layout_marginTop="@dimen/dp_30"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/options" />
+            app:layout_constraintTop_toBottomOf="@id/chip_group" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file
diff --git a/android/navi-amc/src/main/res/layout/icon_title_layout.xml b/android/navi-amc/src/main/res/layout/icon_title_layout.xml
index 15d6935f24..1d96d5d862 100644
--- a/android/navi-amc/src/main/res/layout/icon_title_layout.xml
+++ b/android/navi-amc/src/main/res/layout/icon_title_layout.xml
@@ -12,18 +12,22 @@
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/icon"
+        android:visibility="gone"
         android:layout_width="@dimen/dp_12"
         android:layout_height="@dimen/dp_12"
         app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginEnd="@dimen/dp_4"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintEnd_toStartOf="@id/title"
+        />
 
     <com.navi.design.textview.NaviTextView
         android:id="@+id/title"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="Investments"
-        android:layout_marginStart="@dimen/dp_8"
         app:layout_constraintStart_toEndOf="@id/icon" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/android/navi-amc/src/main/res/layout/overview_icon_layout.xml b/android/navi-amc/src/main/res/layout/overview_icon_layout.xml
index 7743f40c62..eb9afb578d 100644
--- a/android/navi-amc/src/main/res/layout/overview_icon_layout.xml
+++ b/android/navi-amc/src/main/res/layout/overview_icon_layout.xml
@@ -67,7 +67,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="@dimen/dp_16"
-                app:layout_constraintBottom_toTopOf="@id/primary_btn"
+                app:layout_constraintBottom_toTopOf="@id/button_layout"
                 app:layout_constraintStart_toEndOf="@id/guideline"
                 app:layout_constraintTop_toTopOf="@id/top_left" />
 
@@ -85,41 +85,48 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
-            <Button
-                android:id="@+id/secondary_btn"
-                style="@style/TextV8Style"
-                android:layout_width="@dimen/dp_0"
-                android:layout_height="@dimen/dp_32"
-                android:layout_marginStart="@dimen/dp_16"
-                android:layout_marginTop="@dimen/dp_16"
-                android:layout_marginEnd="@dimen/dp_16"
-                android:background="@drawable/purple_border_bg_rounded_4"
-                android:fontFamily="@font/tt_semi_bold"
-                android:gravity="center"
-                android:textAllCaps="false"
-                android:visibility="gone"
-                app:layout_constraintEnd_toStartOf="@id/guideline"
+            <LinearLayout
+                android:id="@+id/button_layout"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/top_right"
-                app:layout_goneMarginBottom="@dimen/dp_16" />
-
-            <Button
-                android:id="@+id/primary_btn"
-                style="@style/ActionButtonTextStyle"
-                android:layout_width="@dimen/dp_0"
-                android:layout_height="@dimen/dp_32"
-                android:layout_marginEnd="@dimen/dp_16"
-                android:layout_marginBottom="@dimen/dp_16"
-                android:background="@drawable/primary_button_background"
-                android:fontFamily="@font/tt_semi_bold"
-                android:gravity="center"
-                android:textAllCaps="false"
-                android:visibility="gone"
-                app:layout_constraintBottom_toTopOf="@id/note"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/guideline"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
                 app:layout_constraintTop_toBottomOf="@id/top_right"
-                app:layout_goneMarginBottom="@dimen/dp_16" />
+                app:layout_constraintBottom_toTopOf="@id/note"
+                android:layout_marginBottom="@dimen/dp_16"
+                android:visibility="gone"
+                android:orientation="horizontal"
+                android:gravity="center_vertical">
+
+                <Button
+                    android:id="@+id/secondary_btn"
+                    style="@style/TextV8Style"
+                    android:layout_width="@dimen/_0dp"
+                    android:layout_height="@dimen/dp_32"
+                    android:layout_marginStart="@dimen/dp_16"
+                    android:layout_marginEnd="@dimen/dp_8"
+                    android:background="@drawable/purple_border_bg_rounded_4"
+                    android:fontFamily="@font/tt_semi_bold"
+                    android:gravity="center"
+                    android:textAllCaps="false"
+                    android:visibility="gone"
+                    android:layout_weight="1" />
+
+                <Button
+                    android:id="@+id/primary_btn"
+                    style="@style/ActionButtonTextStyle"
+                    android:layout_width="@dimen/_0dp"
+                    android:layout_marginStart="@dimen/dp_8"
+                    android:layout_height="@dimen/dp_32"
+                    android:layout_marginEnd="@dimen/dp_16"
+                    android:background="@drawable/primary_button_background"
+                    android:fontFamily="@font/tt_semi_bold"
+                    android:gravity="center"
+                    android:textAllCaps="false"
+                    android:visibility="gone"
+                    android:layout_weight="1" />
+
+            </LinearLayout>
 
             <include
                 android:id="@+id/note"
@@ -130,8 +137,7 @@
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/primary_btn"
-                app:layout_goneMarginBottom="@dimen/dp_16" />
+                app:layout_constraintTop_toBottomOf="@id/button_layout" />
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.cardview.widget.CardView>
 </layout>
\ No newline at end of file
diff --git a/android/navi-amc/src/main/res/layout/portfolio_screen.xml b/android/navi-amc/src/main/res/layout/portfolio_screen.xml
index ade90780ad..35d55701c8 100644
--- a/android/navi-amc/src/main/res/layout/portfolio_screen.xml
+++ b/android/navi-amc/src/main/res/layout/portfolio_screen.xml
@@ -101,6 +101,7 @@
                 android:orientation="vertical"
                 app:divider="@drawable/divider_1"
                 app:showDividers="middle"
+                android:weightSum="@integer/integer_1"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/investment_title"