diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryAdapter.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryAdapter.kt
index b5808e3e..a5fa2e39 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryAdapter.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryAdapter.kt
@@ -524,7 +524,7 @@ class HandHistoryAdapter(
 
 			configurePlayerImage(itemView.hps_player_image, position, row)
 
-			configureCardsLayout(itemView.handLayout, false)
+			configureCardsLayout(itemView.handLayout as LinearLayout, false)
 		}
 	}
 
@@ -550,7 +550,7 @@ class HandHistoryAdapter(
 			val positionalRow = row as PositionalRow
 			itemView.position_button.backgroundTintList = ColorStateList.valueOf(color(positionalRow.isHero))
 
-			configureCardsLayout(itemView.ps_hand_layout, false)
+			configureCardsLayout(itemView.ps_hand_layout as LinearLayout, false)
 
 		}
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/HandHistoryViewModel.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/HandHistoryViewModel.kt
index 64585e44..5058bc22 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/HandHistoryViewModel.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/HandHistoryViewModel.kt
@@ -265,7 +265,9 @@ class HandHistoryViewModel : ViewModel(), RowRepresentableDataSource, CardCentra
 
 		val rows: MutableList<RowRepresentable> = mutableListOf()
 
-		rows.add(HandRowType.COMMENT)
+		if (this.handHistory.comment?.isNotBlank() == true) {
+			rows.add(HandRowType.COMMENT)
+		}
 
 //		rows.add(CustomizableRowRepresentable(customViewType = HandRowType.HEADER, resId = R.string.settings, value = ""))
 
diff --git a/app/src/main/res/layout/row_hand_player_summary.xml b/app/src/main/res/layout/row_hand_player_summary.xml
index c2dc6a1b..aca9174b 100644
--- a/app/src/main/res/layout/row_hand_player_summary.xml
+++ b/app/src/main/res/layout/row_hand_player_summary.xml
@@ -21,7 +21,7 @@
         android:layout_marginStart="8dp"/>
 
     <include layout="@layout/view_card_layout"
-        android:id="@+id/hand_layout"
+        android:id="@+id/handLayout"
         android:layout_weight="1"
         android:layout_height="50dp"
         android:layout_width="0dp" />