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 7969fdaf..218e447e 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
@@ -29,7 +29,7 @@ fun List<Action>.compact(positions: LinkedHashSet<Position>): List<ActionReadRow
 
 fun Action.toReadRow(positions: LinkedHashSet<Position>): ActionReadRow {
 	val pos = positions.elementAt(this.position)
-	return ActionReadRow(mutableListOf(pos), this.type, this.amount)
+	return ActionReadRow(mutableListOf(pos), this.position, this.type, this.amount)
 }
 
 open class Action : RealmObject() {
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 18f4279c..55daa8cc 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
@@ -161,13 +161,13 @@ class HandHistoryAdapter(
 			return itemView.context.getColor(color)
 		}
 
-		fun editTextSelected(editText: EditText, selected: Boolean, tag: Int) {
+		fun editTextSelected(editText: EditText, selected: Boolean) {
 
 			editText.setBackgroundColor(color(selected))
 			val row = dataSource.rowRepresentableForPosition(this.currentPosition)
 				?: throw PAIllegalStateException("Row Representable not found at index: $currentPosition")
 
-			delegate?.onRowSelected(this.currentPosition, row, tag)
+			delegate?.onRowSelected(this.currentPosition, row, editText.tag as Int)
 
 		}
 
@@ -231,7 +231,7 @@ class HandHistoryAdapter(
 
 					editText.requestFocus()
 
-					editTextSelected(editText, true, editText.tag as Int)
+					editTextSelected(editText, true)
 				}
 				return@setOnTouchListener true
 			}
@@ -295,7 +295,6 @@ class HandHistoryAdapter(
 			dataSource.rowRepresentableForPosition(this.currentPosition)?.let { row ->
 
 				val focused = dataSource.isSelected(this.currentPosition, row, layout.tag as Int)
-//				layout.setBackgroundColor(color(focused))
 
 				val drawableId = if (focused) R.drawable.rounded_highlighted_board_background else R.drawable.rounded_board_background
 				layout.background = itemView.resources.getDrawable(drawableId, null)
@@ -394,7 +393,7 @@ class HandHistoryAdapter(
 
 						amountEditText.requestFocus()
 
-						editTextSelected(amountEditText, true, HHKeyboard.AMOUNT.ordinal)
+						editTextSelected(amountEditText, true)
 					}
 					return@setOnTouchListener true
 				}
@@ -472,7 +471,7 @@ class HandHistoryAdapter(
 
 			// Position
 			itemView.findViewById<Button>(R.id.positionButton)?.let { positionButton ->
-				positionButton.text = playerCardView.position?.value ?: throw PAIllegalStateException("Should not happen")
+				positionButton.text = playerCardView.position.value
 			}
 
 			configureCardsLayout(itemView.handLayout)
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 7d61b75d..7238ccad 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
@@ -271,9 +271,9 @@ class HandHistoryFragment : RealmFragment(), RowRepresentableDelegate, KeyboardL
 			this.save()
 		}
 
-		if (this.model.isEdited) {
-			this.findNextActionToEdit(0)
-		}
+//		if (this.model.isEdited && this.model.isNew) {
+//			this.findNextActionToEdit(0)
+//		}
 		this.handHistoryAdapter.notifyDataSetChanged()
 	}
 
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 7b1e97d8..e53134d4 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
@@ -6,8 +6,9 @@ import net.pokeranalytics.android.ui.modules.handhistory.HandRowType
 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 {
+                    var amount: Double?) : RowRepresentable, PositionalRow {
 
 	enum class Tag {
 		PLAYER
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 efead9cc..181a3cc3 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
@@ -220,9 +220,9 @@ class ComputedAction(var manager: ActionManager,
 		this.setEffectiveAmount(significantAmount - committedAmount)
 	}
 
-	private fun getStreetSignificantActionBefore(index: Int): ComputedAction? {
-		return this.manager.getStreetLastSignificantAction(this.street, index - 1)
-	}
+//	private fun getStreetSignificantActionBefore(index: Int): ComputedAction? {
+//		return this.manager.getStreetLastSignificantAction(this.street, index - 1)
+//	}
 
 	private fun getStreetLastSignificantAction(): ComputedAction? {
 		return this.manager.getStreetLastSignificantAction(this.street, this.action.index - 1)
@@ -277,7 +277,7 @@ class ComputedAction(var manager: ActionManager,
 	 * The "read mode" representation of the action
 	 */
 	fun toReadRow(): ActionReadRow {
-		return ActionReadRow(mutableListOf(this.position), this.action.type, this.action.amount)
+		return ActionReadRow(mutableListOf(this.position), this.positionIndex, this.action.type, this.action.amount)
 	}
 
 	override val positionIndex: Int
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/PlayerImageView.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/PlayerImageView.kt
index 1956eb3b..d1e54e85 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/PlayerImageView.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/view/PlayerImageView.kt
@@ -148,6 +148,8 @@ class PlayerImageView : FrameLayout {
 	fun clear(size: Size = Size.NORMAL) {
 		val drawable = this.playerImageView.playerStroke.background as GradientDrawable?
 		drawable?.setStroke(size.getStrokeSize(), getColor(context, R.color.kaki))
+
+		this.playerImageView.playerInitial.text = null
 	}
 
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/row_hand_action_read.xml b/app/src/main/res/layout/row_hand_action_read.xml
index 5b4e1872..62d8772f 100644
--- a/app/src/main/res/layout/row_hand_action_read.xml
+++ b/app/src/main/res/layout/row_hand_action_read.xml
@@ -16,9 +16,10 @@
         android:id="@+id/playersText"
         style="@style/PokerAnalyticsTheme.TextView.RowTitle"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:layout_weight="2"
         android:layout_marginStart="8dp"
+        android:gravity="center_vertical"
         tools:text="BB"
         />
 
@@ -26,7 +27,7 @@
         android:id="@+id/actionText"
         style="@style/PokerAnalyticsTheme.TextView.RowTitle"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:layout_weight="1"
         android:layout_marginStart="8dp"
         tools:text="raises"/>
@@ -35,7 +36,7 @@
         android:id="@+id/amountText"
         style="@style/PokerAnalyticsTheme.TextView.RowTitle"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:layout_weight="1"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"