diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt
index af8e4b90..e16ab1b6 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt
@@ -10,12 +10,11 @@ import kotlinx.android.synthetic.main.bottom_sheet_double_edit_text.*
 import kotlinx.android.synthetic.main.fragment_bottom_sheet.view.*
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.exceptions.RowRepresentableEditDescriptorException
-import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.rowrepresentable.SessionRow
 import net.pokeranalytics.android.util.extensions.round
 
 
-class BottomSheetDoubleEditTextFragment(row: RowRepresentable) : BottomSheetFragment(row) {
+class BottomSheetDoubleEditTextFragment : BottomSheetFragment() {
 
 	private val values = ArrayList<String>()
 	private var isEditingBlinds: Boolean = false
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextFragment.kt
index c45674cc..2581a9ac 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextFragment.kt
@@ -13,7 +13,7 @@ import net.pokeranalytics.android.exceptions.RowRepresentableEditDescriptorExcep
 import net.pokeranalytics.android.ui.view.RowRepresentable
 
 
-class BottomSheetEditTextFragment(row: RowRepresentable) : BottomSheetFragment(row) {
+class BottomSheetEditTextFragment : BottomSheetFragment() {
 
 	private var value: String? = null
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextMultiLinesFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextMultiLinesFragment.kt
index b325c18d..22f450be 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextMultiLinesFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextMultiLinesFragment.kt
@@ -8,10 +8,9 @@ import androidx.core.widget.addTextChangedListener
 import kotlinx.android.synthetic.main.bottom_sheet_edit_text_multi_lines.*
 import kotlinx.android.synthetic.main.fragment_bottom_sheet.view.*
 import net.pokeranalytics.android.exceptions.RowRepresentableEditDescriptorException
-import net.pokeranalytics.android.ui.view.RowRepresentable
 
 
-class BottomSheetEditTextMultiLinesFragment(row: RowRepresentable) : BottomSheetFragment(row) {
+class BottomSheetEditTextMultiLinesFragment : BottomSheetFragment() {
 
 	private var value: String? = null
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt
index 57ac596f..debea4b7 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt
@@ -26,9 +26,10 @@ import net.pokeranalytics.android.ui.view.rowrepresentable.SessionRow
 import net.pokeranalytics.android.ui.view.rowrepresentable.TransactionRow
 import java.util.*
 
-open class BottomSheetFragment(val row: RowRepresentable) : BottomSheetDialogFragment() {
+open class BottomSheetFragment : BottomSheetDialogFragment() {
+
+	lateinit var row: RowRepresentable
 
-//	lateinit var row: RowRepresentable
 	lateinit var delegate: RowRepresentableDelegate
 	var currentCurrency: Currency? = null
 	var valueHasPlaceholder: Boolean = false
@@ -51,9 +52,9 @@ open class BottomSheetFragment(val row: RowRepresentable) : BottomSheetDialogFra
 			isDeletable: Boolean? = false,
 			valueHasPlaceholder: Boolean? = null
 		): BottomSheetFragment {
-			val bottomSheetFragment = row.bottomSheetType.newInstance(row)
+			val bottomSheetFragment = row.bottomSheetType.newInstance()
 			bottomSheetFragment.show(fragmentManager, "bottomSheet")
-//			bottomSheetFragment.row = row
+			bottomSheetFragment.row = row
 			bottomSheetFragment.delegate = delegate
 			bottomSheetFragment.rowRepresentableEditDescriptors = rowRepresentableEditDescriptors
 			bottomSheetFragment.isClearable = isClearable ?: true
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListFragment.kt
index 30fd0b76..fa5997f7 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListFragment.kt
@@ -16,7 +16,7 @@ import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowViewType
 
-open class BottomSheetListFragment(row: RowRepresentable) : BottomSheetFragment(row), LiveRowRepresentableDataSource, RowRepresentableDelegate {
+open class BottomSheetListFragment : BottomSheetFragment(), LiveRowRepresentableDataSource, RowRepresentableDelegate {
 
 	lateinit var dataAdapter: RowRepresentableAdapter
 	var realmData: RealmResults<RowRepresentable>? = null
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListGameFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListGameFragment.kt
index edcfdc9b..9c3b7ca8 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListGameFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListGameFragment.kt
@@ -19,7 +19,7 @@ import net.pokeranalytics.android.ui.view.RowRepresentable
  * Bottom Sheet List Game Fragment
  * Display a list of game + chips to choose the game limit
  */
-class BottomSheetListGameFragment(row: RowRepresentable) : BottomSheetListFragment(row) {
+class BottomSheetListGameFragment : BottomSheetListFragment() {
 
 	private var limit: Int? = 0
 	private val values = ArrayList<Any?>()
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetMultiSelectionFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetMultiSelectionFragment.kt
index a07c8ce5..7bbe3c9e 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetMultiSelectionFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetMultiSelectionFragment.kt
@@ -14,7 +14,7 @@ import net.pokeranalytics.android.ui.view.RowViewType
 /**
  * Manage multiple items selection in a bottom sheet list
  */
-open class BottomSheetMultiSelectionFragment(row: RowRepresentable) : BottomSheetListFragment(row) {
+open class BottomSheetMultiSelectionFragment : BottomSheetListFragment() {
 
 	private val selectedRows: ArrayList<RowRepresentable> = ArrayList()
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetNumericTextFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetNumericTextFragment.kt
index 8d2f87a9..610e701c 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetNumericTextFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetNumericTextFragment.kt
@@ -10,11 +10,10 @@ import kotlinx.android.synthetic.main.bottom_sheet_edit_text.*
 import kotlinx.android.synthetic.main.fragment_bottom_sheet.view.*
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.exceptions.RowRepresentableEditDescriptorException
-import net.pokeranalytics.android.ui.view.RowRepresentable
 import java.text.NumberFormat
 
 
-class BottomSheetNumericTextFragment(row: RowRepresentable) : BottomSheetFragment(row) {
+class BottomSheetNumericTextFragment : BottomSheetFragment() {
 
 	private var value: Double? = null
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetStaticListFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetStaticListFragment.kt
index 86544ec5..7af3f1da 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetStaticListFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetStaticListFragment.kt
@@ -13,7 +13,7 @@ import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
 import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource
 import net.pokeranalytics.android.ui.view.RowRepresentable
 
-class BottomSheetStaticListFragment(row: RowRepresentable) : BottomSheetFragment(row), StaticRowRepresentableDataSource,
+class BottomSheetStaticListFragment : BottomSheetFragment(), StaticRowRepresentableDataSource,
     RowRepresentableDelegate {
 
 	private var staticRows: List<RowRepresentable> = emptyList()
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetSumFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetSumFragment.kt
index eb2f6e6a..8f96c818 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetSumFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetSumFragment.kt
@@ -10,13 +10,12 @@ import kotlinx.android.synthetic.main.bottom_sheet_sum.*
 import kotlinx.android.synthetic.main.fragment_bottom_sheet.view.*
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.exceptions.RowRepresentableEditDescriptorException
-import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.util.extensions.round
 import net.pokeranalytics.android.util.extensions.toCurrency
 import java.text.NumberFormat
 
 
-class BottomSheetSumFragment(row: RowRepresentable) : BottomSheetFragment(row) {
+class BottomSheetSumFragment : BottomSheetFragment() {
 
 	private var value = 0.0
 	private var currentDefaultValue = 0.0
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetTableSizeGridFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetTableSizeGridFragment.kt
index 3614e6f2..c9f3bbba 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetTableSizeGridFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetTableSizeGridFragment.kt
@@ -15,7 +15,7 @@ import net.pokeranalytics.android.ui.extensions.px
 import net.pokeranalytics.android.ui.view.GridSpacingItemDecoration
 import net.pokeranalytics.android.ui.view.RowRepresentable
 
-class BottomSheetTableSizeGridFragment(row: RowRepresentable) : BottomSheetFragment(row), StaticRowRepresentableDataSource, RowRepresentableDelegate {
+class BottomSheetTableSizeGridFragment : BottomSheetFragment(), StaticRowRepresentableDataSource, RowRepresentableDelegate {
 
 	private lateinit var dataAdapter: RowRepresentableAdapter
 	private var defaultSize: Int? = null
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetType.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetType.kt
index a8d52486..447453b0 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetType.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetType.kt
@@ -1,7 +1,5 @@
 package net.pokeranalytics.android.ui.fragment.components.bottomsheet
 
-import net.pokeranalytics.android.ui.view.RowRepresentable
-
 enum class BottomSheetType {
 	NONE,
 	LIST,
@@ -16,20 +14,20 @@ enum class BottomSheetType {
 	NUMERIC_TEXT,
 	SUM;
 
-	fun newInstance(row: RowRepresentable): BottomSheetFragment {
+	fun newInstance(): BottomSheetFragment {
 		return when (this) {
-			NONE -> BottomSheetFragment(row)
-			LIST -> BottomSheetListFragment(row)
-			LIST_STATIC -> BottomSheetStaticListFragment(row)
-			LIST_GAME -> BottomSheetListGameFragment(row)
-			DOUBLE_LIST -> BottomSheetListGameFragment(row)
-			MULTI_SELECTION -> BottomSheetMultiSelectionFragment(row)
-			GRID -> BottomSheetTableSizeGridFragment(row)
-			EDIT_TEXT -> BottomSheetEditTextFragment(row)
-			EDIT_TEXT_MULTI_LINES -> BottomSheetEditTextMultiLinesFragment(row)
-			DOUBLE_EDIT_TEXT -> BottomSheetDoubleEditTextFragment(row)
-			NUMERIC_TEXT -> BottomSheetNumericTextFragment(row)
-			SUM -> BottomSheetSumFragment(row)
+			NONE -> BottomSheetFragment()
+			LIST -> BottomSheetListFragment()
+			LIST_STATIC -> BottomSheetStaticListFragment()
+			LIST_GAME -> BottomSheetListGameFragment()
+			DOUBLE_LIST -> BottomSheetListGameFragment()
+			MULTI_SELECTION -> BottomSheetMultiSelectionFragment()
+			GRID -> BottomSheetTableSizeGridFragment()
+			EDIT_TEXT -> BottomSheetEditTextFragment()
+			EDIT_TEXT_MULTI_LINES -> BottomSheetEditTextMultiLinesFragment()
+			DOUBLE_EDIT_TEXT -> BottomSheetDoubleEditTextFragment()
+			NUMERIC_TEXT -> BottomSheetNumericTextFragment()
+			SUM -> BottomSheetSumFragment()
 		}
 	}
 
diff --git a/app/standard/release/output.json b/app/standard/release/output.json
new file mode 100644
index 00000000..120ab2ec
--- /dev/null
+++ b/app/standard/release/output.json
@@ -0,0 +1 @@
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":60,"versionName":"2.2.3","enabled":true,"outputFile":"PokerAnalytics_2.2.3(60)_190902_1057_release.apk","fullName":"standardRelease","baseName":"standard-release"},"path":"PokerAnalytics_2.2.3(60)_190902_1057_release.apk","properties":{}}]
\ No newline at end of file