diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index efffdd33..a1e4087a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -61,7 +61,6 @@
         <activity
             android:name=".ui.section.VisitedPollingStationsActivity"
             android:parentActivityName=".ui.main.MainActivity"
-            android:label="@string/title_visited_stations"
             android:screenOrientation="portrait"
             android:launchMode="singleTop"
             android:theme="@style/AppTheme.NoActionBar"
diff --git a/app/src/main/java/ro/code4/monitorizarevot/ui/base/ViewModelFragment.kt b/app/src/main/java/ro/code4/monitorizarevot/ui/base/ViewModelFragment.kt
index c93d8310..9825808b 100644
--- a/app/src/main/java/ro/code4/monitorizarevot/ui/base/ViewModelFragment.kt
+++ b/app/src/main/java/ro/code4/monitorizarevot/ui/base/ViewModelFragment.kt
@@ -5,6 +5,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import ro.code4.monitorizarevot.helper.LocaleManager
 import ro.code4.monitorizarevot.interfaces.Layout
 import ro.code4.monitorizarevot.interfaces.ViewModelSetter
 
@@ -13,6 +14,7 @@ abstract class ViewModelFragment<out T : BaseViewModel> : BaseAnalyticsFragment(
     lateinit var mContext: Context
 
     override fun onAttach(context: Context) {
+        LocaleManager.wrapContext(context)
         super.onAttach(context)
         mContext = context
     }
diff --git a/app/src/main/java/ro/code4/monitorizarevot/ui/section/PollingStationViewModel.kt b/app/src/main/java/ro/code4/monitorizarevot/ui/section/PollingStationViewModel.kt
index 587e0e80..934a564a 100644
--- a/app/src/main/java/ro/code4/monitorizarevot/ui/section/PollingStationViewModel.kt
+++ b/app/src/main/java/ro/code4/monitorizarevot/ui/section/PollingStationViewModel.kt
@@ -21,7 +21,7 @@ class PollingStationViewModel : BaseViewModel() {
     private val nextLiveData = SingleLiveEvent<Void>()
     private val nextToMainLiveData = SingleLiveEvent<Void>()
     private val titleLiveData = MutableLiveData<String>()
-    private val pollingStationLiveData = MutableLiveData<String>()
+    private val pollingStationLiveData = MutableLiveData<Pair<Int, String>>()
     private val arrivalTimeLiveData = MutableLiveData<String>()
     private val departureTimeLiveData = MutableLiveData<String>()
     private val selectedPollingStationLiveData = MutableLiveData<Pair<Int?, Int?>>()
@@ -43,15 +43,11 @@ class PollingStationViewModel : BaseViewModel() {
     fun departureTime(): LiveData<String> = departureTimeLiveData
     fun selectedPollingStation(): LiveData<Pair<Int?, Int?>> = selectedPollingStationLiveData
 
-    fun pollingStation(): LiveData<String> = pollingStationLiveData
+    fun pollingStation(): LiveData<Pair<Int, String>> = pollingStationLiveData
 
     fun getPollingStationBarText() {
         pollingStationLiveData.postValue(
-            app.getString(
-                R.string.polling_station,
-                selectedPollingStationNumber,
-                selectedCounty.name
-            )
+            Pair(selectedPollingStationNumber, selectedCounty.name)
         )
         getSelectedPollingStation()
     }
diff --git a/app/src/main/java/ro/code4/monitorizarevot/ui/section/VisitedPollingStationsActivity.kt b/app/src/main/java/ro/code4/monitorizarevot/ui/section/VisitedPollingStationsActivity.kt
index 9449c721..ef948d7b 100644
--- a/app/src/main/java/ro/code4/monitorizarevot/ui/section/VisitedPollingStationsActivity.kt
+++ b/app/src/main/java/ro/code4/monitorizarevot/ui/section/VisitedPollingStationsActivity.kt
@@ -32,6 +32,7 @@ class VisitedPollingStationsActivity : BaseActivity<VisitedPollingStationsViewMo
         setSupportActionBar(toolbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         supportActionBar?.setHomeAsUpIndicator(R.drawable.ic_minimalist_arrow)
+        setTitle(R.string.title_visited_stations)
 
         visitedStationsAdapter = VisitedStationsAdapter(this) { station ->
             if (callingActivity?.className == PollingStationActivity::class.java.name) {
diff --git a/app/src/main/java/ro/code4/monitorizarevot/ui/section/details/PollingStationDetailsFragment.kt b/app/src/main/java/ro/code4/monitorizarevot/ui/section/details/PollingStationDetailsFragment.kt
index 9397c23f..5b6acaf3 100644
--- a/app/src/main/java/ro/code4/monitorizarevot/ui/section/details/PollingStationDetailsFragment.kt
+++ b/app/src/main/java/ro/code4/monitorizarevot/ui/section/details/PollingStationDetailsFragment.kt
@@ -37,7 +37,9 @@ class PollingStationDetailsFragment : ViewModelFragment<PollingStationViewModel>
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         viewModel.pollingStation().observe(viewLifecycleOwner, Observer {
-            pollingStationBarText.text = it
+            pollingStationBarText.text = getString(
+                R.string.polling_station, it.first, it.second
+            )
         })
         viewModel.setTitle(getString(R.string.title_polling_station))
         viewModel.getPollingStationBarText()