diff --git a/data/locales/pt.lua b/data/locales/pt.lua
index f01bc13f..153bd637 100644
--- a/data/locales/pt.lua
+++ b/data/locales/pt.lua
@@ -112,6 +112,9 @@ locale = {
     ["Disable Shared Experience"] = "Desativar experiência compartilhada",
     ["Dismount"] = "Desmontar",
     ["Display connection speed to the server (milliseconds)"] = "Exibir a velocidade de conexão com o servidor (milisegundos)",
+    ["Display creature health bars"] = "Exibir barras de vida das criaturas",
+    ["Display creature names"] = "Exibir nomes das criaturas",
+    ["Display text messages"] = "Exibir mensagens de texto",
     ["Distance Fighting"] = "Combate a Distância",
     ["Don't stretch or shrink Game Window"] = "Não esticar ou contrair a janela do game",
     ["Druid"] = "Druid",
diff --git a/modules/client_options/options.lua b/modules/client_options/options.lua
index c6b54d3d..ca711f7b 100644
--- a/modules/client_options/options.lua
+++ b/modules/client_options/options.lua
@@ -85,6 +85,9 @@ function init()
   optionsWindow:hide()
   optionsButton = modules.client_topmenu.addLeftButton('optionsButton', tr('Options'), '/images/topbuttons/options', toggle)
 
+  optionsTabBar = optionsWindow:getChildById('optionsTabBar')
+  optionsTabBar:setContentWidget(optionsWindow:getChildById('optionsTabContent'))
+
   addEvent(function() setup() end)
 
   g_keyboard.bindKeyDown('Ctrl+Shift+F', function() toggleOption('fullscreen') end)
@@ -117,9 +120,6 @@ function setup()
     end
   end
 
-  optionsTabBar = optionsWindow:getChildById('optionsTabBar')
-  optionsTabBar:setContentWidget(optionsWindow:getChildById('optionsTabContent'))
-
   generalPanel = g_ui.loadUI('game')
   optionsTabBar:addTab(tr('Game'), generalPanel, '/images/optionstab/game')
 
diff --git a/modules/corelib/ui/uicombobox.lua b/modules/corelib/ui/uicombobox.lua
index 12c7bf2f..8198b967 100644
--- a/modules/corelib/ui/uicombobox.lua
+++ b/modules/corelib/ui/uicombobox.lua
@@ -116,6 +116,16 @@ function UIComboBox:onStyleApply(styleName, styleNode)
       self:addOption(option)
     end
   end
+
+  if styleNode.data then
+    for k,data in pairs(styleNode.data) do
+      local option = self.options[k]
+      if option then
+        option.data = data
+      end
+    end
+  end
+
   for name,value in pairs(styleNode) do
     if name == 'mouse-scroll' then
       self.mouseScroll = value