diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Bankroll.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Bankroll.kt
index c5a3df93..b05eb7e2 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/Bankroll.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Bankroll.kt
@@ -89,11 +89,7 @@ open class Bankroll() : RealmObject(), NameManageable, StaticRowRepresentableDat
 		        this.currency?.code = value as String?
 	        }
 	        BankrollRow.RATE -> {
-                value?.let { rate ->
-                    this.currency?.rate = (rate as String).toDouble()
-                } ?: run {
-                    this.currency?.rate = null
-                }
+                this.currency?.rate = value as Double?
 	        }
         }
     }
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/BankrollDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/BankrollDataFragment.kt
index c05569ff..675e198f 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/BankrollDataFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/BankrollDataFragment.kt
@@ -114,9 +114,8 @@ class BankrollDataFragment : EditableDataFragment(), StaticRowRepresentableDataS
 		return when (row) {
 			SimpleRow.NAME -> row.editingDescriptors(mapOf("defaultValue" to this.bankroll.name))
 			BankrollRow.RATE -> {
-				val rate = this.bankroll.currency?.rate ?: 1.0
-				val rateFormatted = CurrencyUtils.getCurrencyRateFormatter().format(rate)
-				row.editingDescriptors(mapOf("defaultValue" to rateFormatted))
+				val rate = this.bankroll.currency?.rate
+				row.editingDescriptors(mapOf("defaultValue" to rate))
 			}
 			else -> null
 		}
@@ -205,7 +204,7 @@ class BankrollDataFragment : EditableDataFragment(), StaticRowRepresentableDataS
 			override fun onResponse(call: Call<Map<String, CurrencyConverterValue>>, response: Response<Map<String, CurrencyConverterValue>>) {
 				response.body()?.let {
 					it[currenciesConverterValue]?.value?.let { rate ->
-						onRowValueChanged(rate.toString(), BankrollRow.RATE)
+						onRowValueChanged(rate, BankrollRow.RATE)
 					}
 				}
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt
index 8b6a3802..db953583 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt
@@ -56,7 +56,10 @@ class SettingsFragment : PokerAnalyticsFragment(), RowRepresentableDelegate, Sta
 	override fun stringForRow(row: RowRepresentable): String {
 		return when (row) {
 			SettingRow.VERSION -> BuildConfig.VERSION_NAME + if (BuildConfig.DEBUG) " (${BuildConfig.VERSION_CODE}) DEBUG" else ""
-			SettingRow.CURRENCY -> Currency.getInstance(Preferences.getCurrencyLocale(this.parentActivity)).symbol
+			SettingRow.CURRENCY -> {
+				val locale = Preferences.getCurrencyLocale(this.parentActivity)
+				Currency.getInstance(locale).symbol
+			}
 			else -> ""
 		}
 	}
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 da9486d5..da8f8510 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
@@ -63,6 +63,7 @@ class BottomSheetNumericTextFragment : BottomSheetFragment() {
 		data[0].defaultValue?.let {
 			if (it is Double || it is Long) {
 				val formatter = NumberFormat.getNumberInstance()
+				formatter.maximumFractionDigits = 6
 				formatter.isGroupingUsed = false
 				editText1.setText(formatter.format(it))
 			} else {
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 df724f8e..f5cfdc6a 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
@@ -40,14 +40,14 @@ enum class BankrollRow : RowRepresentable, DefaultEditDataSource {
             return when (this) {
                 LIVE -> BottomSheetType.NONE
 	            CURRENCY -> BottomSheetType.NONE
-	            RATE -> BottomSheetType.EDIT_TEXT
+	            RATE -> BottomSheetType.NUMERIC_TEXT
 	            REFRESH_RATE -> BottomSheetType.NONE
             }
         }
 
 	override fun editingDescriptors(map: Map<String, Any?>): ArrayList<RowRepresentableEditDescriptor>? {
 		return when (this) {
-			BankrollRow.RATE -> {
+			RATE -> {
 				val defaultValue : Any? by map
 				arrayListOf(
 					RowRepresentableEditDescriptor(defaultValue, R.string.rate, InputType.TYPE_CLASS_NUMBER