diff --git a/burpui/app.py b/burpui/app.py
index ec09189b..a7476577 100644
--- a/burpui/app.py
+++ b/burpui/app.py
@@ -74,8 +74,10 @@ def create_db(myapp, cli=False, unittest=False, create=True):
                     not cli and not unittest:
                 if create:
                     import subprocess
+                    local = os.path.join(os.getcwd(), '..', 'bui-manage')
+                    buimanage = local if os.path.exists(local) else 'bui-manage'
                     cmd = [
-                        'bui-manage',
+                        buimanage,
                         '-c',
                         myapp.config['CFG'],
                         'db',
diff --git a/burpui/templates/calendar.html b/burpui/templates/calendar.html
index 1b14f91d..48eda14d 100644
--- a/burpui/templates/calendar.html
+++ b/burpui/templates/calendar.html
@@ -13,7 +13,17 @@
             {% endif -%}
           </ul>
           <br />
-          <h1 class="page-header">Calendar{% if cname %} of {{ cname }}{% if server %} on {{ server }}{% endif %}{% elif server %} of {{ server }}{% endif %}</h1>
+          <h1 class="page-header">
+            {% if server and client %}
+            {{ _('Calendar of %(client)s on %(server)s', client=cname, server=server) }}
+            {% elif client %}
+            {{ _('Calendar of %(client)s', client=cname) }}
+            {% elif server %}
+            {{ _('Calendars of %(server)s', server=server) }}
+            {% else %}
+            {{ _('Calendars') }}
+            {% endif %}
+          </h1>
           <div id='calendar'></div>
         </div>
 {% endblock %}
diff --git a/burpui/templates/client-browse.html b/burpui/templates/client-browse.html
index 42a91641..9fc8cc40 100644
--- a/burpui/templates/client-browse.html
+++ b/burpui/templates/client-browse.html
@@ -24,7 +24,7 @@
                   <input type="text" class="form-control" placeholder="{{ _('filter...') }}" name="search-tree" autocomplete="off">
                   <div class="input-group-btn">
                     <button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button">
-                      <span class="glyphicon glyphicon-cog"></span> options
+                      <span class="glyphicon glyphicon-cog"></span> {{ _('options') }}
                       <span class="caret"></span>
                     </button>
                     <ul class="dropdown-menu browse">
@@ -55,7 +55,7 @@
             <table id="tree" class="table">
               <thead>
                 <tr>
-                  <th></th><th>mode</th><th>UID</th><th>GID</th><th>{{ _('Size') }}</th><th>Date</th>
+                  <th></th><th>{{ _('mode') }}</th><th>{{ _('UID') }}</th><th>{{ _('GID') }}</th><th>{{ _('Size') }}</th><th>{{ _('Date') }}</th>
                 </tr>
               </thead>
               <tbody>
@@ -75,7 +75,7 @@
                 <div id="notice">
                   <div class="panel panel-warning">
                     <div class="panel-heading">
-                      <h3 class="panel-title"><span class="glyphicon glyphicon-info-sign"></span>&nbsp;Information</h3>
+                      <h3 class="panel-title"><span class="glyphicon glyphicon-info-sign"></span>&nbsp;{{ _('Information') }}</h3>
                     </div>
                     <div class="panel-body">
                       {{ _('This backup is encrypted, please provide the encryption password in order to perform an online restoration.') }}
diff --git a/burpui/translations/es/LC_MESSAGES/messages.po b/burpui/translations/es/LC_MESSAGES/messages.po
index d871e8fb..8225487d 100644
--- a/burpui/translations/es/LC_MESSAGES/messages.po
+++ b/burpui/translations/es/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-02-20 17:33+0100\n"
+"POT-Creation-Date: 2017-02-23 21:33+0100\n"
 "PO-Revision-Date: 2017-01-14 17:32-0300\n"
 "Last-Translator: Pablo Estigarribia <pablodav@gmail.com>\n"
 "Language: es\n"
@@ -19,11 +19,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-#: burpui/app.py:544
+#: burpui/app.py:546
 msgid "Please log in to access this page."
 msgstr "Por favor inicia sesión para acceder a la página."
 
-#: burpui/app.py:547
+#: burpui/app.py:549
 msgid "Please reauthenticate to access this page."
 msgstr "Por favor, vuelve a iniciar sesión para acceder a esta página."
 
@@ -1432,10 +1432,33 @@ msgstr ""
 msgid "Calendar"
 msgstr "Calendario"
 
+#: burpui/templates/calendar.html:18
+#, python-format
+msgid "Calendar of %(client)s on %(server)s"
+msgstr ""
+
+#: burpui/templates/calendar.html:20
+#, python-format
+msgid "Calendar of %(client)s"
+msgstr ""
+
+#: burpui/templates/calendar.html:22
+#, python-format
+msgid "Calendars of %(server)s"
+msgstr ""
+
+#: burpui/templates/calendar.html:24
+msgid "Calendars"
+msgstr ""
+
 #: burpui/templates/client-browse.html:24
 msgid "filter..."
 msgstr "Filtros de búsqueda..."
 
+#: burpui/templates/client-browse.html:27
+msgid "options"
+msgstr ""
+
 #: burpui/templates/client-browse.html:31
 msgid "Hide unmatched nodes"
 msgstr "Ocultar nodos sin igual"
@@ -1475,10 +1498,31 @@ msgstr "Cargar todos los nodos"
 msgid "Loading, Please wait..."
 msgstr "Cargando, por favor espere ..."
 
+#: burpui/templates/client-browse.html:58
+msgid "mode"
+msgstr ""
+
+#: burpui/templates/client-browse.html:58
+msgid "UID"
+msgstr ""
+
+#: burpui/templates/client-browse.html:58
+msgid "GID"
+msgstr ""
+
 #: burpui/templates/client-browse.html:58
 msgid "Size"
 msgstr "Tamaño"
 
+#: burpui/templates/client-browse.html:58 burpui/templates/client.html:22
+#: burpui/templates/client.html:33
+msgid "Date"
+msgstr ""
+
+#: burpui/templates/client-browse.html:78
+msgid "Information"
+msgstr ""
+
 #: burpui/templates/client-browse.html:81
 msgid ""
 "This backup is encrypted, please provide the encryption password in order"
@@ -1569,10 +1613,6 @@ msgstr ""
 msgid "Number"
 msgstr "Número "
 
-#: burpui/templates/client.html:22 burpui/templates/client.html:33
-msgid "Date"
-msgstr ""
-
 #: burpui/templates/client.html:23 burpui/templates/client.html:34
 #: burpui/templates/live-monitor.html:56 burpui/templates/live-monitor.html:62
 msgid "Bytes received"
diff --git a/burpui/translations/fr/LC_MESSAGES/messages.po b/burpui/translations/fr/LC_MESSAGES/messages.po
index 3d4e2b02..c9d7f0ed 100644
--- a/burpui/translations/fr/LC_MESSAGES/messages.po
+++ b/burpui/translations/fr/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-02-20 17:33+0100\n"
+"POT-Creation-Date: 2017-02-23 21:33+0100\n"
 "PO-Revision-Date: 2016-08-25 15:19+0200\n"
 "Last-Translator: Ziirish <hi+burpui@ziirish.me>\n"
 "Language: fr\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-#: burpui/app.py:544
+#: burpui/app.py:546
 msgid "Please log in to access this page."
 msgstr "Veuillez vous authentifier pour accéder à cette page."
 
-#: burpui/app.py:547
+#: burpui/app.py:549
 msgid "Please reauthenticate to access this page."
 msgstr "Veuillez vous ré-authentifier pour accéder à cette page."
 
@@ -1079,10 +1079,33 @@ msgstr "Scannés"
 msgid "Calendar"
 msgstr "Calendrier"
 
+#: burpui/templates/calendar.html:18
+#, python-format
+msgid "Calendar of %(client)s on %(server)s"
+msgstr "Calendrier de %(client)s sur %(server)s"
+
+#: burpui/templates/calendar.html:20
+#, python-format
+msgid "Calendar of %(client)s"
+msgstr "Calendrier de %(client)s"
+
+#: burpui/templates/calendar.html:22
+#, python-format
+msgid "Calendars of %(server)s"
+msgstr "Calendriers de %(server)s"
+
+#: burpui/templates/calendar.html:24
+msgid "Calendars"
+msgstr "Calendriers"
+
 #: burpui/templates/client-browse.html:24
 msgid "filter..."
 msgstr "filtrer..."
 
+#: burpui/templates/client-browse.html:27
+msgid "options"
+msgstr "options"
+
 #: burpui/templates/client-browse.html:31
 msgid "Hide unmatched nodes"
 msgstr "N'afficher que les éléments correspondants"
@@ -1122,10 +1145,31 @@ msgstr "Pré-charger tous les nœuds"
 msgid "Loading, Please wait..."
 msgstr "Chargement, veuillez patienter..."
 
+#: burpui/templates/client-browse.html:58
+msgid "mode"
+msgstr "mode"
+
+#: burpui/templates/client-browse.html:58
+msgid "UID"
+msgstr "UID"
+
+#: burpui/templates/client-browse.html:58
+msgid "GID"
+msgstr "GID"
+
 #: burpui/templates/client-browse.html:58
 msgid "Size"
 msgstr "Taille"
 
+#: burpui/templates/client-browse.html:58 burpui/templates/client.html:22
+#: burpui/templates/client.html:33
+msgid "Date"
+msgstr "Date"
+
+#: burpui/templates/client-browse.html:78
+msgid "Information"
+msgstr "Information"
+
 #: burpui/templates/client-browse.html:81
 msgid ""
 "This backup is encrypted, please provide the encryption password in order"
@@ -1216,10 +1260,6 @@ msgstr "Sauvegardes"
 msgid "Number"
 msgstr "Numéro"
 
-#: burpui/templates/client.html:22 burpui/templates/client.html:33
-msgid "Date"
-msgstr "Date"
-
 #: burpui/templates/client.html:23 burpui/templates/client.html:34
 #: burpui/templates/live-monitor.html:56 burpui/templates/live-monitor.html:62
 msgid "Bytes received"
diff --git a/burpui/utils.py b/burpui/utils.py
index ac3ec384..38128877 100644
--- a/burpui/utils.py
+++ b/burpui/utils.py
@@ -309,6 +309,7 @@ def utc_to_local(timestamp):
     try:
         import arrow
         from tzlocal import get_localzone
+        # 1487607525 -> 1487611125
         utc = arrow.get(datetime.datetime.fromtimestamp(timestamp))
         local = utc.to(str(get_localzone()))
         return local.timestamp