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 15b1c977..7519b212 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
@@ -511,6 +511,8 @@ class HandHistoryAdapter(
 				positionButton.text = playerCardView.position.value
 			}
 
+			configurePlayerImage(itemView.hps_player_image, position, row)
+
 			configureCardsLayout(itemView.handLayout, false)
 		}
 	}
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 31966a32..48ddee97 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
@@ -103,6 +103,10 @@ class ComputedAction(var manager: ActionManager,
 	 */
 	fun setAmount(amount: Double) {
 
+		if (amount <= 0) {
+			return
+		}
+
 		val minimumAmount = this.manager.minimumBetAmount(this.action.index)
 		val correctedAmount = max(minimumAmount, amount)
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/CardSuitAdapter.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/CardSuitAdapter.kt
index 05cfffd3..8be0851d 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/CardSuitAdapter.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/CardSuitAdapter.kt
@@ -26,7 +26,7 @@ class CardSuitAdapter(private var keyboardListener: KeyboardListener) :
 	private val suits = Card.Suit.displaySuits
 
 	override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-		val layout = LayoutInflater.from(parent.context).inflate(R.layout.row_cell, parent, false)
+		val layout = LayoutInflater.from(parent.context).inflate(R.layout.row_bottom_sheet_grid_title, parent, false)
 		return RowViewHolder(layout)
 	}
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/CardValueAdapter.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/CardValueAdapter.kt
index 85a15634..eed898b2 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/CardValueAdapter.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/CardValueAdapter.kt
@@ -24,7 +24,7 @@ class CardValueAdapter(var keyboardListener: KeyboardListener) :
 //	var centralizer: CardCentralizer? = null
 
 	override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-		val layout = LayoutInflater.from(parent.context).inflate(R.layout.row_cell, parent, false)
+		val layout = LayoutInflater.from(parent.context).inflate(R.layout.row_bottom_sheet_grid_title, parent, false)
 		return RowViewHolder(layout)
 	}
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardCardView.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardCardView.kt
index 840ad05e..b161bf38 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardCardView.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardCardView.kt
@@ -10,6 +10,8 @@ import kotlinx.android.synthetic.main.view_hand_keyboard_card.view.*
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.exceptions.PAIllegalStateException
 import net.pokeranalytics.android.model.realm.handhistory.Card
+import net.pokeranalytics.android.ui.extensions.px
+import net.pokeranalytics.android.ui.view.GridSpacingItemDecoration
 
 interface CardCentralizer {
 	fun isValueAvailable(value: Card.Value): Boolean
@@ -52,20 +54,27 @@ class KeyboardCardView(context: Context) : AbstractKeyboardView(context) {
 			this.cardSuitAdapter = CardSuitAdapter(it)
 		} ?: throw PAIllegalStateException("keyboard listener not set")
 
-		val cardValueViewManager = GridLayoutManager(this.context, 7)
+		val spacing = 2.px
+		val includeEdge = false
+
+		val cardSpans = 7
+		val cardValueViewManager = GridLayoutManager(this.context, cardSpans)
 		this.valueRecyclerView.apply {
 			setHasFixedSize(true)
 			layoutManager = cardValueViewManager
 			adapter = cardValueAdapter
-//			addItemDecoration(GridSpacingItemDecoration(spanCount, spacing, includeEdge))
+			addItemDecoration(GridSpacingItemDecoration(cardSpans, spacing, includeEdge))
+			this.isNestedScrollingEnabled = false
 		}
 
-		val cardSuitViewManager = LinearLayoutManager(context, RecyclerView.HORIZONTAL, false)
+		val suitSpans = 5
+		val cardSuitViewManager = GridLayoutManager(this.context, suitSpans)
 		this.suitRecyclerView.apply {
 			setHasFixedSize(true)
 			layoutManager = cardSuitViewManager
 			adapter = cardSuitAdapter
-//			addItemDecoration(GridSpacingItemDecoration(spanCount, spacing, includeEdge))
+			addItemDecoration(GridSpacingItemDecoration(suitSpans, spacing, includeEdge))
+			this.isNestedScrollingEnabled = false
 		}
 
 	}
diff --git a/app/src/main/res/layout/row_hand_cards.xml b/app/src/main/res/layout/row_hand_cards.xml
index 54ee9aaf..3613dbc8 100644
--- a/app/src/main/res/layout/row_hand_cards.xml
+++ b/app/src/main/res/layout/row_hand_cards.xml
@@ -4,7 +4,7 @@
     android:layout_width="144dp"
     android:layout_height="50dp"
     android:background="@drawable/rounded_board_background"
-    android:layout_marginStart="16dp"
+    android:layout_marginStart="8dp"
     android:paddingStart="4dp"
     android:paddingEnd="0dp"
     android:gravity="center_vertical"
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 8c1c2c22..bcb51488 100644
--- a/app/src/main/res/layout/row_hand_player_summary.xml
+++ b/app/src/main/res/layout/row_hand_player_summary.xml
@@ -4,12 +4,12 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/player_button"
-        style="@style/PokerAnalyticsTheme.HHButton"
-        android:layout_width="44dp"
-        android:layout_height="44dp"
-        android:layout_marginStart="8dp"/>
+    <net.pokeranalytics.android.ui.view.PlayerImageView
+        android:id="@+id/hps_player_image"
+        android:layout_marginStart="8dp"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:background="@android:color/transparent" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/positionButton"
@@ -25,10 +25,10 @@
         android:layout_height="50dp"
         android:layout_weight="1"
         android:background="@drawable/rounded_board_background"
-        android:layout_marginStart="16dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
         android:paddingStart="4dp"
-        android:paddingEnd="0dp"
-        android:gravity="center"/>
+        android:paddingEnd="0dp" />
 
 <!--    <androidx.appcompat.widget.AppCompatEditText-->
 <!--        android:id="@+id/cardsEditText"-->
diff --git a/app/src/main/res/layout/row_hhsettings_player_setup.xml b/app/src/main/res/layout/row_hhsettings_player_setup.xml
index ea61a34c..f6dcf6c1 100644
--- a/app/src/main/res/layout/row_hhsettings_player_setup.xml
+++ b/app/src/main/res/layout/row_hhsettings_player_setup.xml
@@ -4,14 +4,6 @@
     android:layout_height="wrap_content"
     android:orientation="horizontal">
 
-    <!--    <androidx.appcompat.widget.AppCompatTextView-->
-    <!--        android:id="@+id/title"-->
-    <!--        style="@style/PokerAnalyticsTheme.TextView.RowTitle"-->
-    <!--        android:layout_width="match_parent"-->
-    <!--        android:layout_height="wrap_content"-->
-    <!--        android:layout_marginTop="8dp"-->
-    <!--        android:layout_marginStart="8dp" />-->
-
     <net.pokeranalytics.android.ui.view.PlayerImageView
         android:id="@+id/player_image"
         android:layout_width="48dp"
diff --git a/app/src/main/res/layout/view_hand_keyboard_card.xml b/app/src/main/res/layout/view_hand_keyboard_card.xml
index f5049d0e..8459d8ba 100644
--- a/app/src/main/res/layout/view_hand_keyboard_card.xml
+++ b/app/src/main/res/layout/view_hand_keyboard_card.xml
@@ -9,6 +9,8 @@
         android:orientation="horizontal"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent">
@@ -17,10 +19,9 @@
             android:id="@+id/closeButton"
             style="@style/PokerAnalyticsTheme.Button"
             app:icon="@drawable/ic_close"
+            android:gravity="center"
             android:layout_width="44dp"
-            android:layout_height="44dp"
-            android:layout_weight="1"
-            android:layout_marginStart="8dp"/>
+            android:layout_height="44dp" />
 
         <Space
             android:layout_width="wrap_content"
@@ -55,7 +56,8 @@
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/valueRecyclerView"
         android:layout_width="match_parent"
-        android:layout_height="100dp"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="10dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toTopOf="@id/suitRecyclerView"
@@ -64,10 +66,12 @@
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/suitRecyclerView"
         android:layout_width="match_parent"
-        android:layout_height="50dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="50dp"
+        android:layout_marginEnd="50dp"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/backSpaceButton"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/backSpaceButton"
         />
 
     <com.google.android.material.button.MaterialButton
@@ -76,6 +80,8 @@
         android:text="@string/backspace"
         android:layout_width="50dp"
         android:layout_height="50dp"
+        android:layout_marginEnd="8dp"
+        android:textSize="20sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         />