diff --git a/app/src/main/java/net/pokeranalytics/android/model/handhistory/ComputedAction.kt b/app/src/main/java/net/pokeranalytics/android/model/handhistory/ComputedAction.kt
index ae8c8717..00e4b9cb 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/handhistory/ComputedAction.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/handhistory/ComputedAction.kt
@@ -6,7 +6,8 @@ import net.pokeranalytics.android.ui.view.RowViewType
 
 class ComputedAction(var action: Action,
                      var totalPotSize: Double = 0.0,
-                     var playerRemainingStack: Double? = null) : RowRepresentable {
+                     var playerRemainingStack: Double? = null,
+                     var position: Position) : RowRepresentable {
 
 	/***
 	 * Returns whether the action requires the user to enter an amount for the selected action
diff --git a/app/src/main/java/net/pokeranalytics/android/model/handhistory/HHBuilder.kt b/app/src/main/java/net/pokeranalytics/android/model/handhistory/HHBuilder.kt
index 56ae164f..100552f3 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/handhistory/HHBuilder.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/handhistory/HHBuilder.kt
@@ -1,10 +1,14 @@
 package net.pokeranalytics.android.model.handhistory
 
+import net.pokeranalytics.android.R
 import net.pokeranalytics.android.exceptions.PAIllegalStateException
 import net.pokeranalytics.android.model.realm.handhistory.Action
 import net.pokeranalytics.android.model.realm.handhistory.HandHistory
 import net.pokeranalytics.android.ui.view.RowRepresentable
+import net.pokeranalytics.android.ui.view.RowViewType
 import net.pokeranalytics.android.ui.view.handhistory.StreetHeader
+import net.pokeranalytics.android.ui.view.rowrepresentable.CustomizableRowRepresentable
+import java.util.*
 import kotlin.math.min
 
 class HHBuilder {
@@ -15,6 +19,7 @@ class HHBuilder {
 	private var handHistory: HandHistory
 		set(value) {
 			field = value
+			setNumberOfPlayers(value.numberOfPlayers)
 			load()
 		}
 
@@ -28,6 +33,8 @@ class HHBuilder {
 	 */
 	private var sortedActions: List<ComputedAction> = mutableListOf()
 
+	var positions: LinkedHashSet<Position> = linkedSetOf()
+
 	/***
 	 * Creates a builder using a [handSetup]
 	 * Creates a new Hand History and configures it according to the [handSetup]
@@ -36,7 +43,6 @@ class HHBuilder {
 		val handHistory = HandHistory()
 		handHistory.configure(handSetup)
 		this.handHistory = handHistory
-
 	}
 
 	/***
@@ -67,7 +73,8 @@ class HHBuilder {
 		val sortedActions = this.handHistory.actions.sortedBy { it.index }
 		sortedActions.forEach { action ->
 			totalPotSize += action.effectiveAmount
-			val ca = ComputedAction(action, totalPotSize, action.positionRemainingStack)
+			val position = this.positions.elementAt(action.position)
+			val ca = ComputedAction(action, totalPotSize, action.positionRemainingStack, position)
 			computedActions.add(ca)
 		}
 		this.sortedActions = computedActions
@@ -249,6 +256,11 @@ class HHBuilder {
 		return previousActions.lastOrNull { it.action.isActionSignificant }
 	}
 
+	fun setNumberOfPlayers(playerCount: Int) {
+		this.handHistory.numberOfPlayers = playerCount
+		this.positions = Position.positionsPerPlayers(playerCount)
+	}
+
 	/***
 	 * Saves the current hand state in the database
 	 */
@@ -259,15 +271,28 @@ class HHBuilder {
 	fun rowRepresentables() : List<RowRepresentable> {
 		val rows: MutableList<RowRepresentable> = mutableListOf()
 
+		rows.add(CustomizableRowRepresentable(customViewType = RowViewType.HEADER_TITLE, resId = R.string.settings))
+
 		var potSize = 0.0
 		Street.values().forEach { street ->
-			rows.add(StreetHeader(street, this.handHistory.cardsForStreet(street), potSize))
+
 			val actions = this.sortedActions.filter { it.action.street == street.ordinal }
-			rows.addAll(actions)
 
 			if (actions.isNotEmpty()) {
+				// Name of the street + pot size if not preflop
+				rows.add(CustomizableRowRepresentable(customViewType = RowViewType.HEADER_TITLE, resId = street.resId))
+
+				// Cards if not preflop
+				if (street.totalBoardCards > 0) {
+					rows.add(StreetHeader(street, this.handHistory.cardsForStreet(street), potSize))
+				}
+
+				// Actions
+				rows.addAll(actions)
+
 				potSize = actions.last().totalPotSize
 			}
+
 		}
 
 		return rows
diff --git a/app/src/main/java/net/pokeranalytics/android/model/handhistory/Position.kt b/app/src/main/java/net/pokeranalytics/android/model/handhistory/Position.kt
new file mode 100644
index 00000000..c22af621
--- /dev/null
+++ b/app/src/main/java/net/pokeranalytics/android/model/handhistory/Position.kt
@@ -0,0 +1,38 @@
+package net.pokeranalytics.android.model.handhistory
+
+import net.pokeranalytics.android.exceptions.PAIllegalStateException
+import java.util.*
+
+enum class Position(var value: String) {
+	SB("SB"),
+	BB("BB"),
+	UTG("UTG"),
+	UTG1("UTG+1"),
+	UTG2("UTG+2"),
+	UTG3("UTG+3"),
+	MP("MP"),
+	HJ("HJ"),
+	CO("CO"),
+	BUT("BUT");
+
+	companion object {
+
+		fun positionsPerPlayers(playerCount: Int) : LinkedHashSet<Position> {
+			return when(playerCount) {
+				2 -> linkedSetOf(SB, BB)
+				3 -> linkedSetOf(SB, BB, BUT)
+				4 -> linkedSetOf(SB, BB, UTG, BUT)
+				5 -> linkedSetOf(SB, BB, UTG, CO, BUT)
+				6 -> linkedSetOf(SB, BB, UTG, HJ, CO, BUT)
+				7 -> linkedSetOf(SB, BB, UTG, MP, HJ, CO, BUT)
+				8 -> linkedSetOf(SB, BB, UTG, UTG1, MP, HJ, CO, BUT)
+				9 -> linkedSetOf(SB, BB, UTG, UTG1, UTG2, MP, HJ, CO, BUT)
+				10 -> linkedSetOf(SB, BB, UTG, UTG1, UTG2, UTG3, MP, HJ, CO, BUT)
+				else -> throw PAIllegalStateException("Unmanaged number of players")
+			}
+		}
+
+	}
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/net/pokeranalytics/android/model/handhistory/Street.kt b/app/src/main/java/net/pokeranalytics/android/model/handhistory/Street.kt
index f823dd0c..861e5c11 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/handhistory/Street.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/handhistory/Street.kt
@@ -1,5 +1,7 @@
 package net.pokeranalytics.android.model.handhistory
 
+import net.pokeranalytics.android.R
+
 enum class Street {
 	PREFLOP,
 	FLOP,
@@ -15,5 +17,16 @@ enum class Street {
 				RIVER -> 5
 			}
 		}
+
+	val resId: Int
+		get() {
+			return when (this) {
+				PREFLOP -> R.string.street_preflop
+				FLOP -> R.string.street_flop
+				TURN -> R.string.street_turn
+				RIVER -> R.string.street_river
+			}
+		}
+
 }
 
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 30f056a6..fe91f2f7 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
@@ -1,23 +1,25 @@
 package net.pokeranalytics.android.model.realm.handhistory
 
 import io.realm.RealmObject
+import net.pokeranalytics.android.R
 import net.pokeranalytics.android.exceptions.PAIllegalStateException
 
 open class Action : RealmObject() {
 
-	enum class Type {
-		POST_SB,
-		POST_BB,
-		STRADDLE,
-		FOLD,
-		CHECK,
-		CALL,
-		BET,
-		RAISE,
-		UNDEFINED_ALLIN,
-		CALL_ALLIN,
-		BET_ALLIN,
-		RAISE_ALLIN;
+	enum class Type(var resId: Int) {
+
+		POST_SB(R.string.posts_sb),
+		POST_BB(R.string.post_bb),
+		STRADDLE(R.string.straddle),
+		FOLD(R.string.fold),
+		CHECK(R.string.check),
+		CALL(R.string.call),
+		BET(R.string.bet),
+		RAISE(R.string.raise),
+		UNDEFINED_ALLIN(R.string.allin),
+		CALL_ALLIN(R.string.allin),
+		BET_ALLIN(R.string.allin),
+		RAISE_ALLIN(R.string.allin);
 
 		val isSignificant: Boolean
 			get() {
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 6e0e8d48..11b582a9 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
@@ -98,7 +98,7 @@ open class HandHistory : RealmObject(), RowRepresentable, Identifiable, Filterab
 		handSetup.smallBlind?.let { this.smallBlind = it }
 		handSetup.bigBlind?.let { this.bigBlind = it }
 
-		for (i in 0..this.numberOfPlayers) {
+		for (i in 0 until this.numberOfPlayers) {
 			val action = Action()
 			action.index = i
 			action.position = i
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt
index 4568665e..a33110a6 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt
@@ -3,6 +3,7 @@ package net.pokeranalytics.android.ui.view
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.FrameLayout
 import androidx.appcompat.widget.AppCompatImageView
 import androidx.appcompat.widget.AppCompatTextView
@@ -25,6 +26,7 @@ import net.pokeranalytics.android.calculus.Stat
 import net.pokeranalytics.android.calculus.bankroll.BankrollReportManager
 import net.pokeranalytics.android.model.TableSize
 import net.pokeranalytics.android.model.extensions.getFormattedGameType
+import net.pokeranalytics.android.model.handhistory.ComputedAction
 import net.pokeranalytics.android.model.realm.CustomField
 import net.pokeranalytics.android.model.realm.Player
 import net.pokeranalytics.android.model.realm.Session
@@ -685,7 +687,19 @@ enum class RowViewType(private var layoutRes: Int) {
 	 * Display a hand action
 	 */
 	inner class RowHandAction(itemView: View) : RecyclerView.ViewHolder(itemView), BindableHolder {
+
 		override fun bind(position: Int, row: RowRepresentable, adapter: RowRepresentableAdapter) {
+			val computedAction = row as ComputedAction
+
+			itemView.findViewById<Button>(R.id.actionButton)?.let { button ->
+				computedAction.action.type?.resId?.let {
+					button.text = itemView.context.getString(it)
+				}
+			}
+
+			itemView.findViewById<Button>(R.id.positionButton)?.let { button ->
+				button.text = computedAction.position.value
+			}
 
 		}
 	}
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/MoreTabRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/MoreTabRow.kt
index 3885a4a1..1f6982a9 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/MoreTabRow.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/MoreTabRow.kt
@@ -17,7 +17,7 @@ enum class MoreTabRow : RowRepresentable {
 			return when(this) {
 				BANKROLL -> R.string.bankroll
 				TOP_10 -> R.string.top_10
-				SETTINGS -> R.string.services
+				SETTINGS -> R.string.settings
 			}
 		}
 
diff --git a/app/src/main/res/layout/fragment_hand_history.xml b/app/src/main/res/layout/fragment_hand_history.xml
index 51122938..0bc0674f 100644
--- a/app/src/main/res/layout/fragment_hand_history.xml
+++ b/app/src/main/res/layout/fragment_hand_history.xml
@@ -1,27 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/mainLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <androidx.core.widget.NestedScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fillViewport="true"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appBar"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:theme="@style/PokerAnalyticsTheme.Toolbar.Session"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
-        <FrameLayout
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="?attr/actionBarSize"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:title="@string/hand_history" />
 
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/recyclerView"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:clipToPadding="false" />
+    </com.google.android.material.appbar.AppBarLayout>
 
-        </FrameLayout>
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recyclerView"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/appBar" />
 
-    </androidx.core.widget.NestedScrollView>
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/row_hand_action.xml b/app/src/main/res/layout/row_hand_action.xml
index a5ae5d16..392fef8c 100644
--- a/app/src/main/res/layout/row_hand_action.xml
+++ b/app/src/main/res/layout/row_hand_action.xml
@@ -1,23 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/playerButton"
         style="@style/PokerAnalyticsTheme.Button"
         android:layout_width="44dp"
         android:layout_height="44dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"/>
+        android:layout_marginStart="8dp"/>
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/positionButton"
         style="@style/PokerAnalyticsTheme.Button"
-        android:layout_width="44dp"
+        android:layout_width="64dp"
         android:layout_height="44dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"/>
+        android:layout_marginStart="8dp"/>
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/actionButton"
@@ -25,7 +24,6 @@
         android:layout_width="120dp"
         android:layout_height="44dp"
         android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
         android:layout_marginEnd="16dp"/>
 
     <androidx.appcompat.widget.AppCompatEditText
@@ -33,9 +31,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
         android:layout_marginEnd="16dp"
-        android:layout_marginBottom="16dp"
         android:imeOptions="actionDone"
         android:maxLines="1" />
 
diff --git a/app/src/main/res/layout/row_hand_cards.xml b/app/src/main/res/layout/row_hand_cards.xml
index 7217bb2c..3d6616cb 100644
--- a/app/src/main/res/layout/row_hand_cards.xml
+++ b/app/src/main/res/layout/row_hand_cards.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="horizontal"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="wrap_content">
 
     <androidx.appcompat.widget.AppCompatEditText
         android:id="@+id/flopEditText"
diff --git a/app/src/main/res/menu/toolbar_bankroll_details.xml b/app/src/main/res/menu/toolbar_bankroll_details.xml
index 2132026e..4db16099 100644
--- a/app/src/main/res/menu/toolbar_bankroll_details.xml
+++ b/app/src/main/res/menu/toolbar_bankroll_details.xml
@@ -4,7 +4,7 @@
 
 	<item
 		android:id="@+id/settings"
-		android:title="@string/services"
+		android:title="@string/settings"
 		android:icon="@drawable/ic_outline_settings"
 		app:showAsAction="always" />
 
diff --git a/app/src/main/res/menu/toolbar_comparison_chart.xml b/app/src/main/res/menu/toolbar_comparison_chart.xml
index 2132026e..4db16099 100644
--- a/app/src/main/res/menu/toolbar_comparison_chart.xml
+++ b/app/src/main/res/menu/toolbar_comparison_chart.xml
@@ -4,7 +4,7 @@
 
 	<item
 		android:id="@+id/settings"
-		android:title="@string/services"
+		android:title="@string/settings"
 		android:icon="@drawable/ic_outline_settings"
 		app:showAsAction="always" />
 
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 8f40f484..e19b5906 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,6 +1,11 @@
 <resources>
 	<string name="app_name">Poker Analytics</string>
 
+	<string name="street_preflop">Preflop</string>
+	<string name="street_flop">Flop</string>
+	<string name="street_turn">Turn</string>
+	<string name="street_river">River</string>
+
 	<string name="_ago">vor %s</string>
 	<string name="_doesn_t_have_access_to_your_contacts_alert_message">%s hat keinen Zugriff auf Ihre Kontakte und kann den Namen Ihrer existierenden Freunde nicht abrufen. Sie können über die iPhone-Einstellungen Zugriff gewähren, um \'unbekannter Benutzer\' als Namen zu vermeiden.</string>
 	<string name="_indicates_that_the_file_is_on_your_icloud_account_">Ein Stern kennzeichnet eine Datei, die in Ihrem iCloud-Konto gespeichert ist.</string>
@@ -424,7 +429,7 @@
 	<string name="semi_finals">Halbfinale</string>
 	<string name="serie_duplicate_confirmation_request">Möchten Sie diese Sitzung wirklich duplizieren?</string>
 	<string name="serie_summary">Serienzusammenfassung</string>
-	<string name="services">Einstellungen</string>
+	<string name="settings">Einstellungen</string>
 	<string name="session">Sitzung</string>
 	<string name="session_duration">Sitzungsdauer</string>
 	<string name="session_won_amount_have_not_been_set_here_is_the_value_used_for_parsing_">Der Sitzung gewonnen-Betrag ist nicht eingestellt! Der für das Parsing verwendete Wert ist: %s</string>
@@ -693,5 +698,15 @@
 	<string name="join_discord">Join us on Discord!</string>
     <string name="discord_feed_message">We\'ve opened our Discord channel! Come to hang out, talk about poker or about the app!</string>
     <string name="good_for_you">Good for you!</string>
+	<string name="posts_sb">post</string>
+	<string name="post_bb">post</string>
+	<string name="fold">fold</string>
+	<string name="straddle">straddle</string>
+	<string name="check">check</string>
+	<string name="call">check</string>
+	<string name="bet">bet</string>
+	<string name="raise">raise</string>
+	<string name="allin">allin</string>
+
 
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 6d2113b0..50d6744a 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1,6 +1,11 @@
 <resources>
 	<string name="app_name">Poker Analytics</string>
 
+	<string name="street_preflop">Preflop</string>
+	<string name="street_flop">Flop</string>
+	<string name="street_turn">Turn</string>
+	<string name="street_river">River</string>
+
 	<string name="_ago">hace %s </string>
 	<string name="_doesn_t_have_access_to_your_contacts_alert_message">%s no tiene acceso a tus contactos y no puede encontrar el nombre de tus amigos existentes. Puedes otorgar acceso a través de las preferencias del iPhone para evitar nombres de \'usuario desconocido\'.</string>
 	<string name="_indicates_that_the_file_is_on_your_icloud_account_">Una estrella significa un archivo guardado en tu cuenta iCloud.</string>
@@ -425,7 +430,7 @@
 	<string name="semi_finals">Semifinal</string>
 	<string name="serie_duplicate_confirmation_request">¿Deseas verdaderamente copiar esta sesión?</string>
 	<string name="serie_summary">Resumen de series</string>
-	<string name="services">Ajustes</string>
+	<string name="settings">Ajustes</string>
 	<string name="session">Sesión</string>
 	<string name="session_duration">Duración de la sesión</string>
 	<string name="session_won_amount_have_not_been_set_here_is_the_value_used_for_parsing_">No se estableció el Importe ganado en la sesión. Este es el valor utilizado para el análisis: %s</string>
@@ -694,5 +699,15 @@
 	<string name="join_discord">Join us on Discord!</string>
     <string name="discord_feed_message">We\'ve opened our Discord channel! Come to hang out, talk about poker or about the app!</string>
     <string name="good_for_you">Good for you!</string>
+	<string name="posts_sb">post</string>
+	<string name="post_bb">post</string>
+	<string name="fold">fold</string>
+	<string name="straddle">straddle</string>
+	<string name="check">check</string>
+	<string name="call">check</string>
+	<string name="bet">bet</string>
+	<string name="raise">raise</string>
+	<string name="allin">allin</string>
+
 
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 5eb8300e..6ab3869b 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1,6 +1,11 @@
 <resources>
 	<string name="app_name">Poker Analytics</string>
 
+	<string name="street_preflop">Preflop</string>
+	<string name="street_flop">Flop</string>
+	<string name="street_turn">Turn</string>
+	<string name="street_river">River</string>
+
 	<string name="session_missing_start_date">Veuillez définir une date de démarrage pour la session</string>
 	<string name="hour">Heure</string>
 	<string name="minute">Minute</string>
@@ -27,7 +32,6 @@
 	<string name="loading_please_wait">Chargement, veuillez patienter&#8230;</string>
 	<string name="new_report_step_type">Choisissez un type de rapport</string>
 	<string name="new_report_step_stat">Choisissez une statistique, ou plusieurs</string>
-	<string name="new_report_step_comparator">Sélectionnez un critère de comparaison, ou plusieurs</string>
 	<string name="new_report_step_filter">Sélectionnez un filtre ou lancez maintenant le rapport</string>
 	<string name="launch_report">Afficher le rapport</string>
 	<string name="progress">Evolution</string>
@@ -38,6 +42,7 @@
 	<string name="custom_field">Champ perso</string>
 	<string name="transaction_relationship_error">L\'élement est utilisé dans une ou plusieurs transactions&#8230;Veuillez effacer les transactions en premier lieu</string>
 
+	<string name="new_report_step_comparator">Sélectionnez un critère de comparaison, ou plusieurs</string>
 	<string name="from_time">À partir de</string>
 	<string name="to_time">Jusqu\'à</string>
 	<string name="ordinal_suffix_first">ère</string>
@@ -503,7 +508,7 @@
 	<string name="semi_finals">Semi-finale</string>
 	<string name="serie_duplicate_confirmation_request">Voulez-vous vraiment dupliquer cette série ?</string>
 	<string name="serie_summary">Historique de sessions</string>
-	<string name="services">Réglages</string>
+	<string name="settings">Réglages</string>
 	<string name="session">Session</string>
 	<string name="session_duration">Durée de la session</string>
 	<string name="session_won_amount_have_not_been_set_here_is_the_value_used_for_parsing_">La somme gagnée n\'a pas été défini, voilà la valeur utilisée lors de l\'importation: %s</string>
@@ -762,5 +767,14 @@
 	<string name="join_discord">Join us on Discord!</string>
     <string name="discord_feed_message">We\'ve opened our Discord channel! Come to hang out, talk about poker or about the app!</string>
     <string name="good_for_you">Good for you!</string>
+	<string name="posts_sb">post</string>
+	<string name="post_bb">post</string>
+	<string name="fold">fold</string>
+	<string name="straddle">straddle</string>
+	<string name="check">check</string>
+	<string name="call">check</string>
+	<string name="bet">bet</string>
+	<string name="raise">raise</string>
+	<string name="allin">allin</string>
 
 </resources>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 61a16083..25d447e0 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -1,6 +1,11 @@
 <resources>
 	<string name="app_name">Poker Analytics</string>
 
+	<string name="street_preflop">Preflop</string>
+	<string name="street_flop">Flop</string>
+	<string name="street_turn">Turn</string>
+	<string name="street_river">River</string>
+
 	<string name="_ago">%s पहले</string>
 	<string name="_doesn_t_have_access_to_your_contacts_alert_message">%s की आपके संपर्कों तक पहुँच नहीं है और आपके मौजुदा दोस्तों के नामों को पुन: प्राप्त नहीं कर सकता है. किसी \'अज्ञात उपयोगकर्ता\' से बचाव के लिए आपको  iPhone प्राथमिकताएं द्वारा पहुँच प्रदान करनी होगी.</string>
 	<string name="_indicates_that_the_file_is_on_your_icloud_account_">एक सि‍तारा आपके iCloud अकाउंट में स्टोर की गई फाइल दर्शाता है.</string>
@@ -424,7 +429,7 @@
 	<string name="semi_finals">सेमी-फाइनल</string>
 	<string name="serie_duplicate_confirmation_request">क्या आप वाकई इस सत्र का प्रतिरूप बनाना चाहते हैं?</string>
 	<string name="serie_summary">सीरिज सारांश</string>
-	<string name="services">सेटिंग्स</string>
+	<string name="settings">सेटिंग्स</string>
 	<string name="session">सत्र</string>
 	<string name="session_duration">सत्र की अवधि</string>
 	<string name="session_won_amount_have_not_been_set_here_is_the_value_used_for_parsing_">सत्र की जी‍ती गई राशि सेट नहीं की गई है! पार्सिंग के लिए यहां मान है: %s</string>
@@ -693,5 +698,14 @@
 	<string name="join_discord">Join us on Discord!</string>
     <string name="discord_feed_message">We\'ve opened our Discord channel! Come to hang out, talk about poker or about the app!</string>
     <string name="good_for_you">Good for you!</string>
+	<string name="posts_sb">post</string>
+	<string name="post_bb">post</string>
+	<string name="fold">fold</string>
+	<string name="straddle">straddle</string>
+	<string name="check">check</string>
+	<string name="call">check</string>
+	<string name="bet">bet</string>
+	<string name="raise">raise</string>
+	<string name="allin">allin</string>
 
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 6f825284..e1a2650c 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1,6 +1,11 @@
 <resources>
 	<string name="app_name">Poker Analytics</string>
 
+	<string name="street_preflop">Preflop</string>
+	<string name="street_flop">Flop</string>
+	<string name="street_turn">Turn</string>
+	<string name="street_river">River</string>
+
 	<string name="_ago">%s fa</string>
 	<string name="_doesn_t_have_access_to_your_contacts_alert_message">%s non ha accesso ai tuoi contatti e non può recuperare il nome dei tuoi amici esistenti. Potresti consentire l\'accesso attraverso le preferenze di iPhone per evitare qualsiasi nome di \&quot;utente sconosciuto\&quot;.</string>
 	<string name="_indicates_that_the_file_is_on_your_icloud_account_">Una stella indica un file archiviato sul tuo account iCloud.</string>
@@ -424,7 +429,7 @@
 	<string name="semi_finals">Semifinale</string>
 	<string name="serie_duplicate_confirmation_request">Vuoi davvero duplicare questa sessione?</string>
 	<string name="serie_summary">Sommario serie</string>
-	<string name="services">Impostazioni</string>
+	<string name="settings">Impostazioni</string>
 	<string name="session">Sessione</string>
 	<string name="session_duration">Durata della sessione</string>
 	<string name="session_won_amount_have_not_been_set_here_is_the_value_used_for_parsing_">Il totale vinto della sessione non è stato impostato! Ecco il valore per questo parsing: %s</string>
@@ -693,5 +698,14 @@
 	<string name="join_discord">Join us on Discord!</string>
     <string name="discord_feed_message">We\'ve opened our Discord channel! Come to hang out, talk about poker or about the app!</string>
     <string name="good_for_you">Good for you!</string>
+	<string name="posts_sb">post</string>
+	<string name="post_bb">post</string>
+	<string name="fold">fold</string>
+	<string name="straddle">straddle</string>
+	<string name="check">check</string>
+	<string name="call">check</string>
+	<string name="bet">bet</string>
+	<string name="raise">raise</string>
+	<string name="allin">allin</string>
 
 </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 29693161..43e00b40 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -1,6 +1,11 @@
 <resources>
 	<string name="app_name">Poker Analytics</string>
 
+	<string name="street_preflop">Preflop</string>
+	<string name="street_flop">Flop</string>
+	<string name="street_turn">Turn</string>
+	<string name="street_river">River</string>
+
 	<string name="_ago">%s 前</string>
 	<string name="_doesn_t_have_access_to_your_contacts_alert_message">%s では、あなたの連絡先にアクセスできないため、既存のお友達の名前を取得できません。「不明なユーザー」名を回避するには、iPhone のユーザー設定からアクセス権限を付与してください。</string>
 	<string name="_indicates_that_the_file_is_on_your_icloud_account_">星マークは、iCloud アカウントにファイルが保管されていることを表します。</string>
@@ -424,7 +429,7 @@
 	<string name="semi_finals">セミファイナル</string>
 	<string name="serie_duplicate_confirmation_request">このセッションを本当に複製してもよろしいですか?</string>
 	<string name="serie_summary">シリーズ概要</string>
-	<string name="services">設定</string>
+	<string name="settings">設定</string>
 	<string name="session">セッション</string>
 	<string name="session_duration">セッション期間</string>
 	<string name="session_won_amount_have_not_been_set_here_is_the_value_used_for_parsing_">セッション勝利金額が設定されました!解析に使用された値: %s</string>
@@ -693,5 +698,14 @@
 	<string name="join_discord">Join us on Discord!</string>
     <string name="discord_feed_message">We\'ve opened our Discord channel! Come to hang out, talk about poker or about the app!</string>
     <string name="good_for_you">Good for you!</string>
+	<string name="posts_sb">post</string>
+	<string name="post_bb">post</string>
+	<string name="fold">fold</string>
+	<string name="straddle">straddle</string>
+	<string name="check">check</string>
+	<string name="call">check</string>
+	<string name="bet">bet</string>
+	<string name="raise">raise</string>
+	<string name="allin">allin</string>
 
 </resources>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 07ffef51..bede1f8c 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -1,6 +1,11 @@
 <resources>
 	<string name="app_name">Poker Analytics</string>
 
+	<string name="street_preflop">Preflop</string>
+	<string name="street_flop">Flop</string>
+	<string name="street_turn">Turn</string>
+	<string name="street_river">River</string>
+
 	<string name="_ago">%s atrás</string>
 	<string name="_doesn_t_have_access_to_your_contacts_alert_message">O %s não possui acesso à lista de contatos e não pode obter os nomes dos seus amigos. Você pode permitir o acesso nos ajustes dos iPhone para evitar exibir \'usuário desconhecido\' no lugar do nome.</string>
 	<string name="_indicates_that_the_file_is_on_your_icloud_account_">Um asterisco indica um arquivo armazenado na sua conta do iCloud.</string>
@@ -424,7 +429,7 @@
 	<string name="semi_finals">Semifinal</string>
 	<string name="serie_duplicate_confirmation_request">Realmente deseja duplicar essa sessão?</string>
 	<string name="serie_summary">Sumário da Série</string>
-	<string name="services">Ajustes</string>
+	<string name="settings">Ajustes</string>
 	<string name="session">Sessão</string>
 	<string name="session_duration">Duração da sessão</string>
 	<string name="session_won_amount_have_not_been_set_here_is_the_value_used_for_parsing_">A Sessão Quantia de Ganhos não foi definida! Aqui está o valor usado na análise: %s</string>
@@ -692,5 +697,14 @@
     <string name="poker_rumble">Poker Rumble</string>
     <string name="discord_feed_message">We\'ve opened our Discord channel! Come to hang out, talk about poker or about the app!</string>
     <string name="good_for_you">Good for you!</string>
+	<string name="posts_sb">post</string>
+	<string name="post_bb">post</string>
+	<string name="fold">fold</string>
+	<string name="straddle">straddle</string>
+	<string name="check">check</string>
+	<string name="call">check</string>
+	<string name="bet">bet</string>
+	<string name="raise">raise</string>
+	<string name="allin">allin</string>
 
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index d328257c..fa100226 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -1,6 +1,11 @@
 <resources>
 	<string name="app_name">Poker Analytics</string>
 
+	<string name="street_preflop">Preflop</string>
+	<string name="street_flop">Flop</string>
+	<string name="street_turn">Turn</string>
+	<string name="street_river">River</string>
+
 	<string name="_ago">%s назад</string>
 	<string name="_doesn_t_have_access_to_your_contacts_alert_message">%s не имеет доступа к адресной книге и не может определить имена выбранных вами друзей. Предоставьте доступ к контактам в настройках телефона чтобы исключить имена \'неизвестный пользователь\'</string>
 	<string name="_indicates_that_the_file_is_on_your_icloud_account_">Звёздочкой отмечены файлы сохранённые на вашем аккаунте iCloud.</string>
@@ -427,7 +432,7 @@
 	<string name="semi_finals">Полуфинал</string>
 	<string name="serie_duplicate_confirmation_request">Требуется подтверждение для дублирования сессии</string>
 	<string name="serie_summary">Итоги серии</string>
-	<string name="services">Настройки</string>
+	<string name="settings">Настройки</string>
 	<string name="session">Сессия</string>
 	<string name="session_duration">Продолжительность сессии</string>
 	<string name="session_won_amount_have_not_been_set_here_is_the_value_used_for_parsing_">Результат сессии не определён! Здесь значение используемое при обработке: %s</string>
@@ -694,5 +699,14 @@
 	<string name="join_discord">Join us on Discord!</string>
     <string name="discord_feed_message">We\'ve opened our Discord channel! Come to hang out, talk about poker or about the app!</string>
     <string name="good_for_you">Good for you!</string>
+	<string name="posts_sb">post</string>
+	<string name="post_bb">post</string>
+	<string name="fold">fold</string>
+	<string name="straddle">straddle</string>
+	<string name="check">check</string>
+	<string name="call">check</string>
+	<string name="bet">bet</string>
+	<string name="raise">raise</string>
+	<string name="allin">allin</string>
 
 </resources>
diff --git a/app/src/main/res/values-v24/strings.xml b/app/src/main/res/values-v24/strings.xml
index 2ec9f97f..4bf776ab 100644
--- a/app/src/main/res/values-v24/strings.xml
+++ b/app/src/main/res/values-v24/strings.xml
@@ -3,4 +3,10 @@
     <string name="poker_rumble">Poker Rumble</string>
     <string name="discord_feed_message">We\'ve opened our Discord channel! Come to hang out, talk about poker or about the app!</string>
     <string name="good_for_you">Good for you!</string>
+    <string name="posts_sb">posts</string>
+    <string name="post_bb">posts</string>
+    <string name="fold">fold</string>
+    <string name="straddle">straddle</string>
+    <string name="check">check</string>
+    <string name="call">check</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 54d7f266..8e263b0a 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -1,6 +1,10 @@
 <resources>
 	<string name="app_name">Poker Analytics</string>
 
+	<string name="street_preflop">Preflop</string>
+	<string name="street_flop">Flop</string>
+	<string name="street_turn">Turn</string>
+	<string name="street_river">River</string>
 
 	<string name="_ago">%s前</string>
 	<string name="_doesn_t_have_access_to_your_contacts_alert_message">%s不能访问你的联系人且不能检索你的现有好友姓名。通过iPhone首选项可授权防止任何\'陌生用户\'名访问。</string>
@@ -376,7 +380,7 @@
 	<string name="select_filters">选择筛选</string>
 	<string name="serie_duplicate_confirmation_request">你真要重复此进程？</string>
 	<string name="serie_summary">系列摘要</string>
-	<string name="services">设置</string>
+	<string name="settings">设置</string>
 	<string name="session">进程</string>
 	<string name="session_duration">进程时长</string>
 	<string name="session_won_amount_have_not_been_set_here_is_the_value_used_for_parsing_">未设置进程获胜数量！这是被用来分析的值：%s</string>
@@ -689,5 +693,14 @@
 	<string name="join_discord">Join us on Discord!</string>
     <string name="discord_feed_message">We\'ve opened our Discord channel! Come to hang out, talk about poker or about the app!</string>
     <string name="good_for_you">Good for you!</string>
+	<string name="posts_sb">post</string>
+	<string name="post_bb">post</string>
+	<string name="fold">fold</string>
+	<string name="straddle">straddle</string>
+	<string name="check">check</string>
+	<string name="call">check</string>
+	<string name="bet">bet</string>
+	<string name="raise">raise</string>
+	<string name="allin">allin</string>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 147236df..a75a33df 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,6 +1,11 @@
 <resources>
     <string name="app_name">Poker Analytics</string>
 
+    <string name="street_preflop">Preflop</string>
+    <string name="street_flop">Flop</string>
+    <string name="street_turn">Turn</string>
+    <string name="street_river">River</string>
+
     <!-- Not translated -->
     <string name="session_missing_start_date">Please set a start date for the session</string>
     <string name="hour">Hour</string>
@@ -500,7 +505,7 @@
     <string name="semi_finals">Semi-final</string>
     <string name="serie_duplicate_confirmation_request">Do you really want to duplicate this session?</string>
     <string name="serie_summary">Series Summary</string>
-    <string name="services">Settings</string>
+    <string name="settings">Settings</string>
     <string name="session">Session</string>
     <string name="session_duration">Session duration</string>
     <string name="session_won_amount_have_not_been_set_here_is_the_value_used_for_parsing_">Session Won Amount has not been set! Here is the value used for parsing: %s</string>
@@ -773,5 +778,14 @@
     <string name="join_discord">Join us on Discord!</string>
     <string name="discord_feed_message">We\'ve opened our Discord channel! Come to hang out, talk about poker or about the app!</string>
     <string name="good_for_you">Good for you!</string>
+    <string name="posts_sb">post</string>
+    <string name="post_bb">post</string>
+    <string name="fold">fold</string>
+    <string name="straddle">straddle</string>
+    <string name="check">check</string>
+    <string name="call">check</string>
+    <string name="bet">bet</string>
+    <string name="raise">raise</string>
+    <string name="allin">allin</string>
 
 </resources>