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 29ecea1d..22376bc3 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
@@ -7,6 +7,7 @@ import android.view.ViewGroup
 import android.widget.Toast
 import androidx.recyclerview.widget.LinearLayoutManager
 import kotlinx.android.synthetic.main.fragment_settings.*
+import net.pokeranalytics.android.BuildConfig
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.ui.activity.DataListActivity
 import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
@@ -31,6 +32,13 @@ class SettingsFragment : PokerAnalyticsFragment(), RowRepresentableDelegate, Sta
 		}
 	}
 
+	override fun stringForRow(row: RowRepresentable): String {
+		return when(row) {
+			SettingRow.VERSION -> BuildConfig.VERSION_NAME + if (BuildConfig.DEBUG) " DEBUG" else ""
+			else -> ""
+		}
+	}
+
 	private lateinit var settingsAdapterRow: RowRepresentableAdapter
 
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SettingRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SettingRow.kt
index 75908898..d197ecdf 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SettingRow.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SettingRow.kt
@@ -46,10 +46,15 @@ enum class SettingRow : RowRepresentable {
 			rows.add(HeaderRowRepresentable(customViewType = RowViewType.HEADER_SESSION, resId = R.string.follow_us))
 			rows.addAll(arrayListOf(FOLLOW_US))
 
-			rows.add(HeaderRowRepresentable(customViewType = RowViewType.HEADER_SESSION,resId = R.string.preferences))
+			rows.add(HeaderRowRepresentable(customViewType = RowViewType.HEADER_SESSION, resId = R.string.preferences))
 			rows.addAll(arrayListOf(CURRENCY))
 
-			rows.add(HeaderRowRepresentable(customViewType = RowViewType.HEADER_SESSION,resId = R.string.data_management))
+			rows.add(
+				HeaderRowRepresentable(
+					customViewType = RowViewType.HEADER_SESSION,
+					resId = R.string.data_management
+				)
+			)
 			rows.addAll(arrayListOf(BANKROLL, GAME, LOCATION, TOURNAMENT_TYPE, TRANSACTION_TYPE))
 
 			rows.add(HeaderRowRepresentable(customViewType = RowViewType.HEADER_SESSION, resId = R.string.terms))
@@ -80,7 +85,14 @@ enum class SettingRow : RowRepresentable {
 			}
 		}
 
-	override val viewType: Int = RowViewType.TITLE.ordinal
+
+	override val viewType: Int
+		get() {
+			return when (this) {
+				VERSION -> RowViewType.TITLE_VALUE.ordinal
+				else -> RowViewType.TITLE.ordinal
+			}
+		}
 
 	override val relatedResultsRepresentable: LiveData?
 		get() {