diff --git a/app/src/main/java/net/pokeranalytics/android/ui/activity/StatisticDetailsActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/activity/StatisticDetailsActivity.kt
index 52e4a81e..e7fa885e 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/activity/StatisticDetailsActivity.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/activity/StatisticDetailsActivity.kt
@@ -22,12 +22,14 @@ class StatisticDetailsActivity : PokerAnalyticsActivity() {
 
 		// Unparcel fails when setting a custom Parcelable object on Entry so we use a static reference to passe objects
 		var parameters: GraphParameters? = null
+		var displayAggregationChoices: Boolean = true
 
 		/**
 		 * Default constructor
 		 */
-		fun newInstance(context: Context, stat: Stat, group: ComputableGroup, report: Report) {
+		fun newInstance(context: Context, stat: Stat, group: ComputableGroup, report: Report, displayAggregationChoices: Boolean = true) {
 			parameters = GraphParameters(stat, group, report)
+			this.displayAggregationChoices = displayAggregationChoices
 			val intent = Intent(context, StatisticDetailsActivity::class.java)
 			context.startActivity(intent)
 		}
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarDetailsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarDetailsFragment.kt
index ddf831f2..bead1e0e 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarDetailsFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarDetailsFragment.kt
@@ -6,6 +6,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.isVisible
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.tabs.TabLayout
 import io.realm.Realm
@@ -72,7 +73,7 @@ class CalendarDetailsFragment : PokerAnalyticsFragment(), StaticRowRepresentable
 			is GraphRow -> {
 				//TODO: Open graph details
 				row.report.results.firstOrNull()?.group?.let { computableGroup ->
-					StatisticDetailsActivity.newInstance(requireContext(), row.stat, computableGroup, row.report)
+					StatisticDetailsActivity.newInstance(requireContext(), row.stat, computableGroup, row.report, false)
 				}
 			}
 		}
@@ -146,6 +147,10 @@ class CalendarDetailsFragment : PokerAnalyticsFragment(), StaticRowRepresentable
 	 */
 	private fun launchStatComputation() {
 
+		progressBar.isVisible = true
+		progressBar.animate().alpha(1f).start()
+		recyclerView.animate().alpha(0f).start()
+
 		computedResults?.let { computedResults ->
 
 			GlobalScope.launch {
@@ -193,6 +198,10 @@ class CalendarDetailsFragment : PokerAnalyticsFragment(), StaticRowRepresentable
 
 				launch(Dispatchers.Main) {
 					statsAdapter.notifyDataSetChanged()
+					progressBar.animate().cancel()
+					progressBar.animate().alpha(0f).withEndAction { progressBar.isVisible = false }.start()
+					recyclerView.animate().cancel()
+					recyclerView.animate().alpha(1f).start()
 				}
 			}
 		}
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarFragment.kt
index 255b6393..edf63519 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarFragment.kt
@@ -23,6 +23,8 @@ import net.pokeranalytics.android.ui.activity.CalendarDetailsActivity
 import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
 import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource
+import net.pokeranalytics.android.ui.extensions.hideWithAnimation
+import net.pokeranalytics.android.ui.extensions.showWithAnimation
 import net.pokeranalytics.android.ui.fragment.components.SessionObserverFragment
 import net.pokeranalytics.android.ui.view.CalendarTabs
 import net.pokeranalytics.android.ui.view.RowRepresentable
@@ -219,6 +221,9 @@ class CalendarFragment : SessionObserverFragment(), CoroutineScope, StaticRowRep
 	 */
 	private fun launchStatComputation() {
 
+		progressBar?.showWithAnimation()
+		recyclerView?.hideWithAnimation()
+
 		GlobalScope.launch {
 
 			val calendar = Calendar.getInstance()
@@ -373,6 +378,9 @@ class CalendarFragment : SessionObserverFragment(), CoroutineScope, StaticRowRep
 
 		calendarAdapter.notifyDataSetChanged()
 
+		progressBar?.hideWithAnimation()
+		recyclerView?.showWithAnimation()
+
 	}
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatisticDetailsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatisticDetailsFragment.kt
index 26401474..8ea97620 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatisticDetailsFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatisticDetailsFragment.kt
@@ -61,7 +61,7 @@ class StatisticDetailsFragment : PokerAnalyticsFragment() {
 		fragmentTransaction.commit()
 
 		StatisticDetailsActivity.parameters?.let {
-			fragment.setData(it.stat, it.computableGroup, it.report)
+			fragment.setData(it.stat, it.computableGroup, it.report, StatisticDetailsActivity.displayAggregationChoices)
 			StatisticDetailsActivity.parameters = null
 		} ?: run {
 			throw Exception("Missing graph parameters")