diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
index c0b74242..a2366435 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
@@ -450,6 +450,24 @@ open class Session : RealmObject(), Savable, Editable, StaticRowRepresentableDat
 			return this.bbNet / this.hourlyDuration
 		}
 
+	val isLive: Boolean
+		get() {
+			this.bankroll?.let {
+				return it.live
+			}
+			return true // default should be true
+		}
+
+	val hasBuyin: Boolean
+		get() {
+			return this.result?.buyin != null
+		}
+
+	val hasNetResult: Boolean
+		get() {
+			return this.result?.netResult != null
+		}
+
 	// Manageable
 
 	override fun isValidForSave(): Boolean {
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SessionRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SessionRow.kt
index 8ea38dfe..fd43faa8 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SessionRow.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SessionRow.kt
@@ -92,17 +92,13 @@ enum class SessionRow : RowRepresentable {
 							return arrayListOf(GAME, BLINDS, LOCATION, BANKROLL, TABLE_SIZE, START_DATE, END_DATE)
 						}
 						SessionState.STARTED, SessionState.PAUSED, SessionState.FINISHED -> {
-							val liveBankroll = session.bankroll?.live ?: false
 
 							val fields = mutableListOf<RowRepresentable>()
-							if (session.result?.buyin != null) { // fill with what's used
-								fields.addAll(listOf(CASHED_OUT, BUY_IN, TIPS))
-							} else if (session.result?.netResult != null) {
-								fields.add(NET_RESULT)
-							} else if (liveBankroll) {
-								fields.addAll(listOf(CASHED_OUT, BUY_IN, TIPS))
-							} else {
-								fields.add(NET_RESULT)
+							when {
+								session.hasBuyin -> fields.addAll(listOf(CASHED_OUT, BUY_IN, TIPS))
+								session.hasNetResult -> fields.add(NET_RESULT)
+								session.isLive -> fields.addAll(listOf(CASHED_OUT, BUY_IN, TIPS))
+								else -> fields.add(NET_RESULT)
 							}
 							fields.add(SeparatorRow())
 							fields.addAll(listOf(