diff --git a/component.json b/component.json
index db15bab3cd..b5da53e6da 100644
--- a/component.json
+++ b/component.json
@@ -2,7 +2,7 @@
   "name": "Phraseanet",
   "version": "3.8.0",
   "dependencies": {
-    "bootstrap": "~2.3.0",
+    "bootstrap": "~2.2.2",
     "jquery": "~1.8.3",
     "font-awesome": "~3.0.2",
     "underscore": "~1.4.4",
diff --git a/lib/Alchemy/Phrasea/Setup/Requirements/BinariesRequirements.php b/lib/Alchemy/Phrasea/Setup/Requirements/BinariesRequirements.php
index 30a9a3864c..71a9f909ba 100644
--- a/lib/Alchemy/Phrasea/Setup/Requirements/BinariesRequirements.php
+++ b/lib/Alchemy/Phrasea/Setup/Requirements/BinariesRequirements.php
@@ -150,6 +150,7 @@ class BinariesRequirements extends RequirementCollection implements RequirementI
 
         if (null !== $unoconv) {
             $output = null;
+            exec($unoconv . ' --version', $output);
             $data = sscanf($output[0], 'unoconv %d.%d');
             $version = sprintf('%d.%d', $data[0], $data[1]);
 
diff --git a/plugins/autoload.php b/plugins/autoload.php
index 7c242765f2..e914fb7f97 100644
--- a/plugins/autoload.php
+++ b/plugins/autoload.php
@@ -1,10 +1,5 @@
 <?php
 
-// This file is automatically generated, please do not edit it.
-// To update configuration, use bin/console plugins:* commands.
-
 return call_user_func(function () {
-    $loader = require __DIR__ . '/../vendor/autoload.php';
-
-    return $loader;
+    return require __DIR__ . '/../vendor/autoload.php';
 });
diff --git a/plugins/services.php b/plugins/services.php
index e1edd7ca84..68ae54d28d 100644
--- a/plugins/services.php
+++ b/plugins/services.php
@@ -1,11 +1,7 @@
 <?php
 
-// This file is automatically generated, please do not edit it.
-// To update configuration, use bin/console plugins:* commands.
-
 use Alchemy\Phrasea\Application;
 
 return call_user_func(function (Application $app) {
-
     return $app;
 }, $app);
diff --git a/templates/web/admin/editusers_timelimit_sbas.html.twig b/templates/web/admin/editusers_timelimit_sbas.html.twig
index 45eaac6b9d..332fffc8d4 100644
--- a/templates/web/admin/editusers_timelimit_sbas.html.twig
+++ b/templates/web/admin/editusers_timelimit_sbas.html.twig
@@ -62,12 +62,16 @@ function datePicker()
     }
   });
   {% if datas.limited_to %}
-    var instance = $('.dmin').data("datepicker");
-    $('.dmin').datepicker("option", 'maxDate', $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, "{{datas.limited_to}}", instance.settings));
+    var instance = $('.dmin').data("ui-datepicker");
+    if (instance) {
+        $('.dmin').datepicker("option", 'maxDate', $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, "{{datas.limited_to}}", instance.settings));
+    }
   {% endif %}
   {% if datas.limited_from %}
-    var instance = $('.dmax').data("datepicker");
-    $('.dmax').datepicker("option", 'minDate', $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, "{{datas.limited_from}}", instance.settings));
+    var instance = $('.dmax').data("ui-datepicker");
+    if (instance) {
+        $('.dmax').datepicker("option", 'minDate', $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, "{{datas.limited_from}}", instance.settings));
+    }
   {% endif %}
 }
 </script>
diff --git a/templates/web/admin/task.html.twig b/templates/web/admin/task.html.twig
index 4e5592f7a2..128d5759d2 100644
--- a/templates/web/admin/task.html.twig
+++ b/templates/web/admin/task.html.twig
@@ -157,9 +157,13 @@
                 });
 
 {% if task.getInterfaceHTML() is empty %}
-                $("#taskTabs").tabs("disable", 0);
+                if ($("#taskTabs").tabs.data("ui-tabs")) {
+                    $("#taskTabs").tabs("disable", 0);
+                }
 {% else %}
-                $("#taskTabs").tabs("active", 0);
+                if ($("#taskTabs").tabs.data("ui-tabs")) {
+                    $("#taskTabs").tabs("active", 0);
+                }
 {% endif %}
 
                 $("#taskResetCrashCounterButton").click(function()
diff --git a/templates/web/common/index_bootstrap.html.twig b/templates/web/common/index_bootstrap.html.twig
index efe4ae28ba..8855230f4e 100644
--- a/templates/web/common/index_bootstrap.html.twig
+++ b/templates/web/common/index_bootstrap.html.twig
@@ -11,6 +11,9 @@
 
         <script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/jquery/jquery.js' }) }}"></script>
         <script type="text/javascript" src="{{ path('minifier', { 'f' : 'include/jslibs/jquery-ui-1.10.3.js' }) }}"></script>
+        <script type="text/javascript">
+            $.widget.bridge('uitooltip', $.ui.tooltip);
+        </script>
         <script type="text/javascript" src="{{ path('minifier', { 'f' : 'skins/build/bootstrap/js/bootstrap.js' }) }}"></script>
         <script type="text/javascript">
             var btn = $.fn.button.noConflict(); // reverts $.fn.button to jqueryui btn
diff --git a/templates/web/common/indexfloat.html.twig b/templates/web/common/indexfloat.html.twig
index 7511752cfc..cd4e1e1ae4 100644
--- a/templates/web/common/indexfloat.html.twig
+++ b/templates/web/common/indexfloat.html.twig
@@ -3,7 +3,7 @@
   <head>
     <meta http-equiv="X-UA-Compatible" content="chrome=1">
     <title>{% if local_title is defined%}{{local_title}} | {% endif %}{{ app['phraseanet.registry'].get('GV_homeTitle') }} - {{ module_name }} </title>
-    <link type="text/css" rel="stylesheet" href="{{app['phraseanet.registry'].get('GV_STATIC_URL')}}/skins/common/main.css">
+    <link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'skins/common/main.css' }) }}">
     {% block stylesheet %}{% endblock %}
     {% block icon %}{% endblock %}
     {% block rss %}{% endblock %}
diff --git a/templates/web/lightbox/IE6/validate.html.twig b/templates/web/lightbox/IE6/validate.html.twig
index 3400be898c..5669d01012 100644
--- a/templates/web/lightbox/IE6/validate.html.twig
+++ b/templates/web/lightbox/IE6/validate.html.twig
@@ -7,11 +7,6 @@
         <script type="text/javascript" src="{{ path('minifier', { 'g' : 'lightboxie6' }) }}"></script>
 {% endblock %}
 
-{% block stylesheet %}
-    <link type="text/css" rel="stylesheet"
-        href="{{ path('minifier', { 'f' : 'include/jslibs/jquery-ui-1.10.3/css/ui-lightness/jquery-ui-1.10.3.custom.css,skins/lightbox/lightboxie6.css' }) }}" media="screen"/>
-{% endblock %}
-
 {% block content %}
     {% set basket_element = basket.getElements().first() %}
     <div id="innerWrapper" style="top:10px;left:10px;position:relative;width:100%;height:100%;">
diff --git a/templates/web/prod/User/Add.html.twig b/templates/web/prod/User/Add.html.twig
index c0fa002d27..ad1909cfc1 100644
--- a/templates/web/prod/User/Add.html.twig
+++ b/templates/web/prod/User/Add.html.twig
@@ -66,16 +66,17 @@
     $("#QuickAddUser button").button();
 
     $("#QuickAddUser form").bind('submit', function(){
-
-
       return false;
     });
     $("#QuickAddUser form button.cancel").bind('click', function(){
+        var dialog = $(this).closest('.ui-dialog-content');
+        if (dialog.data("ui-dialog")) {
+            dialog.dialog('destroy');
+        }
 
-      $(this).closest('.ui-dialog-content').dialog('destroy');
-      $(this).closest('.ui-dialog-content').remove();
+        dialog.remove();
 
-      return false;
+        return false;
     });
     $("#QuickAddUser form button.valid").bind('click', function(){
 
@@ -83,7 +84,10 @@
       var $this = $(this);
 
       var callback = function(){
-        $this.closest('.ui-dialog-content').dialog('destroy').remove()
+          var dialog = $this.closest('.ui-dialog-content');
+          if (dialog.data("ui-dialog")) {
+              dialog.dialog('destroy').remove();
+          }
       };
 
       p4.Feedback.addUser($form, callback);
diff --git a/templates/web/prod/actions/Bridge/index.html.twig b/templates/web/prod/actions/Bridge/index.html.twig
index f3c19e4299..0bd92b6ea5 100644
--- a/templates/web/prod/actions/Bridge/index.html.twig
+++ b/templates/web/prod/actions/Bridge/index.html.twig
@@ -109,7 +109,9 @@ $(function() {
       $('.error_box, .notice_box', $panel).delay(10000).fadeOut();
 
       $('.back_link', $panel).bind('click', function(){
-        $('#pub_tabs').tabs('load',$('#pub_tabs').tabs('option', 'active'));
+        if ($('#pub_tabs').data("ui-tabs")) {
+            $('#pub_tabs').tabs('load',$('#pub_tabs').tabs('option', 'active'));
+        }
 
         return false;
       });
@@ -317,25 +319,26 @@ $(function() {
 
   pub_tabs.tabs({
     beforeLoad: function( event, ui ) {
-        ui.tab.find('span').html("<i>loading...</i>");
+        ui.tab.html_tab = ui.tab.find('span').html();
+        ui.tab.find('span').html("<i>{{ 'Loading'|trans }}...</i>");
     },
     load: function(event, ui)
     {
-      ui.tab.find('span').empty();
-      $panel = $(ui.panel);
-      $('.container-bridge', $panel).removeClass('loading');
-      panel_load($panel);
+        ui.tab.find('span').empty().append(ui.tab.html_tab);
+        $panel = $(ui.panel);
+        $('.container-bridge', $panel).removeClass('loading');
+        $panel.addClass("PNB");
+        $panel.wrapInner("<div class='PNB10 container-bridge' />");
+        panel_load($panel);
     }
-    //@todo remove this as it is deprected, check where new tabs is added
-    , panelTemplate : '<div class="PNB"><div class="PNB10 container-bridge"></div></div>'
     ,beforeActivate: function(event, ui)
     {
-      if($(ui.tab).hasClass('account'))
-      {
-        var container = $('.container-bridge', ui.panel);
-        container.empty();
-        $('.container', ui.panel).addClass('loading');
-      }
+        if($(ui.tab).hasClass('account'))
+        {
+          var container = $('.container-bridge', ui.panel);
+          container.empty();
+          $('.container', ui.panel).addClass('loading');
+        }
     }
   }).addClass('ui-tabs-vertical ui-helper-clearfix');
   $('.ui-tabs-nav', pub_tabs).removeClass('ui-corner-all');
@@ -399,16 +402,23 @@ $(function() {
 
 
   $("li", pub_tabs).removeClass('ui-corner-top').addClass('ui-corner-left');
+
   $("#api_connexion").click(function(){
-    container.dialog("close")
+    if (container.data("ui-dialog")) {
+        container.dialog("close");
+    }
   });
 
   {% if route.get_count_element_received() == 0 %}
     alert('{{ "Vous n\'avez selectionne aucun element"|trans|e('js') }}');
-    container.dialog('close');
+    if (container.data("ui-dialog")) {
+        container.dialog("close");
+    }
   {% elseif route.get_count_actionable() == 0 %}
     alert('{{ "Vous n\'avez pas assez de droits sur les elements selectionnes"|trans|e('js') }}');
-    container.dialog('close');
+    if (container.data("ui-dialog")) {
+        container.dialog("close");
+    }
   {% elseif route.get_count_actionable() != route.get_count_element_received() %}
     alert('{{ "Vous n\'avez pas assez de droits sur certains elements selectionnes"|trans|e('js') }}');
   {% endif %}
diff --git a/templates/web/prod/actions/Property/index.html.twig b/templates/web/prod/actions/Property/index.html.twig
index 1076a0c30c..5df81f0931 100644
--- a/templates/web/prod/actions/Property/index.html.twig
+++ b/templates/web/prod/actions/Property/index.html.twig
@@ -143,7 +143,7 @@
                     ui.tab.data( "loaded", true );
                });
 
-               ui.tab.find('span').html("<i>loading...</i>");
+               ui.tab.find('span').html("<i>{{ 'Loading'|trans }}...</i>");
            },
             load: function(event, ui)
             {
diff --git a/templates/web/prod/index.html.twig b/templates/web/prod/index.html.twig
index 7db96a6748..29a7ee639d 100644
--- a/templates/web/prod/index.html.twig
+++ b/templates/web/prod/index.html.twig
@@ -75,27 +75,11 @@
     </style>
     <style type="text/css">
         /* Vertical Tabs */
-        .ui-tabs-vertical .ui-tabs-nav {
-            padding: .2em .1em .2em .2em;
-            float: left;
-            width: 12em;
-        }
-        .ui-tabs-vertical .ui-tabs-nav li {
-            clear: left;
-            width: 100%;
-            border-bottom-width: 1px !important;
-            border-right-width: 0 !important;
-            margin: 0 -1px .2em 0;
-        }
-        .ui-tabs-vertical .ui-tabs-nav li a {
-            display:block;
-        }
-        .ui-tabs-vertical .ui-tabs-nav li.ui-tabs-selected {
-            padding-bottom: 0;
-            padding-right: .1em;
-            border-right-width: 1px;
-            border-right-width: 1px;
-        }
+        .ui-tabs-vertical .ui-tabs-nav { padding: .2em .1em .2em .2em; float: left; width: 12em; }
+        .ui-tabs-vertical .ui-tabs-nav li { clear: left; width: 100%; border-bottom-width: 1px !important; border-right-width: 0 !important; margin: 0 -1px .2em 0; }
+        .ui-tabs-vertical .ui-tabs-nav li a { display:block; }
+        .ui-tabs-vertical .ui-tabs-nav li.ui-tabs-active { padding-bottom: 0; padding-right: .1em; border-right-width: 1px; border-right-width: 1px; }
+        .ui-tabs-vertical .ui-tabs-panel { padding: 1em; float: right;}
     </style>
 
     <link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'include/jslibs/jquery.contextmenu.css,include/jslibs/colorpicker/css/colorpicker.css,include/jslibs/jquery-treeview/jquery.treeview.css,skins/common/main.css,skins/geonames/geonames.css,include/jquery.image_enhancer.css' }) }}" >
@@ -171,7 +155,7 @@
                         </li>
                         {% endif %}
                         <li style="float:right;">
-                            <a href="#" class="" style="margin:8px 0;">
+                            <a href="#" class="escamote" style="margin:8px 0;">
                                 <img src="/skins/icons/workzoneEscamote.png" title="{% trans 'Close the WorkZone' %}"/>
                             </a>
                         </li>
@@ -826,7 +810,7 @@
                         <h1>{% trans 'Theme' %}</h1>
                         {% for color, file in css %}
                             <div title="{% trans 'Selecteur de theme' %}" class="colorpicker_box"
-                                onclick="setCss('{{color}}')" style="width:16px;height:16px;background-color:#{{ color }};">&nbsp;</div>
+                                onclick="setCss('{{color}}');" style="width:16px;height:16px;background-color:#{{ color }};">&nbsp;</div>
                         {% endfor %}
                     </div>
                 </div>
@@ -1026,7 +1010,7 @@
         function sessionactive(){
             $.ajax({
                 type: "POST",
-                url: "/session/update/",
+                url: "{{ path('update_session') }}",
                 dataType: "json",
                 data: {
                     module : 1,
@@ -1048,14 +1032,14 @@
 
                     return;
                 }
-            })
+            });
         };
 
         function setCss(color) {
             $("#skinCss").attr("href","/include/minify/?f=skins/prod/"+color+"/prodcolor.css");
-            $.post("prodFeedBack.php", {
-                action: "CSS",
-                color: color,
+            $.post("{{ path('save_pref') }}", {
+                prop: "css",
+                value: color,
                 t: Math.random()
             }, function(data){
                 return;
diff --git a/templates/web/prod/templates/upload.html.twig b/templates/web/prod/templates/upload.html.twig
index 18f7e46090..81d4029b58 100644
--- a/templates/web/prod/templates/upload.html.twig
+++ b/templates/web/prod/templates/upload.html.twig
@@ -45,7 +45,7 @@
 <b><%= heading %></b>
 <br />
 <% _.each(reasons, function(reason) { %>
-    <div>*<%= reason%></div>
+    <div>*<%= reason %></div>
 <% }); %>
 </script>
 
diff --git a/templates/web/prod/upload/lazaret.html.twig b/templates/web/prod/upload/lazaret.html.twig
index 9d61e8328a..cf168c90b3 100644
--- a/templates/web/prod/upload/lazaret.html.twig
+++ b/templates/web/prod/upload/lazaret.html.twig
@@ -95,7 +95,7 @@
 
                     }else{
                         var html = _.template($("#alert_error_tpl").html(), {
-                             content:datas.message
+                             content:data.message
                         });
 
                         that.closest(".btn-group").before( html );
@@ -104,7 +104,7 @@
                 error: function(){
                     stopAjax(that);
                     var html = _.template($("#alert_error_tpl").html(), {
-                        content:datas.message
+                        content:language.errorAjaxRequest
                     });
 
                     that.closest(".btn-group").before( html );
@@ -138,7 +138,7 @@
                         that.closest(".wrapper-item").remove();
                     }else{
                         var html = _.template($("#alert_error_tpl").html(), {
-                             content:datas.message
+                             content:data.message
                         });
                         that.closest(".thumbnail").append(html);
                     }
diff --git a/templates/web/report/all_content.html.twig b/templates/web/report/all_content.html.twig
index f34abce68b..f76d181448 100644
--- a/templates/web/report/all_content.html.twig
+++ b/templates/web/report/all_content.html.twig
@@ -1,7 +1,7 @@
 {% extends "common/index_bootstrap.html.twig" %}
 
 {% block stylesheet %}
-    <link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'skins/report/jquery-ui.css,skins/report/jquery-ui-2.css,skins/report/report-table.css,skins/report/jquery.cluetip.css,include/jslibs/jquery.contextmenu.css' }) }}" media="screen" />
+    <link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'skins/common/main.css,skins/report/jquery-ui.css,skins/report/jquery-ui-2.css,skins/report/report-table.css,skins/report/jquery.cluetip.css,include/jslibs/jquery.contextmenu.css' }) }}" media="screen" />
     <link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'skins/report/print.css' }) }}" media="print" />
 {% endblock stylesheet %}
 
@@ -38,8 +38,6 @@
 
     </script>
     <script type="text/javascript" src="https://www.google.com/jsapi"></script>
-    <script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/jquery/jquery.js' }) }}"></script>
-    <script type="text/javascript" src="{{ path('minifier', { 'f' : 'include/jslibs/jquery-ui-1.10.3.js' }) }}"></script>
     <script type="text/javascript" src="{{ path('minifier', { 'g' : 'report' }) }}"></script>
     <script type="text/javascript" src="{{ path('minifier', { 'f' : 'include/jslibs/jquery.gvChart-0.1.js' }) }}"></script>
     <script type="text/javascript">
diff --git a/www/include/jquery.common.js b/www/include/jquery.common.js
index 8900b3bab6..6a80123e64 100644
--- a/www/include/jquery.common.js
+++ b/www/include/jquery.common.js
@@ -18,6 +18,7 @@ $(document).ready(function(){
 	$.datepicker.setDefaults($.datepicker.regional[jq_date]);
 
 	$('a.infoDialog,div.infoDialog').live('click',function(event){
+            console.log("click");
 		infoDialog($(this));
 	});
 
diff --git a/www/skins/admin/editusers.js b/www/skins/admin/editusers.js
index a023d4a65d..403f7febd6 100644
--- a/www/skins/admin/editusers.js
+++ b/www/skins/admin/editusers.js
@@ -168,7 +168,9 @@ $('#right-ajax button.users_rights_valid').bind('click', function(){
           success: function(data){
             var dialog = $('#time_dialog');
 
-            dialog.html(data).dialog('open');
+            if (dialog.data("ui-dialog")) {
+                dialog.html(data).dialog('open');
+            }
 
             $('div.switch_time', dialog).bind('click', function(event){
               var newclass, boxes;
@@ -238,9 +240,11 @@ $('#right-ajax button.users_rights_valid').bind('click', function(){
         base_id:base_id
       },
       success: function(data){
-
         var dialog = $('#quotas_dialog');
-        dialog.html(data).dialog('open');
+
+        if (dialog.data("ui-dialog")) {
+            dialog.html(data).dialog('open');
+        }
 
         $('div.switch_quota', dialog).bind('click', function(event){
           var newclass, boxes;
diff --git a/www/skins/admin/users.js b/www/skins/admin/users.js
index 2c40d7db31..e1a962a9f3 100644
--- a/www/skins/admin/users.js
+++ b/www/skins/admin/users.js
@@ -64,7 +64,7 @@ $(document).ready(function(){
     check_new_user(true);
   };
   buttons[language.annuler] = function(){
-    $('#template_add_dialog').dialog('close')
+    $('#template_add_dialog').dialog('close');
   };
 
   $('#template_add_dialog').dialog({
@@ -96,7 +96,9 @@ $(document).ready(function(){
         $('.new_user_loader', container).hide();
         if(!data.error)
         {
-          container.dialog('close');
+          if (container.data("ui-dialog")) {
+            container.dialog('close');
+          }
           $('input[name="value"]', container).val('');
           $('#right-ajax').empty().addClass('loading');
           p4.users.sel = [];
@@ -130,14 +132,15 @@ $(document).ready(function(){
 
 
   $('#users_page .user_adder').live('click', function(){
-
-    $('#user_add_dialog').dialog('open');
-
+    if ($('#user_add_dialog').data("ui-dialog")) {
+        $('#user_add_dialog').dialog('open');
+    }
   });
+
   $('#users_page .template_adder').live('click', function(){
-
-    $('#template_add_dialog').dialog('open');
-
+      if ($('#template_add_dialog').data("ui-dialog")) {
+        $('#template_add_dialog').dialog('open');
+      }
   });
 
   $('#users_page_form').live('submit', function(){
diff --git a/www/skins/client/jquery.p4client.1.0.js b/www/skins/client/jquery.p4client.1.0.js
index 9e8178a363..1ecd5b180e 100644
--- a/www/skins/client/jquery.p4client.1.0.js
+++ b/www/skins/client/jquery.p4client.1.0.js
@@ -62,7 +62,9 @@ function activateCgus()
 			    var currentdialog = $(this);
 			    $('.cgus-accept',$(this)).bind('click',function(){
 			    	acceptCgus($('.cgus-accept',currentdialog).attr('id'),$('.cgus-accept',currentdialog).attr('date'));
-			    	$('.cgu-dialog').dialog('close');
+			    	if ($('.cgu-dialog').data("ui-dialog")) {
+                                    $('.cgu-dialog').dialog('close');
+                                }
 			    });
 			    $('.cgus-cancel',$(this)).bind('click',function(){
 			    	if(confirm(language.warningDenyCgus))
diff --git a/www/skins/common/main.css b/www/skins/common/main.css
index 96829f22a7..fa6fe89811 100644
--- a/www/skins/common/main.css
+++ b/www/skins/common/main.css
@@ -228,5 +228,6 @@ input.checkbox{
     display:none;
 }
 
-
-
+#tooltip .popover {
+    max-width: none;
+}
diff --git a/www/skins/prod/000000/prodcolor.css b/www/skins/prod/000000/prodcolor.css
index f7ea923e60..693325ff06 100644
--- a/www/skins/prod/000000/prodcolor.css
+++ b/www/skins/prod/000000/prodcolor.css
@@ -210,14 +210,14 @@ span.ww_winTitle {
     overflow: hidden;
 }
 
-.ui-tabs .ui-tabs-nav li.ui-tabs-selected {
+.ui-tabs .ui-tabs-nav li.ui-tabs-active {
     background-color: #404040;
     border: none;
 }
 
 #idFrameC .ui-tabs .ui-tabs-nav li {
     width: auto;
-    height: 52px;
+    height: 45px;
     display: inline-block;
     background-color: #404040;
     z-index: 10;
@@ -303,14 +303,14 @@ span.ww_winTitle {
     font-weight: normal;
 }
 
-.ui-tabs .ui-tabs-nav li.ui-tabs-selected a,
+.ui-tabs .ui-tabs-nav li.ui-tabs-active a,
 .ui-tabs .ui-tabs-nav li.ui-state-disabled a,
 .ui-tabs .ui-tabs-nav li.ui-state-processing a {
     cursor: pointer;
 }
 
 .ui-tabs .ui-tabs-nav li a,
-.ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a {
+.ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active a {
     cursor: pointer;
 }
 
@@ -624,14 +624,21 @@ div.diapo {
 }
 
 /******* POPOVERS *************************************************************/
+#tooltip .popover {
+    background-color:inherit;
+}
 
 .popover-inner {
-    background: none repeat scroll 0 0 #666666;
+    background-color: black;
+    border: 2px solid #444;
+    padding: 0px;
     color: #FFFFFF;
+    border-radius: 4px;
 }
 
 .popover-inner .popover-title {
     background-color: #404040;
+    border-radius: 0;
 }
 
 .popover-inner .popover-content {
@@ -1769,7 +1776,7 @@ H4 {
     color: #333333;
 }
 
-.bodyprofile .ui-tabs .ui-tabs-nav li.ui-tabs-selected {
+.bodyprofile .ui-tabs .ui-tabs-nav li.ui-tabs-active {
     background-color: #a3a3a3;
     color: #404040;
 }
@@ -2286,7 +2293,7 @@ DIV.thesaurus U.w {
     background-color: #404040;
 }
 
-#EDIT_MID_R li.ui-tabs-selected,
+#EDIT_MID_R li.ui-tabs-active,
 #EDIT_MID_R li.ui-state-active {
     background-color: #404040;
 }
@@ -2972,7 +2979,7 @@ dans l'onglet thesaurus : arbres, menus contextuels
     color: #c0c0c0;
 }
 
-#THPD_tabs .ui-tabs-nav .ui-tabs-selected A {
+#THPD_tabs .ui-tabs-nav .ui-tabs-active A {
     color: #FFFFFF;
     text-decoration: underline;
 }
@@ -4256,3 +4263,7 @@ dans l'onglet thesaurus : arbres, menus contextuels
 #lazaretBox .lazaret-file .thumbnail button img {
     margin-right: 5px;
 }
+
+ui-dialog-titlebar {
+    min-height: 20px;
+}
diff --git a/www/skins/prod/959595/prodcolor.css b/www/skins/prod/959595/prodcolor.css
index 2bdbc204c6..234d7b8b28 100644
--- a/www/skins/prod/959595/prodcolor.css
+++ b/www/skins/prod/959595/prodcolor.css
@@ -210,20 +210,20 @@ span.ww_winTitle {
     overflow: hidden;
 }
 
-.ui-tabs .ui-tabs-nav li.ui-tabs-selected {
+.ui-tabs .ui-tabs-nav li.ui-tabs-active {
     background-color: #B1B1B1;
     border: none;
 }
 
 #idFrameC .ui-tabs .ui-tabs-nav li {
     width: auto;
-    height: 52px;
+    height: 45px;
     display: inline-block;
     background-color: #999999;
     z-index: 10;
 }
 
-#idFrameC .ui-tabs .ui-tabs-nav li.ui-tabs-selected {
+#idFrameC .ui-tabs .ui-tabs-nav li.ui-tabs-active {
     background-color: #B1B1B1;
 }
 
@@ -312,7 +312,7 @@ span.ww_winTitle {
     font-weight: normal;
 }
 
-.ui-tabs .ui-tabs-nav li.ui-tabs-selected a,
+.ui-tabs .ui-tabs-nav li.ui-tabs-active a,
 .ui-tabs .ui-tabs-nav li.ui-state-disabled a,
 .ui-tabs .ui-tabs-nav li.ui-state-processing a {
     cursor: pointer;
@@ -320,7 +320,7 @@ span.ww_winTitle {
 }
 
 .ui-tabs .ui-tabs-nav li a,
-.ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a {
+.ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active a {
     cursor: pointer;
     color: black;
 }
@@ -652,13 +652,21 @@ div.diapo {
 
 /******* POPOVERS *************************************************************/
 
+#tooltip .popover {
+    background-color:inherit;
+}
+
 .popover-inner {
-    background: none repeat scroll 0 0 #999999;
+    background-color: #999999;
+    border: 2px solid #444;
+    padding: 0px;
     color: #333333;
+    border-radius: 4px;
 }
 
 .popover-inner .popover-title {
     background-color: #B1B1B1;
+    border-radius: 0;
 }
 
 .popover-inner .popover-content {
@@ -1820,7 +1828,7 @@ H4 {
     color: #333333;
 }
 
-.bodyprofile .ui-tabs .ui-tabs-nav li.ui-tabs-selected {
+.bodyprofile .ui-tabs .ui-tabs-nav li.ui-tabs-active {
     background-color: #a3a3a3;
     color: #FFFFFF;
 }
@@ -2351,7 +2359,7 @@ DIV.thesaurus U.w {
     background-color: #D9D9D9;
 }
 
-#EDIT_MID_R li.ui-tabs-selected,
+#EDIT_MID_R li.ui-tabs-active,
 #EDIT_MID_R li.ui-state-active {
     background-color: #D9D9D9;
 }
@@ -3051,7 +3059,7 @@ dans l'onglet thesaurus :  arbres, menus contextuels
     color: #c0c0c0;
 }
 
-#THPD_tabs .ui-tabs-nav .ui-tabs-selected A {
+#THPD_tabs .ui-tabs-nav .ui-tabs-active A {
     color: #FFFFFF;
     text-decoration: underline;
 }
@@ -4399,3 +4407,7 @@ dans l'onglet thesaurus :  arbres, menus contextuels
 #lazaretBox .lazaret-file .thumbnail button img {
     margin-right: 5px;
 }
+
+ui-dialog-titlebar {
+    min-height: 20px;
+}
diff --git a/www/skins/prod/jquery.Dialog.js b/www/skins/prod/jquery.Dialog.js
index 1fbd539b82..b90f76a0a7 100644
--- a/www/skins/prod/jquery.Dialog.js
+++ b/www/skins/prod/jquery.Dialog.js
@@ -155,10 +155,12 @@ var p4 = p4 || {};
       var $this = this;
       $(window).unbind('resize.DIALOG' + getLevel(level))
       .bind('resize.DIALOG' + getLevel(level), function(){
-        $this.$dialog.dialog('option', {
-          width : bodySize.x - 30,
-          height : bodySize.y - 30
-        });
+        if ($this.$dialog.data("ui-dialog")) {
+            $this.$dialog.dialog('option', {
+              width : bodySize.x - 30,
+              height : bodySize.y - 30
+            });
+        }
       });
     }
 
@@ -213,22 +215,24 @@ var p4 = p4 || {};
       return this.$dialog;
     },
     getOption : function (optionName) {
-      return this.$dialog.dialog('option', optionName);
+      if (this.$dialog.data("ui-dialog")) {
+          return this.$dialog.dialog('option', optionName);
+      }
+      return null;
     },
     setOption : function (optionName, optionValue) {
-
       if(optionName === 'buttons')
       {
         optionValue = addButtons(optionValue, this);
       }
-
-      this.$dialog.dialog('option', optionName, optionValue);
+      if (this.$dialog.data("ui-dialog")) {
+        this.$dialog.dialog('option', optionName, optionValue);
+      }
     }
   };
 
   var Dialog = function () {
     this.currentStack = {};
-
   };
 
   Dialog.prototype = {
diff --git a/www/skins/prod/jquery.Feedback.js b/www/skins/prod/jquery.Feedback.js
index 418df45593..8e05193401 100644
--- a/www/skins/prod/jquery.Feedback.js
+++ b/www/skins/prod/jquery.Feedback.js
@@ -54,12 +54,16 @@
           return;
         },
         error: function(){
-          $('#user_adder_dialog').dialog('destroy');
+          if ($('#user_adder_dialog').data("ui-dialog")) {
+            $('#user_adder_dialog').dialog('destroy');
+          }
           $('#user_adder_dialog').remove();
           return;
         },
         timeout: function(){
-          $('#user_adder_dialog').dialog('destroy');
+          if ($('#user_adder_dialog').data("ui-dialog")) {
+            $('#user_adder_dialog').dialog('destroy');
+          }
           $('#user_adder_dialog').remove();
           return;
         }
@@ -486,12 +490,16 @@
           return;
         },
         error: function(){
-          $('#user_adder_dialog').dialog('destroy');
+          if ($('#user_adder_dialog').data("ui-dialog")) {
+            $('#user_adder_dialog').dialog('destroy');
+          }
           $('#user_adder_dialog').remove();
           return;
         },
         timeout: function(){
-          $('#user_adder_dialog').dialog('destroy');
+          if ($('#user_adder_dialog').data("ui-dialog")) {
+            $('#user_adder_dialog').dialog('destroy');
+          }
           $('#user_adder_dialog').remove();
           return;
         }
diff --git a/www/skins/prod/jquery.WorkZone.js b/www/skins/prod/jquery.WorkZone.js
index d357d68299..7589ffeb03 100644
--- a/www/skins/prod/jquery.WorkZone.js
+++ b/www/skins/prod/jquery.WorkZone.js
@@ -27,10 +27,15 @@ var p4 = p4 || {};
             success: function(data) {
                 var cache = $("#idFrameC #baskets");
 
-                $(".SSTT", cache).droppable('destroy');
-                $('.bloc', cache).droppable('destroy');
-
-                cache.accordion('destroy').empty().append(data);
+                if ($(".SSTT", cache).data("ui-droppable")) {
+                    $(".SSTT", cache).droppable('destroy');
+                }
+                if ($(".bloc", cache).data("ui-droppable")) {
+                    $('.bloc', cache).droppable('destroy');
+                }
+                if (cache.data("ui-accordion")) {
+                    cache.accordion('destroy').empty().append(data);
+                }
 
                 activeBaskets();
                 $('.basketTips').tooltip({
@@ -124,7 +129,10 @@ var p4 = p4 || {};
                     humane.info(data.message);
                     p4.WorkZone.Selection.remove(id);
 
-                    $('.wrapCHIM_' + id).find('.CHIM').draggable('destroy');
+                    if ($('.wrapCHIM_' + id).find('.CHIM').data("ui-draggable")) {
+                        $('.wrapCHIM_' + id).find('.CHIM').draggable('destroy');
+                    }
+
                     $('.wrapCHIM_' + id).remove();
 
                     if (context === "reg_train_basket") {
@@ -294,8 +302,10 @@ var p4 = p4 || {};
                 header.removeClass('unread');
 
                 var dest = header.next();
-
-                dest.droppable('destroy').empty().removeClass('loading');
+                if (dest.data("ui-droppable")) {
+                    dest.droppable('destroy')
+                }
+                dest.empty().removeClass('loading');
 
                 dest.append(data);
 
@@ -552,40 +562,40 @@ var p4 = p4 || {};
                 getContent(sstt.prev());
             },
             'close': function() {
-//                var frame = $('#idFrameC'), that = this;
-//
-//                if (!frame.hasClass('closed'))
-//                {
-//                    frame.data('openwidth', frame.width());
-//                    frame.animate({width: 100},
-//                    300,
-//                            'linear',
-//                            function() {
-//                                answerSizer();
-//                                linearize();
-//                                $('#answers').trigger('resize');
-//                            });
-//                    frame.addClass('closed');
-//                    $('.escamote', frame).hide();
-//                    $('li.ui-tabs-selected', frame).removeClass('ui-tabs-selected');
-//                    frame.unbind('click.escamote').bind('click.escamote', function() {
-//                        that.open();
-//                    });
-//                }
+                var frame = $('#idFrameC'), that = this;
+
+                if (!frame.hasClass('closed'))
+                {
+                    frame.data('openwidth', frame.width());
+                    frame.animate({width: 100},
+                    300,
+                            'linear',
+                            function() {
+                                answerSizer();
+                                linearize();
+                                $('#answers').trigger('resize');
+                            });
+                    frame.addClass('closed');
+                    $('.escamote', frame).hide();
+                    $('li.ui-tabs-selected', frame).removeClass('ui-tabs-selected');
+                    frame.unbind('click.escamote').bind('click.escamote', function() {
+                        that.open();
+                    });
+                }
             },
             'open': function() {
-//                var frame = $('#idFrameC');
-//
-//                if (frame.hasClass('closed'))
-//                {
-//                    var width = frame.data('openwidth') ? frame.data('openwidth') : 300;
-//                    frame.css({width: width});
-//                    answerSizer();
-//                    linearize();
-//                    frame.removeClass('closed');
-//                    $('.escamote', frame).show();
-//                    frame.unbind('click.escamote');
-//                }
+                var frame = $('#idFrameC');
+
+                if (frame.hasClass('closed'))
+                {
+                    var width = frame.data('openwidth') ? frame.data('openwidth') : 300;
+                    frame.css({width: width});
+                    answerSizer();
+                    linearize();
+                    frame.removeClass('closed');
+                    $('.escamote', frame).show();
+                    frame.unbind('click.escamote');
+                }
             }
         };
     });
diff --git a/www/skins/prod/jquery.edit.js b/www/skins/prod/jquery.edit.js
index 7eb3b89b91..8858f383b4 100644
--- a/www/skins/prod/jquery.edit.js
+++ b/www/skins/prod/jquery.edit.js
@@ -25,9 +25,15 @@ function setSizeLimits()
   if(!$('#EDITWINDOW').is(':visible'))
     return;
 
-  $('#EDIT_TOP').resizable('option','maxHeight', ($('#EDIT_ALL').height() - $('#buttonEditing').height() - 10 - 160));
-  $('#divS_wrapper').resizable('option','maxWidth', ($('#EDIT_MID_L').width() - 270));
-  $('#EDIT_MID_R').resizable('option','maxWidth', ($('#EDIT_MID_R').width() + $('#idEditZone').width() - 240));
+  if ($('#EDIT_TOP').data("ui-resizable")) {
+    $('#EDIT_TOP').resizable('option','maxHeight', ($('#EDIT_ALL').height() - $('#buttonEditing').height() - 10 - 160));
+  }
+  if ($('#divS_wrapper').data("ui-resizable")) {
+    $('#divS_wrapper').resizable('option','maxWidth', ($('#EDIT_MID_L').width() - 270));
+  }
+  if ($('#EDIT_MID_R').data("ui-resizable")) {
+    $('#EDIT_MID_R').resizable('option','maxWidth', ($('#EDIT_MID_R').width() + $('#idEditZone').width() - 240));
+  }
 }
 
 function edit_kdwn(evt, src)
@@ -303,7 +309,10 @@ function editField(evt, meta_struct_id)
             dateObj.setMonth((d[1]-1));
             dateObj.setDate(d[2]);
           }
-          $("#idEditDateZone", p4.edit.editBox).datepicker('setDate', dateObj);
+
+          if ($("#idEditDateZone", p4.edit.editBox).data("ui-datepicker")) {
+              $("#idEditDateZone", p4.edit.editBox).datepicker('setDate', dateObj);
+          }
         }
       }
       p4.edit.textareaIsDirty = false;
@@ -1511,14 +1520,16 @@ function preset_copy()
   {
     if(p4.edit.T_fields[i]._status == 1)
     {
-      var c = p4.edit.T_fields[i]._value == "" ? "" : "checked=\"1\"";
+      var c = p4.edit.T_fields[i]._value === "" ? "" : "checked=\"1\"";
       var v = p4.edit.T_fields[i]._value;
       html += "<div><label class=\"checkbox\" for=\"new_preset_" + p4.edit.T_fields[i].name + "\"><input type=\"checkbox\" class=\"checkbox\" id=\"new_preset_" + p4.edit.T_fields[i].name + "\" value=\"" + i + "\" " + c + "/>" + "<b>" + p4.edit.T_fields[i].label + " : </b></label> ";
       html += cleanTags(p4.edit.T_fields[i]._value) + "</div>";
     }
   }
   $("#Edit_copyPreset_dlg FORM DIV").html(html);
-  $("#Edit_copyPreset_dlg").dialog('open');
+  if ( $("#Edit_copyPreset_dlg").data("ui-dialog")) {
+      $("#Edit_copyPreset_dlg").dialog('open');
+  }
 }
 
 function preset_paint(data)
@@ -1586,8 +1597,9 @@ function preset_load(preset_id)
     p,
     function(data, textStatus)
     {
-
-      $("#Edit_copyPreset_dlg").dialog("close");
+      if ($("#Edit_copyPreset_dlg").data("ui-dialog")) {
+        $("#Edit_copyPreset_dlg").dialog("close");
+      }
 
       for(i in p4.edit.T_fields)
       {
@@ -2043,7 +2055,9 @@ function startThisEditing(sbas_id,what,regbasprid,ssel)
       {
         preset_paint(data);
 
-        $("#Edit_copyPreset_dlg").dialog("close");
+        if ($("#Edit_copyPreset_dlg").data("ui-dialog")) {
+            $("#Edit_copyPreset_dlg").dialog("close");
+        }
       }
     });
   };
diff --git a/www/skins/prod/jquery.main-prod.js b/www/skins/prod/jquery.main-prod.js
index 6123baaa35..f2ab3da25a 100644
--- a/www/skins/prod/jquery.main-prod.js
+++ b/www/skins/prod/jquery.main-prod.js
@@ -648,7 +648,7 @@ function activateCgus()
         width:800,
         height:500,
         open:function() {
-//            $this.parents(".ui-dialog:first").find(".ui-dialog-titlebar-close").remove();
+            $this.parents(".ui-dialog:first").find(".ui-dialog-titlebar-close").remove();
             $('.cgus-accept',$(this)).bind('click',function(){
                 acceptCgus($('.cgus-accept',$this).attr('id'),$('.cgus-accept',$this).attr('date'));
                 $this.dialog('close').remove();
@@ -688,12 +688,10 @@ function triggerShortcuts()
     };
 
     $('#keyboard-dialog').dialog({
-
         closeOnEscape:false,
         resizable:false,
         draggable:false,
         modal:true,
-        draggable:false,
         width:600,
         height:400,
         zIndex:1400,
@@ -703,8 +701,13 @@ function triggerShortcuts()
         },
         close : function(){
 
-            if($('#keyboard-stop').get(0).checked)
-                $('#keyboard-dialog').dialog('destroy').remove();
+            if($('#keyboard-stop').get(0).checked) {
+                var dialog = $('#keyboard-dialog');
+                if (dialog.data("ui-dialog")) {
+                    dialog.dialog('destroy');
+                }
+                dialog.remove();
+            }
         }
     }).dialog('option','buttons',buttons).dialog('open');
     return false;
@@ -1000,8 +1003,6 @@ $(document).ready(function(){
         event.stopPropagation();
         var $this = $(this);
 
-        var append = $this.hasClass('append');
-
         $.ajax({
             type:"GET",
             url : $this.attr('href')+(event.renew === true ? '?renew=true' : ''),
@@ -1009,18 +1010,19 @@ $(document).ready(function(){
             success : function(data){
                 if(data.texte !== false && data.titre !== false)
                 {
-                    $("#DIALOG").dialog('destroy').attr('title',data.titre)
+                    if ($("#DIALOG").data("ui-dialog")) {
+                        $("#DIALOG").dialog('destroy');
+                    }
+                    $("#DIALOG").attr('title',data.titre)
                     .empty()
                     .append(data.texte)
                     .dialog({
-
                         autoOpen:false,
                         closeOnEscape:true,
                         resizable:false,
                         draggable:false,
                         modal:true,
                         buttons:buttons,
-                        draggable:false,
                         width:650,
                         height:250,
                         overlay: {
@@ -1098,7 +1100,7 @@ $(document).ready(function(){
 
     $('#idFrameC .escamote').bind('click', function(event){
         event.stopImmediatePropagation();
-//        p4.WorkZone.close();
+        p4.WorkZone.close();
         return false;
     });
 
@@ -2332,9 +2334,9 @@ function checkDeleteThis(type, el)
 
             var lst = '';
 
-            if(type == 'IMGT')
+            if(type === 'IMGT')
                 lst = p4.Results.Selection.serialize();
-            if(type == 'CHIM')
+            if(type === 'CHIM')
                 lst = p4.WorkZone.Selection.serialize();
 
             deleteThis(lst);
@@ -2377,7 +2379,10 @@ function shareThis(bas,rec)
 
 function printThis(value)
 {
-    $('#DIALOG').dialog('destroy').attr('title', 'Print')
+    if ($("#DIALOG").data("ui-dialog")) {
+        $("#DIALOG").dialog('destroy');
+    }
+    $('#DIALOG').attr('title', 'Print')
     .empty().addClass('loading')
     .dialog({
         resizable:false,
@@ -2569,7 +2574,12 @@ function doDelete(lst)
                 chim = $('.CHIM_'+n),
                 stories = $('.STORY_'+n);
                 $('.doc_infos', imgt).remove();
-                imgt.unbind("click").removeAttr("ondblclick").removeClass("selected").draggable("destroy").removeClass("IMGT").find("img").unbind();
+                imgt.unbind("click").removeAttr("ondblclick").removeClass("selected").removeClass("IMGT").find("img").unbind();
+
+                if (imgt.data("ui-draggable")) {
+                    imgt.draggable("destroy");
+                }
+
                 imgt.find(".thumb img").attr("src","/skins/icons/deleted.png").css({
                     width:'100%',
                     height:'auto',
@@ -2606,11 +2616,24 @@ function archiveBasket(basket_id)
         success: function(data){
             if(data.success)
             {
-                $('#SSTT_'+basket_id).next().slideUp().droppable('destroy').remove();
-                $('#SSTT_'+basket_id).slideUp().droppable('destroy').remove();
+                var basket = $('#SSTT_'+basket_id);
+                var next = basket.next();
 
-                if($('#baskets .SSTT').length == 0)
+                if (next.data("ui-droppable")) {
+                    next.droppable('destroy');
+                }
+
+                next.slideUp().remove();
+
+                if (basket.data("ui-droppable")) {
+                    basket.droppable('destroy');
+                }
+
+                basket.slideUp().remove();
+
+                if($('#baskets .SSTT').length === 0) {
                     return p4.WorkZone.refresh(false);
+                }
             }
             else
             {
@@ -2624,7 +2647,10 @@ function archiveBasket(basket_id)
 
 function deleteBasket(item)
 {
-    $('#DIALOG').dialog("destroy");
+    if ($("#DIALOG").data("ui-dialog")) {
+        $("#DIALOG").dialog('destroy');
+    }
+
     var k = $(item).attr('id').split('_').slice(1,2).pop();	// id de chutier
     $.ajax({
         type: "POST",
@@ -2636,11 +2662,24 @@ function deleteBasket(item)
         success: function(data){
             if(data.success)
             {
-                $('#SSTT_'+k).next().slideUp().droppable('destroy').remove();
-                $('#SSTT_'+k).slideUp().droppable('destroy').remove();
+                var basket = $('#SSTT_'+k);
+                var next = basket.next();
 
-                if($('#baskets .SSTT').length == 0)
+                if (next.data("ui-droppable")) {
+                    next.droppable('destroy');
+                }
+
+                next.slideUp().remove();
+
+                if (basket.data("ui-droppable")) {
+                    basket.droppable('destroy');
+                }
+
+                basket.slideUp().remove();
+
+                if($('#baskets .SSTT').length === 0) {
                     return p4.WorkZone.refresh(false);
+                }
             }
             else
             {
@@ -2719,9 +2758,7 @@ function advSearch(event)
 {
     event.cancelBubble = true;
     //  alternateSearch(false);
-console.log("advSearch");
     $('#idFrameC .tabs a.adv_search').trigger('click');
-
 }
 
 function start_page_selector()
@@ -2800,7 +2837,7 @@ function lookBox(el,event)
 function showAnswer(p)
 {
     var o;
-    if(p=='Results')
+    if(p ==='Results')
     {
         // on montre les results
         if(o = document.getElementById("AnswerExplain"))
@@ -3078,13 +3115,19 @@ function set_up_feed_box(data)
                     $('#entry_'+id).replaceWith(data.datas);
                     $('#entry_'+id).hide().fadeIn();
                 }
-                $feed_box.dialog('destroy');
+
+                if ($feed_box.data("ui-dialog")) {
+                    $feed_box.dialog('destroy');
+                }
             }
         });
         return false;
     });
     $('button.close_dialog').bind('click', function(){
-        $feed_box.dialog('destroy');
+        if($feed_box.data("ui-dialog")) {
+            $feed_box.dialog('destroy');
+        }
+
         return false;
     });
     return;
diff --git a/www/skins/report/report.js b/www/skins/report/report.js
index e94c22421b..8186c899df 100644
--- a/www/skins/report/report.js
+++ b/www/skins/report/report.js
@@ -1079,8 +1079,10 @@ function update_tab(submit, form, f_val)
       //load the result
       submit.empty().append(data.rs);
       //get selected li index
-      var selected_tab = $tabs.tabs('option', 'active');
-      if( typeof(selected_tab) == 'undefined')
+      if ($tabs.data("ui-tabs")) {
+        var selected_tab = $tabs.tabs('option', 'active');
+      }
+      if( typeof(selected_tab) === 'undefined')
         selected_tab = 0;
       class_selected_tab = $('.tabb:visible li').eq(selected_tab).attr('class');
       //hide show the next and previous button according to the results