diff --git a/app/src/main/res/layout-sw320dp/fragment_calendar.xml b/app/src/main/res/layout-sw320dp/fragment_calendar.xml
index 1f773978..7bb22310 100644
--- a/app/src/main/res/layout-sw320dp/fragment_calendar.xml
+++ b/app/src/main/res/layout-sw320dp/fragment_calendar.xml
@@ -83,6 +83,22 @@
 
 	</com.google.android.material.appbar.AppBarLayout>
 
+	<androidx.core.widget.ContentLoadingProgressBar
+		android:id="@+id/progressBar"
+		style="?android:attr/progressBarStyle"
+		android:layout_width="32dp"
+		android:layout_height="32dp"
+		android:layout_marginStart="8dp"
+		android:layout_marginTop="8dp"
+		android:layout_marginEnd="8dp"
+		android:layout_marginBottom="8dp"
+		android:alpha="0"
+		android:visibility="gone"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/appBar" />
+
 	<androidx.recyclerview.widget.RecyclerView
 		android:id="@+id/recyclerView"
 		android:layout_width="0dp"
diff --git a/app/src/main/res/layout-sw400dp/fragment_calendar.xml b/app/src/main/res/layout-sw400dp/fragment_calendar.xml
index f12b0457..7bc77927 100644
--- a/app/src/main/res/layout-sw400dp/fragment_calendar.xml
+++ b/app/src/main/res/layout-sw400dp/fragment_calendar.xml
@@ -17,28 +17,28 @@
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:gravity="center"
-			android:padding="8dp"
-			android:orientation="horizontal">
+			android:orientation="horizontal"
+			android:padding="8dp">
 
 			<com.google.android.material.chip.ChipGroup
 				android:id="@+id/filtersTime"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				app:singleSelection="false"
-				app:chipSpacing="8dp">
+				app:chipSpacing="8dp"
+				app:singleSelection="false">
 
 				<com.google.android.material.chip.Chip
 					android:id="@+id/filterTimeMonth"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:checked="true"
-					android:text="@string/month"/>
+					android:text="@string/month" />
 
 				<com.google.android.material.chip.Chip
 					android:id="@+id/filterTimeYear"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:text="@string/year"/>
+					android:text="@string/year" />
 
 			</com.google.android.material.chip.ChipGroup>
 
@@ -51,27 +51,27 @@
 				android:id="@+id/filtersSession"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				app:singleSelection="false"
-				app:chipSpacing="6dp">
+				app:chipSpacing="6dp"
+				app:singleSelection="false">
 
 				<com.google.android.material.chip.Chip
 					android:id="@+id/filterSessionAll"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:checked="true"
-					android:text="@string/all"/>
+					android:text="@string/all" />
 
 				<com.google.android.material.chip.Chip
 					android:id="@+id/filterSessionCash"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:text="@string/cash_game"/>
+					android:text="@string/cash_game" />
 
 				<com.google.android.material.chip.Chip
 					android:id="@+id/filterSessionTournament"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:text="@string/tournament"/>
+					android:text="@string/tournament" />
 
 			</com.google.android.material.chip.ChipGroup>
 
@@ -87,6 +87,22 @@
 
 	</com.google.android.material.appbar.AppBarLayout>
 
+	<androidx.core.widget.ContentLoadingProgressBar
+		android:id="@+id/progressBar"
+		style="?android:attr/progressBarStyle"
+		android:layout_width="32dp"
+		android:layout_height="32dp"
+		android:layout_marginStart="8dp"
+		android:layout_marginTop="8dp"
+		android:layout_marginEnd="8dp"
+		android:layout_marginBottom="8dp"
+		android:alpha="0"
+		android:visibility="gone"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/appBar" />
+
 	<androidx.recyclerview.widget.RecyclerView
 		android:id="@+id/recyclerView"
 		android:layout_width="0dp"
diff --git a/app/src/main/res/layout/fragment_calendar.xml b/app/src/main/res/layout/fragment_calendar.xml
index c072581c..642db7b7 100644
--- a/app/src/main/res/layout/fragment_calendar.xml
+++ b/app/src/main/res/layout/fragment_calendar.xml
@@ -88,6 +88,22 @@
 
 	</com.google.android.material.appbar.AppBarLayout>
 
+	<androidx.core.widget.ContentLoadingProgressBar
+		android:id="@+id/progressBar"
+		style="?android:attr/progressBarStyle"
+		android:layout_width="32dp"
+		android:layout_height="32dp"
+		android:layout_marginStart="8dp"
+		android:layout_marginTop="8dp"
+		android:layout_marginEnd="8dp"
+		android:layout_marginBottom="8dp"
+		android:alpha="0"
+		android:visibility="gone"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/appBar" />
+
 	<androidx.recyclerview.widget.RecyclerView
 		android:id="@+id/recyclerView"
 		android:layout_width="0dp"
diff --git a/app/src/main/res/layout/fragment_calendar_details.xml b/app/src/main/res/layout/fragment_calendar_details.xml
index e40f2f7b..3eda6595 100644
--- a/app/src/main/res/layout/fragment_calendar_details.xml
+++ b/app/src/main/res/layout/fragment_calendar_details.xml
@@ -32,31 +32,49 @@
 				android:id="@+id/tabAll"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:text="@string/all"/>
+				android:text="@string/all" />
 
 			<com.google.android.material.tabs.TabItem
 				android:id="@+id/tabCash"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:text="@string/cash_game"/>
+				android:text="@string/cash_game" />
 
 			<com.google.android.material.tabs.TabItem
 				android:id="@+id/tabTournament"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:text="@string/tournament"/>
+				android:text="@string/tournament" />
 
 		</com.google.android.material.tabs.TabLayout>
 
 	</com.google.android.material.appbar.AppBarLayout>
 
+	<androidx.core.widget.ContentLoadingProgressBar
+		android:id="@+id/progressBar"
+		style="?android:attr/progressBarStyle"
+		android:layout_width="32dp"
+		android:layout_height="32dp"
+		android:layout_marginStart="8dp"
+		android:layout_marginTop="8dp"
+		android:layout_marginEnd="8dp"
+		android:layout_marginBottom="8dp"
+		android:alpha="0"
+		android:visibility="gone"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="@+id/recyclerView"
+		tools:alpha="1"
+		tools:visibility="visible" />
+
 	<androidx.recyclerview.widget.RecyclerView
 		android:id="@+id/recyclerView"
 		android:layout_width="0dp"
 		android:layout_height="0dp"
-		app:layout_constraintTop_toBottomOf="@+id/appBar"
-		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintBottom_toBottomOf="parent" />
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/appBar" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_evograph.xml b/app/src/main/res/layout/fragment_graph.xml
similarity index 100%
rename from app/src/main/res/layout/fragment_evograph.xml
rename to app/src/main/res/layout/fragment_graph.xml