diff --git a/core/res/layout/dialog_setlabel.xml b/core/res/layout/dialog_setlabel.xml
new file mode 100644
index 00000000..034d2b49
--- /dev/null
+++ b/core/res/layout/dialog_setlabel.xml
@@ -0,0 +1,49 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/core/res/layout/dialog_trackers.xml b/core/res/layout/dialog_trackers.xml
new file mode 100644
index 00000000..691f1132
--- /dev/null
+++ b/core/res/layout/dialog_trackers.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/core/res/values/strings.xml b/core/res/values/strings.xml
index 2b20b978..f78a0f1e 100644
--- a/core/res/values/strings.xml
+++ b/core/res/values/strings.xml
@@ -100,6 +100,10 @@
KB/S
Reset
Update
+ PICK A LABEL
+ NEW LABEL
+ Remove label
+ E.g. movies or linux
All labels
Unlabeled
@@ -313,6 +317,7 @@
The settings file could not be found
Can\'t write to the settings file
Please enter a positive number
+ Please enter a valid label or pick from the list
Transdroid
\u00A9 Eric Kok, 2312 development
diff --git a/core/src/org/transdroid/core/gui/DetailsActivity.java b/core/src/org/transdroid/core/gui/DetailsActivity.java
index 67ddea77..c7b7581e 100644
--- a/core/src/org/transdroid/core/gui/DetailsActivity.java
+++ b/core/src/org/transdroid/core/gui/DetailsActivity.java
@@ -17,6 +17,7 @@ import org.transdroid.core.R;
import org.transdroid.core.app.settings.*;
import org.transdroid.core.gui.lists.LocalTorrent;
import org.transdroid.core.gui.log.Log;
+import org.transdroid.core.gui.navigation.Label;
import org.transdroid.core.gui.navigation.NavigationHelper;
import org.transdroid.daemon.Daemon;
import org.transdroid.daemon.IDaemonAdapter;
@@ -66,6 +67,9 @@ public class DetailsActivity extends SherlockFragmentActivity implements Torrent
@Extra
@InstanceState
protected Torrent torrent;
+ @Extra
+ @InstanceState
+ protected ArrayList