diff --git a/src/main/java/org/olat/ims/qti/_content/qti_preview.html b/src/main/java/org/olat/ims/qti/_content/qti_preview.html
index 565141c63c4c1c03a1b771593116a598eef1465f..a7a14793487f8d7728dfd1d4ea355f13b0b48383 100644
--- a/src/main/java/org/olat/ims/qti/_content/qti_preview.html
+++ b/src/main/java/org/olat/ims/qti/_content/qti_preview.html
@@ -1,11 +1,7 @@
 #if($r.available("preview"))
 	$r.render("preview")
-#else
-	No preview
 #end
 
 #if($r.available("metadatas"))
 	$r.render("metadatas")
-#else
-	No metadatas
 #end
\ No newline at end of file
diff --git a/src/main/java/org/olat/modules/qpool/QuestionPoolModule.java b/src/main/java/org/olat/modules/qpool/QuestionPoolModule.java
index e53716afefd0d1a5a8544642d434d841c91b40b8..0c5118d7b4a01ae0370a3aff751cc762dfab8e44 100644
--- a/src/main/java/org/olat/modules/qpool/QuestionPoolModule.java
+++ b/src/main/java/org/olat/modules/qpool/QuestionPoolModule.java
@@ -24,11 +24,14 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import org.olat.NewControllerFactory;
 import org.olat.core.commons.modules.bc.vfs.OlatRootFolderImpl;
 import org.olat.core.configuration.AbstractOLATModule;
 import org.olat.core.configuration.ConfigOnOff;
 import org.olat.core.configuration.PersistedProperties;
+import org.olat.core.id.context.SiteContextEntryControllerCreator;
 import org.olat.core.util.vfs.VFSContainer;
+import org.olat.modules.qpool.site.QuestionPoolSite;
 
 /**
  * 
@@ -44,7 +47,10 @@ public class QuestionPoolModule extends AbstractOLATModule implements ConfigOnOf
 
 	@Override
 	public void init() {
-		//
+		
+		NewControllerFactory.getInstance().addContextEntryControllerCreator("QPool",
+				new SiteContextEntryControllerCreator(QuestionPoolSite.class));
+
 	}
 
 	@Override
diff --git a/src/main/java/org/olat/modules/qpool/ui/QuestionListController.java b/src/main/java/org/olat/modules/qpool/ui/QuestionListController.java
index 337017b7a8ed9f4e5c5f50ff7076809ecab23e03..9c19326eb72a312e4a11a6b7024cae31b60f220f 100644
--- a/src/main/java/org/olat/modules/qpool/ui/QuestionListController.java
+++ b/src/main/java/org/olat/modules/qpool/ui/QuestionListController.java
@@ -108,7 +108,7 @@ public class QuestionListController extends AbstractItemListController implement
 
 	@Override
 	protected void initButtons(FormItemContainer formLayout) {
-		list = uifactory.addFormLink("create.list", formLayout, Link.BUTTON);
+		list = uifactory.addFormLink("list", formLayout, Link.BUTTON);
 		exportItem = uifactory.addFormLink("export.item", formLayout, Link.BUTTON);
 		shareItem = uifactory.addFormLink("share.item", formLayout, Link.BUTTON);
 		if(getSource().isRemoveEnabled()) {
@@ -346,7 +346,7 @@ public class QuestionListController extends AbstractItemListController implement
 		if(nextRow != null) {
 			QuestionItem nextItem = qpoolService.loadItemById(nextRow.getKey());
 			stackPanel.popUpToRootController(ureq);
-			doSelect(ureq, nextItem, true);
+			doSelect(ureq, nextItem, row.isEditable());
 		}
 	}
 	
@@ -356,7 +356,7 @@ public class QuestionListController extends AbstractItemListController implement
 		if(previousRow != null) {
 			QuestionItem previousItem = qpoolService.loadItemById(previousRow.getKey());
 			stackPanel.popUpToRootController(ureq);
-			doSelect(ureq, previousItem, true);
+			doSelect(ureq, previousItem, row.isEditable());
 		}
 	}
 	
diff --git a/src/main/java/org/olat/modules/qpool/ui/_content/item_list.html b/src/main/java/org/olat/modules/qpool/ui/_content/item_list.html
index 2ae80877e8c517245acdbc1dcb3f0cf97d9fd402..7fc33986e3bff712a91076a00a2b9038b8da2734 100644
--- a/src/main/java/org/olat/modules/qpool/ui/_content/item_list.html
+++ b/src/main/java/org/olat/modules/qpool/ui/_content/item_list.html
@@ -1,8 +1,8 @@
 $r.render("items")
 <div class="b_clearfix o_qpool_button_bar_box">
 	<div class="o_qpool_button_bar">
-	#if($r.available("create.list"))
-		$r.render("create.list")
+	#if($r.available("list"))
+		$r.render("list")
 	#end
 	#if($r.available("export.item"))
 		$r.render("export.item")
diff --git a/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_de.properties
index 09ed7e5a57b82e295a7391c38fe70fe977cbd639..918efbcb5bab0885f71526e8e3a7fa0815ffd624 100644
--- a/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_de.properties
@@ -7,7 +7,7 @@ remove=-
 topnav.qpool=Q-Pool
 topnav.qpool.alt=Question pools
 create.collection.description=Geben Sie eine Name zu Ihre Liste.
-bulk.change=Metadatas ändern
+bulk.change=Metadaten ändern
 bulk.change.description=Hier können Sie in 1 Schritt mehrere Attributen von mehreren Fragen ändern.
 collection.name=Name
 collection.creationDate=Erstellt am
@@ -16,12 +16,13 @@ copy.confirmation=Wollen Sie wirklich diese Frage kopieren?
 delete.item=Löschen
 delete.collection=Liste löschen
 details=Detailansicht
-rename.collection=Liste rename
-next=Next
-previous=Previous
+rename.collection=Liste umbenennen
+next=Weiter
+previous=Vorherig
 confirm.delete=Wollen Sie wirklich diese Frage löschen? Sie wird von allen Gruppen, alle Pools und alle Liste gelöscht.
 confirm.delete.source=Wollen Sie wirklich diese Liste löschen?
 confirm.unshare=Wollen Sie wirklich diese Frage von "{0}" entfernen?
+list=Listen
 menu.admin=Administration
 menu.admin.alt=Administration
 menu.admin.studyfields=Fachbereich