diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/handhistory/Action.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/handhistory/Action.kt
index ce90eb68..172365d0 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/handhistory/Action.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/handhistory/Action.kt
@@ -15,21 +15,22 @@ import net.pokeranalytics.android.util.extensions.formatted
  * An extension to transform a list of ComputedAction into
  * a more compact and read-friendly list of ActionReadRow
  */
-fun List<Action>.compact(positions: LinkedHashSet<Position>): List<ActionReadRow> {
+fun List<Action>.compact(positions: LinkedHashSet<Position>, heroIndex: Int?): List<ActionReadRow> {
 	val rows = mutableListOf<ActionReadRow>()
 	this.forEach {
 		if (it.type == Action.Type.FOLD && rows.lastOrNull()?.action == Action.Type.FOLD) {
 			rows.lastOrNull()?.positions?.add(positions.elementAt(it.position))
 		} else {
-			rows.add(it.toReadRow(positions))
+			rows.add(it.toReadRow(positions, heroIndex))
 		}
 	}
 	return rows
 }
 
-fun Action.toReadRow(positions: LinkedHashSet<Position>): ActionReadRow {
+fun Action.toReadRow(positions: LinkedHashSet<Position>, heroIndex: Int?): ActionReadRow {
 	val pos = positions.elementAt(this.position)
-	return ActionReadRow(mutableListOf(pos), this.position, this.type, this.amount)
+	val isHero = (heroIndex == this.position)
+	return ActionReadRow(mutableListOf(pos), this.position, this.type, this.amount, isHero)
 }
 
 open class Action : RealmObject() {
diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/handhistory/HandHistory.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/handhistory/HandHistory.kt
index 788ac1cb..20d3b89c 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/handhistory/HandHistory.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/handhistory/HandHistory.kt
@@ -309,7 +309,7 @@ open class HandHistory : RealmObject(), Deletable, RowRepresentable, Identifiabl
 
 			string = string.addLineReturn(2)
 
-			val streetActions = sortedActions.filter { it.street == street }.compact(positions)
+			val streetActions = sortedActions.filter { it.street == street }.compact(positions, this.heroIndex)
 			if (streetActions.isNotEmpty()) {
 
 				val streetItems = mutableListOf<CharSequence>(context.getString(street.resId))
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 200224a5..88d5a680 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
@@ -448,6 +448,8 @@ class HandHistoryAdapter(
 			// Position
 			itemView.findViewById<Button>(R.id.positionButton)?.let { button ->
 				button.text = computedAction.position.value
+//				button.setBackgroundColor(color(computedAction.isHero))
+				button.backgroundTintList = ColorStateList.valueOf(color(computedAction.isHero))
 			}
 
 			// Action
@@ -509,6 +511,7 @@ class HandHistoryAdapter(
 			// Position
 			itemView.findViewById<Button>(R.id.positionButton)?.let { positionButton ->
 				positionButton.text = playerCardView.position.value
+				positionButton.setBackgroundColor(color(playerCardView.isHero))
 			}
 
 			configurePlayerImage(itemView.hps_player_image, position, row)
@@ -530,10 +533,14 @@ class HandHistoryAdapter(
 
 			this.delegate = adapter.delegate
 
+
 			// Position Button
 			itemView.position_button.text = adapter.dataSource.charSequenceForRow(row, itemView.context, PlayerSetupRow.Tag.POSITION.ordinal)
 			val positionSelected = adapter.dataSource.isSelected(position, row, PlayerSetupRow.Tag.POSITION.ordinal)
-			itemView.position_button.backgroundTintList = ColorStateList.valueOf(color(positionSelected))
+//			itemView.position_button.backgroundTintList = ColorStateList.valueOf(color(positionSelected))
+
+			val positionalRow = row as PositionalRow
+			itemView.position_button.backgroundTintList = ColorStateList.valueOf(color(positionalRow.isHero))
 
 			configureCardsLayout(itemView.ps_hand_layout, false)
 
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 8963a064..624faec3 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
@@ -402,16 +402,18 @@ class HandHistoryFragment : RealmFragment(), RowRepresentableDelegate, KeyboardL
 	override fun onItemClick(position: Int, row: RowRepresentable, tag: Int) {
 
 		when (row) {
-			is PlayerSetupRow -> {
-				when (tag) {
-					PlayerSetupRow.Tag.PLAYER.ordinal -> {
-						this.model.clickPlayerPosition = position
-						DataListActivity.newDialogInstance(this, LiveData.PLAYER, true)
-					}
-					else -> {
-						Timber.d("onItemClick not configured for row: $row, position: $position, tag: $tag")
-					}
-				}
+			is PositionalRow -> {
+				this.model.tappedPlayerPositionIndex = row.positionIndex
+				DataListActivity.newDialogInstance(this, LiveData.PLAYER, true)
+//				when (tag) {
+//					PlayerSetupRow.Tag.PLAYER.ordinal -> {
+//						this.model.clickPlayerPosition = position
+//						DataListActivity.newDialogInstance(this, LiveData.PLAYER, true)
+//					}
+//					else -> {
+//						Timber.d("onItemClick not configured for row: $row, position: $position, tag: $tag")
+//					}
+//				}
 			}
 		}
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/ActionList.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/ActionList.kt
index 5d6ee938..8877df97 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/ActionList.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/ActionList.kt
@@ -18,6 +18,7 @@ interface ActionManager {
 	fun blindsUpdated(type: Action.Type, amount: Double)
 	fun minimumBetAmount(index: Int): Double
 	fun totalPotSize(index: Int): Double
+	val heroIndex: Int?
 }
 
 interface ActionListListener : PlayerSetupCreationListener {
@@ -72,6 +73,12 @@ class ActionList(var listener: ActionListListener) : ArrayList<ComputedAction>()
 	 */
 	var positions: LinkedHashSet<Position> = linkedSetOf()
 
+	/***
+	 * Returns the hero index
+	 */
+	override val heroIndex: Int?
+		get() { return this.handHistory.heroIndex }
+
 	/***
 	 * Selects an action type for the action at the provided [index]
 	 * In case of UNDEFINED_ALLIN, we define which type of allin it is.
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/ActionReadRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/ActionReadRow.kt
index e53134d4..6fca527d 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/ActionReadRow.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/ActionReadRow.kt
@@ -8,7 +8,8 @@ import net.pokeranalytics.android.ui.view.RowRepresentable
 class ActionReadRow(var positions: MutableList<Position>,
                     override var positionIndex: Int,
                     var action: Action.Type?,
-                    var amount: Double?) : RowRepresentable, PositionalRow {
+                    var amount: Double?,
+                    override val isHero: Boolean) : RowRepresentable, PositionalRow {
 
 	enum class Tag {
 		PLAYER
@@ -16,4 +17,5 @@ class ActionReadRow(var positions: MutableList<Position>,
 
 	override val viewType: Int = HandRowType.ACTION_READ.ordinal
 
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/ComputedAction.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/ComputedAction.kt
index e12701da..95f8c01a 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/ComputedAction.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/ComputedAction.kt
@@ -42,6 +42,11 @@ class ComputedAction(var manager: ActionManager,
 		AMOUNT
 	}
 
+	override val isHero: Boolean
+		get() {
+			return this.manager.heroIndex == this.action.position
+		}
+
 	/***
 	 * Returns whether the action requires the user to enter an amount for the selected action
 	 */
@@ -287,7 +292,7 @@ class ComputedAction(var manager: ActionManager,
 	 * The "read mode" representation of the action
 	 */
 	fun toReadRow(): ActionReadRow {
-		return ActionReadRow(mutableListOf(this.position), this.positionIndex, this.action.type, this.action.amount)
+		return ActionReadRow(mutableListOf(this.position), this.positionIndex, this.action.type, this.action.amount, this.isHero)
 	}
 
 	override val positionIndex: Int
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/HandHistoryRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/HandHistoryRow.kt
index f0a957f1..0ce95990 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/HandHistoryRow.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/HandHistoryRow.kt
@@ -18,4 +18,5 @@ interface HandHistoryRow : RowRepresentable {
 
 interface PositionalRow {
 	val positionIndex: Int
+	val isHero: Boolean
 }
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 d0240f0c..64585e44 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
@@ -128,7 +128,7 @@ class HandHistoryViewModel : ViewModel(), RowRepresentableDataSource, CardCentra
 	/***
 	 * The position of a click
 	 */
-	var clickPlayerPosition: Int? = null
+	var tappedPlayerPositionIndex: Int? = null
 
 	/***
 	 * The maximum number of cards in a player's hand
@@ -897,20 +897,14 @@ class HandHistoryViewModel : ViewModel(), RowRepresentableDataSource, CardCentra
 	}
 
 	/***
-	 * Defines the [player] at the saved [clickPlayerPosition]
+	 * Defines the [player] at the saved [tappedPlayerPositionIndex]
 	 */
 	fun playerSelected(player: Player) {
-		this.clickPlayerPosition?.let { position ->
-
-			when (val row = this.rowRepresentables[position]) {
-				is PlayerSetupRow -> {
-					val playerSetup = row.playerSetup ?: this.handHistory.createPlayerSetup(position)
-					player.realm.executeTransaction {
-						playerSetup.player = player
-					}
-				}
+		this.tappedPlayerPositionIndex?.let { positionIndex ->
+			player.realm.executeTransaction {
+				val ps = this.handHistory.playerSetupForPosition(positionIndex) ?: this.handHistory.createPlayerSetup(positionIndex)
+				ps.player = player
 			}
-
 		} ?: throw PAIllegalStateException("Click position not set for player selection")
 	}
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/PlayerCardsRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/PlayerCardsRow.kt
index 1a7d354b..3a0958d9 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/PlayerCardsRow.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/PlayerCardsRow.kt
@@ -48,4 +48,9 @@ open class PlayerCardsRow(private var playerSetupCreationListener: PlayerSetupCr
 	val playerSetup: PlayerSetup?
 		get() { return this.handHistory.playerSetupForPosition(this.positionIndex) }
 
+	override val isHero: Boolean
+		get() {
+			return this.handHistory.heroIndex == this.positionIndex
+		}
+
 }
\ No newline at end of file