diff --git a/src/webui/extra_translations.h b/src/webui/extra_translations.h
index 695f6c302..350682447 100644
--- a/src/webui/extra_translations.h
+++ b/src/webui/extra_translations.h
@@ -38,7 +38,8 @@ static const char *__TRANSLATIONS__[] = {
     QT_TRANSLATE_NOOP("HttpServer", "Help"),
     QT_TRANSLATE_NOOP("HttpServer", "Logout"),
     QT_TRANSLATE_NOOP("HttpServer", "Exit qBittorrent"),
-    QT_TRANSLATE_NOOP("HttpServer", "Download Torrents from their URL or Magnet link"),
+    QT_TRANSLATE_NOOP("HttpServer", "Download from URLs"),
+    QT_TRANSLATE_NOOP("HttpServer", "Download Torrents from their URLs or Magnet links"),
     QT_TRANSLATE_NOOP("HttpServer", "Only one link per line"),
     QT_TRANSLATE_NOOP("HttpServer", "Upload local torrent"),
     QT_TRANSLATE_NOOP("HttpServer", "Download"),
@@ -76,7 +77,6 @@ static const char *__TRANSLATIONS__[] = {
     QT_TRANSLATE_NOOP("HttpServer", "Download limit:"),
     QT_TRANSLATE_NOOP("HttpServer", "Apply"),
     QT_TRANSLATE_NOOP("HttpServer", "Add"),
-    QT_TRANSLATE_NOOP("HttpServer", "Upload Torrents"),
     QT_TRANSLATE_NOOP("HttpServer", "All"),
     QT_TRANSLATE_NOOP("HttpServer", "Downloading"),
     QT_TRANSLATE_NOOP("HttpServer", "Seeding"),
@@ -114,7 +114,8 @@ static const struct { const char *source; const char *comment; } __COMMENTED_TRA
     QT_TRANSLATE_NOOP3("HttpServer", "Thursday", "Schedule the use of alternative rate limits on ..."),
     QT_TRANSLATE_NOOP3("HttpServer", "Friday", "Schedule the use of alternative rate limits on ..."),
     QT_TRANSLATE_NOOP3("HttpServer", "Saturday", "Schedule the use of alternative rate limits on ..."),
-    QT_TRANSLATE_NOOP3("HttpServer", "Sunday", "Schedule the use of alternative rate limits on ...")
+    QT_TRANSLATE_NOOP3("HttpServer", "Sunday", "Schedule the use of alternative rate limits on ..."),
+    QT_TRANSLATE_NOOP3("HttpServer", "Upload Torrents", "Upload torrent files to qBittorent using WebUI")
 };
 
 #endif // EXTRA_TRANSLATIONS_H
diff --git a/src/webui/www/public/newlabel.html b/src/webui/www/public/newlabel.html
index ccf226bc2..bff86e307 100644
--- a/src/webui/www/public/newlabel.html
+++ b/src/webui/www/public/newlabel.html
@@ -7,6 +7,17 @@
     <script type="text/javascript" src="scripts/mootools-1.2-core-yc.js" charset="utf-8"></script>
     <script type="text/javascript" src="scripts/mootools-1.2-more.js" charset="utf-8"></script>
     <script type="text/javascript">
+        var newLabelKeyboardEvents = new Keyboard({
+            defaultEventType: 'keydown',
+            events: {
+                'enter': function (event) {
+                    $('newLabelButton').click();
+                    event.preventDefault();
+                }
+            }
+        });
+        newLabelKeyboardEvents.activate();
+
         window.addEvent('domready', function() {
             $('newLabel').focus();
             $('newLabelButton').addEvent('click', function(e) {
diff --git a/src/webui/www/public/properties_content.html b/src/webui/www/public/properties_content.html
index 4c1276c3e..60b3dca83 100644
--- a/src/webui/www/public/properties_content.html
+++ b/src/webui/www/public/properties_content.html
@@ -107,4 +107,5 @@
 
 <script type="text/javascript">
     torrentPeersTable.setup('torrentPeersTable', 'torrentPeersTableHeader', null);
-</script>
\ No newline at end of file
+    $(getLocalStorageItem('selected_tab', 'PropGeneralLink')).click();
+</script>
diff --git a/src/webui/www/public/scripts/client.js b/src/webui/www/public/scripts/client.js
index 23473ea37..3757c142d 100644
--- a/src/webui/www/public/scripts/client.js
+++ b/src/webui/www/public/scripts/client.js
@@ -25,9 +25,15 @@
 torrentsTable = new TorrentsTable();
 torrentPeersTable = new TorrentPeersTable();
 
-var updatePropertiesPanel = function(){};
-var updateTorrentPeersData = function(){};
-var updateMainData = function(){};
+var updatePropertiesPanel = function () {};
+
+var updateTorrentData = function () {};
+var updateTrackersData = function () {};
+var updateTorrentPeersData = function () {};
+var updateWebSeedsData = function () {};
+var updateTorrentFilesData = function () {};
+
+var updateMainData = function () {};
 var alternativeSpeedLimits = false;
 var queueing_enabled = true;
 var syncMainDataTimerPeriod = 1500;
@@ -578,8 +584,6 @@ window.addEvent('load', function () {
             $('propertiesPanel_collapseToggle').addEvent('click', function(e){
                 updatePropertiesPanel();
             });
-
-            $(getLocalStorageItem('selected_tab', 'PropGeneralLink')).click();
         },
         column : 'mainColumn',
         height : prop_h