diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 9417040d5..de09d2c00 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,4 +1,5 @@
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@android:color/white"
@@ -41,4 +42,5 @@
             app:menu="@menu/navigation" />
 
     </LinearLayout>
+
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/content_event.xml b/app/src/main/res/layout/content_event.xml
index 9fb819ea4..69b83e301 100644
--- a/app/src/main/res/layout/content_event.xml
+++ b/app/src/main/res/layout/content_event.xml
@@ -4,7 +4,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <data>
-
         <variable
             name="event"
             type="org.fossasia.openevent.general.event.Event" />
@@ -152,6 +151,7 @@
                         tools:text="Wed June 5" />
 
                 </LinearLayout>
+
             </LinearLayout>
 
             <LinearLayout
@@ -182,6 +182,7 @@
                     android:layout_margin="@dimen/layout_margin_medium"
                     android:textColor="@color/dark_grey"
                     tools:text="Location" />
+
             </LinearLayout>
 
             <LinearLayout
@@ -210,6 +211,7 @@
                     android:layout_height="wrap_content"
                     android:layout_margin="@dimen/layout_margin_medium"
                     android:textColor="@color/dark_grey"/>
+
             </LinearLayout>
 
             <LinearLayout
@@ -311,6 +313,7 @@
                     android:textColor="@color/dark_grey"
                     android:textStyle="bold"
                     android:visibility="gone" />
+
             </LinearLayout>
 
             <LinearLayout
@@ -365,6 +368,7 @@
                     android:background="?selectableItemBackground"
                     android:scaleType="centerCrop"
                     android:src="@drawable/header" />
+
             </LinearLayout>
 
             <LinearLayout
@@ -455,7 +459,9 @@
                             android:textColor="@color/dark_grey"
                             android:textStyle="bold"
                             android:visibility="gone" />
+
                     </LinearLayout>
+
                 </LinearLayout>
 
                 <LinearLayout
@@ -470,6 +476,7 @@
                     android:animateLayoutChanges="true"
                     android:visibility="gone"
                     tools:visibility="visible">
+
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -485,7 +492,9 @@
                         android:layout_marginBottom="@dimen/layout_margin_medium"
                         android:layout_height="wrap_content"
                         android:scrollbars="vertical" />
+
                 </LinearLayout>
+
             </LinearLayout>
 
             <LinearLayout
@@ -565,8 +574,8 @@
                     android:layout_marginBottom="@dimen/layout_margin_large"
                     android:textColor="@color/colorAccent"
                     android:text="@string/write_feedback" />
-            </LinearLayout>
 
+            </LinearLayout>
 
             <LinearLayout
                 android:id="@+id/speakersContainer"
@@ -601,7 +610,6 @@
                     android:textColor="@color/dark_grey"
                     android:textSize="@dimen/event_details_headers" />
 
-
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/speakerRv"
                     android:layout_width="wrap_content"
@@ -646,7 +654,6 @@
                     android:textColor="@color/dark_grey"
                     android:textSize="@dimen/event_details_headers" />
 
-
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/sessionsRv"
                     android:layout_width="wrap_content"
@@ -702,6 +709,7 @@
                     android:orientation="vertical"
                     tools:itemCount="3"
                     tools:listitem="@layout/item_sponsor" />
+
             </LinearLayout>
 
             <LinearLayout
@@ -758,12 +766,17 @@
                             <include layout="@layout/placeholder_item_card_similar_events" />
                             <include layout="@layout/placeholder_item_card_similar_events" />
                             <include layout="@layout/placeholder_item_card_similar_events" />
+
                         </LinearLayout>
+
                     </com.facebook.shimmer.ShimmerFrameLayout>
+
                 </LinearLayout>
+
             </LinearLayout>
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
     </androidx.core.widget.NestedScrollView>
+
 </layout>
diff --git a/app/src/main/res/layout/content_fetching_event_error.xml b/app/src/main/res/layout/content_fetching_event_error.xml
index acecc2065..aa72a1fd6 100644
--- a/app/src/main/res/layout/content_fetching_event_error.xml
+++ b/app/src/main/res/layout/content_fetching_event_error.xml
@@ -47,6 +47,7 @@
             android:textColor="@color/colorPrimary"
             style="@style/Widget.AppCompat.Button.Borderless"
             tools:text="RETRY" />
+
     </LinearLayout>
 
 </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/content_no_internet.xml b/app/src/main/res/layout/content_no_internet.xml
index 71685f608..a5fe7e52a 100644
--- a/app/src/main/res/layout/content_no_internet.xml
+++ b/app/src/main/res/layout/content_no_internet.xml
@@ -47,6 +47,7 @@
             android:textColor="@color/colorPrimary"
             style="@style/Widget.MaterialComponents.Button.TextButton"
             tools:text="RETRY" />
+
     </LinearLayout>
 
 </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/dialog_change_password.xml b/app/src/main/res/layout/dialog_change_password.xml
index 5af61e70a..fc6c9a162 100644
--- a/app/src/main/res/layout/dialog_change_password.xml
+++ b/app/src/main/res/layout/dialog_change_password.xml
@@ -48,6 +48,7 @@
                 android:drawableStart="@drawable/ic_lock_black"
                 android:hint="@string/new_password"
                 android:inputType="textPassword" />
+
         </com.google.android.material.textfield.TextInputLayout>
 
         <com.google.android.material.textfield.TextInputLayout
@@ -68,6 +69,9 @@
                 android:drawableStart="@drawable/ic_lock_black"
                 android:hint="@string/confirm_new_password"
                 android:inputType="textPassword" />
+
         </com.google.android.material.textfield.TextInputLayout>
+
     </LinearLayout>
+
 </ScrollView>
diff --git a/app/src/main/res/layout/dialog_confirm_delete_account.xml b/app/src/main/res/layout/dialog_confirm_delete_account.xml
index 1f8f6566a..4510e76af 100644
--- a/app/src/main/res/layout/dialog_confirm_delete_account.xml
+++ b/app/src/main/res/layout/dialog_confirm_delete_account.xml
@@ -3,6 +3,7 @@
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:padding="@dimen/padding_large">
+
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -21,5 +22,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:inputType="textPassword"/>
+
     </com.google.android.material.textfield.TextInputLayout>
+
 </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_delete_account.xml b/app/src/main/res/layout/dialog_delete_account.xml
index d5f29ecfd..d237047eb 100644
--- a/app/src/main/res/layout/dialog_delete_account.xml
+++ b/app/src/main/res/layout/dialog_delete_account.xml
@@ -5,6 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:padding="@dimen/padding_large">
+
     <LinearLayout
         android:id="@+id/confirmEmailLayout"
         android:layout_width="match_parent"
@@ -13,6 +14,7 @@
         android:layout_marginBottom="@dimen/layout_margin_medium"
         android:visibility="gone"
         tools:visibility="visible">
+
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -30,7 +32,9 @@
                 android:id="@+id/email"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"/>
+
         </com.google.android.material.textfield.TextInputLayout>
+
         <com.google.android.material.button.MaterialButton
             android:id="@+id/confirmEmailButton"
             android:layout_width="wrap_content"
@@ -38,6 +42,7 @@
             android:layout_gravity="end"
             android:enabled="false"
             android:text="@string/confirm"/>
+
     </LinearLayout>
 
     <LinearLayout
@@ -47,22 +52,26 @@
         android:orientation="vertical"
         android:visibility="gone"
         tools:visibility="visible">
+
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/event_details_divider"
             android:background="@color/grey"
             android:layout_marginBottom="@dimen/layout_margin_medium"/>
+
         <CheckBox
             android:id="@+id/confirmDeleteCheckbox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/confirm_delete_checkbox_message"
             android:textColor="@color/greyMore"/>
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="end"
             android:orientation="horizontal">
+
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/cancelButton"
                 android:layout_width="wrap_content"
@@ -79,7 +88,9 @@
                 android:backgroundTint="@color/red"
                 android:enabled="false"
                 android:text="@string/delete"/>
+
         </LinearLayout>
+
     </LinearLayout>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_edit_profile_image.xml b/app/src/main/res/layout/dialog_edit_profile_image.xml
index 3b5465a73..de1121867 100644
--- a/app/src/main/res/layout/dialog_edit_profile_image.xml
+++ b/app/src/main/res/layout/dialog_edit_profile_image.xml
@@ -15,17 +15,21 @@
             android:padding="@dimen/padding_large"
             android:background="?selectableItemBackground"
             android:orientation="vertical">
+
             <ImageView
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/icon_edit_profile_height"
                 android:padding="@dimen/padding_large"
                 android:src="@drawable/ic_crop"/>
+
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:text="@string/edit_image"/>
+
         </LinearLayout>
+
         <LinearLayout
             android:id="@+id/replaceImage"
             android:layout_width="match_parent"
@@ -33,17 +37,21 @@
             android:padding="@dimen/padding_large"
             android:background="?selectableItemBackground"
             android:orientation="vertical">
+
             <ImageView
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/icon_edit_profile_height"
                 android:padding="@dimen/padding_large"
                 android:src="@drawable/ic_image"/>
+
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:text="@string/replace_image"/>
+
         </LinearLayout>
+
         <LinearLayout
             android:id="@+id/takeImage"
             android:layout_width="match_parent"
@@ -51,17 +59,21 @@
             android:padding="@dimen/padding_large"
             android:background="?selectableItemBackground"
             android:orientation="vertical">
+
             <ImageView
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/icon_edit_profile_height"
                 android:padding="@dimen/padding_large"
                 android:src="@drawable/ic_camera"/>
+
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:text="@string/take_image"/>
+
         </LinearLayout>
+
         <LinearLayout
             android:id="@+id/removeImage"
             android:layout_width="match_parent"
@@ -69,16 +81,21 @@
             android:padding="@dimen/padding_large"
             android:background="?selectableItemBackground"
             android:orientation="vertical">
+
             <ImageView
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/icon_edit_profile_height"
                 android:padding="@dimen/padding_large"
                 android:src="@drawable/ic_trash"/>
+
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:text="@string/remove_image"/>
+
         </LinearLayout>
+
     </LinearLayout>
+
 </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/dialog_feedback.xml b/app/src/main/res/layout/dialog_feedback.xml
index 28db654b7..8a3f6b914 100644
--- a/app/src/main/res/layout/dialog_feedback.xml
+++ b/app/src/main/res/layout/dialog_feedback.xml
@@ -28,6 +28,7 @@
             android:layout_height="wrap_content"
             android:hint="@string/write_feedback"
             android:inputType="textCapSentences" />
+
     </com.google.android.material.textfield.TextInputLayout>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_filter_order.xml b/app/src/main/res/layout/dialog_filter_order.xml
index a97a431b7..d04dd9906 100644
--- a/app/src/main/res/layout/dialog_filter_order.xml
+++ b/app/src/main/res/layout/dialog_filter_order.xml
@@ -8,6 +8,7 @@
         android:layout_height="match_parent"
         android:orientation="vertical"
         android:padding="@dimen/padding_large">
+
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -16,6 +17,7 @@
             android:text="@string/filter_orders"
             android:textStyle="bold"
             android:textSize="@dimen/text_size_expanded_title" />
+
         <CheckBox
             android:id="@+id/completedOrdersCheckBox"
             android:layout_width="match_parent"
@@ -23,6 +25,7 @@
             android:text="@string/completed_orders"
             android:textColor="@color/light_grey"
             android:textSize="@dimen/text_size_large" />
+
         <CheckBox
             android:id="@+id/placedOrdersCheckBox"
             android:layout_width="match_parent"
@@ -30,6 +33,7 @@
             android:text="@string/placed_orders"
             android:textColor="@color/light_grey"
             android:textSize="@dimen/text_size_large" />
+
         <CheckBox
             android:id="@+id/pendingOrdersCheckBox"
             android:layout_width="match_parent"
@@ -37,6 +41,7 @@
             android:text="@string/pending_orders"
             android:textColor="@color/light_grey"
             android:textSize="@dimen/text_size_large" />
+
         <TextView
             android:id="@+id/sortLabel"
             android:layout_width="match_parent"
@@ -70,6 +75,9 @@
                 android:text="@string/order_status"
                 android:textColor="@color/light_grey"
                 android:textSize="@dimen/text_size_large" />
+
         </RadioGroup>
+
     </LinearLayout>
+
 </ScrollView>
diff --git a/app/src/main/res/layout/dialog_login_to_like.xml b/app/src/main/res/layout/dialog_login_to_like.xml
index 4d53212d5..1a377dbda 100644
--- a/app/src/main/res/layout/dialog_login_to_like.xml
+++ b/app/src/main/res/layout/dialog_login_to_like.xml
@@ -10,6 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:padding="@dimen/padding_large">
+
         <ImageView
             android:id="@+id/eventImage"
             android:layout_width="match_parent"
@@ -18,6 +19,7 @@
             android:scaleType="centerCrop"
             tools:src="@drawable/header"
             android:layout_marginBottom="@dimen/layout_margin_medium"/>
+
         <TextView
             android:id="@+id/eventName"
             android:layout_width="match_parent"
@@ -27,6 +29,7 @@
             android:gravity="center"
             android:maxLines="2"
             tools:text="Sign in to like The New Event"/>
+
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -39,5 +42,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/get_started"/>
+        
     </LinearLayout>
+
 </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/fragment_feedback.xml b/app/src/main/res/layout/fragment_feedback.xml
index 8d720fbb0..23260bca4 100644
--- a/app/src/main/res/layout/fragment_feedback.xml
+++ b/app/src/main/res/layout/fragment_feedback.xml
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
     <ProgressBar
         android:id="@+id/progressBar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/layout_margin_large"/>
+        android:layout_marginTop="@dimen/layout_margin_large" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/feedbackRecyclerView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:visibility="gone"
-        tools:visibility="visible"/>
+        tools:visibility="visible" />
 
     <LinearLayout
         android:id="@+id/feedbackEmptyView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="@dimen/padding_large"
         android:orientation="vertical"
+        android:padding="@dimen/padding_large"
         tools:visibility="visible">
 
         <RelativeLayout
@@ -46,7 +46,7 @@
                 android:layout_centerInParent="true"
                 android:scaleType="centerCrop"
                 app:srcCompat="@drawable/ic_faq"
-                app:tint="@color/colorPrimary"/>
+                app:tint="@color/colorPrimary" />
 
         </RelativeLayout>
 
diff --git a/app/src/main/res/layout/fragment_order_completed.xml b/app/src/main/res/layout/fragment_order_completed.xml
index e0175e679..9d961992a 100644
--- a/app/src/main/res/layout/fragment_order_completed.xml
+++ b/app/src/main/res/layout/fragment_order_completed.xml
@@ -9,9 +9,9 @@
     app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:id="@+id/orderCoordinatorLayout"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/orderCoordinatorLayout">
+        android:layout_height="wrap_content">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -40,8 +40,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/event_details_divider"
                 android:layout_marginLeft="@dimen/layout_margin_medium"
-                android:layout_marginRight="@dimen/layout_margin_medium"
                 android:layout_marginTop="@dimen/layout_margin_extra_large"
+                android:layout_marginRight="@dimen/layout_margin_medium"
                 android:background="@color/grey" />
 
             <LinearLayout
@@ -93,8 +93,8 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="@dimen/layout_margin_medium"
                 android:layout_marginLeft="@dimen/layout_margin_medium"
+                android:layout_marginRight="@dimen/layout_margin_medium"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
                 android:padding="@dimen/padding_medium"
@@ -148,11 +148,11 @@
                     android:layout_width="@dimen/layout_margin_none"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/layout_margin_large"
-                    android:paddingLeft="@dimen/layout_margin_medium"
                     android:layout_weight="0.95"
-                    android:textSize="@dimen/text_size_medium"
+                    android:paddingLeft="@dimen/layout_margin_medium"
                     android:text="@string/invite"
-                    android:textColor="@color/black" />
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/text_size_medium" />
 
                 <ImageButton
                     android:id="@+id/share"
@@ -165,19 +165,20 @@
             <View
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/event_details_divider"
-                android:layout_marginBottom="@dimen/event_details_divider_margin"
                 android:layout_marginLeft="@dimen/layout_margin_medium"
                 android:layout_marginRight="@dimen/layout_margin_medium"
+                android:layout_marginBottom="@dimen/event_details_divider_margin"
                 android:background="@color/grey" />
 
             <LinearLayout
                 android:id="@+id/similarEventLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/layout_margin_medium"
                 android:orientation="vertical"
                 android:visibility="gone"
-                tools:visibility="visible"
-                android:layout_marginTop="@dimen/layout_margin_medium">
+                tools:visibility="visible">
+
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -191,39 +192,40 @@
                 <HorizontalScrollView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:orientation="horizontal">
-
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/similarEventsRecycler"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:scrollbars="vertical"
-                    tools:listitem="@layout/item_card_similar_events" />
-
-                <com.facebook.shimmer.ShimmerFrameLayout
-                    android:id="@+id/shimmerSimilarEvents"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:visibility="gone"
-                    tools:visibility="visible">
 
                     <LinearLayout
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:orientation="horizontal">
 
-                        <include layout="@layout/placeholder_item_card_similar_events" />
+                        <androidx.recyclerview.widget.RecyclerView
+                            android:id="@+id/similarEventsRecycler"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:scrollbars="vertical"
+                            tools:listitem="@layout/item_card_similar_events" />
+
+                        <com.facebook.shimmer.ShimmerFrameLayout
+                            android:id="@+id/shimmerSimilarEvents"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:visibility="gone"
+                            tools:visibility="visible">
+
+                            <LinearLayout
+                                android:layout_width="wrap_content"
+                                android:layout_height="match_parent"
+                                android:orientation="horizontal">
+
+                                <include layout="@layout/placeholder_item_card_similar_events" />
 
-                        <include layout="@layout/placeholder_item_card_similar_events" />
+                                <include layout="@layout/placeholder_item_card_similar_events" />
 
-                        <include layout="@layout/placeholder_item_card_similar_events" />
+                                <include layout="@layout/placeholder_item_card_similar_events" />
 
+                            </LinearLayout>
+                        </com.facebook.shimmer.ShimmerFrameLayout>
                     </LinearLayout>
-                </com.facebook.shimmer.ShimmerFrameLayout>
-                </LinearLayout>
                 </HorizontalScrollView>
             </LinearLayout>
         </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_orders_under_user.xml b/app/src/main/res/layout/fragment_orders_under_user.xml
index 86b085fee..f0eb2a8f3 100644
--- a/app/src/main/res/layout/fragment_orders_under_user.xml
+++ b/app/src/main/res/layout/fragment_orders_under_user.xml
@@ -1,202 +1,218 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout  xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-    android:id="@+id/swipeRefresh"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-<androidx.core.widget.NestedScrollView
-    android:id="@+id/scrollView"
-    android:orientation="vertical"
-    android:fitsSystemWindows="true"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <FrameLayout
+
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+        android:id="@+id/swipeRefresh"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
-        <ImageView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:src="@drawable/background_fragment"
-            android:scaleType="fitXY"/>
 
-        <ImageView
-            android:id="@+id/filter"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:padding="@dimen/padding_large"
-            android:background="?selectableItemBackground"
-            android:src="@drawable/ic_filter" />
-
-        <androidx.constraintlayout.widget.ConstraintLayout
+        <androidx.core.widget.NestedScrollView
+            android:id="@+id/scrollView"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
-            <TextView
-                android:id="@+id/ticketsTitle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/layout_margin_large"
-                android:layout_marginTop="@dimen/layout_margin_extra_large"
-                android:text="@string/tickets"
-                android:textColor="@color/white"
-                android:textStyle="bold"
-                android:textSize="@dimen/text_size_expanded_title_large"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-            <TextView
-                android:id="@+id/ticketsNumber"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="@dimen/layout_margin_large"
-                android:textSize="@dimen/text_size_large"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/ticketsTitle"
-                android:textColor="@color/white"
-                android:text="@string/loading_tickets"/>
-            <TextView
-                android:id="@+id/pastEvent"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/padding_large"
-                android:textSize="@dimen/text_size_large"
-                android:textColor="@color/white"
-                android:background="?selectableItemBackground"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintBaseline_toBaselineOf="@id/ticketsNumber"
-                android:text="@string/past"/>
+            android:layout_height="match_parent"
+            android:fitsSystemWindows="true"
+            android:orientation="vertical">
 
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/ordersRecycler"
-                android:layout_margin="@dimen/layout_margin_medium"
+            <FrameLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_margin_large"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/ticketsNumber"
-                android:scrollbars="vertical"
-                tools:itemCount="3"
-                tools:listitem="@layout/item_card_order"/>
-
-            <include android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_margin_extra_large"
-                app:layout_constraintTop_toBottomOf="@id/ordersRecycler"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                android:textAlignment="center"
-                android:visibility="gone"
-                tools:visibility="visible"
-                layout="@layout/content_no_internet" />
-
-            <com.facebook.shimmer.ShimmerFrameLayout
-                android:id="@+id/shimmerSearch"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/ordersRecycler"
-                android:visibility="gone">
+                android:layout_height="match_parent">
 
-                <LinearLayout
+                <ImageView
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:orientation="vertical">
-                    <include layout="@layout/placeholder_item_card_tickets" />
-                    <include layout="@layout/placeholder_item_card_tickets" />
-                    <include layout="@layout/placeholder_item_card_tickets" />
-                    <include layout="@layout/placeholder_item_card_tickets" />
-                    <include layout="@layout/placeholder_item_card_tickets" />
-                </LinearLayout>
-            </com.facebook.shimmer.ShimmerFrameLayout>
-
-            <LinearLayout
-                android:id="@+id/noTicketsScreen"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/layout_margin_extreme_large"
-                app:layout_constraintTop_toBottomOf="@id/ordersRecycler"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                android:orientation="vertical"
-                android:visibility="gone"
-                tools:visibility="gone">
-
-                <RelativeLayout
-                    android:layout_width="@dimen/item_image_view_large"
-                    android:layout_height="@dimen/item_image_view_large"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginTop="@dimen/layout_margin_large">
-
-                    <ImageView
-                        android:layout_width="@dimen/item_image_view_large"
-                        android:layout_height="@dimen/item_image_view_large"
-                        android:layout_centerInParent="true"
-                        android:scaleType="centerCrop"
-                        app:srcCompat="@drawable/round_shape" />
-
-                    <ImageView
-                        android:id="@+id/ticketImageView"
-                        android:layout_width="@dimen/item_image_view"
-                        android:layout_height="@dimen/item_image_view"
-                        android:layout_centerInParent="true"
-                        android:scaleType="centerCrop"
-                        app:srcCompat="@drawable/ic_baseline_ticket"
-                        app:tint="@color/colorPrimary"/>
-
-                </RelativeLayout>
-
-                <TextView
-                    android:id="@+id/noTicketMessage"
-                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginTop="@dimen/layout_margin_extra_large"
-                    android:text="@string/no_ticket_message"
-                    android:textSize="@dimen/text_size_medium" />
+                    android:scaleType="fitXY"
+                    android:src="@drawable/background_fragment" />
 
-                <TextView
-                    android:id="@+id/findMyTickets"
+                <ImageView
+                    android:id="@+id/filter"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginTop="@dimen/layout_margin_large"
-                    android:padding="@dimen/padding_medium"
+                    android:layout_gravity="end"
                     android:background="?selectableItemBackground"
-                    android:text="@string/find_my_tickets"
-                    android:textColor="@color/colorPrimary"
-                    android:textSize="@dimen/text_size_large" />
-
-            </LinearLayout>
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </FrameLayout>
-</androidx.core.widget.NestedScrollView>
-</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-<androidx.cardview.widget.CardView
-    android:id="@+id/toolbarLayout"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:elevation="@dimen/custom_toolbar_elevation"
-    android:visibility="gone">
-    <androidx.appcompat.widget.Toolbar
+                    android:padding="@dimen/padding_large"
+                    android:src="@drawable/ic_filter" />
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+
+                    <TextView
+                        android:id="@+id/ticketsTitle"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/layout_margin_large"
+                        android:layout_marginTop="@dimen/layout_margin_extra_large"
+                        android:text="@string/tickets"
+                        android:textColor="@color/white"
+                        android:textSize="@dimen/text_size_expanded_title_large"
+                        android:textStyle="bold"
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <TextView
+                        android:id="@+id/ticketsNumber"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="16dp"
+                        android:layout_marginTop="@dimen/layout_margin_large"
+                        android:text="@string/loading_tickets"
+                        android:textColor="@color/white"
+                        android:textSize="@dimen/text_size_large"
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/ticketsTitle" />
+
+                    <TextView
+                        android:id="@+id/pastEvent"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:background="?selectableItemBackground"
+                        android:padding="@dimen/padding_large"
+                        android:text="@string/past"
+                        android:textColor="@color/white"
+                        android:textSize="@dimen/text_size_large"
+                        app:layout_constraintBaseline_toBaselineOf="@id/ticketsNumber"
+                        app:layout_constraintRight_toRightOf="parent" />
+
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/ordersRecycler"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="@dimen/layout_margin_medium"
+                        android:layout_marginTop="@dimen/layout_margin_large"
+                        android:scrollbars="vertical"
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/ticketsNumber"
+                        tools:itemCount="3"
+                        tools:listitem="@layout/item_card_order" />
+
+                    <include
+                        layout="@layout/content_no_internet"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/layout_margin_extra_large"
+                        android:textAlignment="center"
+                        android:visibility="gone"
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/ordersRecycler"
+                        tools:visibility="visible" />
+
+                    <com.facebook.shimmer.ShimmerFrameLayout
+                        android:id="@+id/shimmerSearch"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:visibility="gone"
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/ordersRecycler">
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:orientation="vertical">
+
+                            <include layout="@layout/placeholder_item_card_tickets" />
+
+                            <include layout="@layout/placeholder_item_card_tickets" />
+
+                            <include layout="@layout/placeholder_item_card_tickets" />
+
+                            <include layout="@layout/placeholder_item_card_tickets" />
+
+                            <include layout="@layout/placeholder_item_card_tickets" />
+                        </LinearLayout>
+                    </com.facebook.shimmer.ShimmerFrameLayout>
+
+                    <LinearLayout
+                        android:id="@+id/noTicketsScreen"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="@dimen/layout_margin_extreme_large"
+                        android:orientation="vertical"
+                        android:visibility="gone"
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/ordersRecycler"
+                        tools:visibility="gone">
+
+                        <RelativeLayout
+                            android:layout_width="@dimen/item_image_view_large"
+                            android:layout_height="@dimen/item_image_view_large"
+                            android:layout_gravity="center_horizontal"
+                            android:layout_marginTop="@dimen/layout_margin_large">
+
+                            <ImageView
+                                android:layout_width="@dimen/item_image_view_large"
+                                android:layout_height="@dimen/item_image_view_large"
+                                android:layout_centerInParent="true"
+                                android:scaleType="centerCrop"
+                                app:srcCompat="@drawable/round_shape" />
+
+                            <ImageView
+                                android:id="@+id/ticketImageView"
+                                android:layout_width="@dimen/item_image_view"
+                                android:layout_height="@dimen/item_image_view"
+                                android:layout_centerInParent="true"
+                                android:scaleType="centerCrop"
+                                app:srcCompat="@drawable/ic_baseline_ticket"
+                                app:tint="@color/colorPrimary" />
+
+                        </RelativeLayout>
+
+                        <TextView
+                            android:id="@+id/noTicketMessage"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_horizontal"
+                            android:layout_marginTop="@dimen/layout_margin_extra_large"
+                            android:text="@string/no_ticket_message"
+                            android:textSize="@dimen/text_size_medium" />
+
+                        <TextView
+                            android:id="@+id/findMyTickets"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_horizontal"
+                            android:layout_marginTop="@dimen/layout_margin_large"
+                            android:background="?selectableItemBackground"
+                            android:padding="@dimen/padding_medium"
+                            android:text="@string/find_my_tickets"
+                            android:textColor="@color/colorPrimary"
+                            android:textSize="@dimen/text_size_large" />
+
+                    </LinearLayout>
+                </androidx.constraintlayout.widget.ConstraintLayout>
+            </FrameLayout>
+        </androidx.core.widget.NestedScrollView>
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/toolbarLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/colorPrimary"
-        app:titleTextColor="@color/white"
-        app:title="@string/tickets">
-        <ImageView
-            android:id="@+id/filterToolbar"
-            android:layout_width="wrap_content"
+        android:elevation="@dimen/custom_toolbar_elevation"
+        android:visibility="gone">
+
+        <androidx.appcompat.widget.Toolbar
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:padding="@dimen/padding_large"
-            android:background="?selectableItemBackground"
-            android:src="@drawable/ic_filter" />
-    </androidx.appcompat.widget.Toolbar>
-</androidx.cardview.widget.CardView>
+            android:background="@color/colorPrimary"
+            app:title="@string/tickets"
+            app:titleTextColor="@color/white">
+
+            <ImageView
+                android:id="@+id/filterToolbar"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end"
+                android:background="?selectableItemBackground"
+                android:padding="@dimen/padding_large"
+                android:src="@drawable/ic_filter" />
+        </androidx.appcompat.widget.Toolbar>
+    </androidx.cardview.widget.CardView>
 </FrameLayout>
diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml
index c92b3d0ec..b4a58483b 100644
--- a/app/src/main/res/layout/fragment_profile.xml
+++ b/app/src/main/res/layout/fragment_profile.xml
@@ -7,33 +7,38 @@
     android:layout_height="match_parent"
     android:fillViewport="true"
     android:fitsSystemWindows="true">
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">
+
         <androidx.appcompat.widget.Toolbar
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@color/colorPrimary"
-            app:titleTextColor="@color/white"
-            app:title="@string/profile"/>
+            app:title="@string/profile"
+            app:titleTextColor="@color/white" />
+
         <LinearLayout
             android:id="@+id/accountInfoContainer"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/layout_margin_large"
-            android:layout_marginBottom="@dimen/layout_margin_medium"
             android:layout_marginStart="@dimen/layout_margin_large"
+            android:layout_marginTop="@dimen/layout_margin_large"
             android:layout_marginEnd="@dimen/layout_margin_large"
-            android:orientation="vertical"
-            android:background="@drawable/border_curved">
+            android:layout_marginBottom="@dimen/layout_margin_medium"
+            android:background="@drawable/border_curved"
+            android:orientation="vertical">
+
             <ImageView
                 android:id="@+id/accountAvatar"
                 android:layout_width="@dimen/item_image_view_large"
                 android:layout_height="@dimen/item_image_view_large"
-                android:padding="@dimen/padding_large"
                 android:layout_gravity="center_horizontal"
-                tools:src="@drawable/ic_account_circle_grey"/>
+                android:padding="@dimen/padding_large"
+                tools:src="@drawable/ic_account_circle_grey" />
+
             <TextView
                 android:id="@+id/accountName"
                 android:layout_width="match_parent"
@@ -41,197 +46,217 @@
                 android:gravity="center_horizontal"
                 android:textColor="@color/black"
                 android:textSize="@dimen/text_size_expanded_title"
-                tools:text="@string/name_preview"/>
+                tools:text="@string/name_preview" />
+
             <TextView
                 android:id="@+id/accountEmail"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textSize="@dimen/text_size_large"
                 android:layout_marginBottom="@dimen/layout_margin_medium"
                 android:gravity="center"
+                android:textSize="@dimen/text_size_large"
                 tools:text="@string/email_preview" />
         </LinearLayout>
+
         <LinearLayout
             android:id="@+id/profileSettingContainer"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:layout_marginTop="@dimen/layout_margin_medium"
-            android:layout_marginBottom="@dimen/layout_margin_medium"
             android:layout_marginStart="@dimen/layout_margin_large"
+            android:layout_marginTop="@dimen/layout_margin_medium"
             android:layout_marginEnd="@dimen/layout_margin_large"
+            android:layout_marginBottom="@dimen/layout_margin_medium"
+            android:background="@drawable/border_curved"
+            android:orientation="vertical"
             android:paddingStart="@dimen/padding_large"
-            android:paddingEnd="@dimen/padding_large"
             android:paddingTop="@dimen/padding_medium"
-            android:background="@drawable/border_curved"
+            android:paddingEnd="@dimen/padding_large"
             android:visibility="gone"
             tools:visibility="visible">
+
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:text="@string/profile_settings"
                 android:textColor="@color/black"
-                android:textSize="@dimen/text_size_expanded_title"
-                android:text="@string/profile_settings"/>
+                android:textSize="@dimen/text_size_expanded_title" />
+
             <View
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/event_details_divider"
                 android:layout_marginTop="@dimen/layout_margin_small"
                 android:layout_marginBottom="@dimen/layout_margin_medium"
                 android:background="@color/grey" />
+
             <TextView
                 android:id="@+id/accountVerified"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textSize="@dimen/text_size_large"
-                android:paddingTop="@dimen/padding_small"
-                android:paddingBottom="@dimen/padding_small"
-                android:drawablePadding="@dimen/padding_medium"
                 android:background="?attr/selectableItemBackground"
                 android:drawableEnd="@drawable/ic_tick_inside_circle"
+                android:drawablePadding="@dimen/padding_medium"
+                android:paddingTop="@dimen/padding_small"
+                android:paddingBottom="@dimen/padding_small"
+                android:text="@string/verified"
                 android:textColor="@android:color/holo_green_light"
-                android:text="@string/verified"/>
+                android:textSize="@dimen/text_size_large" />
+
             <TextView
                 android:id="@+id/accountNotVerified"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textSize="@dimen/text_size_large"
+                android:background="?attr/selectableItemBackground"
+                android:drawablePadding="@dimen/padding_medium"
                 android:paddingTop="@dimen/padding_small"
                 android:paddingBottom="@dimen/padding_small"
-                android:drawablePadding="@dimen/padding_medium"
-                android:background="?attr/selectableItemBackground"
+                android:text="@string/not_verified"
                 android:textColor="@color/colorAccent"
-                android:text="@string/not_verified"/>
+                android:textSize="@dimen/text_size_large" />
+
             <TextView
                 android:id="@+id/editProfile"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textSize="@dimen/text_size_large"
+                android:background="?attr/selectableItemBackground"
                 android:paddingTop="@dimen/padding_small"
                 android:paddingBottom="@dimen/padding_small"
-                android:background="?attr/selectableItemBackground"
-                android:text="@string/edit_profile"/>
+                android:text="@string/edit_profile"
+                android:textSize="@dimen/text_size_large" />
+
             <TextView
                 android:id="@+id/changePassword"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textSize="@dimen/text_size_large"
+                android:background="?attr/selectableItemBackground"
                 android:paddingTop="@dimen/padding_small"
                 android:paddingBottom="@dimen/padding_small"
-                android:background="?attr/selectableItemBackground"
-                android:text="@string/title_change_password"/>
+                android:text="@string/title_change_password"
+                android:textSize="@dimen/text_size_large" />
+
             <TextView
                 android:id="@+id/deleteAccount"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textSize="@dimen/text_size_large"
+                android:layout_marginBottom="@dimen/layout_margin_medium"
+                android:background="?attr/selectableItemBackground"
                 android:paddingTop="@dimen/padding_small"
                 android:paddingBottom="@dimen/padding_small"
-                android:background="?attr/selectableItemBackground"
-                android:layout_marginBottom="@dimen/layout_margin_medium"
+                android:text="@string/delete_account"
                 android:textColor="@color/red"
-                android:text="@string/delete_account"/>
+                android:textSize="@dimen/text_size_large" />
         </LinearLayout>
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:layout_marginTop="@dimen/layout_margin_medium"
-            android:layout_marginBottom="@dimen/layout_margin_medium"
             android:layout_marginStart="@dimen/layout_margin_large"
+            android:layout_marginTop="@dimen/layout_margin_medium"
             android:layout_marginEnd="@dimen/layout_margin_large"
+            android:layout_marginBottom="@dimen/layout_margin_medium"
+            android:background="@drawable/border_curved"
+            android:orientation="vertical"
             android:paddingStart="@dimen/padding_large"
-            android:paddingEnd="@dimen/padding_large"
             android:paddingTop="@dimen/padding_medium"
-            android:background="@drawable/border_curved">
+            android:paddingEnd="@dimen/padding_large">
+
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:text="@string/general_settings_and_support"
                 android:textColor="@color/black"
-                android:textSize="@dimen/text_size_expanded_title"
-                android:text="@string/general_settings_and_support"/>
+                android:textSize="@dimen/text_size_expanded_title" />
+
             <View
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/event_details_divider"
                 android:layout_marginTop="@dimen/layout_margin_small"
                 android:layout_marginBottom="@dimen/layout_margin_medium"
                 android:background="@color/grey" />
+
             <TextView
                 android:id="@+id/settings"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textSize="@dimen/text_size_large"
+                android:background="?attr/selectableItemBackground"
                 android:paddingTop="@dimen/padding_small"
                 android:paddingBottom="@dimen/padding_small"
-                android:background="?attr/selectableItemBackground"
-                android:text="@string/settings"/>
+                android:text="@string/settings"
+                android:textSize="@dimen/text_size_large" />
+
             <TextView
                 android:id="@+id/manageEvents"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textSize="@dimen/text_size_large"
+                android:background="?attr/selectableItemBackground"
                 android:paddingTop="@dimen/padding_small"
                 android:paddingBottom="@dimen/padding_small"
                 android:text="@string/manage_events"
-                android:background="?attr/selectableItemBackground"/>
+                android:textSize="@dimen/text_size_large" />
+
             <TextView
                 android:id="@+id/ticketIssues"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textSize="@dimen/text_size_large"
+                android:layout_marginBottom="@dimen/layout_margin_medium"
+                android:background="?attr/selectableItemBackground"
                 android:paddingTop="@dimen/padding_small"
                 android:paddingBottom="@dimen/padding_small"
-                android:background="?attr/selectableItemBackground"
                 android:text="@string/ticket_issues"
-                android:layout_marginBottom="@dimen/layout_margin_medium" />
+                android:textSize="@dimen/text_size_large" />
         </LinearLayout>
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:layout_marginTop="@dimen/layout_margin_medium"
-            android:layout_marginBottom="@dimen/layout_margin_large"
             android:layout_marginStart="@dimen/layout_margin_large"
+            android:layout_marginTop="@dimen/layout_margin_medium"
             android:layout_marginEnd="@dimen/layout_margin_large"
+            android:layout_marginBottom="@dimen/layout_margin_large"
+            android:background="@drawable/border_curved"
+            android:orientation="vertical"
             android:paddingStart="@dimen/padding_large"
-            android:paddingEnd="@dimen/padding_large"
             android:paddingTop="@dimen/padding_medium"
-            android:background="@drawable/border_curved">
+            android:paddingEnd="@dimen/padding_large">
+
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:text="@string/login"
                 android:textColor="@color/black"
-                android:textSize="@dimen/text_size_expanded_title"
-                android:text="@string/login"/>
+                android:textSize="@dimen/text_size_expanded_title" />
+
             <View
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/event_details_divider"
                 android:layout_marginTop="@dimen/layout_margin_small"
                 android:layout_marginBottom="@dimen/layout_margin_medium"
                 android:background="@color/grey" />
+
             <TextView
                 android:id="@+id/logout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textSize="@dimen/text_size_large"
+                android:layout_marginBottom="@dimen/layout_margin_medium"
+                android:background="?attr/selectableItemBackground"
+                android:drawablePadding="@dimen/padding_medium"
                 android:paddingTop="@dimen/padding_small"
                 android:paddingBottom="@dimen/padding_small"
-                android:background="?attr/selectableItemBackground"
                 android:text="@string/logout"
-                android:drawablePadding="@dimen/padding_medium"
                 android:textColor="@color/red"
-                android:layout_marginBottom="@dimen/layout_margin_medium" />
+                android:textSize="@dimen/text_size_large" />
+
             <TextView
                 android:id="@+id/login"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textSize="@dimen/text_size_large"
+                android:layout_marginBottom="@dimen/layout_margin_medium"
+                android:background="?attr/selectableItemBackground"
+                android:drawablePadding="@dimen/padding_medium"
                 android:paddingTop="@dimen/padding_small"
                 android:paddingBottom="@dimen/padding_small"
-                android:background="?attr/selectableItemBackground"
                 android:text="@string/login"
-                android:drawablePadding="@dimen/padding_medium"
                 android:textColor="@color/colorAccent"
-                android:layout_marginBottom="@dimen/layout_margin_medium" />
+                android:textSize="@dimen/text_size_large" />
         </LinearLayout>
     </LinearLayout>
 </ScrollView>
diff --git a/app/src/main/res/layout/fragment_proposal_speaker.xml b/app/src/main/res/layout/fragment_proposal_speaker.xml
index 02c49f0c2..a01e5551a 100644
--- a/app/src/main/res/layout/fragment_proposal_speaker.xml
+++ b/app/src/main/res/layout/fragment_proposal_speaker.xml
@@ -2,48 +2,52 @@
 <LinearLayout 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"
-    android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:padding="@dimen/padding_large">
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
+
                 <TextView
                     android:layout_width="0dp"
-                    android:layout_weight="1"
                     android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/speaker_details"
                     android:textColor="@color/black"
-                    android:textSize="@dimen/heading_text_size"
-                    android:text="@string/speaker_details"/>
+                    android:textSize="@dimen/heading_text_size" />
             </LinearLayout>
 
             <ImageView
                 android:id="@+id/speakerImage"
-                android:layout_gravity="center"
                 android:layout_width="@dimen/avatar_large"
                 android:layout_height="@dimen/avatar_large"
-                android:padding="@dimen/padding_large"
+                android:layout_gravity="center"
                 android:foreground="?selectableItemBackground"
-                app:srcCompat="@drawable/ic_account_circle_grey"
+                android:padding="@dimen/padding_large"
                 android:visibility="gone"
-                tools:visibility="visible"/>
+                app:srcCompat="@drawable/ic_account_circle_grey"
+                tools:visibility="visible" />
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/speakerNameLayout"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/padding_medium"
                 android:layout_marginTop="@dimen/padding_medium"
+                android:layout_marginBottom="@dimen/padding_medium"
                 android:hint="@string/name"
                 android:visibility="gone"
                 tools:visibility="visible">
@@ -52,8 +56,8 @@
                     android:id="@+id/speakerName"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:singleLine="true"
-                    android:inputType="text" />
+                    android:inputType="text"
+                    android:singleLine="true" />
             </com.google.android.material.textfield.TextInputLayout>
 
             <com.google.android.material.textfield.TextInputLayout
@@ -61,8 +65,8 @@
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/padding_medium"
                 android:layout_marginTop="@dimen/padding_medium"
+                android:layout_marginBottom="@dimen/padding_medium"
                 android:hint="@string/email"
                 android:visibility="gone"
                 tools:visibility="visible">
@@ -71,16 +75,17 @@
                     android:id="@+id/speakerEmail"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:singleLine="true"
-                    android:inputType="text" />
+                    android:inputType="text"
+                    android:singleLine="true" />
             </com.google.android.material.textfield.TextInputLayout>
+
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/speakerOrgLayout"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/padding_medium"
                 android:layout_marginTop="@dimen/padding_medium"
+                android:layout_marginBottom="@dimen/padding_medium"
                 android:hint="@string/organization"
                 android:visibility="gone"
                 tools:visibility="visible">
@@ -89,16 +94,17 @@
                     android:id="@+id/speakerOrganization"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:singleLine="true"
-                    android:inputType="text" />
+                    android:inputType="text"
+                    android:singleLine="true" />
             </com.google.android.material.textfield.TextInputLayout>
+
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/speakerPositionLayout"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/padding_medium"
                 android:layout_marginTop="@dimen/padding_medium"
+                android:layout_marginBottom="@dimen/padding_medium"
                 android:hint="@string/position"
                 android:visibility="gone"
                 tools:visibility="visible">
@@ -107,16 +113,17 @@
                     android:id="@+id/speakerPosition"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:singleLine="true"
-                    android:inputType="text" />
+                    android:inputType="text"
+                    android:singleLine="true" />
             </com.google.android.material.textfield.TextInputLayout>
+
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/speakerCountryLayout"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/padding_medium"
                 android:layout_marginTop="@dimen/padding_medium"
+                android:layout_marginBottom="@dimen/padding_medium"
                 android:hint="@string/country"
                 android:visibility="gone"
                 tools:visibility="visible">
@@ -125,16 +132,17 @@
                     android:id="@+id/speakerCountry"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:singleLine="true"
-                    android:inputType="text" />
+                    android:inputType="text"
+                    android:singleLine="true" />
             </com.google.android.material.textfield.TextInputLayout>
+
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/speakerShortBioLayout"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/padding_medium"
                 android:layout_marginTop="@dimen/padding_medium"
+                android:layout_marginBottom="@dimen/padding_medium"
                 android:hint="@string/short_bio"
                 android:visibility="gone"
                 tools:visibility="visible">
@@ -143,16 +151,17 @@
                     android:id="@+id/speakerShortBio"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:singleLine="true"
-                    android:inputType="text" />
+                    android:inputType="text"
+                    android:singleLine="true" />
             </com.google.android.material.textfield.TextInputLayout>
+
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/speakerLongBioLayout"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/padding_medium"
                 android:layout_marginTop="@dimen/padding_medium"
+                android:layout_marginBottom="@dimen/padding_medium"
                 android:hint="@string/long_bio"
                 android:visibility="gone"
                 tools:visibility="visible">
@@ -162,7 +171,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:inputType="text"
-                    android:lines="3"/>
+                    android:lines="3" />
             </com.google.android.material.textfield.TextInputLayout>
 
             <com.google.android.material.textfield.TextInputLayout
@@ -170,8 +179,8 @@
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/padding_medium"
                 android:layout_marginTop="@dimen/padding_medium"
+                android:layout_marginBottom="@dimen/padding_medium"
                 android:hint="@string/speaker_experience"
                 android:visibility="gone"
                 tools:visibility="visible">
@@ -180,16 +189,17 @@
                     android:id="@+id/speakerSpeakingExp"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:singleLine="true"
-                    android:inputType="textUri" />
+                    android:inputType="textUri"
+                    android:singleLine="true" />
             </com.google.android.material.textfield.TextInputLayout>
+
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/speakerMobileLayout"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/padding_medium"
                 android:layout_marginTop="@dimen/padding_medium"
+                android:layout_marginBottom="@dimen/padding_medium"
                 android:hint="@string/phone"
                 android:visibility="gone"
                 tools:visibility="visible">
@@ -198,16 +208,17 @@
                     android:id="@+id/speakerMobile"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:singleLine="true"
-                    android:inputType="number" />
+                    android:inputType="number"
+                    android:singleLine="true" />
             </com.google.android.material.textfield.TextInputLayout>
+
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/speakerWebsiteLayout"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/padding_medium"
                 android:layout_marginTop="@dimen/padding_medium"
+                android:layout_marginBottom="@dimen/padding_medium"
                 android:hint="@string/website"
                 android:visibility="gone"
                 tools:visibility="visible">
@@ -216,16 +227,17 @@
                     android:id="@+id/speakerWebsite"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:singleLine="true"
-                    android:inputType="textUri" />
+                    android:inputType="textUri"
+                    android:singleLine="true" />
             </com.google.android.material.textfield.TextInputLayout>
+
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/speakerFacebookLayout"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/padding_medium"
                 android:layout_marginTop="@dimen/padding_medium"
+                android:layout_marginBottom="@dimen/padding_medium"
                 android:hint="@string/facebook"
                 android:visibility="gone"
                 tools:visibility="visible">
@@ -234,16 +246,17 @@
                     android:id="@+id/speakerFacebook"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:singleLine="true"
-                    android:inputType="textUri" />
+                    android:inputType="textUri"
+                    android:singleLine="true" />
             </com.google.android.material.textfield.TextInputLayout>
+
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/speakerGithubLayout"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/padding_medium"
                 android:layout_marginTop="@dimen/padding_medium"
+                android:layout_marginBottom="@dimen/padding_medium"
                 android:hint="@string/github"
                 android:visibility="gone"
                 tools:visibility="visible">
@@ -252,16 +265,17 @@
                     android:id="@+id/speakerGithub"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:singleLine="true"
-                    android:inputType="textUri" />
+                    android:inputType="textUri"
+                    android:singleLine="true" />
             </com.google.android.material.textfield.TextInputLayout>
+
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/speakerLinkedInLayout"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/padding_medium"
                 android:layout_marginTop="@dimen/padding_medium"
+                android:layout_marginBottom="@dimen/padding_medium"
                 android:hint="@string/linkedin"
                 android:visibility="gone"
                 tools:visibility="visible">
@@ -270,16 +284,17 @@
                     android:id="@+id/speakerLinkedIn"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:singleLine="true"
-                    android:inputType="textUri" />
+                    android:inputType="textUri"
+                    android:singleLine="true" />
             </com.google.android.material.textfield.TextInputLayout>
+
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/speakerTwitterLayout"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/padding_medium"
                 android:layout_marginTop="@dimen/padding_medium"
+                android:layout_marginBottom="@dimen/padding_medium"
                 android:hint="@string/twitter"
                 android:visibility="gone"
                 tools:visibility="visible">
@@ -288,16 +303,17 @@
                     android:id="@+id/speakerTwitter"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:singleLine="true"
-                    android:inputType="textUri" />
+                    android:inputType="textUri"
+                    android:singleLine="true" />
             </com.google.android.material.textfield.TextInputLayout>
+
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/speakerHeardFromLayout"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/padding_medium"
                 android:layout_marginTop="@dimen/padding_medium"
+                android:layout_marginBottom="@dimen/padding_medium"
                 android:hint="@string/heard_from"
                 android:visibility="gone"
                 tools:visibility="visible">
@@ -306,16 +322,16 @@
                     android:id="@+id/speakerHeardFrom"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:singleLine="true"
-                    android:inputType="textUri" />
+                    android:inputType="textUri"
+                    android:singleLine="true" />
             </com.google.android.material.textfield.TextInputLayout>
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/submitButton"
+                style="@style/AppTheme.MaterialButton.RoundedCorners"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                style="@style/AppTheme.MaterialButton.RoundedCorners"
-                tools:text="Add Speaker"/>
+                tools:text="Add Speaker" />
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_search_filter.xml b/app/src/main/res/layout/fragment_search_filter.xml
index b2f0f09f8..efaeafeab 100644
--- a/app/src/main/res/layout/fragment_search_filter.xml
+++ b/app/src/main/res/layout/fragment_search_filter.xml
@@ -1,236 +1,240 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:context="org.fossasia.openevent.general.search.SearchFilterFragment"
-    android:orientation="vertical">
-<androidx.cardview.widget.CardView
-    android:id="@+id/toolbarLayout"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:elevation="0dp">
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
+    android:orientation="vertical"
+    tools:context="org.fossasia.openevent.general.search.SearchFilterFragment">
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/toolbarLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:navigationIcon="@drawable/ic_arrow_back_black">
-    <ImageView
-        android:id="@+id/tick"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="end"
-        android:padding="@dimen/padding_large"
-        android:src="@drawable/ic_baseline_tick"
-        android:tint="@color/black"/>
-</androidx.appcompat.widget.Toolbar>
-</androidx.cardview.widget.CardView>
+        android:elevation="0dp">
 
-    <androidx.core.widget.NestedScrollView
-    android:id="@+id/scrollView"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout
-        android:id="@+id/rootView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:padding="@dimen/padding_large">
-        <LinearLayout
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/layout_margin_medium"
-            android:orientation="vertical">
+            app:navigationIcon="@drawable/ic_arrow_back_black">
 
-            <TextView
-                android:id="@+id/dateLabel"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingTop="@dimen/padding_medium"
-                android:paddingBottom="@dimen/padding_medium"
-                android:text="@string/date"
-                android:textStyle="bold"
-                android:textSize="@dimen/text_size_expanded_title" />
-
-            <TextView
-                android:id="@+id/tvSelectDate"
-                android:layout_width="match_parent"
+            <ImageView
+                android:id="@+id/tick"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="?selectableItemBackground"
-                android:drawableStart="@drawable/ic_time"
-                android:drawablePadding="@dimen/padding_medium"
-                android:gravity="center_vertical"
-                android:padding="@dimen/padding_small"
-                android:text="@string/anytime"
-                android:textSize="@dimen/text_size_large" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/event_details_divider"
-                android:layout_marginTop="@dimen/layout_margin_large"
-                android:background="@color/grey" />
-        </LinearLayout>
+                android:layout_gravity="end"
+                android:padding="@dimen/padding_large"
+                android:src="@drawable/ic_baseline_tick"
+                app:tint="@color/black" />
+        </androidx.appcompat.widget.Toolbar>
+    </androidx.cardview.widget.CardView>
+
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/scrollView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
         <LinearLayout
+            android:id="@+id/rootView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/layout_margin_medium"
-            android:orientation="vertical">
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:padding="@dimen/padding_large">
 
-            <TextView
-                android:id="@+id/locationLabel"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingTop="@dimen/padding_medium"
-                android:paddingBottom="@dimen/padding_medium"
-                android:text="@string/location"
-                android:textStyle="bold"
-                android:textSize="@dimen/text_size_expanded_title" />
-
-            <TextView
-                android:id="@+id/tvSelectLocation"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?selectableItemBackground"
-                android:drawableStart="@drawable/ic_location_pin"
-                android:drawablePadding="@dimen/padding_medium"
-                android:drawableTint="@color/light_grey"
-                android:gravity="center_vertical"
-                android:padding="@dimen/padding_small"
-                android:text="@string/anywhere"
-                android:textSize="@dimen/text_size_large" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/event_details_divider"
-                android:layout_marginTop="@dimen/layout_margin_large"
-                android:background="@color/grey" />
-        </LinearLayout>
+                android:layout_marginBottom="@dimen/layout_margin_medium"
+                android:orientation="vertical">
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/layout_margin_medium"
-            android:orientation="vertical">
+                <TextView
+                    android:id="@+id/dateLabel"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="@dimen/padding_medium"
+                    android:paddingBottom="@dimen/padding_medium"
+                    android:text="@string/date"
+                    android:textSize="@dimen/text_size_expanded_title"
+                    android:textStyle="bold" />
 
-            <TextView
-                android:id="@+id/categoryLabel"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingTop="@dimen/padding_medium"
-                android:paddingBottom="@dimen/padding_medium"
-                android:text="@string/category"
-                android:textStyle="bold"
-                android:textSize="@dimen/text_size_expanded_title" />
-
-            <TextView
-                android:id="@+id/tvSelectCategory"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="?selectableItemBackground"
-                android:drawableStart="@drawable/ic_star_border"
-                android:drawablePadding="@dimen/padding_medium"
-                android:drawableTint="@color/light_grey"
-                android:gravity="center_vertical"
-                android:padding="@dimen/padding_small"
-                android:text="@string/anything"
-                android:textSize="@dimen/text_size_large" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/event_details_divider"
-                android:layout_marginTop="@dimen/layout_margin_large"
-                android:background="@color/grey" />
-        </LinearLayout>
+                <TextView
+                    android:id="@+id/tvSelectDate"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="?selectableItemBackground"
+                    android:drawableStart="@drawable/ic_time"
+                    android:drawablePadding="@dimen/padding_medium"
+                    android:gravity="center_vertical"
+                    android:padding="@dimen/padding_small"
+                    android:text="@string/anytime"
+                    android:textSize="@dimen/text_size_large" />
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/event_details_divider"
+                    android:layout_marginTop="@dimen/layout_margin_large"
+                    android:background="@color/grey" />
+            </LinearLayout>
 
-            <TextView
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingBottom="@dimen/padding_medium"
-                android:paddingTop="@dimen/padding_medium"
-                android:text="@string/filter"
-                android:textStyle="bold"
-                android:textSize="@dimen/text_size_expanded_title" />
-
-            <CheckBox
-                android:id="@+id/freeStuffCheckBox"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/free_stuff"
-                android:textColor="@color/light_grey"
-                android:textSize="@dimen/text_size_large" />
+                android:layout_marginBottom="@dimen/layout_margin_medium"
+                android:orientation="vertical">
 
-            <CheckBox
-                android:id="@+id/sessionsAndSpeakerCheckBox"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/sessions_and_speakers"
-                android:textColor="@color/light_grey"
-                android:textSize="@dimen/text_size_large" />
+                <TextView
+                    android:id="@+id/locationLabel"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="@dimen/padding_medium"
+                    android:paddingBottom="@dimen/padding_medium"
+                    android:text="@string/location"
+                    android:textSize="@dimen/text_size_expanded_title"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/tvSelectLocation"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="?selectableItemBackground"
+                    android:drawableStart="@drawable/ic_location_pin"
+                    android:drawablePadding="@dimen/padding_medium"
+                    android:drawableTint="@color/light_grey"
+                    android:gravity="center_vertical"
+                    android:padding="@dimen/padding_small"
+                    android:text="@string/anywhere"
+                    android:textSize="@dimen/text_size_large" />
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/event_details_divider"
+                    android:layout_marginTop="@dimen/layout_margin_large"
+                    android:background="@color/grey" />
+            </LinearLayout>
 
-            <CheckBox
-                android:id="@+id/callForSpeakerCheckBox"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/call_for_speakers"
-                android:textColor="@color/light_grey"
-                android:textSize="@dimen/text_size_large" />
+                android:layout_marginBottom="@dimen/layout_margin_medium"
+                android:orientation="vertical">
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/event_details_divider"
-                android:layout_marginTop="@dimen/layout_margin_large"
-                android:background="@color/grey" />
-        </LinearLayout>
+                <TextView
+                    android:id="@+id/categoryLabel"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="@dimen/padding_medium"
+                    android:paddingBottom="@dimen/padding_medium"
+                    android:text="@string/category"
+                    android:textSize="@dimen/text_size_expanded_title"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/tvSelectCategory"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="?selectableItemBackground"
+                    android:drawableStart="@drawable/ic_star_border"
+                    android:drawablePadding="@dimen/padding_medium"
+                    android:drawableTint="@color/light_grey"
+                    android:gravity="center_vertical"
+                    android:padding="@dimen/padding_small"
+                    android:text="@string/anything"
+                    android:textSize="@dimen/text_size_large" />
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/event_details_divider"
+                    android:layout_marginTop="@dimen/layout_margin_large"
+                    android:background="@color/grey" />
+            </LinearLayout>
 
-            <TextView
-                android:id="@+id/sortLabel"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingTop="@dimen/padding_medium"
-                android:paddingBottom="@dimen/padding_medium"
-                android:text="@string/sort_by"
-                android:textStyle="bold"
-                android:textSize="@dimen/text_size_expanded_title" />
-
-            <RadioGroup
-                android:id="@+id/radioGroup"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content">
-
-                <RadioButton
-                    android:id="@+id/dateRadioButton"
+                android:orientation="vertical">
+
+                <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:checked="false"
-                    android:text="@string/date"
+                    android:paddingTop="@dimen/padding_medium"
+                    android:paddingBottom="@dimen/padding_medium"
+                    android:text="@string/filter"
+                    android:textSize="@dimen/text_size_expanded_title"
+                    android:textStyle="bold" />
+
+                <CheckBox
+                    android:id="@+id/freeStuffCheckBox"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/free_stuff"
+                    android:textColor="@color/light_grey"
+                    android:textSize="@dimen/text_size_large" />
+
+                <CheckBox
+                    android:id="@+id/sessionsAndSpeakerCheckBox"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/sessions_and_speakers"
                     android:textColor="@color/light_grey"
                     android:textSize="@dimen/text_size_large" />
 
-                <RadioButton
-                    android:id="@+id/nameRadioButton"
+                <CheckBox
+                    android:id="@+id/callForSpeakerCheckBox"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:checked="false"
-                    android:text="@string/name"
+                    android:text="@string/call_for_speakers"
                     android:textColor="@color/light_grey"
                     android:textSize="@dimen/text_size_large" />
-            </RadioGroup>
 
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/event_details_divider"
+                    android:layout_marginTop="@dimen/layout_margin_large"
+                    android:background="@color/grey" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/sortLabel"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="@dimen/padding_medium"
+                    android:paddingBottom="@dimen/padding_medium"
+                    android:text="@string/sort_by"
+                    android:textSize="@dimen/text_size_expanded_title"
+                    android:textStyle="bold" />
+
+                <RadioGroup
+                    android:id="@+id/radioGroup"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content">
+
+                    <RadioButton
+                        android:id="@+id/dateRadioButton"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:checked="false"
+                        android:text="@string/date"
+                        android:textColor="@color/light_grey"
+                        android:textSize="@dimen/text_size_large" />
+
+                    <RadioButton
+                        android:id="@+id/nameRadioButton"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal"
+                        android:checked="false"
+                        android:text="@string/name"
+                        android:textColor="@color/light_grey"
+                        android:textSize="@dimen/text_size_large" />
+                </RadioGroup>
+
+            </LinearLayout>
         </LinearLayout>
-    </LinearLayout>
-</androidx.core.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_search_location.xml b/app/src/main/res/layout/fragment_search_location.xml
index 0d6888087..ad80ec418 100644
--- a/app/src/main/res/layout/fragment_search_location.xml
+++ b/app/src/main/res/layout/fragment_search_location.xml
@@ -12,25 +12,29 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:elevation="0dp">
+
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:layout_constraintTop_toTopOf="parent"
             app:navigationIcon="@drawable/ic_arrow_back_black">
+
             <TextView
                 android:id="@+id/toolbarTitle"
-                style = "@style/TextAppearance.Widget.AppCompat.Toolbar.Title"
-                android:layout_width = "wrap_content"
-                android:gravity = "center_vertical"
-                android:layout_height = "match_parent" />
+                style="@style/TextAppearance.Widget.AppCompat.Toolbar.Title"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical" />
         </androidx.appcompat.widget.Toolbar>
     </androidx.cardview.widget.CardView>
+
     <androidx.core.widget.NestedScrollView
         android:id="@+id/scrollView"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1">
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -40,35 +44,35 @@
                 android:id="@+id/locationSearchView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/layout_margin_medium"
                 android:background="@null"
+                android:hint="@string/enter_location"
+                android:imeOptions="actionSearch"
+                android:inputType="textCapWords"
                 android:paddingStart="@dimen/padding_large"
-                android:paddingEnd="@dimen/padding_large"
                 android:paddingTop="@dimen/padding_medium"
-                android:paddingBottom="@dimen/padding_medium"
-                android:inputType="textCapWords"
-                android:imeOptions="actionSearch"
-                android:hint="@string/enter_location"
-                android:layout_marginBottom="@dimen/layout_margin_medium"/>
+                android:paddingEnd="@dimen/padding_large"
+                android:paddingBottom="@dimen/padding_medium" />
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal"
                 android:layout_marginStart="@dimen/layout_margin_large"
                 android:layout_marginTop="@dimen/layout_margin_small"
                 android:layout_marginBottom="@dimen/layout_margin_small"
-                android:background="?selectableItemBackground">
+                android:background="?selectableItemBackground"
+                android:orientation="horizontal">
 
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     app:srcCompat="@drawable/ic_location_pin"
-                    app:tint="@color/colorPrimary"/>
+                    app:tint="@color/colorPrimary" />
 
                 <TextView
+                    android:id="@+id/currentLocation"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:id="@+id/currentLocation"
                     android:layout_marginStart="@dimen/layout_margin_medium"
                     android:text="@string/current_location"
                     android:textColor="@color/colorPrimary"
@@ -82,25 +86,26 @@
                 android:layout_height="@dimen/item_image_view_medium"
                 android:layout_marginBottom="@dimen/layout_margin_medium"
                 android:visibility="gone"
-                tools:visibility="visible"/>
+                tools:visibility="visible" />
 
             <androidx.cardview.widget.CardView
                 android:id="@+id/placeSuggestionsCard"
-                android:layout_margin="@dimen/layout_margin_medium"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/locationSearchView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_margin="@dimen/layout_margin_medium"
                 android:visibility="gone"
-                app:cardElevation="@dimen/card_elevation"
                 app:cardCornerRadius="@dimen/card_corner_radius"
+                app:cardElevation="@dimen/card_elevation"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/locationSearchView"
                 tools:visibility="visible">
+
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/rvAutoPlaces"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    tools:visibility="visible"/>
+                    tools:visibility="visible" />
             </androidx.cardview.widget.CardView>
 
             <LinearLayout
@@ -116,12 +121,12 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="@dimen/layout_margin_medium"
-                    android:text="@string/recent_locations"
                     android:paddingStart="@dimen/padding_large"
-                    android:paddingEnd="@dimen/padding_large"
                     android:paddingTop="@dimen/padding_large"
-                    android:textStyle="bold"
-                    android:textSize="@dimen/text_size_expanded_title" />
+                    android:paddingEnd="@dimen/padding_large"
+                    android:text="@string/recent_locations"
+                    android:textSize="@dimen/text_size_expanded_title"
+                    android:textStyle="bold" />
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/recentSearchRv"
@@ -132,11 +137,11 @@
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/event_details_divider"
-                    android:dividerHeight="0dp"
-                    android:divider="@null"
                     android:layout_marginStart="@dimen/layout_margin_large"
                     android:layout_marginEnd="@dimen/layout_margin_large"
-                    android:background="@color/grey" />
+                    android:background="@color/grey"
+                    android:divider="@null"
+                    android:dividerHeight="0dp" />
             </LinearLayout>
 
             <LinearLayout
@@ -144,27 +149,27 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
+                android:paddingBottom="@dimen/padding_large"
                 android:visibility="gone"
-                tools:visibility="visible"
-                android:paddingBottom="@dimen/padding_large">
+                tools:visibility="visible">
 
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="@dimen/layout_margin_medium"
-                    android:text="@string/popular_locations"
                     android:paddingStart="@dimen/padding_large"
                     android:paddingEnd="@dimen/padding_large"
-                    android:textStyle="bold"
-                    android:textSize="@dimen/text_size_expanded_title" />
+                    android:text="@string/popular_locations"
+                    android:textSize="@dimen/text_size_expanded_title"
+                    android:textStyle="bold" />
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/popularLocationsRv"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:dividerHeight="0dp"
+                    android:layout_marginBottom="@dimen/layout_margin_medium"
                     android:divider="@null"
-                    android:layout_marginBottom="@dimen/layout_margin_medium" />
+                    android:dividerHeight="0dp" />
             </LinearLayout>
 
 
@@ -178,14 +183,23 @@
                     android:layout_height="match_parent"
                     android:orientation="vertical"
                     tools:visibility="gone">
+
                     <include layout="@layout/placeholder_item_event_location" />
+
                     <include layout="@layout/placeholder_item_event_location" />
+
                     <include layout="@layout/placeholder_item_event_location" />
+
                     <include layout="@layout/placeholder_item_event_location" />
+
                     <include layout="@layout/placeholder_item_event_location" />
+
                     <include layout="@layout/placeholder_item_event_location" />
+
                     <include layout="@layout/placeholder_item_event_location" />
+
                     <include layout="@layout/placeholder_item_event_location" />
+
                     <include layout="@layout/placeholder_item_event_location" />
                 </LinearLayout>
             </com.facebook.shimmer.ShimmerFrameLayout>
diff --git a/app/src/main/res/layout/fragment_search_results.xml b/app/src/main/res/layout/fragment_search_results.xml
index 742da39e6..4c915b3cf 100644
--- a/app/src/main/res/layout/fragment_search_results.xml
+++ b/app/src/main/res/layout/fragment_search_results.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout 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"
     android:layout_width="match_parent"
@@ -13,29 +12,32 @@
         android:layout_height="wrap_content"
         android:elevation="0dp"
         app:layout_constraintTop_toTopOf="parent">
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:background="@color/colorPrimary"
-        app:titleTextColor="@color/black"
-        android:layout_width="match_parent"
-        app:navigationIcon="@drawable/ic_arrow_back_black"
-        android:layout_height="wrap_content"
-        android:backgroundTint="@color/white">
-        <TextView
-            android:id="@+id/toolbarTitle"
-            style = "@style/TextAppearance.Widget.AppCompat.Toolbar.Title"
-            android:layout_width = "wrap_content"
-            android:gravity = "center_vertical"
-            android:layout_height = "match_parent" />
-        <ImageView
-            android:id="@+id/filter"
-            android:layout_width="wrap_content"
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:padding="@dimen/padding_large"
-            android:tint="@color/black"
-            android:src="@drawable/ic_filter"/>
-    </androidx.appcompat.widget.Toolbar>
+            android:background="@color/colorPrimary"
+            android:backgroundTint="@color/white"
+            app:navigationIcon="@drawable/ic_arrow_back_black"
+            app:titleTextColor="@color/black">
+
+            <TextView
+                android:id="@+id/toolbarTitle"
+                style="@style/TextAppearance.Widget.AppCompat.Toolbar.Title"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical" />
+
+            <ImageView
+                android:id="@+id/filter"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end"
+                android:padding="@dimen/padding_large"
+                android:src="@drawable/ic_filter"
+                android:tint="@color/black" />
+        </androidx.appcompat.widget.Toolbar>
     </androidx.cardview.widget.CardView>
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
@@ -44,20 +46,24 @@
         android:layout_weight="1"
         android:fitsSystemWindows="false"
         tools:context="org.fossasia.openevent.general.search.SearchResultsFragment">
+
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/appBar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:elevation="0dp"
-            android:background="@color/white">
+            android:background="@color/white"
+            android:elevation="0dp">
+
             <com.google.android.material.appbar.CollapsingToolbarLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 app:layout_scrollFlags="scroll|exitUntilCollapsed">
+
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical">
+
                     <FrameLayout
                         android:layout_width="fill_parent"
                         android:layout_height="wrap_content"
@@ -70,112 +76,112 @@
                             android:layout_height="wrap_content"
                             android:background="@null"
                             android:hint="@string/search_hint"
-                            android:inputType="text"
                             android:imeOptions="actionSearch"
+                            android:inputType="text"
                             android:textSize="@dimen/text_size_extra_large"
-                            android:textStyle="bold"/>
+                            android:textStyle="bold" />
 
                         <ImageView
                             android:id="@+id/clearSearchText"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
+                            android:layout_gravity="end|center_vertical"
+                            android:layout_marginEnd="@dimen/layout_margin_large"
+                            android:background="@drawable/ic_clear"
                             android:foreground="?selectableItemBackground"
                             android:padding="@dimen/padding_medium"
-                            android:scaleType="center"
-                            android:layout_marginEnd="@dimen/layout_margin_large"
-                            android:layout_gravity="end|center_vertical"
-                            android:background="@drawable/ic_clear" />
+                            android:scaleType="center" />
                     </FrameLayout>
                 </LinearLayout>
             </com.google.android.material.appbar.CollapsingToolbarLayout>
         </com.google.android.material.appbar.AppBarLayout>
 
-    <androidx.core.widget.NestedScrollView
-        android:id="@+id/scrollView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:clipToPadding="false"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-        <LinearLayout
+        <androidx.core.widget.NestedScrollView
+            android:id="@+id/scrollView"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-            <HorizontalScrollView
-                android:id="@+id/chipGroupLayout"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/padding_medium"
-                android:scrollbars="none">
-
-                <com.google.android.material.chip.ChipGroup
-                    android:id="@+id/chipGroup"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
-            </HorizontalScrollView>
+            android:layout_height="wrap_content"
+            android:clipToPadding="false"
+            android:orientation="vertical"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-            <androidx.recyclerview.widget.RecyclerView
-                tools:visibility="gone"
-                android:id="@+id/eventsRecycler"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:scrollbars="vertical"
-                tools:listitem="@layout/item_card_favorite_event" />
+                android:orientation="vertical">
 
-            <include
-                layout="@layout/content_no_internet"
-                tools:visibility="gone" />
+                <HorizontalScrollView
+                    android:id="@+id/chipGroupLayout"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="@dimen/padding_medium"
+                    android:scrollbars="none">
 
-            <com.facebook.shimmer.ShimmerFrameLayout
-                android:id="@+id/shimmerSearch"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:visibility="gone">
+                    <com.google.android.material.chip.ChipGroup
+                        android:id="@+id/chipGroup"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content" />
+                </HorizontalScrollView>
 
-                <LinearLayout
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/eventsRecycler"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:orientation="vertical">
+                    android:scrollbars="vertical"
+                    tools:listitem="@layout/item_card_favorite_event"
+                    tools:visibility="gone" />
 
-                    <include layout="@layout/placeholder_item_card_search" />
+                <include
+                    layout="@layout/content_no_internet"
+                    tools:visibility="gone" />
 
-                    <include layout="@layout/placeholder_item_card_search" />
+                <com.facebook.shimmer.ShimmerFrameLayout
+                    android:id="@+id/shimmerSearch"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:visibility="gone">
 
-                    <include layout="@layout/placeholder_item_card_search" />
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:orientation="vertical">
 
-                    <include layout="@layout/placeholder_item_card_search" />
+                        <include layout="@layout/placeholder_item_card_search" />
 
-                    <include layout="@layout/placeholder_item_card_search" />
-                </LinearLayout>
-            </com.facebook.shimmer.ShimmerFrameLayout>
+                        <include layout="@layout/placeholder_item_card_search" />
 
-        </LinearLayout>
-    </androidx.core.widget.NestedScrollView>
+                        <include layout="@layout/placeholder_item_card_search" />
 
-    <LinearLayout
-        android:id="@+id/noSearchResults"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:visibility="gone"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent">
-
-        <ImageView
-            android:layout_width="@dimen/item_image_view"
-            android:layout_height="@dimen/item_image_view"
-            app:srcCompat="@drawable/ic_search_grey" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/no_search_results"
-            android:textSize="@dimen/text_size_medium" />
-    </LinearLayout>
+                        <include layout="@layout/placeholder_item_card_search" />
+
+                        <include layout="@layout/placeholder_item_card_search" />
+                    </LinearLayout>
+                </com.facebook.shimmer.ShimmerFrameLayout>
+
+            </LinearLayout>
+        </androidx.core.widget.NestedScrollView>
+
+        <LinearLayout
+            android:id="@+id/noSearchResults"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <ImageView
+                android:layout_width="@dimen/item_image_view"
+                android:layout_height="@dimen/item_image_view"
+                app:srcCompat="@drawable/ic_search_grey" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/no_search_results"
+                android:textSize="@dimen/text_size_medium" />
+        </LinearLayout>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_search_time.xml b/app/src/main/res/layout/fragment_search_time.xml
index e26b7a912..3b3233df9 100644
--- a/app/src/main/res/layout/fragment_search_time.xml
+++ b/app/src/main/res/layout/fragment_search_time.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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"
+    style="@style/AppTheme.NoActionBar"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@android:color/white"
     android:orientation="vertical"
-    style="@style/AppTheme.NoActionBar"
     tools:context="org.fossasia.openevent.general.search.time.SearchTimeFragment">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:navigationIcon="@drawable/ic_arrow_back_black"/>
+        app:navigationIcon="@drawable/ic_arrow_back_black" />
 
     <TextView
         android:layout_width="wrap_content"
@@ -27,8 +27,9 @@
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:scrollbars="none"
-        android:overScrollMode="never">
+        android:overScrollMode="never"
+        android:scrollbars="none">
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -39,10 +40,10 @@
                 android:id="@+id/anytimeTextView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="@dimen/layout_margin_large"
+                android:background="?attr/selectableItemBackground"
                 android:gravity="center_vertical"
+                android:padding="@dimen/layout_margin_large"
                 android:text="@string/anytime"
-                android:background="?attr/selectableItemBackground"
                 android:textColor="@color/black"
                 android:textSize="@dimen/text_size_expanded_title" />
 
@@ -50,10 +51,10 @@
                 android:id="@+id/todayTextView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="@dimen/layout_margin_large"
+                android:background="?attr/selectableItemBackground"
                 android:gravity="center_vertical"
+                android:padding="@dimen/layout_margin_large"
                 android:text="@string/today"
-                android:background="?attr/selectableItemBackground"
                 android:textColor="@color/black"
                 android:textSize="@dimen/text_size_expanded_title" />
 
@@ -61,10 +62,10 @@
                 android:id="@+id/tomorrowTextView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="@dimen/layout_margin_large"
+                android:background="?attr/selectableItemBackground"
                 android:gravity="center_vertical"
+                android:padding="@dimen/layout_margin_large"
                 android:text="@string/tomorrow"
-                android:background="?attr/selectableItemBackground"
                 android:textColor="@color/black"
                 android:textSize="@dimen/text_size_expanded_title" />
 
@@ -72,10 +73,10 @@
                 android:id="@+id/thisWeekendTextView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="@dimen/layout_margin_large"
+                android:background="?attr/selectableItemBackground"
                 android:gravity="center_vertical"
+                android:padding="@dimen/layout_margin_large"
                 android:text="@string/weekend"
-                android:background="?attr/selectableItemBackground"
                 android:textColor="@color/black"
                 android:textSize="@dimen/text_size_expanded_title" />
 
@@ -83,10 +84,10 @@
                 android:id="@+id/nextMonthTextView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="@dimen/layout_margin_large"
+                android:background="?attr/selectableItemBackground"
                 android:gravity="center_vertical"
+                android:padding="@dimen/layout_margin_large"
                 android:text="@string/month"
-                android:background="?attr/selectableItemBackground"
                 android:textColor="@color/black"
                 android:textSize="@dimen/text_size_expanded_title" />
 
@@ -94,10 +95,10 @@
                 android:id="@+id/timeTextView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="@dimen/layout_margin_large"
+                android:background="?attr/selectableItemBackground"
                 android:gravity="center_vertical"
+                android:padding="@dimen/layout_margin_large"
                 android:text="@string/pick_date"
-                android:background="?attr/selectableItemBackground"
                 android:textColor="@color/black"
                 android:textSize="@dimen/text_size_expanded_title" />
         </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_search_type.xml b/app/src/main/res/layout/fragment_search_type.xml
index 1a4062b1c..368fdd31f 100644
--- a/app/src/main/res/layout/fragment_search_type.xml
+++ b/app/src/main/res/layout/fragment_search_type.xml
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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"
+    style="@style/AppTheme.NoActionBar"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@android:color/white"
     android:orientation="vertical"
-    tools:context="org.fossasia.openevent.general.search.type.SearchTypeFragment"
-    style="@style/AppTheme.NoActionBar">
+    tools:context="org.fossasia.openevent.general.search.type.SearchTypeFragment">
+
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:navigationIcon="@drawable/ic_arrow_back_black"/>
+        app:navigationIcon="@drawable/ic_arrow_back_black" />
 
     <include layout="@layout/content_no_internet" />
 
@@ -25,6 +26,7 @@
         android:textColor="@color/black"
         android:textSize="@dimen/text_size_extra_large"
         android:textStyle="bold" />
+
     <com.facebook.shimmer.ShimmerFrameLayout
         android:id="@+id/shimmerSearchEventTypes"
         android:layout_width="wrap_content"
@@ -63,6 +65,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:divider="@null"
-        android:scrollbars="none"/>
+        android:scrollbars="none" />
 </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_session.xml b/app/src/main/res/layout/fragment_session.xml
index dd2b33fce..f89ec9b7e 100644
--- a/app/src/main/res/layout/fragment_session.xml
+++ b/app/src/main/res/layout/fragment_session.xml
@@ -1,266 +1,289 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_height="match_parent"
-    android:layout_width="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-<RelativeLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-<ProgressBar
-    android:id="@+id/progressBar"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_marginTop="@dimen/layout_margin_extreme_large"
-    android:layout_centerHorizontal="true"/>
-<LinearLayout
-    android:id="@+id/sessionDetailContainer"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:padding="@dimen/padding_large">
-    <TextView
-        android:id="@+id/sessionDetailName"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/layout_margin_medium"
-        android:fontFamily="sans-serif-light"
-        android:textColor="@color/dark_grey"
-        android:textSize="@dimen/text_size_extra_large"
-        tools:text="Session Name"/>
-    <TextView
-        android:id="@+id/sessionDetailType"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:fontFamily="sans-serif-thin"
-        android:textColor="@color/dark_grey"
-        android:layout_marginBottom="@dimen/layout_margin_medium"
-        android:textStyle="bold|italic"
-        android:textSize="@dimen/text_size_large"
-        tools:text="Type: Talk"/>
-    <LinearLayout
-        android:id="@+id/sessionDetailTimeContainer"
+
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="?selectableItemBackground"
-        android:orientation="horizontal">
-        <ImageView
+        android:layout_height="match_parent">
+
+        <ProgressBar
+            android:id="@+id/progressBar"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_margin="@dimen/layout_margin_medium"
-            android:scaleType="fitCenter"
-            app:srcCompat="@drawable/ic_baseline_event_grey" />
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="@dimen/layout_margin_extreme_large" />
+
         <LinearLayout
+            android:id="@+id/sessionDetailContainer"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="@dimen/layout_margin_medium"
-            android:orientation="vertical">
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:padding="@dimen/padding_large">
+
             <TextView
-                android:id="@+id/sessionDetailStartTime"
-                android:layout_width="wrap_content"
+                android:id="@+id/sessionDetailName"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/layout_margin_medium"
+                android:fontFamily="sans-serif-light"
                 android:textColor="@color/dark_grey"
-                tools:text="Tuesday, June 5 - 10:00 AM" />
+                android:textSize="@dimen/text_size_extra_large"
+                tools:text="Session Name" />
 
             <TextView
-                android:id="@+id/sessionDetailEndTime"
-                android:layout_width="wrap_content"
+                android:id="@+id/sessionDetailType"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/layout_margin_medium"
+                android:fontFamily="sans-serif-thin"
                 android:textColor="@color/dark_grey"
-                tools:text="- Tuesday, June 5 - 12:00 PM GMT+1" />
-        </LinearLayout>
-    </LinearLayout>
+                android:textSize="@dimen/text_size_large"
+                android:textStyle="bold|italic"
+                tools:text="Type: Talk" />
 
-    <LinearLayout
-        android:id="@+id/sessionDetailLanguageContainer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="?selectableItemBackground"
-        android:orientation="horizontal">
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_margin="@dimen/layout_margin_medium"
-            android:scaleType="fitCenter"
-            app:srcCompat="@drawable/ic_language_black" />
+            <LinearLayout
+                android:id="@+id/sessionDetailTimeContainer"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?selectableItemBackground"
+                android:orientation="horizontal">
 
-        <TextView
-            android:id="@+id/sessionDetailLanguage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="@dimen/layout_margin_medium"
-            android:layout_gravity="center"
-            android:textColor="@color/dark_grey"
-            tools:text="English" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/sessionDetailTrackContainer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="?selectableItemBackground"
-        android:orientation="horizontal">
-        <ImageView
-            android:id="@+id/sessionDetailTrackIcon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_margin="@dimen/layout_margin_medium"
-            android:scaleType="fitCenter"
-            app:srcCompat="@drawable/ic_track" />
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_margin="@dimen/layout_margin_medium"
+                    android:scaleType="fitCenter"
+                    app:srcCompat="@drawable/ic_baseline_event_grey" />
 
-        <TextView
-            android:id="@+id/sessionDetailTrack"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="@dimen/layout_margin_medium"
-            android:layout_gravity="center"
-            android:textColor="@color/dark_grey"
-            tools:text="English" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/sessionDetailLocationInfoContainer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="?selectableItemBackground"
-        android:layout_marginBottom="@dimen/layout_margin_large"
-        android:orientation="horizontal">
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_margin="@dimen/layout_margin_medium"
-            android:scaleType="fitCenter"
-            app:srcCompat="@drawable/ic_location_on_black" />
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="@dimen/layout_margin_medium"
+                    android:orientation="vertical">
 
-            <TextView
-                android:id="@+id/sessionDetailInfoLocation"
+                    <TextView
+                        android:id="@+id/sessionDetailStartTime"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textColor="@color/dark_grey"
+                        tools:text="Tuesday, June 5 - 10:00 AM" />
+
+                    <TextView
+                        android:id="@+id/sessionDetailEndTime"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textColor="@color/dark_grey"
+                        tools:text="- Tuesday, June 5 - 12:00 PM GMT+1" />
+                </LinearLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/sessionDetailLanguageContainer"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="@dimen/layout_margin_medium"
-                android:layout_gravity="center"
-                android:textColor="@color/dark_grey"
-                tools:text="15 Science Centre Rd, Singapore 69890243" />
-    </LinearLayout>
+                android:background="?selectableItemBackground"
+                android:orientation="horizontal">
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/event_details_divider"
-        android:layout_marginBottom="@dimen/layout_margin_large"
-        android:background="@color/grey" />
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_margin="@dimen/layout_margin_medium"
+                    android:scaleType="fitCenter"
+                    app:srcCompat="@drawable/ic_language_black" />
 
-    <LinearLayout
-        android:id="@+id/sessionDetailAbstractContainer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/about"
-            android:textColor="@color/dark_grey"
-            android:textSize="@dimen/event_details_headers"
-            android:layout_marginBottom="@dimen/layout_margin_medium"/>
-        <at.blogc.android.views.ExpandableTextView
-            android:id="@+id/sessionDetailAbstract"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:lines="4"
-            android:autoLink="web|email|phone"
-            android:background="?selectableItemBackground"
-            tools:text="@string/description_preview"/>
-        <TextView
-            android:id="@+id/sessionDetailAbstractSeeMore"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/see_more"
-            android:textColor="@color/dark_grey"
-            android:textStyle="bold"/>
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/event_details_divider"
-            android:layout_marginTop="@dimen/layout_margin_large"
-            android:layout_marginBottom="@dimen/layout_margin_large"
-            android:background="@color/grey" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/sessionDetailLocationContainer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="?selectableItemBackground"
-        android:orientation="vertical">
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/location"
-            android:textColor="@color/dark_grey"
-            android:textSize="@dimen/event_details_headers"
-            android:layout_marginBottom="@dimen/layout_margin_medium"/>
-        <TextView
-            android:id="@+id/sessionDetailLocation"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textColor="@color/dark_grey"
-            android:textStyle="bold"
-            android:layout_marginBottom="@dimen/layout_margin_medium"
-            tools:text="15 Science Centre Rd, Singapore 69890243"/>
-        <ImageView
-            android:id="@+id/sessionDetailLocationImageMap"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/home_logo_width"
-            android:background="?selectableItemBackground" />
+                <TextView
+                    android:id="@+id/sessionDetailLanguage"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_margin="@dimen/layout_margin_medium"
+                    android:textColor="@color/dark_grey"
+                    tools:text="English" />
+            </LinearLayout>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/event_details_divider"
-            android:layout_marginBottom="@dimen/layout_margin_large"
-            android:background="@color/grey" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/sessionDetailSpeakersContainer"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:animateLayoutChanges="true">
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/speakers"
-            android:textColor="@color/dark_grey"
-            android:textSize="@dimen/event_details_headers"
-            android:layout_marginBottom="@dimen/layout_margin_medium"/>
-        <ProgressBar
-            android:id="@+id/speakersProgressBar"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"/>
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/speakersUnderSessionRecycler"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"/>
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/event_details_divider"
-            android:layout_marginTop="@dimen/layout_margin_large"
-            android:layout_marginBottom="@dimen/layout_margin_large"
-            android:background="@color/grey" />
-    </LinearLayout>
-
-    <androidx.appcompat.widget.AppCompatButton
-        android:id="@+id/sessionDetailSignUpButton"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        style="@style/AppTheme.MaterialButton.RoundedCorners"
-        android:text="@string/sign_up"/>
+            <LinearLayout
+                android:id="@+id/sessionDetailTrackContainer"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?selectableItemBackground"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:id="@+id/sessionDetailTrackIcon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_margin="@dimen/layout_margin_medium"
+                    android:scaleType="fitCenter"
+                    app:srcCompat="@drawable/ic_track" />
+
+                <TextView
+                    android:id="@+id/sessionDetailTrack"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_margin="@dimen/layout_margin_medium"
+                    android:textColor="@color/dark_grey"
+                    tools:text="English" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/sessionDetailLocationInfoContainer"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/layout_margin_large"
+                android:background="?selectableItemBackground"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_margin="@dimen/layout_margin_medium"
+                    android:scaleType="fitCenter"
+                    app:srcCompat="@drawable/ic_location_on_black" />
+
+                <TextView
+                    android:id="@+id/sessionDetailInfoLocation"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_margin="@dimen/layout_margin_medium"
+                    android:textColor="@color/dark_grey"
+                    tools:text="15 Science Centre Rd, Singapore 69890243" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/event_details_divider"
+                android:layout_marginBottom="@dimen/layout_margin_large"
+                android:background="@color/grey" />
+
+            <LinearLayout
+                android:id="@+id/sessionDetailAbstractContainer"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="@dimen/layout_margin_medium"
+                    android:text="@string/about"
+                    android:textColor="@color/dark_grey"
+                    android:textSize="@dimen/event_details_headers" />
+
+                <at.blogc.android.views.ExpandableTextView
+                    android:id="@+id/sessionDetailAbstract"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:autoLink="web|email|phone"
+                    android:background="?selectableItemBackground"
+                    android:ellipsize="end"
+                    android:lines="4"
+                    tools:text="@string/description_preview" />
+
+                <TextView
+                    android:id="@+id/sessionDetailAbstractSeeMore"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/see_more"
+                    android:textColor="@color/dark_grey"
+                    android:textStyle="bold" />
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/event_details_divider"
+                    android:layout_marginTop="@dimen/layout_margin_large"
+                    android:layout_marginBottom="@dimen/layout_margin_large"
+                    android:background="@color/grey" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/sessionDetailLocationContainer"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?selectableItemBackground"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="@dimen/layout_margin_medium"
+                    android:text="@string/location"
+                    android:textColor="@color/dark_grey"
+                    android:textSize="@dimen/event_details_headers" />
+
+                <TextView
+                    android:id="@+id/sessionDetailLocation"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="@dimen/layout_margin_medium"
+                    android:textColor="@color/dark_grey"
+                    android:textStyle="bold"
+                    tools:text="15 Science Centre Rd, Singapore 69890243" />
+
+                <ImageView
+                    android:id="@+id/sessionDetailLocationImageMap"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/home_logo_width"
+                    android:background="?selectableItemBackground" />
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/event_details_divider"
+                    android:layout_marginBottom="@dimen/layout_margin_large"
+                    android:background="@color/grey" />
+            </LinearLayout>
 
-</LinearLayout>
-</RelativeLayout>
+            <LinearLayout
+                android:id="@+id/sessionDetailSpeakersContainer"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:animateLayoutChanges="true"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="@dimen/layout_margin_medium"
+                    android:text="@string/speakers"
+                    android:textColor="@color/dark_grey"
+                    android:textSize="@dimen/event_details_headers" />
+
+                <ProgressBar
+                    android:id="@+id/speakersProgressBar"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center" />
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/speakersUnderSessionRecycler"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/event_details_divider"
+                    android:layout_marginTop="@dimen/layout_margin_large"
+                    android:layout_marginBottom="@dimen/layout_margin_large"
+                    android:background="@color/grey" />
+            </LinearLayout>
+
+            <androidx.appcompat.widget.AppCompatButton
+                android:id="@+id/sessionDetailSignUpButton"
+                style="@style/AppTheme.MaterialButton.RoundedCorners"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/sign_up" />
+
+        </LinearLayout>
+    </RelativeLayout>
 
 </androidx.core.widget.NestedScrollView>
 
diff --git a/app/src/main/res/layout/fragment_signup.xml b/app/src/main/res/layout/fragment_signup.xml
index d6d355aed..ce771ebbb 100644
--- a/app/src/main/res/layout/fragment_signup.xml
+++ b/app/src/main/res/layout/fragment_signup.xml
@@ -17,142 +17,147 @@
             android:layout_height="wrap_content"
             app:navigationIcon="@drawable/ic_arrow_back_black"/>
 
-    <LinearLayout
-        android:id="@+id/mainView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/layout_margin_medium"
-        android:orientation="vertical"
-        android:paddingLeft="@dimen/padding_extra_large"
-        android:paddingRight="@dimen/padding_extra_large">
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center|bottom"
-            android:layout_marginBottom="@dimen/layout_margin_large"
-            android:text="@string/eventyay_logo"
-            android:textColor="@color/black"
-            android:textSize="@dimen/text_size_very_large" />
-
-        <!-- Email Label -->
-        <com.google.android.material.textfield.TextInputLayout
-            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-            android:id="@+id/textInputLayoutEmail"
+        <LinearLayout
+            android:id="@+id/mainView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/padding_medium"
-            android:layout_marginTop="@dimen/padding_medium"
-            android:hint="@string/email">
+            android:layout_marginTop="@dimen/layout_margin_medium"
+            android:orientation="vertical"
+            android:paddingLeft="@dimen/padding_extra_large"
+            android:paddingRight="@dimen/padding_extra_large">
 
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/emailSignUp"
-                android:transitionName="emailSignUpTransition"
+            <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:drawablePadding="@dimen/layout_margin_moderate"
-                android:drawableStart="@drawable/ic_email_black"
-                android:inputType="textEmailAddress" />
-        </com.google.android.material.textfield.TextInputLayout>
-
-        <!-- Password Label -->
-        <com.google.android.material.textfield.TextInputLayout
-            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-            android:id="@+id/textInputLayoutPassword"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/padding_medium"
-            android:layout_marginTop="@dimen/padding_medium"
-            app:passwordToggleEnabled="true">
-
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/passwordSignUp"
+                android:gravity="center|bottom"
+                android:layout_marginBottom="@dimen/layout_margin_large"
+                android:text="@string/eventyay_logo"
+                android:textColor="@color/black"
+                android:textSize="@dimen/text_size_very_large" />
+
+            <!-- Email Label -->
+            <com.google.android.material.textfield.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                android:id="@+id/textInputLayoutEmail"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:drawablePadding="@dimen/layout_margin_moderate"
-                android:drawableStart="@drawable/ic_lock_black"
-                android:hint="@string/password"
-                android:inputType="textPassword" />
-        </com.google.android.material.textfield.TextInputLayout>
-
-        <com.google.android.material.textfield.TextInputLayout
-            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-            android:id="@+id/textInputLayoutConfirmPassword"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/padding_medium"
-            android:layout_marginTop="@dimen/padding_medium"
-            app:passwordToggleEnabled="true">
-
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/confirmPasswords"
+                android:layout_marginBottom="@dimen/padding_medium"
+                android:layout_marginTop="@dimen/padding_medium"
+                android:hint="@string/email">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/emailSignUp"
+                    android:transitionName="emailSignUpTransition"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:drawablePadding="@dimen/layout_margin_moderate"
+                    android:drawableStart="@drawable/ic_email_black"
+                    android:inputType="textEmailAddress" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <!-- Password Label -->
+            <com.google.android.material.textfield.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                android:id="@+id/textInputLayoutPassword"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:drawableLeft="@drawable/ic_lock_black"
-                android:drawablePadding="@dimen/layout_margin_moderate"
-                android:drawableStart="@drawable/ic_lock_black"
-                android:hint="@string/confirm_password"
-                android:inputType="textPassword" />
-        </com.google.android.material.textfield.TextInputLayout>
-
-        <com.google.android.material.textfield.TextInputLayout
-            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/padding_medium"
-            android:layout_marginTop="@dimen/padding_medium">
-
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/firstNameText"
+                android:layout_marginBottom="@dimen/padding_medium"
+                android:layout_marginTop="@dimen/padding_medium"
+                app:passwordToggleEnabled="true">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/passwordSignUp"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:drawablePadding="@dimen/layout_margin_moderate"
+                    android:drawableStart="@drawable/ic_lock_black"
+                    android:hint="@string/password"
+                    android:inputType="textPassword" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                android:id="@+id/textInputLayoutConfirmPassword"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="@string/first_name_optional"
-                android:inputType="textCapWords"/>
-        </com.google.android.material.textfield.TextInputLayout>
-
-        <com.google.android.material.textfield.TextInputLayout
-            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/padding_medium"
-            android:layout_marginTop="@dimen/padding_medium">
-
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/lastNameText"
+                android:layout_marginBottom="@dimen/padding_medium"
+                android:layout_marginTop="@dimen/padding_medium"
+                app:passwordToggleEnabled="true">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/confirmPasswords"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:drawableLeft="@drawable/ic_lock_black"
+                    android:drawablePadding="@dimen/layout_margin_moderate"
+                    android:drawableStart="@drawable/ic_lock_black"
+                    android:hint="@string/confirm_password"
+                    android:inputType="textPassword" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="@string/last_name_optional"
-                android:inputType="textCapWords"
-                android:imeOptions="actionDone"/>
-        </com.google.android.material.textfield.TextInputLayout>
+                android:layout_marginBottom="@dimen/padding_medium"
+                android:layout_marginTop="@dimen/padding_medium">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/firstNameText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/first_name_optional"
+                    android:inputType="textCapWords"/>
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/padding_medium"
+                android:layout_marginTop="@dimen/padding_medium">
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/lastNameText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/last_name_optional"
+                    android:inputType="textCapWords"
+                    android:imeOptions="actionDone"/>
 
-            <CheckBox
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:id="@+id/signUpCheckbox"
-                android:layout_gravity="center_vertical"/>
+            </com.google.android.material.textfield.TextInputLayout>
 
-            <TextView
-                android:layout_width="wrap_content"
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <CheckBox
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/signUpCheckbox"
+                    android:layout_gravity="center_vertical"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textSize="@dimen/text_size_medium"
+                    android:layout_gravity="center_vertical"
+                    android:id="@+id/signUpText"/>
+
+            </LinearLayout>
+
+            <com.google.android.material.button.MaterialButton
+                android:theme="@style/AccentButton"
+                style="@style/Widget.MaterialComponents.Button"
+                android:id="@+id/signUpButton"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textSize="@dimen/text_size_medium"
-                android:layout_gravity="center_vertical"
-                android:id="@+id/signUpText"/>
+                android:layout_marginBottom="@dimen/padding_large"
+                android:layout_marginTop="@dimen/padding_large"
+                android:text="@string/sign_up" />
+
         </LinearLayout>
 
-        <com.google.android.material.button.MaterialButton
-            android:theme="@style/AccentButton"
-            style="@style/Widget.MaterialComponents.Button"
-            android:id="@+id/signUpButton"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/padding_large"
-            android:layout_marginTop="@dimen/padding_large"
-            android:text="@string/sign_up" />
-    </LinearLayout>
     </LinearLayout>
+
 </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/placeholder_item_card_tickets.xml b/app/src/main/res/layout/placeholder_item_card_tickets.xml
index d1bb96e8e..28c7945b7 100644
--- a/app/src/main/res/layout/placeholder_item_card_tickets.xml
+++ b/app/src/main/res/layout/placeholder_item_card_tickets.xml
@@ -31,9 +31,9 @@
             android:layout_width="@dimen/layout_margin_none"
             android:layout_height="@dimen/placeholder_tickets_view_height"
             android:layout_marginLeft="@dimen/layout_margin_medium"
+            android:layout_marginTop="@dimen/details_margin_small"
             android:layout_marginRight="@dimen/layout_margin_medium"
             android:layout_marginBottom="@dimen/layout_margin_small"
-            android:layout_marginTop="@dimen/details_margin_small"
             android:background="@color/shimmer_background"
             android:ellipsize="end"
             app:layout_constraintLeft_toRightOf="@+id/date"