diff --git a/app/src/main/java/net/pokeranalytics/android/ui/adapter/components/DynamicRowInterface.kt b/app/src/main/java/net/pokeranalytics/android/ui/adapter/components/DynamicRowInterface.kt
index 0bd7764f..5f811a14 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/adapter/components/DynamicRowInterface.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/adapter/components/DynamicRowInterface.kt
@@ -80,9 +80,9 @@ enum class BankrollRow(val resId: Int) : DynamicRowInterface {
 	override var bottomSheetType: BottomSheetType = BottomSheetType.NONE
 		get() {
 			return when (this) {
-				NAME -> BottomSheetType.DATE
-				LIVE -> BottomSheetType.DATE
-				CURRENCY -> BottomSheetType.DATE
+				NAME -> BottomSheetType.EDIT_TEXT
+				LIVE -> BottomSheetType.NONE
+				CURRENCY -> BottomSheetType.LIST
 			}
 		}
 }
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt
index c782b4db..217e5716 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt
@@ -69,23 +69,21 @@ class EditableDataFragment : PokerAnalyticsFragment(), DynamicRowCallback, Botto
 
 		this.dataType = SettingRow.values()[dataType]
 		val realm = Realm.getDefaultInstance()
-		var _item : RealmObject? = null
+		var proxyItem : RealmObject? = null
 		primaryKey?.let {
 			val t = realm.where(this.dataType.clazz()).equalTo("id", it).findFirst()
 			t?.let {
-				_item = t
+                proxyItem = t
 			}
 		}
 
 		realm.beginTransaction()
-		_item?.let {
+        proxyItem?.let {
 			this.item = realm.copyFromRealm(it)
 		} ?: run {
 			this.item = realm.createObject(Bankroll::class.java, UUID.randomUUID().toString())
 		}
 		realm.commitTransaction()
-
-		//TODO: Crash happens here
 		val dynamicListAdapter = DynamicListAdapter((this.item as DynamicRowDelegate), this)
 		this.recyclerView.adapter = dynamicListAdapter