diff --git a/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt b/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt
index 84d9fcd9..2a6b4e44 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt
@@ -15,7 +15,7 @@ import net.pokeranalytics.android.model.TournamentType
 import net.pokeranalytics.android.model.interfaces.Identifiable
 import net.pokeranalytics.android.model.interfaces.NameManageable
 import net.pokeranalytics.android.model.realm.*
-import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetType
+import net.pokeranalytics.android.ui.fragment.components.input.InputFragmentType
 import net.pokeranalytics.android.ui.view.RowViewType
 import net.pokeranalytics.android.ui.view.rowrepresentable.FilterElementRow
 import net.pokeranalytics.android.ui.view.rowrepresentable.FilterSectionRow
@@ -593,7 +593,7 @@ sealed class QueryCondition : FilterElementRow {
 			}
 
 		override val viewType: Int = RowViewType.TITLE_VALUE_CHECK.ordinal
-		override val bottomSheetType: BottomSheetType = BottomSheetType.DOUBLE_EDIT_TEXT
+        override val inputFragmentType: InputFragmentType = InputFragmentType.DOUBLE_EDIT_TEXT
 
 		override fun labelForValue(value: Int, context: Context): String {
 			return value.toMinutes(context)
@@ -952,15 +952,15 @@ sealed class QueryCondition : FilterElementRow {
 			}
 		}
 
-	override val bottomSheetType: BottomSheetType
+	override val inputFragmentType: InputFragmentType
 		get() {
 			return when (this) {
-				is PastDay -> BottomSheetType.EDIT_TEXT
+				is PastDay -> InputFragmentType.EDIT_TEXT
 				else -> {
 					when (this.operator) {
-						Operator.MORE -> BottomSheetType.EDIT_TEXT
-						Operator.LESS -> BottomSheetType.EDIT_TEXT
-						else -> BottomSheetType.NONE
+						Operator.MORE -> InputFragmentType.EDIT_TEXT
+						Operator.LESS -> InputFragmentType.EDIT_TEXT
+						else -> InputFragmentType.NONE
 					}
 				}
 			}
diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/CustomField.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/CustomField.kt
index b3b04e58..bd98946d 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/CustomField.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/CustomField.kt
@@ -17,8 +17,8 @@ import net.pokeranalytics.android.model.interfaces.NameManageable
 import net.pokeranalytics.android.model.interfaces.SaveValidityStatus
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
 import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource
-import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetFragment
-import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetType
+import net.pokeranalytics.android.ui.fragment.components.input.InputFragment
+import net.pokeranalytics.android.ui.fragment.components.input.InputFragmentType
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowEditableDataSource
 import net.pokeranalytics.android.ui.view.RowViewType
@@ -138,7 +138,7 @@ open class CustomField : RealmObject(), NameManageable, StaticRowRepresentableDa
             Type.LIST.uniqueIdentifier -> data.append(dataSource.customFieldEntries.find { it.customField?.id == id }?.value, staticData = entries)
             else -> data.append(dataSource.customFieldEntries.find { it.customField?.id == dataSource.id }?.numericValue, inputType = InputType.TYPE_CLASS_NUMBER or InputType.TYPE_NUMBER_FLAG_DECIMAL or InputType.TYPE_NUMBER_FLAG_SIGNED)
         }
-        BottomSheetFragment.create(this, parent, data)
+        InputFragment.buildAndShow(this, parent, data)
     }
 
 	override fun updateValue(value: Any?, row: RowRepresentable) {
@@ -177,11 +177,11 @@ open class CustomField : RealmObject(), NameManageable, StaticRowRepresentableDa
 		return R.string.cf_entry_delete_popup_message
 	}
 
-	override val bottomSheetType: BottomSheetType
+	override val inputFragmentType: InputFragmentType
 		get() {
 			return when (type) {
-				Type.LIST.uniqueIdentifier -> BottomSheetType.LIST_STATIC
-				else -> BottomSheetType.NUMERIC_TEXT
+				Type.LIST.uniqueIdentifier -> InputFragmentType.LIST_STATIC
+				else -> InputFragmentType.NUMERIC_TEXT
 			}
 		}
 
diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/CustomFieldEntry.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/CustomFieldEntry.kt
index 20990e60..0af6c81b 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/CustomFieldEntry.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/CustomFieldEntry.kt
@@ -17,8 +17,8 @@ import net.pokeranalytics.android.model.interfaces.Identifiable
 import net.pokeranalytics.android.model.interfaces.NameManageable
 import net.pokeranalytics.android.model.interfaces.SaveValidityStatus
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
-import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetFragment
-import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetType
+import net.pokeranalytics.android.ui.fragment.components.input.InputFragment
+import net.pokeranalytics.android.ui.fragment.components.input.InputFragmentType
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowEditableDataSource
 import net.pokeranalytics.android.ui.view.RowViewType
@@ -84,7 +84,7 @@ open class CustomFieldEntry : RealmObject(), NameManageable, RowRepresentable {
 		}
 
 	@Ignore
-	override val bottomSheetType: BottomSheetType = BottomSheetType.EDIT_TEXT
+    override val inputFragmentType: InputFragmentType = InputFragmentType.EDIT_TEXT
 
 	override fun localizedTitle(context: Context): String {
 		return context.getString(R.string.value)
@@ -99,7 +99,7 @@ open class CustomFieldEntry : RealmObject(), NameManageable, RowRepresentable {
         if (parent !is RowRepresentableDelegate) return
         val data = RowEditableDataSource()
         data.append(this.value, R.string.value, InputType.TYPE_CLASS_TEXT)
-        BottomSheetFragment.create(this, parent, data, isDeletable = true)
+        InputFragment.buildAndShow(this, parent, data, isDeletable = true)
     }
 
     override val valueCanBeClearedWhenEditing: Boolean
diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Filter.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Filter.kt
index 5d54f02e..f6e6e4c2 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/Filter.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Filter.kt
@@ -12,8 +12,8 @@ import net.pokeranalytics.android.model.filter.Query
 import net.pokeranalytics.android.model.filter.QueryCondition
 import net.pokeranalytics.android.model.interfaces.*
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
-import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetFragment
-import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetType
+import net.pokeranalytics.android.ui.fragment.components.input.InputFragment
+import net.pokeranalytics.android.ui.fragment.components.input.InputFragmentType
 import net.pokeranalytics.android.ui.interfaces.FilterableType
 import net.pokeranalytics.android.ui.view.*
 import net.pokeranalytics.android.ui.view.rowrepresentable.FilterCategoryRow
@@ -193,9 +193,9 @@ open class Filter : RealmObject(), RowRepresentable, Editable, Deletable, Counta
 		return R.string.relationship_error
 	}
 
-	override val bottomSheetType: BottomSheetType
+    override val inputFragmentType: InputFragmentType
 		get() {
-			return BottomSheetType.EDIT_TEXT
+			return InputFragmentType.EDIT_TEXT
 		}
 
 	override fun localizedTitle(context: Context): String {
@@ -216,6 +216,6 @@ open class Filter : RealmObject(), RowRepresentable, Editable, Deletable, Counta
         if (parent !is RowRepresentableDelegate) return
         val data = RowEditableDataSource()
         data.append(this.name)
-        BottomSheetFragment.create(this, parent, data, isDeletable = true, valueHasPlaceholder = false)
+        InputFragment.buildAndShow(this, parent, data, isDeletable = true, valueHasPlaceholder = false)
     }
 }
diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/TimeFrame.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/TimeFrame.kt
index f9fe2236..2e173268 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/TimeFrame.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/TimeFrame.kt
@@ -233,7 +233,7 @@
 //
 //    /**
 //     * Multiple session sets update:
-//     * Merges all sets into one (delete all then create a new one)
+//     * Merges all sets into one (delete all then buildAndShow a new one)
 //     */
 //    private fun mergeSessionGroups(owner: Session, sessionSets: RealmResults<SessionSet>) {
 //
diff --git a/app/src/main/java/net/pokeranalytics/android/model/utils/SessionSetManager.kt b/app/src/main/java/net/pokeranalytics/android/model/utils/SessionSetManager.kt
index 8efe64ff..31e3b8c0 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/utils/SessionSetManager.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/utils/SessionSetManager.kt
@@ -97,7 +97,7 @@ class SessionSetManager {
 
 		/**
 		 * Multiple session sets update:
-		 * Merges all sets into one (delete all then create a new one)
+		 * Merges all sets into one (delete all then buildAndShow a new one)
 		 */
 		private fun mergeSessionGroups(session: Session, sessionSets: RealmResults<SessionSet>) {
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/FilterDetailsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/FilterDetailsFragment.kt
index 14102d11..289a8c91 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/FilterDetailsFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/FilterDetailsFragment.kt
@@ -18,8 +18,6 @@ import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
 import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource
 import net.pokeranalytics.android.ui.fragment.components.RealmFragment
-import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetFragment
-import net.pokeranalytics.android.ui.helpers.DateTimePickerManager
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowViewType
 import net.pokeranalytics.android.ui.view.rowrepresentable.FilterCategoryRow
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt
index 1c3699e6..c159efe1 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt
@@ -80,7 +80,7 @@ class SessionFragment : RealmFragment(), RowRepresentableDelegate {
 			} else {
 				throw PAIllegalStateException("Session cannot be null here, session id = $sessionId")
 			}
-		} else { // create new session
+		} else { // buildAndShow new session
             realm.executeTransaction { executeRealm ->
                 currentSession = Session.newInstance(executeRealm, isTournament)
                 FavoriteSessionFinder.copyParametersFromFavoriteSession(currentSession, null, requireContext())
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/DeletableItemFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/DeletableItemFragment.kt
index 9136dac1..5a7de0f4 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/DeletableItemFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/DeletableItemFragment.kt
@@ -78,7 +78,7 @@ abstract class DeletableItemFragment : RealmFragment() {
 
 		this.dataListAdapter = dataListAdapter
 
-		// Save the delete position & create a copy of the object
+		// Save the delete position & buildAndShow a copy of the object
 		val itemPosition = items.indexOfFirst { it.id == itemId }
 		val itemToDelete = items.find { it.id == itemId }
 
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
deleted file mode 100644
index a8d52486..00000000
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetType.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-package net.pokeranalytics.android.ui.fragment.components.bottomsheet
-
-import net.pokeranalytics.android.ui.view.RowRepresentable
-
-enum class BottomSheetType {
-	NONE,
-	LIST,
-	LIST_STATIC,
-	LIST_GAME,
-	DOUBLE_LIST,
-	MULTI_SELECTION,
-	GRID,
-	EDIT_TEXT,
-	EDIT_TEXT_MULTI_LINES,
-	DOUBLE_EDIT_TEXT,
-	NUMERIC_TEXT,
-	SUM;
-
-	fun newInstance(row: RowRepresentable): 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)
-		}
-	}
-
-	val validationRequired: Boolean
-		get() = when (this) {
-			LIST, LIST_GAME, LIST_STATIC, GRID, DOUBLE_LIST -> false
-			else -> true
-		}
-
-	val clearRequired: Boolean
-		get() = true
-
-	val addRequired: Boolean
-		get() = when (this) {
-			EDIT_TEXT, NUMERIC_TEXT, DOUBLE_EDIT_TEXT, EDIT_TEXT_MULTI_LINES, GRID, LIST_STATIC, SUM -> false
-			else -> true
-		}
-}
\ No newline at end of file
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/input/InputDoubleEditTextFragment.kt
similarity index 94%
rename from app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/fragment/components/input/InputDoubleEditTextFragment.kt
index 08016579..cbf8b0f0 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/input/InputDoubleEditTextFragment.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.fragment.components.bottomsheet
+package net.pokeranalytics.android.ui.fragment.components.input
 
 import android.os.Bundle
 import android.text.InputType
@@ -15,7 +15,7 @@ import net.pokeranalytics.android.ui.view.rowrepresentable.SessionRow
 import net.pokeranalytics.android.util.extensions.round
 
 
-class BottomSheetDoubleEditTextFragment(row: RowRepresentable) : BottomSheetFragment(row) {
+class InputDoubleEditTextFragment(row: RowRepresentable) : InputFragment(row) {
 
 	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/input/InputEditTextFragment.kt
similarity index 92%
rename from app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextFragment.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/fragment/components/input/InputEditTextFragment.kt
index 9bb082e4..68f32b3f 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/input/InputEditTextFragment.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.fragment.components.bottomsheet
+package net.pokeranalytics.android.ui.fragment.components.input
 
 import android.os.Bundle
 import android.text.InputType
@@ -13,7 +13,7 @@ import net.pokeranalytics.android.exceptions.RowRepresentableEditDescriptorExcep
 import net.pokeranalytics.android.ui.view.RowRepresentable
 
 
-class BottomSheetEditTextFragment(row: RowRepresentable) : BottomSheetFragment(row) {
+class InputEditTextFragment(row: RowRepresentable) : InputFragment(row) {
 
 	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/input/InputEditTextMultiLinesFragment.kt
similarity index 90%
rename from app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextMultiLinesFragment.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/fragment/components/input/InputEditTextMultiLinesFragment.kt
index 82808f8b..30b1a32a 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/input/InputEditTextMultiLinesFragment.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.fragment.components.bottomsheet
+package net.pokeranalytics.android.ui.fragment.components.input
 
 import android.os.Bundle
 import android.text.InputType
@@ -11,7 +11,7 @@ import net.pokeranalytics.android.exceptions.RowRepresentableEditDescriptorExcep
 import net.pokeranalytics.android.ui.view.RowRepresentable
 
 
-class BottomSheetEditTextMultiLinesFragment(row: RowRepresentable) : BottomSheetFragment(row) {
+class InputEditTextMultiLinesFragment(row: RowRepresentable) : InputFragment(row) {
 
 	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/input/InputFragment.kt
similarity index 92%
rename from app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/fragment/components/input/InputFragment.kt
index 070436e3..54fbea9f 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/input/InputFragment.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.fragment.components.bottomsheet
+package net.pokeranalytics.android.ui.fragment.components.input
 
 import android.annotation.SuppressLint
 import android.app.Activity.RESULT_OK
@@ -21,14 +21,13 @@ import net.pokeranalytics.android.model.LiveData
 import net.pokeranalytics.android.ui.activity.EditableDataActivity
 import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
 import net.pokeranalytics.android.ui.adapter.RowEditableDelegate
-import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
 import net.pokeranalytics.android.ui.helpers.DateTimePickerManager
 import net.pokeranalytics.android.ui.view.*
 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 InputFragment(val row: RowRepresentable) : BottomSheetDialogFragment() {
 
 //	lateinit var row: RowRepresentable
 	lateinit var delegate: RowEditableDelegate
@@ -43,7 +42,7 @@ open class BottomSheetFragment(val row: RowRepresentable) : BottomSheetDialogFra
 
 		const val REQUEST_CODE_ADD_NEW_OBJECT = 100
 
-        fun create(
+        fun buildAndShow(
             row: RowRepresentable,
             delegate: RowEditableDelegate,
             dataSource: RowEditableDataSource?,
@@ -52,9 +51,9 @@ open class BottomSheetFragment(val row: RowRepresentable) : BottomSheetDialogFra
             ) {
             if (delegate !is Fragment) throw PokerAnalyticsException.BottomSheetException
             if (dataSource?.descriptorType == RowEditableDescriptorType.DATE) {
-                DateTimePickerManager.create(row, delegate, dataSource.descriptors.first())
+                DateTimePickerManager.buildAndShow(row, delegate, dataSource.descriptors.first())
             } else {
-                val bottomSheetFragment = row.bottomSheetType.newInstance(row)
+                val bottomSheetFragment = row.inputFragmentType.newInstance(row)
                 bottomSheetFragment.show(delegate.fragmentManager, "bottomSheet")
                 bottomSheetFragment.delegate = delegate
                 bottomSheetFragment.rowEditableDescriptors = dataSource?.descriptors
@@ -110,9 +109,9 @@ open class BottomSheetFragment(val row: RowRepresentable) : BottomSheetDialogFra
 			bottomSheetToolbar.setOnMenuItemClickListener {
 				false
 			}
-			bottomSheetToolbar.menu.findItem(R.id.actionCheck).isVisible = row.bottomSheetType.validationRequired
-			bottomSheetToolbar.menu.findItem(R.id.actionClear).isVisible = row.bottomSheetType.clearRequired
-			bottomSheetToolbar.menu.findItem(R.id.actionAdd).isVisible = row.bottomSheetType.addRequired
+			bottomSheetToolbar.menu.findItem(R.id.actionCheck).isVisible = row.inputFragmentType.validationRequired
+			bottomSheetToolbar.menu.findItem(R.id.actionClear).isVisible = row.inputFragmentType.clearRequired
+			bottomSheetToolbar.menu.findItem(R.id.actionAdd).isVisible = row.inputFragmentType.addRequired
 
 			// Menu
 			bottomSheetToolbar.menu.findItem(R.id.actionClear).setOnMenuItemClickListener {
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/input/InputFragmentType.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/input/InputFragmentType.kt
new file mode 100644
index 00000000..bb37dc46
--- /dev/null
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/input/InputFragmentType.kt
@@ -0,0 +1,50 @@
+package net.pokeranalytics.android.ui.fragment.components.input
+
+import net.pokeranalytics.android.ui.view.RowRepresentable
+
+enum class InputFragmentType {
+	NONE,
+	LIST,
+	LIST_STATIC,
+	LIST_GAME,
+	DOUBLE_LIST,
+	MULTI_SELECTION,
+	GRID,
+	EDIT_TEXT,
+	EDIT_TEXT_MULTI_LINES,
+	DOUBLE_EDIT_TEXT,
+	NUMERIC_TEXT,
+	SUM;
+
+	fun newInstance(row: RowRepresentable): InputFragment {
+		return when (this) {
+			NONE -> InputFragment(row)
+			LIST -> InputListFragment(row)
+			LIST_STATIC -> InputStaticListFragment(row)
+			LIST_GAME -> InputListGameFragment(row)
+			DOUBLE_LIST -> InputListGameFragment(row)
+			MULTI_SELECTION -> InputMultiSelectionFragment(row)
+			GRID -> InputTableSizeGridFragment(row)
+			EDIT_TEXT -> InputEditTextFragment(row)
+			EDIT_TEXT_MULTI_LINES -> InputEditTextMultiLinesFragment(row)
+			DOUBLE_EDIT_TEXT -> InputDoubleEditTextFragment(row)
+			NUMERIC_TEXT -> InputNumericTextFragment(row)
+			SUM -> InputSumFragment(row)
+		}
+	}
+
+	val validationRequired: Boolean
+		get() = when (this) {
+			LIST, LIST_GAME, LIST_STATIC, GRID, DOUBLE_LIST -> false
+			else -> true
+		}
+
+	val clearRequired: Boolean
+		get() = true
+
+	val addRequired: Boolean
+		get() = when (this) {
+			EDIT_TEXT, NUMERIC_TEXT, DOUBLE_EDIT_TEXT, EDIT_TEXT_MULTI_LINES, GRID, LIST_STATIC, SUM -> false
+			else -> true
+		}
+}
\ No newline at end of file
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/input/InputListFragment.kt
similarity index 93%
rename from app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListFragment.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/fragment/components/input/InputListFragment.kt
index 029ee156..6e3c8a8c 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/input/InputListFragment.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.fragment.components.bottomsheet
+package net.pokeranalytics.android.ui.fragment.components.input
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -17,7 +17,7 @@ import net.pokeranalytics.android.ui.view.DataRowEditableDescriptor
 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 InputListFragment(row: RowRepresentable) : InputFragment(row), 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/input/InputListGameFragment.kt
similarity index 94%
rename from app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListGameFragment.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/fragment/components/input/InputListGameFragment.kt
index 1e5abb84..a53326ac 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/input/InputListGameFragment.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.fragment.components.bottomsheet
+package net.pokeranalytics.android.ui.fragment.components.input
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -20,7 +20,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 InputListGameFragment(row: RowRepresentable) : InputListFragment(row) {
 
 	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/input/InputMultiSelectionFragment.kt
similarity index 93%
rename from app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetMultiSelectionFragment.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/fragment/components/input/InputMultiSelectionFragment.kt
index 2aa939fb..7a8a659f 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/input/InputMultiSelectionFragment.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.fragment.components.bottomsheet
+package net.pokeranalytics.android.ui.fragment.components.input
 
 import android.app.Activity
 import android.content.Intent
@@ -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 InputMultiSelectionFragment(row: RowRepresentable) : InputListFragment(row) {
 
 	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/input/InputNumericTextFragment.kt
similarity index 93%
rename from app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetNumericTextFragment.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/fragment/components/input/InputNumericTextFragment.kt
index eea5e50b..5570fcf6 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/input/InputNumericTextFragment.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.fragment.components.bottomsheet
+package net.pokeranalytics.android.ui.fragment.components.input
 
 import android.os.Bundle
 import android.text.InputType
@@ -14,7 +14,7 @@ import net.pokeranalytics.android.ui.view.RowRepresentable
 import java.text.NumberFormat
 
 
-class BottomSheetNumericTextFragment(row: RowRepresentable) : BottomSheetFragment(row) {
+class InputNumericTextFragment(row: RowRepresentable) : InputFragment(row) {
 
 	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/input/InputStaticListFragment.kt
similarity index 90%
rename from app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetStaticListFragment.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/fragment/components/input/InputStaticListFragment.kt
index 27ca0fe6..37fa6c4c 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/input/InputStaticListFragment.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.fragment.components.bottomsheet
+package net.pokeranalytics.android.ui.fragment.components.input
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -11,11 +11,10 @@ import net.pokeranalytics.android.exceptions.RowRepresentableEditDescriptorExcep
 import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
 import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource
-import net.pokeranalytics.android.ui.view.DataRowEditableDescriptor
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.StaticDataRowEditableDescriptor
 
-class BottomSheetStaticListFragment(row: RowRepresentable) : BottomSheetFragment(row), StaticRowRepresentableDataSource,
+class InputStaticListFragment(row: RowRepresentable) : InputFragment(row), 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/input/InputSumFragment.kt
similarity index 95%
rename from app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetSumFragment.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/fragment/components/input/InputSumFragment.kt
index 92ac5180..bcd2b3b7 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/input/InputSumFragment.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.fragment.components.bottomsheet
+package net.pokeranalytics.android.ui.fragment.components.input
 
 import android.os.Bundle
 import android.text.InputType
@@ -16,7 +16,7 @@ import net.pokeranalytics.android.util.extensions.toCurrency
 import java.text.NumberFormat
 
 
-class BottomSheetSumFragment(row: RowRepresentable) : BottomSheetFragment(row) {
+class InputSumFragment(row: RowRepresentable) : InputFragment(row) {
 
 	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/input/InputTableSizeGridFragment.kt
similarity index 91%
rename from app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetTableSizeGridFragment.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/fragment/components/input/InputTableSizeGridFragment.kt
index 21fd8222..3fc34b44 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/input/InputTableSizeGridFragment.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.fragment.components.bottomsheet
+package net.pokeranalytics.android.ui.fragment.components.input
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -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 InputTableSizeGridFragment(row: RowRepresentable) : InputFragment(row), StaticRowRepresentableDataSource, RowRepresentableDelegate {
 
 	private lateinit var dataAdapter: RowRepresentableAdapter
 	private var defaultSize: Int? = null
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/CustomFieldDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/CustomFieldDataFragment.kt
index 6bf28e8f..1651bcb9 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/CustomFieldDataFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/CustomFieldDataFragment.kt
@@ -17,7 +17,6 @@ import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource
 import net.pokeranalytics.android.ui.extensions.ChipGroupExtension
 import net.pokeranalytics.android.ui.extensions.px
 import net.pokeranalytics.android.ui.extensions.showAlertDialog
-import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetFragment
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.rowrepresentable.CustomFieldRow
 import net.pokeranalytics.android.util.NULL_TEXT
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/LocationDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/LocationDataFragment.kt
index e03f7e30..88418033 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/LocationDataFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/LocationDataFragment.kt
@@ -45,7 +45,7 @@ class LocationDataFragment : EditableDataFragment(), StaticRowRepresentableDataS
 
 		} else if (locationActivated) {
 
-			// If we create a new location, we try to locate the user by default
+			// If we buildAndShow a new location, we try to locate the user by default
 			isLookingForPlaces = true
 			getSuggestionsPlaces()
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/helpers/DateTimePickerManager.kt b/app/src/main/java/net/pokeranalytics/android/ui/helpers/DateTimePickerManager.kt
index 56da28f5..18cdaaca 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/helpers/DateTimePickerManager.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/helpers/DateTimePickerManager.kt
@@ -12,8 +12,6 @@ import androidx.fragment.app.Fragment
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.exceptions.PokerAnalyticsException
 import net.pokeranalytics.android.ui.adapter.RowEditableDelegate
-import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
-import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetFragment
 import net.pokeranalytics.android.ui.view.*
 import java.util.*
 
@@ -31,7 +29,7 @@ class DateTimePickerManager : DatePickerDialog.OnDateSetListener,
 	private var isClearable: Boolean = true
 
 	companion object {
-        fun create(
+        fun buildAndShow(
             row: RowRepresentable,
             delegate: RowEditableDelegate,
             dataSource: RowEditableDescriptor
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/RowRepresentable.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/RowRepresentable.kt
index 98316d56..1e0d241b 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/RowRepresentable.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/view/RowRepresentable.kt
@@ -3,7 +3,7 @@ package net.pokeranalytics.android.ui.view
 import android.content.Context
 import androidx.fragment.app.Fragment
 import net.pokeranalytics.android.model.LiveData
-import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetType
+import net.pokeranalytics.android.ui.fragment.components.input.InputFragmentType
 import net.pokeranalytics.android.util.NULL_TEXT
 
 /**
@@ -57,9 +57,9 @@ interface Displayable : Localizable {
 			return null
 		}
 
-	val bottomSheetType: BottomSheetType
+	val inputFragmentType: InputFragmentType
 		get() {
-			return BottomSheetType.NONE
+			return InputFragmentType.NONE
 		}
 
 	val selectedChoice: Int
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/BankrollRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/BankrollRow.kt
index 3686bff0..e7bf908f 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/BankrollRow.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/BankrollRow.kt
@@ -6,8 +6,8 @@ import net.pokeranalytics.android.R
 import net.pokeranalytics.android.exceptions.PokerAnalyticsException
 import net.pokeranalytics.android.model.realm.Bankroll
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
-import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetFragment
-import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetType
+import net.pokeranalytics.android.ui.fragment.components.input.InputFragment
+import net.pokeranalytics.android.ui.fragment.components.input.InputFragmentType
 import net.pokeranalytics.android.ui.view.*
 import java.util.*
 
@@ -43,15 +43,15 @@ enum class BankrollRow : RowRepresentable {
             }
         }
 
-    override val bottomSheetType: BottomSheetType
+    override val inputFragmentType: InputFragmentType
         get() {
             return when (this) {
-                NAME -> BottomSheetType.EDIT_TEXT
-                LIVE -> BottomSheetType.NONE
-	            INITIAL_VALUE -> BottomSheetType.NUMERIC_TEXT
-	            CURRENCY -> BottomSheetType.NONE
-	            RATE -> BottomSheetType.NUMERIC_TEXT
-	            REFRESH_RATE -> BottomSheetType.NONE
+                NAME -> InputFragmentType.EDIT_TEXT
+                LIVE -> InputFragmentType.NONE
+	            INITIAL_VALUE -> InputFragmentType.NUMERIC_TEXT
+	            CURRENCY -> InputFragmentType.NONE
+	            RATE -> InputFragmentType.NUMERIC_TEXT
+	            REFRESH_RATE -> InputFragmentType.NONE
             }
         }
 
@@ -69,6 +69,6 @@ enum class BankrollRow : RowRepresentable {
             RATE -> data.append(dataSource.currency?.rate, R.string.rate, InputType.TYPE_CLASS_NUMBER or InputType.TYPE_NUMBER_FLAG_DECIMAL)
             else -> PokerAnalyticsException.BottomSheetException
         }
-        BottomSheetFragment.create(this, parent, data)
+        InputFragment.buildAndShow(this, parent, data)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/CustomFieldRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/CustomFieldRow.kt
index f35341df..52342c21 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/CustomFieldRow.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/CustomFieldRow.kt
@@ -5,8 +5,8 @@ import net.pokeranalytics.android.R
 import net.pokeranalytics.android.exceptions.PokerAnalyticsException
 import net.pokeranalytics.android.model.realm.CustomField
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
-import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetFragment
-import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetType
+import net.pokeranalytics.android.ui.fragment.components.input.InputFragment
+import net.pokeranalytics.android.ui.fragment.components.input.InputFragmentType
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowEditableDataSource
 import net.pokeranalytics.android.ui.view.RowViewType
@@ -34,12 +34,12 @@ enum class CustomFieldRow : RowRepresentable {
 			}
 		}
 
-	override val bottomSheetType: BottomSheetType
+    override val inputFragmentType: InputFragmentType
 		get() {
 			return when (this) {
-                NAME -> BottomSheetType.EDIT_TEXT
-                TYPE -> BottomSheetType.NONE
-				COPY_ON_DUPLICATE -> BottomSheetType.NONE
+                NAME -> InputFragmentType.EDIT_TEXT
+                TYPE -> InputFragmentType.NONE
+				COPY_ON_DUPLICATE -> InputFragmentType.NONE
 			}
 		}
 
@@ -98,6 +98,6 @@ enum class CustomFieldRow : RowRepresentable {
             NAME -> data.append(dataSource.name)
             else -> PokerAnalyticsException.BottomSheetException
         }
-        BottomSheetFragment.create(this, parent, data)
+        InputFragment.buildAndShow(this, parent, data)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterElementRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterElementRow.kt
index 64d2a369..fd6cc87a 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterElementRow.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterElementRow.kt
@@ -5,8 +5,7 @@ import androidx.fragment.app.Fragment
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.model.filter.QueryCondition
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
-import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetFragment
-import net.pokeranalytics.android.ui.helpers.DateTimePickerManager
+import net.pokeranalytics.android.ui.fragment.components.input.InputFragment
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowEditableDataSource
 
@@ -46,7 +45,7 @@ interface FilterElementRow : RowRepresentable {
                 data.append(valueAsString, hint, inputType = InputType.TYPE_CLASS_NUMBER)
             }
         }
-        BottomSheetFragment.create(this, parent, data)
+        InputFragment.buildAndShow(this, parent, data)
 
     }
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/GameRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/GameRow.kt
index 1695e188..770c2bd3 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/GameRow.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/GameRow.kt
@@ -4,8 +4,8 @@ import androidx.fragment.app.Fragment
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.model.realm.Game
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
-import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetFragment
-import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetType
+import net.pokeranalytics.android.ui.fragment.components.input.InputFragment
+import net.pokeranalytics.android.ui.fragment.components.input.InputFragmentType
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowEditableDataSource
 import net.pokeranalytics.android.ui.view.RowViewType
@@ -30,11 +30,11 @@ enum class GameRow : RowRepresentable {
             }
         }
 
-    override val bottomSheetType: BottomSheetType
+    override val inputFragmentType: InputFragmentType
         get() {
             return when (this) {
-                NAME -> BottomSheetType.EDIT_TEXT
-                SHORT_NAME -> BottomSheetType.EDIT_TEXT
+                NAME -> InputFragmentType.EDIT_TEXT
+                SHORT_NAME -> InputFragmentType.EDIT_TEXT
             }
         }
 
@@ -48,7 +48,7 @@ enum class GameRow : RowRepresentable {
             NAME -> data.append(dataSource.name)
             SHORT_NAME -> data.append(dataSource.shortName)
         }
-        BottomSheetFragment.create(this, parent, data)
+        InputFragment.buildAndShow(this, parent, data)
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/LocationRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/LocationRow.kt
index 90891bef..fb857604 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/LocationRow.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/LocationRow.kt
@@ -5,8 +5,8 @@ import net.pokeranalytics.android.R
 import net.pokeranalytics.android.exceptions.PokerAnalyticsException
 import net.pokeranalytics.android.model.realm.Location
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
-import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetFragment
-import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetType
+import net.pokeranalytics.android.ui.fragment.components.input.InputFragment
+import net.pokeranalytics.android.ui.fragment.components.input.InputFragmentType
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowEditableDataSource
 import net.pokeranalytics.android.ui.view.RowViewType
@@ -35,12 +35,12 @@ enum class LocationRow : RowRepresentable {
             }
         }
 
-    override val bottomSheetType: BottomSheetType
+    override val inputFragmentType: InputFragmentType
         get() {
             return when (this) {
-                NAME -> BottomSheetType.EDIT_TEXT
-	            LOCATION_PERMISSION_SWITCH -> BottomSheetType.NONE
-                LOCATION_LOADER -> BottomSheetType.NONE
+                NAME -> InputFragmentType.EDIT_TEXT
+	            LOCATION_PERMISSION_SWITCH -> InputFragmentType.NONE
+                LOCATION_LOADER -> InputFragmentType.NONE
             }
         }
 
@@ -55,6 +55,6 @@ enum class LocationRow : RowRepresentable {
             NAME -> data.append(dataSource.name)
             else -> PokerAnalyticsException.BottomSheetException
         }
-        BottomSheetFragment.create(this, parent, data)
+        InputFragment.buildAndShow(this, parent, data)
     }
 }
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SessionRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SessionRow.kt
index 6d1ec0a0..30424067 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SessionRow.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SessionRow.kt
@@ -9,9 +9,8 @@ import net.pokeranalytics.android.model.extensions.SessionState
 import net.pokeranalytics.android.model.extensions.getState
 import net.pokeranalytics.android.model.realm.*
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
-import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetFragment
-import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetType
-import net.pokeranalytics.android.ui.helpers.DateTimePickerManager
+import net.pokeranalytics.android.ui.fragment.components.input.InputFragment
+import net.pokeranalytics.android.ui.fragment.components.input.InputFragmentType
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowEditableDataSource
 import net.pokeranalytics.android.ui.view.RowViewType
@@ -165,19 +164,19 @@ enum class SessionRow : RowRepresentable {
             }
         }
 
-    override val bottomSheetType: BottomSheetType
+    override val inputFragmentType: InputFragmentType
         get() {
             return when (this) {
-                NET_RESULT, CASHED_OUT, INITIAL_BUY_IN, BREAK_TIME, POSITION, PLAYERS, PRIZE -> BottomSheetType.NUMERIC_TEXT
-                BUY_IN, TIPS -> BottomSheetType.SUM
-                BLINDS -> BottomSheetType.DOUBLE_EDIT_TEXT
-                GAME -> BottomSheetType.LIST_GAME
-                TOURNAMENT_TYPE -> BottomSheetType.LIST_STATIC
-                LOCATION, BANKROLL, TOURNAMENT_NAME -> BottomSheetType.LIST
-                TOURNAMENT_FEATURE -> BottomSheetType.MULTI_SELECTION
-                TABLE_SIZE -> BottomSheetType.GRID
-                COMMENT -> BottomSheetType.EDIT_TEXT_MULTI_LINES
-                else -> BottomSheetType.NONE
+                NET_RESULT, CASHED_OUT, INITIAL_BUY_IN, BREAK_TIME, POSITION, PLAYERS, PRIZE -> InputFragmentType.NUMERIC_TEXT
+                BUY_IN, TIPS -> InputFragmentType.SUM
+                BLINDS -> InputFragmentType.DOUBLE_EDIT_TEXT
+                GAME -> InputFragmentType.LIST_GAME
+                TOURNAMENT_TYPE -> InputFragmentType.LIST_STATIC
+                LOCATION, BANKROLL, TOURNAMENT_NAME -> InputFragmentType.LIST
+                TOURNAMENT_FEATURE -> InputFragmentType.MULTI_SELECTION
+                TABLE_SIZE -> InputFragmentType.GRID
+                COMMENT -> InputFragmentType.EDIT_TEXT_MULTI_LINES
+                else -> InputFragmentType.NONE
             }
         }
 
@@ -274,7 +273,7 @@ enum class SessionRow : RowRepresentable {
             BREAK_TIME -> data.append(hint = R.string.in_minutes, inputType = InputType.TYPE_CLASS_NUMBER)
             COMMENT -> data.append(session.comment, R.string.comment)
         }
-        BottomSheetFragment.create(this, parent, data)
+        InputFragment.buildAndShow(this, parent, data)
     }
 
     override val valueCanBeClearedWhenEditing: Boolean
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SimpleRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SimpleRow.kt
index 95c0c1df..d1a64f83 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SimpleRow.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SimpleRow.kt
@@ -1,7 +1,7 @@
 package net.pokeranalytics.android.ui.view.rowrepresentable
 
 import net.pokeranalytics.android.R
-import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetType
+import net.pokeranalytics.android.ui.fragment.components.input.InputFragmentType
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowViewType
 
@@ -11,5 +11,5 @@ enum class SimpleRow : RowRepresentable {
 
     override val resId: Int? = R.string.name
     override val viewType: Int = RowViewType.TITLE_VALUE.ordinal
-    override val bottomSheetType: BottomSheetType = BottomSheetType.EDIT_TEXT
+    override val inputFragmentType: InputFragmentType = InputFragmentType.EDIT_TEXT
 }
\ No newline at end of file
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/TournamentFeatureRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/TournamentFeatureRow.kt
index 6f76de5a..1b52eb99 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/TournamentFeatureRow.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/TournamentFeatureRow.kt
@@ -4,8 +4,8 @@ import androidx.fragment.app.Fragment
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.model.realm.TournamentFeature
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
-import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetFragment
-import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetType
+import net.pokeranalytics.android.ui.fragment.components.input.InputFragment
+import net.pokeranalytics.android.ui.fragment.components.input.InputFragmentType
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowEditableDataSource
 import net.pokeranalytics.android.ui.view.RowViewType
@@ -27,10 +27,10 @@ enum class TournamentFeatureRow : RowRepresentable {
             }
         }
 
-    override val bottomSheetType: BottomSheetType
+    override val inputFragmentType: InputFragmentType
         get() {
             return when (this) {
-                NAME -> BottomSheetType.EDIT_TEXT
+                NAME -> InputFragmentType.EDIT_TEXT
             }
         }
 
@@ -43,7 +43,7 @@ enum class TournamentFeatureRow : RowRepresentable {
         when (this) {
             NAME -> data.append(dataSource.name)
         }
-        BottomSheetFragment.create(this, parent, data)
+        InputFragment.buildAndShow(this, parent, data)
     }
 
 }
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/TournamentNameRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/TournamentNameRow.kt
index eff37ce7..3d08f3f9 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/TournamentNameRow.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/TournamentNameRow.kt
@@ -4,8 +4,8 @@ import androidx.fragment.app.Fragment
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.model.realm.TournamentName
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
-import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetFragment
-import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetType
+import net.pokeranalytics.android.ui.fragment.components.input.InputFragment
+import net.pokeranalytics.android.ui.fragment.components.input.InputFragmentType
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowEditableDataSource
 import net.pokeranalytics.android.ui.view.RowViewType
@@ -27,10 +27,10 @@ enum class TournamentNameRow : RowRepresentable {
             }
         }
 
-    override val bottomSheetType: BottomSheetType
+    override val inputFragmentType: InputFragmentType
         get() {
             return when (this) {
-                NAME -> BottomSheetType.EDIT_TEXT
+                NAME -> InputFragmentType.EDIT_TEXT
             }
         }
 
@@ -43,7 +43,7 @@ enum class TournamentNameRow : RowRepresentable {
         when (this) {
             NAME -> data.append(dataSource.name)
         }
-        BottomSheetFragment.create(this, parent, data)
+        InputFragment.buildAndShow(this, parent, data)
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/TransactionRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/TransactionRow.kt
index 2ecd84b3..f8478ea4 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/TransactionRow.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/TransactionRow.kt
@@ -8,10 +8,8 @@ import net.pokeranalytics.android.model.realm.Bankroll
 import net.pokeranalytics.android.model.realm.Transaction
 import net.pokeranalytics.android.model.realm.TransactionType
 import net.pokeranalytics.android.ui.adapter.RowEditableDelegate
-import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
-import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetFragment
-import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetType
-import net.pokeranalytics.android.ui.helpers.DateTimePickerManager
+import net.pokeranalytics.android.ui.fragment.components.input.InputFragment
+import net.pokeranalytics.android.ui.fragment.components.input.InputFragmentType
 import net.pokeranalytics.android.ui.view.*
 import net.pokeranalytics.android.util.extensions.round
 import net.pokeranalytics.android.util.extensions.sorted
@@ -46,14 +44,14 @@ enum class TransactionRow : RowRepresentable {
             }
         }
 
-    override val bottomSheetType: BottomSheetType
+    override val inputFragmentType: InputFragmentType
         get() {
             return when (this) {
-	            BANKROLL -> BottomSheetType.LIST
-	            TYPE -> BottomSheetType.LIST
-	            AMOUNT -> BottomSheetType.EDIT_TEXT
-	            COMMENT -> BottomSheetType.EDIT_TEXT_MULTI_LINES
-	            DATE -> BottomSheetType.NONE
+	            BANKROLL -> InputFragmentType.LIST
+	            TYPE -> InputFragmentType.LIST
+	            AMOUNT -> InputFragmentType.EDIT_TEXT
+	            COMMENT -> InputFragmentType.EDIT_TEXT_MULTI_LINES
+	            DATE -> InputFragmentType.NONE
             }
         }
 
@@ -90,6 +88,6 @@ enum class TransactionRow : RowRepresentable {
             )
             COMMENT -> data.append(dataSource.comment, R.string.comment)
         }
-        BottomSheetFragment.create(this, parent, data)
+        InputFragment.buildAndShow(this, parent, data)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/TransactionTypeRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/TransactionTypeRow.kt
index 2cf42408..10b98815 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/TransactionTypeRow.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/TransactionTypeRow.kt
@@ -5,8 +5,8 @@ import net.pokeranalytics.android.R
 import net.pokeranalytics.android.exceptions.PokerAnalyticsException
 import net.pokeranalytics.android.model.realm.TransactionType
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
-import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetFragment
-import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetType
+import net.pokeranalytics.android.ui.fragment.components.input.InputFragment
+import net.pokeranalytics.android.ui.fragment.components.input.InputFragmentType
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowEditableDataSource
 import net.pokeranalytics.android.ui.view.RowViewType
@@ -31,11 +31,11 @@ enum class TransactionTypeRow : RowRepresentable {
 			}
 		}
 
-	override val bottomSheetType: BottomSheetType
+	override val inputFragmentType: InputFragmentType
 		get() {
 			return when (this) {
-                NAME -> BottomSheetType.EDIT_TEXT
-				TRANSACTION_ADDITIVE -> BottomSheetType.NONE
+                NAME -> InputFragmentType.EDIT_TEXT
+				TRANSACTION_ADDITIVE -> InputFragmentType.NONE
 			}
 		}
 
@@ -50,7 +50,7 @@ enum class TransactionTypeRow : RowRepresentable {
             NAME -> data.append(dataSource.name)
             else -> PokerAnalyticsException.BottomSheetException
         }
-        BottomSheetFragment.create(this, parent, data)
+        InputFragment.buildAndShow(this, parent, data)
     }
 
 
diff --git a/app/src/main/java/net/pokeranalytics/android/util/LocationManager.kt b/app/src/main/java/net/pokeranalytics/android/util/LocationManager.kt
index 30d974d4..b66efa0f 100644
--- a/app/src/main/java/net/pokeranalytics/android/util/LocationManager.kt
+++ b/app/src/main/java/net/pokeranalytics/android/util/LocationManager.kt
@@ -38,7 +38,7 @@ class LocationManager(private var context: Context) {
 		// Use fields to define the data types to return.
 		val placeFields = Arrays.asList(Place.Field.NAME, Place.Field.ADDRESS, Place.Field.LAT_LNG)
 
-		// Use the builder to create a FindCurrentPlaceRequest.
+		// Use the builder to buildAndShow a FindCurrentPlaceRequest.
 		val request = FindCurrentPlaceRequest.builder(placeFields).build()
 
 		// Call findCurrentPlace and handle the response (first check that the user has granted permission).