diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryFragment.kt
index 1b74925c..07a5f3ce 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryFragment.kt
@@ -651,6 +651,8 @@ class HandHistoryFragment : RealmFragment(), RowRepresentableDelegate, KeyboardL
 				if (lp.guideEnd == end.toInt()) {
 					endHandler?.invoke()
 				}
+			} ?: run {
+				Timber.w("WARNING >>> kbTopGuideline is null")
 			}
 
 		}
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/ReplayerAnimator.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/ReplayerAnimator.kt
index 945823b5..5b3434cc 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/ReplayerAnimator.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/ReplayerAnimator.kt
@@ -238,9 +238,9 @@ class ReplayerAnimator(var handHistory: HandHistory, var export: Boolean) {
 
 		val maxPlayerCards = this.handHistory.maxPlayerCards
 		val grid = when (this.handHistory.numberOfPlayers) {
-			2, 3 -> Pair(2, 3)
-			9, 10 -> Pair(4, 5)
-			else -> Pair(3, 4)
+			2, 3 -> Pair(2.8f, 4f)
+			9, 10 -> Pair(4f, 5f)
+			else -> Pair(3.2f, 4.4f)
 		}
 
 		val portrait = height > width