diff --git a/res/app/device-list/device-list.jade b/res/app/device-list/device-list.jade
index 7981e28f..691c54ff 100644
--- a/res/app/device-list/device-list.jade
+++ b/res/app/device-list/device-list.jade
@@ -42,6 +42,10 @@ div.stf-device-list
               .filtering-buttons
                 clear-button(ng-click="tableParams.sorting({}); tableParams.filter({})")
                 filter-button(ng-model='filterEnabled')
+                .button-spacer.pull-right
+                button(btn-checkbox, ng-model='showAll').btn.btn-sm.btn-primary-outline.pull-right
+                  i.fa.fa-list-alt
+                  span {{"Show All"|translate}}
 
 
               table.table.table-hover.dataTable(ng-table='tableParams',
@@ -81,25 +85,27 @@ div.stf-device-list
                     button(ng-class='{"btn-primary": device.state == "using", \
                     "btn-primary-outline": device.state == "available"}',
                       ng-click='device.usable && toggle(device)').btn.btn-xs.device-status {{statusName(device)}}
-                  td(data-title="'Model'", sortable='"model"', filter='{"model": "text"}')
+                  td(data-title="'Model'|translate", sortable='"model"', filter='{"model": "text"}')
                     span {{device.model}}
-                  td(data-title="'Product'", sortable='"name"', filter='{"name": "text"}')
+                  td(data-title="'Product'|translate", sortable='"name"', filter='{"name": "text"}')
                     span {{device.name}}
-                  td(data-title="'Carrier'", sortable='"operator"', filter='{"operator": "text"}')
+                  td(data-title="'Carrier'|translate", sortable='"operator"', filter='{"operator": "text"}')
                     span {{device.operator}}
-                  td(data-title="'Phone number'", sortable='"phone.phoneNumber"', filter='{"phone.phoneNumber": "text"}')
-                    span {{device.phone.phoneNumber}}
-                  td(data-title="'Release'", sortable='"releasedAt"', filter='{"releasedAt": "text"}')
+                  td(data-title="'Release'|translate", sortable='"releasedAt"', filter='{"releasedAt": "text"}')
                     span {{device.releasedAt | date:'yyyy/MM/dd'}}
-                  td(data-title="'OS'", sortable='"version"', filter='{"version": "text"}')
+                  td(data-title="'OS'|translate", sortable='"version"', filter='{"version": "text"}')
                     span {{device.version}}
-                  td(data-title="'Screen'", sortable='"display.width"', filter='{"display.width": "text"}')
+                  td(data-title="'Screen'|translate", sortable='"display.width"', filter='{"display.width": "text"}')
                     span {{device.display.width}}x{{device.display.height}}
-                  td(data-title="'Location'", sortable='"provider.name"', filter='{"provider.name": "text"}')
+                  td(data-title="'Location'|translate", sortable='"provider.name"', filter='{"provider.name": "text"}')
                     span {{device.provider.name}}
-                  td(data-title="'User'", sortable='"owner.name"', filter='{"owner.name": "text"}')
+                  td(data-title="'User'|translate", sortable='"owner.name"', filter='{"owner.name": "text"}')
                     a(ng-if='device.owner', ng-href='{{userContactUrl(device.owner.email)}}', role='button', target='_href') {{device.owner.name || "No name"}}
                     a(ng-if='!device.owner') -
+                  td(ng-show='showAll', data-title="'Phone number'", sortable='"phone.phoneNumber"', filter='{"phone.phoneNumber": "text"}')
+                    span {{device.phone.phoneNumber}}
+
+
               //p
                 strong Sorting
                 pre {{tableParams.sorting() | json}}
diff --git a/res/app/layout/stf-styles.css b/res/app/layout/stf-styles.css
index 8ae94d48..5149fbc4 100644
--- a/res/app/layout/stf-styles.css
+++ b/res/app/layout/stf-styles.css
@@ -19,6 +19,12 @@ body {
     overflow: visible;
 }
 
+.button-spacer {
+  display: inline-block;
+  width: 24px;
+  height: 12px;
+}
+
 /* Overflow */
 
 .overflow-x {
diff --git a/res/common/lang/po/stf.ja.po b/res/common/lang/po/stf.ja.po
index 0a8f1c17..f7ae3a0f 100644
--- a/res/common/lang/po/stf.ja.po
+++ b/res/common/lang/po/stf.ja.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: \n"
+"Project-Id-Version: stf\n"
 "POT-Creation-Date: \n"
 "PO-Revision-Date: \n"
 "Last-Translator: Gunther Brunner <gunta85@gmail.com>\n"
@@ -26,7 +26,7 @@ msgstr ""
 
 #: /Users/a12907/STF/stf/tmp/html/app/device-list/device-list.html
 msgid "Details"
-msgstr ""
+msgstr "詳細"
 
 #: /Users/a12907/STF/stf/tmp/html/app/settings/settings.html
 msgid "Device Port"
@@ -67,7 +67,7 @@ msgstr ""
 
 #: /Users/a12907/STF/stf/tmp/html/app/device-list/device-list.html
 msgid "Model"
-msgstr ""
+msgstr "型番"
 
 #: /Users/a12907/STF/stf/tmp/html/app/menu/menu.html
 msgid "Native"
diff --git a/res/common/lang/po/stf.pot b/res/common/lang/po/stf.pot
index 3d2dcfa3..df562668 100644
--- a/res/common/lang/po/stf.pot
+++ b/res/common/lang/po/stf.pot
@@ -9,6 +9,10 @@ msgstr ""
 msgid ""
 msgstr ""
 
+#: /Users/a12907/STF/stf/tmp/html/app/control-panes/device-control/device-control.html
+msgid "(Absent)"
+msgstr ""
+
 #: /Users/a12907/STF/stf/tmp/html/app/control-panes/dashboard/input/input.html
 msgid "Aa"
 msgstr ""
@@ -58,6 +62,10 @@ msgstr ""
 msgid "CPU"
 msgstr ""
 
+#: /Users/a12907/STF/stf/tmp/html/app/control-panes/dashboard/upload/upload.html
+msgid "Cannot access specified URL"
+msgstr ""
+
 #: /Users/a12907/STF/stf/tmp/html/app/device-list/device-list.html
 msgid "Carrier"
 msgstr ""
@@ -105,7 +113,7 @@ msgstr ""
 msgid "Device"
 msgstr ""
 
-#: /Users/a12907/STF/stf/tmp/html/app/settings/settings.html
+#: /Users/a12907/STF/stf/tmp/html/app/control-panes/advanced/port-forwarding/port-forwarding.html
 msgid "Device Port"
 msgstr ""
 
@@ -123,10 +131,18 @@ msgstr ""
 msgid "Domain"
 msgstr ""
 
+#: /Users/a12907/STF/stf/tmp/html/app/control-panes/dashboard/upload/upload.html
+msgid "Drop file to upload"
+msgstr ""
+
 #: /Users/a12907/STF/stf/tmp/html/app/settings/notifications/notifications.html
 msgid "Enable notifications"
 msgstr ""
 
+#: /Users/a12907/STF/stf/tmp/html/app/control-panes/dashboard/upload/upload.html
+msgid "Error"
+msgstr ""
+
 #: /Users/a12907/STF/stf/res/build/bundle.js
 #: /Users/a12907/STF/stf/res/app/components/stf/socket/socket-state/socket-state-directive.js
 msgid "Error while connecting."
@@ -142,14 +158,22 @@ msgstr ""
 msgid "Error."
 msgstr ""
 
-#: /Users/a12907/STF/stf/tmp/html/app/settings/settings.html
+#: /Users/a12907/STF/stf/tmp/html/app/control-panes/advanced/port-forwarding/port-forwarding.html
 msgid "Example: 3000"
 msgstr ""
 
+#: /Users/a12907/STF/stf/tmp/html/app/control-panes/dashboard/upload/upload.html
+msgid "Failed to download file"
+msgstr ""
+
 #: /Users/a12907/STF/stf/tmp/html/app/components/stf/common-ui/filter-button/filter-button.html
 msgid "Filter"
 msgstr ""
 
+#: /Users/a12907/STF/stf/tmp/html/app/control-panes/advanced/port-forwarding/port-forwarding.html
+msgid "Forward Ports"
+msgstr ""
+
 #: /Users/a12907/STF/stf/tmp/html/app/control-panes/logs/logs.html
 #: /Users/a12907/STF/stf/tmp/html/app/control-panes/resources/resources.html
 msgid "Get"
@@ -179,6 +203,10 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
+#: /Users/a12907/STF/stf/tmp/html/app/control-panes/advanced/port-forwarding/port-forwarding.html
+msgid "Hostname"
+msgstr ""
+
 #: /Users/a12907/STF/stf/res/build/bundle.js
 #: /Users/a12907/STF/stf/res/app/control-panes/control-panes-controller.js
 msgid "Inspect"
@@ -196,6 +224,14 @@ msgstr ""
 msgid "Inspector"
 msgstr ""
 
+#: /Users/a12907/STF/stf/tmp/html/app/control-panes/dashboard/upload/upload.html
+msgid "Installation failed"
+msgstr ""
+
+#: /Users/a12907/STF/stf/tmp/html/app/control-panes/dashboard/upload/upload.html
+msgid "Installing app..."
+msgstr ""
+
 #: /Users/a12907/STF/stf/tmp/html/app/control-panes/device-control/device-control.html
 msgid "Just control device"
 msgstr ""
@@ -212,6 +248,14 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
+#: /Users/a12907/STF/stf/tmp/html/app/control-panes/dashboard/upload/activities/activities.html
+msgid "Launch Activity"
+msgstr ""
+
+#: /Users/a12907/STF/stf/tmp/html/app/control-panes/dashboard/upload/upload.html
+msgid "Launching activity..."
+msgstr ""
+
 #: /Users/a12907/STF/stf/tmp/html/app/control-panes/logs/logs.html
 msgid "Level"
 msgstr ""
@@ -323,6 +367,14 @@ msgstr ""
 msgid "Path"
 msgstr ""
 
+#: /Users/a12907/STF/stf/tmp/html/app/control-panes/advanced/port-forwarding/port-forwarding.html
+msgid "Port"
+msgstr ""
+
+#: /Users/a12907/STF/stf/tmp/html/app/control-panes/advanced/port-forwarding/port-forwarding.html
+msgid "Port forwarding"
+msgstr ""
+
 #: /Users/a12907/STF/stf/tmp/html/app/control-panes/dashboard/input/input.html
 msgid "Power Button"
 msgstr ""
@@ -337,10 +389,18 @@ msgstr ""
 msgid "Present"
 msgstr ""
 
+#: /Users/a12907/STF/stf/tmp/html/app/control-panes/dashboard/upload/upload.html
+msgid "Processing..."
+msgstr ""
+
 #: /Users/a12907/STF/stf/tmp/html/app/device-list/device-list.html
 msgid "Product"
 msgstr ""
 
+#: /Users/a12907/STF/stf/tmp/html/app/control-panes/dashboard/upload/upload.html
+msgid "Pushing app..."
+msgstr ""
+
 #: /Users/a12907/STF/stf/res/build/bundle.js
 #: /Users/a12907/STF/stf/res/app/device-list/device-list-controller.js
 msgid "Ready"
@@ -474,6 +534,10 @@ msgstr ""
 msgid "Stop Using"
 msgstr ""
 
+#: /Users/a12907/STF/stf/tmp/html/app/control-panes/dashboard/upload/upload.html
+msgid "Storing..."
+msgstr ""
+
 #: /Users/a12907/STF/stf/tmp/html/app/control-panes/dashboard/input/input.html
 msgid "Switch Charset"
 msgstr ""
@@ -494,15 +558,15 @@ msgstr ""
 msgid "Take Screenshot"
 msgstr ""
 
-#: /Users/a12907/STF/stf/tmp/html/app/settings/settings.html
+#: /Users/a12907/STF/stf/tmp/html/app/control-panes/advanced/port-forwarding/port-forwarding.html
 msgid "Target IP / Hostname"
 msgstr ""
 
-#: /Users/a12907/STF/stf/tmp/html/app/settings/settings.html
+#: /Users/a12907/STF/stf/tmp/html/app/control-panes/advanced/port-forwarding/port-forwarding.html
 msgid "Target Port"
 msgstr ""
 
-#: /Users/a12907/STF/stf/tmp/html/app/settings/settings.html
+#: /Users/a12907/STF/stf/tmp/html/app/control-panes/advanced/port-forwarding/port-forwarding.html
 msgid "Target host (detect if blank)"
 msgstr ""
 
@@ -523,6 +587,14 @@ msgstr ""
 msgid "Unauthorized"
 msgstr ""
 
+#: /Users/a12907/STF/stf/tmp/html/app/control-panes/advanced/port-forwarding/port-forwarding.html
+msgid "Unforward Ports"
+msgstr ""
+
+#: /Users/a12907/STF/stf/tmp/html/app/control-panes/dashboard/upload/upload.html
+msgid "Uninstall"
+msgstr ""
+
 #: /Users/a12907/STF/stf/res/build/bundle.js
 #: /Users/a12907/STF/stf/res/app/device-list/device-list-controller.js
 msgid "Unknown"
@@ -532,6 +604,22 @@ msgstr ""
 msgid "Upload"
 msgstr ""
 
+#: /Users/a12907/STF/stf/tmp/html/app/control-panes/dashboard/upload/upload.html
+msgid "Upload complete"
+msgstr ""
+
+#: /Users/a12907/STF/stf/tmp/html/app/control-panes/dashboard/upload/upload.html
+msgid "Upload failed"
+msgstr ""
+
+#: /Users/a12907/STF/stf/tmp/html/app/control-panes/dashboard/upload/upload.html
+msgid "Uploaded file is not valid"
+msgstr ""
+
+#: /Users/a12907/STF/stf/tmp/html/app/control-panes/dashboard/upload/upload.html
+msgid "Uploading..."
+msgstr ""
+
 #: /Users/a12907/STF/stf/tmp/html/app/control-panes/advanced/usb/usb.html
 msgid "Usb speed"
 msgstr ""
diff --git a/res/common/lang/translations/stf.ja.json b/res/common/lang/translations/stf.ja.json
index e34cbf07..671c054f 100644
--- a/res/common/lang/translations/stf.ja.json
+++ b/res/common/lang/translations/stf.ja.json
@@ -1 +1 @@
-{"ja":{"Carrier":"キャリア","Clear":"","Control":"","Details":"","Device Port":"","Devices":"","Enable notifications":"","Example: 3000":"","Filter":"","Help":"ヘルプ","Language":"","Local Settings":"","Location":"","Model":"","Native":"","No devices connected":"","Notifications":"","OS":"","Product":"","Refresh":"","Release Date":"","Reset Settings":"","Saved to: {{savedTo}}":"","Screen":"","Settings":"","Shell":"","Start Using":"","Status":"","Stop Using":"","Target IP / Hostname":"","Target Port":"","Target host (detect if blank)":"","Use":"","User":"","Web":""}}
\ No newline at end of file
+{"ja":{"Carrier":"キャリア","Clear":"","Control":"","Details":"詳細","Device Port":"","Devices":"","Enable notifications":"","Example: 3000":"","Filter":"","Help":"ヘルプ","Language":"","Local Settings":"","Location":"","Model":"型番","Native":"","No devices connected":"","Notifications":"","OS":"","Product":"","Refresh":"","Release Date":"","Reset Settings":"","Saved to: {{savedTo}}":"","Screen":"","Settings":"","Shell":"","Start Using":"","Status":"","Stop Using":"","Target IP / Hostname":"","Target Port":"","Target host (detect if blank)":"","Use":"","User":"","Web":""}}
\ No newline at end of file