--- a/integration/js/editor.js	Wed Nov 28 12:19:21 2012 +0100
+++ b/integration/js/editor.js	Wed Nov 28 15:42:16 2012 +0100
@@ -400,7 +400,6 @@
             }
             $(".add-segment").val(IriSP.translate(addMode ? "Add segment to hashcut" : "Save segment"));
             $(".create-or-edit").text(IriSP.translate(addMode ? "Create new segment" : "Edit existing segment"));
-            media.show();
             $("#segment-title").val(currentSegment.title);
             $("#segment-description").val(currentSegment.description);
             var segment_tags = $("#segment-tags");
@@ -619,7 +618,13 @@
         project.trigger("mouseout-annotation");
     })
     .on("click", ".item-video", function() {
-        project.trigger("click-annotation", project.getElement($(this).attr("data-segment-id")));
+        var segment = project.getElement($(this).attr("data-segment-id"));
+        if (currentMedia === mashup) {
+            project.trigger("click-annotation", segment);
+        } else {
+            currentSegment = segment;
+            setMedia(segment.getMedia());
+        }
     })
     .on("click", ".edit", function(e) {
         var currentItem = $(this).parents(".item-video"),
@@ -848,7 +853,7 @@
         postproject.addList("annotation",annotations);
         postproject.addList("media",medias);
         postproject.addList("mashup",[mashup]);
-        postproject.creator = "admin";
+        postproject.creator = options.creator;
         postproject.created = new Date();
         postproject.modified = new Date();
         postproject.title = mashup.title;
@@ -858,7 +863,9 @@
             url: IriSP.endpoints.project,
             data: IriSP.serializers.ldt.serialize(postproject),
             contentType: "application/cinelab",
-//            headers: {"X-CSRFToken": "{{csrf_token}}"},
+            headers: {
+                "X-CSRFToken": options.csrf_token
+            },
             success: function(data, status, request){
                 var location = request.getResponseHeader("Location"),
                     projid = location.match(/([^/]+)\/?$/)[1],