diff --git a/app/src/main/java/com/fox2code/mmm/module/ModuleViewAdapter.java b/app/src/main/java/com/fox2code/mmm/module/ModuleViewAdapter.java
index a5adda9..89e9c61 100644
--- a/app/src/main/java/com/fox2code/mmm/module/ModuleViewAdapter.java
+++ b/app/src/main/java/com/fox2code/mmm/module/ModuleViewAdapter.java
@@ -9,8 +9,8 @@ import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.HorizontalScrollView;
 import android.widget.ImageButton;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.annotation.ColorInt;
@@ -74,7 +74,7 @@ public final class ModuleViewAdapter extends RecyclerView.Adapter<ModuleViewAdap
         private final TextView titleText;
         private final TextView creditText;
         private final TextView descriptionText;
-        private final LinearLayout moduleOptionsHolder;
+        private final HorizontalScrollView moduleOptionsHolder;
         private final TextView updateText;
         private final Chip[] actionsButtons;
         private final ArrayList<ActionButtonType> actionButtonsTypes;
@@ -274,6 +274,7 @@ public final class ModuleViewAdapter extends RecyclerView.Adapter<ModuleViewAdap
                 }
                 this.switchMaterial.setVisibility(View.GONE);
                 this.creditText.setVisibility(View.GONE);
+                this.moduleOptionsHolder.setVisibility(View.GONE);
                 this.descriptionText.setVisibility(View.GONE);
                 this.updateText.setVisibility(View.GONE);
                 this.titleText.setText(" ");
diff --git a/app/src/main/res/layout/module_entry.xml b/app/src/main/res/layout/module_entry.xml
index e0a8234..b039084 100644
--- a/app/src/main/res/layout/module_entry.xml
+++ b/app/src/main/res/layout/module_entry.xml
@@ -117,80 +117,69 @@
             </LinearLayout>
 
             <!-- Buttons -->
-            <LinearLayout
-                android:id="@+id/module_options_holder"
+            <HorizontalScrollView
                 android:visibility="gone"
+                android:id="@+id/module_options_holder"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="8dp"
-                android:orientation="horizontal">
-                <HorizontalScrollView
-                    android:id="@+id/horizontalScrollView"
-                    android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <com.google.android.material.chip.ChipGroup
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    tools:ignore="UselessParent">
+                    android:layout_gravity="end"
+                    android:padding="4dp"
+                    app:singleLine="true">
 
-                    <com.google.android.material.chip.ChipGroup
+                    <com.google.android.material.chip.Chip
+                        android:id="@+id/button_action1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="end"
-                        android:padding="4dp"
-                        app:singleLine="true">
-
-                        <com.google.android.material.chip.Chip
-                            android:id="@+id/button_action1"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/loading"
-                            android:visibility="gone"
-                            app:chipIcon="@drawable/ic_baseline_error_24" />
-
-                        <com.google.android.material.chip.Chip
-                            android:id="@+id/button_action2"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/loading"
-                            android:visibility="gone"
-                            app:chipIcon="@drawable/ic_baseline_error_24" />
-
-
-                        <com.google.android.material.chip.Chip
-                            android:id="@+id/button_action3"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/loading"
-                            android:visibility="gone"
-                            app:chipIcon="@drawable/ic_baseline_error_24" />
-
-                        <com.google.android.material.chip.Chip
-                            android:id="@+id/button_action4"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/loading"
-                            android:visibility="gone"
-                            app:chipIcon="@drawable/ic_baseline_error_24" />
-
-                        <com.google.android.material.chip.Chip
-                            android:id="@+id/button_action5"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/loading"
-                            android:visibility="gone"
-                            app:chipIcon="@drawable/ic_baseline_error_24" />
-
-                        <com.google.android.material.chip.Chip
-                            android:id="@+id/button_action6"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/loading"
-                            android:visibility="gone"
-                            app:chipIcon="@drawable/ic_baseline_error_24" />
-                    </com.google.android.material.chip.ChipGroup>
-                </HorizontalScrollView>
-            </LinearLayout>
+                        android:text="@string/loading"
+                        android:visibility="gone"
+                        app:chipIcon="@drawable/ic_baseline_error_24" />
 
+                    <com.google.android.material.chip.Chip
+                        android:id="@+id/button_action2"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/loading"
+                        android:visibility="gone"
+                        app:chipIcon="@drawable/ic_baseline_error_24" />
+
+
+                    <com.google.android.material.chip.Chip
+                        android:id="@+id/button_action3"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/loading"
+                        android:visibility="gone"
+                        app:chipIcon="@drawable/ic_baseline_error_24" />
+
+                    <com.google.android.material.chip.Chip
+                        android:id="@+id/button_action4"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/loading"
+                        android:visibility="gone"
+                        app:chipIcon="@drawable/ic_baseline_error_24" />
+
+                    <com.google.android.material.chip.Chip
+                        android:id="@+id/button_action5"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/loading"
+                        android:visibility="gone"
+                        app:chipIcon="@drawable/ic_baseline_error_24" />
+
+                    <com.google.android.material.chip.Chip
+                        android:id="@+id/button_action6"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/loading"
+                        android:visibility="gone"
+                        app:chipIcon="@drawable/ic_baseline_error_24" />
+                </com.google.android.material.chip.ChipGroup>
+            </HorizontalScrollView>
         </LinearLayout>
 
     </com.google.android.material.card.MaterialCardView>