diff --git a/pom.xml b/pom.xml
index affe37c7..f4679547 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>org.woehlke</groupId>
   <artifactId>simpleworklist</artifactId>
-  <version>2.3.58-SNAPSHOT</version>
+  <version>2.3.61-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <parent>
@@ -1259,58 +1259,6 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
           <version>${version.maven-site-plugin}</version>
-          <!--
-          <dependencies>
-              <dependency>
-                  <groupId>org.apache.maven.doxia</groupId>
-                  <artifactId>doxia-module-markdown</artifactId>
-                  <version>${doxia-module.version}</version>
-                  <scope>compile</scope>
-              </dependency>
-              <dependency>
-                  <groupId>org.apache.maven.doxia</groupId>
-                  <artifactId>doxia-module-itext</artifactId>
-                  <version>${doxia-module.version}</version>
-                  <scope>compile</scope>
-              </dependency>
-              <dependency>
-                  <groupId>org.apache.maven.doxia</groupId>
-                  <artifactId>doxia-module-latex</artifactId>
-                  <version>${doxia-module.version}</version>
-                  <scope>compile</scope>
-              </dependency>
-              <dependency>
-                  <groupId>org.apache.maven.doxia</groupId>
-                  <artifactId>doxia-module-rtf</artifactId>
-                  <version>${doxia-module.version}</version>
-                  <scope>compile</scope>
-              </dependency>
-              <dependency>
-                  <groupId>org.apache.maven.doxia</groupId>
-                  <artifactId>doxia-module-xdoc</artifactId>
-                  <version>${doxia-module.version}</version>
-                  <scope>compile</scope>
-              </dependency>
-              <dependency>
-                  <groupId>org.apache.maven.doxia</groupId>
-                  <artifactId>doxia-skin-model</artifactId>
-                  <version>${doxia-module.version}</version>
-                  <scope>compile</scope>
-              </dependency>
-              <dependency>
-                  <groupId>org.apache.maven.doxia</groupId>
-                  <artifactId>doxia-site-renderer</artifactId>
-                  <version>${doxia-module.version}</version>
-                  <scope>compile</scope>
-              </dependency>
-              <dependency>
-                  <groupId>org.apache.maven.doxia</groupId>
-                  <artifactId>doxia-test-docs</artifactId>
-                  <version>${doxia-module.version}</version>
-                  <scope>compile</scope>
-              </dependency>
-          </dependencies>
-          -->
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -1457,6 +1405,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <executions>
+          <!--
           <execution>
             <id>unpack-dependency-classes-install</id>
             <phase>pre-site</phase>
@@ -1564,6 +1513,7 @@
               <goal>tree</goal>
             </goals>
           </execution>
+          -->
           <execution>
             <id>report</id>
             <phase>site</phase>
@@ -1611,6 +1561,14 @@
               -->
             </configuration>
           </execution>
+          <execution>
+            <id>copy-dependencies</id>
+            <phase>package</phase>
+            <goals><goal>copy-dependencies</goal></goals>
+            <configuration>
+              <includeScope>compile</includeScope>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
       <plugin>
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessageController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/ChatMessageController.java
similarity index 96%
rename from src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessageController.java
rename to src/main/java/org/woehlke/java/simpleworklist/domain/ChatMessageController.java
index ccd06b9e..e2f791ab 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessageController.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/ChatMessageController.java
@@ -1,4 +1,4 @@
-package org.woehlke.java.simpleworklist.domain.chat;
+package org.woehlke.java.simpleworklist.domain;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
@@ -15,6 +15,8 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.woehlke.java.simpleworklist.application.framework.AbstractController;
 import org.woehlke.java.simpleworklist.domain.breadcrumb.Breadcrumb;
+import org.woehlke.java.simpleworklist.domain.chat.ChatMessage;
+import org.woehlke.java.simpleworklist.domain.chat.ChatMessageForm;
 import org.woehlke.java.simpleworklist.domain.context.Context;
 import org.woehlke.java.simpleworklist.domain.user.account.UserAccount;
 import org.woehlke.java.simpleworklist.domain.session.UserSessionBean;
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/context/ContextController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/ContextController.java
similarity index 89%
rename from src/main/java/org/woehlke/java/simpleworklist/domain/context/ContextController.java
rename to src/main/java/org/woehlke/java/simpleworklist/domain/ContextController.java
index c3dd16cb..b32ccccd 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/domain/context/ContextController.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/ContextController.java
@@ -1,4 +1,4 @@
-package org.woehlke.java.simpleworklist.domain.context;
+package org.woehlke.java.simpleworklist.domain;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Controller;
@@ -8,6 +8,8 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.woehlke.java.simpleworklist.application.framework.AbstractController;
+import org.woehlke.java.simpleworklist.domain.context.Context;
+import org.woehlke.java.simpleworklist.domain.context.ContextService;
 import org.woehlke.java.simpleworklist.domain.session.UserSessionBean;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/PagesController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/PagesController.java
new file mode 100644
index 00000000..6d7d503d
--- /dev/null
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/PagesController.java
@@ -0,0 +1,28 @@
+package org.woehlke.java.simpleworklist.domain;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.woehlke.java.simpleworklist.domain.session.UserSessionBean;
+
+import javax.validation.constraints.NotNull;
+import java.util.Locale;
+
+@Slf4j
+@Controller
+@RequestMapping(path = "/")
+public class PagesController {
+
+
+  @RequestMapping(path = "/information", method = RequestMethod.GET)
+  public final String renderPageInformation(
+    @NotNull @ModelAttribute("userSession") UserSessionBean userSession,
+    Locale locale, Model model
+  ) {
+    log.info("addNewTaskToInboxGet");
+    return "pages/information";
+  }
+}
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/project/ProjectIdController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/ProjectIdController.java
similarity index 99%
rename from src/main/java/org/woehlke/java/simpleworklist/domain/project/ProjectIdController.java
rename to src/main/java/org/woehlke/java/simpleworklist/domain/ProjectIdController.java
index b988629b..3d89b650 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/domain/project/ProjectIdController.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/ProjectIdController.java
@@ -1,4 +1,4 @@
-package org.woehlke.java.simpleworklist.domain.project;
+package org.woehlke.java.simpleworklist.domain;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
@@ -14,6 +14,8 @@
 import org.woehlke.java.simpleworklist.application.framework.AbstractController;
 import org.woehlke.java.simpleworklist.domain.breadcrumb.Breadcrumb;
 import org.woehlke.java.simpleworklist.domain.context.Context;
+import org.woehlke.java.simpleworklist.domain.project.Project;
+import org.woehlke.java.simpleworklist.domain.project.ProjectControllerService;
 import org.woehlke.java.simpleworklist.domain.task.Task;
 import org.woehlke.java.simpleworklist.domain.task.TaskEnergy;
 import org.woehlke.java.simpleworklist.domain.task.TaskService;
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/project/ProjectRootController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/ProjectRootController.java
similarity index 99%
rename from src/main/java/org/woehlke/java/simpleworklist/domain/project/ProjectRootController.java
rename to src/main/java/org/woehlke/java/simpleworklist/domain/ProjectRootController.java
index 831f270c..6df02ec0 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/domain/project/ProjectRootController.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/ProjectRootController.java
@@ -1,4 +1,4 @@
-package org.woehlke.java.simpleworklist.domain.project;
+package org.woehlke.java.simpleworklist.domain;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,6 +14,8 @@
 import org.springframework.web.bind.annotation.*;
 import org.woehlke.java.simpleworklist.domain.breadcrumb.Breadcrumb;
 import org.woehlke.java.simpleworklist.domain.context.Context;
+import org.woehlke.java.simpleworklist.domain.project.Project;
+import org.woehlke.java.simpleworklist.domain.project.ProjectControllerService;
 import org.woehlke.java.simpleworklist.domain.task.Task;
 import org.woehlke.java.simpleworklist.domain.task.TaskEnergy;
 import org.woehlke.java.simpleworklist.domain.task.TaskService;
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/search/SearchController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/SearchController.java
similarity index 94%
rename from src/main/java/org/woehlke/java/simpleworklist/domain/search/SearchController.java
rename to src/main/java/org/woehlke/java/simpleworklist/domain/SearchController.java
index 3a1bf6af..55d8fc1b 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/domain/search/SearchController.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/SearchController.java
@@ -1,4 +1,4 @@
-package org.woehlke.java.simpleworklist.domain.search;
+package org.woehlke.java.simpleworklist.domain;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Controller;
@@ -9,6 +9,7 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.woehlke.java.simpleworklist.application.framework.AbstractController;
 import org.woehlke.java.simpleworklist.domain.context.Context;
+import org.woehlke.java.simpleworklist.domain.search.SearchService;
 import org.woehlke.java.simpleworklist.domain.search.result.SearchResult;
 import org.woehlke.java.simpleworklist.domain.breadcrumb.Breadcrumb;
 import org.woehlke.java.simpleworklist.domain.session.UserSessionBean;
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/TaskStateTabController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/TaskStateTabController.java
similarity index 96%
rename from src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/TaskStateTabController.java
rename to src/main/java/org/woehlke/java/simpleworklist/domain/TaskStateTabController.java
index eff7f2b8..a6475dce 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/TaskStateTabController.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/TaskStateTabController.java
@@ -1,4 +1,4 @@
-package org.woehlke.java.simpleworklist.domain.taskworkflow;
+package org.woehlke.java.simpleworklist.domain;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
@@ -14,6 +14,9 @@
 import org.woehlke.java.simpleworklist.domain.session.UserSessionBean;
 
 import lombok.extern.slf4j.Slf4j;
+import org.woehlke.java.simpleworklist.domain.taskworkflow.MoveTaskToTaskInTaskstateService;
+import org.woehlke.java.simpleworklist.domain.taskworkflow.TaskState;
+
 import javax.validation.constraints.NotNull;
 import java.util.Locale;
 
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/TaskStateTaskController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/TaskStateTaskController.java
similarity index 98%
rename from src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/TaskStateTaskController.java
rename to src/main/java/org/woehlke/java/simpleworklist/domain/TaskStateTaskController.java
index 663b91a0..04eec994 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/TaskStateTaskController.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/TaskStateTaskController.java
@@ -1,4 +1,4 @@
-package org.woehlke.java.simpleworklist.domain.taskworkflow;
+package org.woehlke.java.simpleworklist.domain;
 
 
 import org.springframework.stereotype.Controller;
@@ -14,6 +14,9 @@
 import org.woehlke.java.simpleworklist.domain.task.TaskEnergy;
 import org.woehlke.java.simpleworklist.domain.task.TaskService;
 import org.woehlke.java.simpleworklist.domain.task.TaskTime;
+import org.woehlke.java.simpleworklist.domain.taskworkflow.MoveTaskToTaskInTaskstateService;
+import org.woehlke.java.simpleworklist.domain.taskworkflow.TaskState;
+import org.woehlke.java.simpleworklist.domain.taskworkflow.TransformTaskIntoProjektService;
 import org.woehlke.java.simpleworklist.domain.user.account.UserAccount;
 import org.woehlke.java.simpleworklist.application.framework.AbstractController;
 import org.woehlke.java.simpleworklist.domain.session.UserSessionBean;
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/testdata/TestDataController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/TestDataController.java
similarity index 91%
rename from src/main/java/org/woehlke/java/simpleworklist/domain/testdata/TestDataController.java
rename to src/main/java/org/woehlke/java/simpleworklist/domain/TestDataController.java
index e83ab96a..5728f18d 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/domain/testdata/TestDataController.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/TestDataController.java
@@ -1,9 +1,10 @@
-package org.woehlke.java.simpleworklist.domain.testdata;
+package org.woehlke.java.simpleworklist.domain;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.woehlke.java.simpleworklist.domain.testdata.TestDataService;
 import org.woehlke.java.simpleworklist.domain.user.account.UserAccount;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/user/login/UserLoginController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/UserLoginController.java
similarity index 94%
rename from src/main/java/org/woehlke/java/simpleworklist/domain/user/login/UserLoginController.java
rename to src/main/java/org/woehlke/java/simpleworklist/domain/UserLoginController.java
index 14e5b8ed..58e76662 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/domain/user/login/UserLoginController.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/UserLoginController.java
@@ -1,4 +1,4 @@
-package org.woehlke.java.simpleworklist.domain.user.login;
+package org.woehlke.java.simpleworklist.domain;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +18,8 @@
 import org.springframework.web.bind.support.SessionStatus;
 import org.woehlke.java.simpleworklist.domain.user.access.UserAuthorizationService;
 import org.woehlke.java.simpleworklist.domain.user.account.UserAccount;
+import org.woehlke.java.simpleworklist.domain.user.login.LoginForm;
+import org.woehlke.java.simpleworklist.domain.user.login.UserAccountLoginSuccessService;
 
 @Slf4j
 @Controller
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/UserPasswordRecoveryController.java
similarity index 96%
rename from src/main/java/org/woehlke/java/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryController.java
rename to src/main/java/org/woehlke/java/simpleworklist/domain/UserPasswordRecoveryController.java
index f7b5ced1..3bdbbea3 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryController.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/UserPasswordRecoveryController.java
@@ -1,4 +1,4 @@
-package org.woehlke.java.simpleworklist.domain.user.passwordrecovery;
+package org.woehlke.java.simpleworklist.domain;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Controller;
@@ -11,6 +11,8 @@
 import org.woehlke.java.simpleworklist.domain.user.account.UserAccountService;
 import org.woehlke.java.simpleworklist.domain.user.account.UserAccountForm;
 import org.woehlke.java.simpleworklist.domain.user.account.UserAccount;
+import org.woehlke.java.simpleworklist.domain.user.passwordrecovery.UserPasswordRecovery;
+import org.woehlke.java.simpleworklist.domain.user.passwordrecovery.UserPasswordRecoveryService;
 import org.woehlke.java.simpleworklist.domain.user.signup.UserRegistrationForm;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/user/signup/UserRegistrationController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/UserRegistrationController.java
similarity index 95%
rename from src/main/java/org/woehlke/java/simpleworklist/domain/user/signup/UserRegistrationController.java
rename to src/main/java/org/woehlke/java/simpleworklist/domain/UserRegistrationController.java
index e288bac8..1293de2f 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/domain/user/signup/UserRegistrationController.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/UserRegistrationController.java
@@ -1,4 +1,4 @@
-package org.woehlke.java.simpleworklist.domain.user.signup;
+package org.woehlke.java.simpleworklist.domain;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,6 +11,9 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.woehlke.java.simpleworklist.domain.user.account.UserAccountService;
 import org.woehlke.java.simpleworklist.domain.user.account.UserAccountForm;
+import org.woehlke.java.simpleworklist.domain.user.signup.UserRegistration;
+import org.woehlke.java.simpleworklist.domain.user.signup.UserRegistrationForm;
+import org.woehlke.java.simpleworklist.domain.user.signup.UserRegistrationService;
 
 import javax.validation.Valid;
 
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/user/accountselfservice/UserSelfserviceController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/UserSelfserviceController.java
similarity index 98%
rename from src/main/java/org/woehlke/java/simpleworklist/domain/user/accountselfservice/UserSelfserviceController.java
rename to src/main/java/org/woehlke/java/simpleworklist/domain/UserSelfserviceController.java
index 97112e6c..e9f48014 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/domain/user/accountselfservice/UserSelfserviceController.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/UserSelfserviceController.java
@@ -1,4 +1,4 @@
-package org.woehlke.java.simpleworklist.domain.user.accountselfservice;
+package org.woehlke.java.simpleworklist.domain;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +24,9 @@
 import org.woehlke.java.simpleworklist.domain.context.Context;
 import org.woehlke.java.simpleworklist.domain.user.account.UserAccount;
 import org.woehlke.java.simpleworklist.domain.session.UserSessionBean;
+import org.woehlke.java.simpleworklist.domain.user.accountselfservice.UserChangeDefaultContextForm;
+import org.woehlke.java.simpleworklist.domain.user.accountselfservice.UserChangeNameForm;
+import org.woehlke.java.simpleworklist.domain.user.accountselfservice.UserChangePasswordForm;
 
 import javax.validation.Valid;
 import java.util.List;
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/breadcrumb/BreadcrumbService.java b/src/main/java/org/woehlke/java/simpleworklist/domain/breadcrumb/BreadcrumbService.java
index 3e7e79ab..bcd79df5 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/domain/breadcrumb/BreadcrumbService.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/breadcrumb/BreadcrumbService.java
@@ -2,7 +2,6 @@
 
 import org.woehlke.java.simpleworklist.domain.context.Context;
 import org.woehlke.java.simpleworklist.domain.project.Project;
-import org.woehlke.java.simpleworklist.domain.task.Task;
 import org.woehlke.java.simpleworklist.domain.taskworkflow.TaskState;
 import org.woehlke.java.simpleworklist.domain.session.UserSessionBean;
 
@@ -16,12 +15,6 @@ public interface BreadcrumbService {
 
     Breadcrumb getBreadcrumbForTaskstate(TaskState taskstate, Locale locale, UserSessionBean userSession);
 
-    Breadcrumb getBreadcrumbForTaskstateAll(Locale locale, UserSessionBean userSession);
-
-    Breadcrumb getBreadcrumbForTaskInTaskstate(String taskstate, Task task, Locale locale, UserSessionBean userSession);
-
-    Breadcrumb getBreadcrumbForTaskInProject(Project thisProject, Task task, Locale local, UserSessionBean userSession);
-
     Breadcrumb getBreadcrumbForUserProfileAndMenu(Locale locale,UserSessionBean userSession);
 
     Breadcrumb getBreadcrumbForUserChangeName(Locale locale, UserSessionBean userSession);
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/breadcrumb/BreadcrumbServiceImpl.java b/src/main/java/org/woehlke/java/simpleworklist/domain/breadcrumb/BreadcrumbServiceImpl.java
index a7bb1c5b..be7c3b99 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/domain/breadcrumb/BreadcrumbServiceImpl.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/breadcrumb/BreadcrumbServiceImpl.java
@@ -85,37 +85,6 @@ public Breadcrumb getBreadcrumbForTaskstate(
         return breadcrumb;
     }
 
-    @Override
-    public Breadcrumb getBreadcrumbForTaskInTaskstate(String taskstate, Task task, Locale locale, UserSessionBean userSession) {
-        log.info("getBreadcrumbForTaskInTaskstate");
-        Optional<Context> context = contextService.getContextFor(userSession);
-        Breadcrumb breadcrumb = new Breadcrumb(locale, context.get());
-        breadcrumb.addTaskstate(taskstate);
-        breadcrumb.addTask(task);
-        return breadcrumb;
-    }
-
-    @Override
-    public Breadcrumb getBreadcrumbForTaskstateAll(Locale locale, UserSessionBean userSession) {
-        log.info("getBreadcrumbForTaskstateAll");
-        Optional<Context> context = contextService.getContextFor(userSession);
-        Breadcrumb breadcrumb = new Breadcrumb(locale, context.get());
-        String code="layout.page.all";
-        String name= messageSource.getMessage(code,null,locale);
-        String url="/taskstate/all";
-        breadcrumb.addPage(name,url);
-        return breadcrumb;
-    }
-
-    @Override
-    public Breadcrumb getBreadcrumbForTaskInProject(Project thisProject, Task task, Locale locale, UserSessionBean userSession) {
-        log.info("getBreadcrumbForTaskInProject");
-        Breadcrumb breadcrumb = new Breadcrumb(locale,thisProject.getContext());
-        breadcrumb.addProject(thisProject);
-        breadcrumb.addTask(task);
-        return breadcrumb;
-    }
-
     @Override
     public Breadcrumb getBreadcrumbForUserProfileAndMenu(Locale locale, UserSessionBean userSession) {
         log.info("getBreadcrumbForUserProfileAndMenu");
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessage.java b/src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessage.java
index 035519cf..856df9a6 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessage.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessage.java
@@ -47,7 +47,6 @@ public class ChatMessage extends AuditModel implements Serializable {
     )
     private Long id;
 
-    //@SafeHtml(whitelistType= SafeHtml.WhiteListType.SIMPLE_TEXT)
     @NotBlank
     @Length(min=1,max=65535)
     @Column(name="message_text", nullable = false, length = 65535, columnDefinition="text")
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessageForm.java b/src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessageForm.java
index cc81dbc8..f413576c 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessageForm.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessageForm.java
@@ -3,7 +3,6 @@
 
 import lombok.*;
 import org.hibernate.validator.constraints.Length;
-//import org.hibernate.validator.constraints.SafeHtml;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
@@ -18,7 +17,6 @@ public class ChatMessageForm implements Serializable {
 
     private static final long serialVersionUID = 1576610181966480168L;
 
-    //@SafeHtml(whitelistType= SafeHtml.WhiteListType.SIMPLE_TEXT)
     @NotBlank
     @Length(min=1,max=65535)
     private String messageText;
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessageRepository.java b/src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessageRepository.java
index 910e562b..0b30f667 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessageRepository.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessageRepository.java
@@ -33,17 +33,8 @@ List<ChatMessage> findByReceiverAndReadByReceiver(
             boolean readByReceiver
     );
 
-    Page<ChatMessage> findByReceiverAndReadByReceiver(
-        UserAccount receiver,
-        boolean readByReceiver,
-        Pageable request
-    );
-
     List<ChatMessage> findBySenderAndReceiverAndReadByReceiver(
             UserAccount sender, UserAccount receiver, boolean readByReceiver
     );
 
-    Page<ChatMessage> findBySenderAndReceiverAndReadByReceiver(
-        UserAccount sender, UserAccount receiver, boolean readByReceiver, Pageable request
-    );
 }
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/context/Context.java b/src/main/java/org/woehlke/java/simpleworklist/domain/context/Context.java
index 9ccdee00..30368a00 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/domain/context/Context.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/context/Context.java
@@ -4,7 +4,6 @@
 import org.hibernate.annotations.LazyToOne;
 import org.hibernate.validator.constraints.Length;
 
-//import org.hibernate.validator.constraints.SafeHtml;
 import org.woehlke.java.simpleworklist.application.framework.AuditModel;
 import org.woehlke.java.simpleworklist.application.framework.ComparableById;
 import org.woehlke.java.simpleworklist.domain.user.account.UserAccount;
@@ -62,14 +61,10 @@ public class Context extends AuditModel implements Serializable, ComparableById<
     @LazyToOne(PROXY)
     private UserAccount userAccount;
 
-    //@SafeHtml(whitelistType = SafeHtml.WhiteListType.NONE)
-    //@NotBlank
     @Length(min = 1, max = 255)
     @Column(name = "name_de", nullable = false)
     private String nameDe;
 
-    //@SafeHtml(whitelistType = SafeHtml.WhiteListType.NONE)
-    //@NotBlank
     @Length(min = 1, max = 255)
     @Column(name = "name_en", nullable = false)
     private String nameEn;
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/context/ContextRepository.java b/src/main/java/org/woehlke/java/simpleworklist/domain/context/ContextRepository.java
index 83736d17..1bc56f3a 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/domain/context/ContextRepository.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/context/ContextRepository.java
@@ -15,7 +15,6 @@
 public interface ContextRepository extends JpaRepository<Context, Long> {
 
     List<Context> findByUserAccount(UserAccount user);
-    Page<Context> findByUserAccount(UserAccount user, Pageable pageRequest);
 
     Context findByIdAndUserAccount(long newContextId, UserAccount userAccount);
 
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/context/NewContextForm.java b/src/main/java/org/woehlke/java/simpleworklist/domain/context/NewContextForm.java
index 75818973..64474510 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/domain/context/NewContextForm.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/context/NewContextForm.java
@@ -3,7 +3,6 @@
 import lombok.*;
 import org.hibernate.validator.constraints.Length;
 import javax.validation.constraints.NotBlank;
-//import org.hibernate.validator.constraints.SafeHtml;
 
 import java.io.Serializable;
 
@@ -20,12 +19,10 @@ public class NewContextForm implements Serializable {
 
     private static final long serialVersionUID = -937143305653156981L;
 
-    //@SafeHtml(whitelistType = SafeHtml.WhiteListType.NONE)
     @NotBlank
     @Length(min = 1, max = 255)
     private String nameDe;
 
-    //@SafeHtml(whitelistType = SafeHtml.WhiteListType.NONE)
     @NotBlank
     @Length(min = 1, max = 255)
     private String nameEn;
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/project/Project.java b/src/main/java/org/woehlke/java/simpleworklist/domain/project/Project.java
index f421f7f2..426375a6 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/domain/project/Project.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/project/Project.java
@@ -16,7 +16,6 @@
 import org.hibernate.annotations.OnDeleteAction;
 import org.hibernate.validator.constraints.Length;
 import javax.validation.constraints.NotBlank;
-//import org.hibernate.validator.constraints.SafeHtml;
 import org.woehlke.java.simpleworklist.domain.user.account.UserAccount;
 import org.woehlke.java.simpleworklist.domain.context.Context;
 import org.woehlke.java.simpleworklist.application.framework.AuditModel;
@@ -80,13 +79,11 @@ public class Project extends AuditModel implements Serializable, ComparableById<
     @OnDelete(action = OnDeleteAction.NO_ACTION)
     private Context context;
 
-    //@SafeHtml(whitelistType = SafeHtml.WhiteListType.NONE)
     @NotBlank
     @Length(min = 1, max = 255)
     @Column(name = "name", nullable = false)
     private String name;
 
-    //@SafeHtml(whitelistType= SafeHtml.WhiteListType.RELAXED)
     @Length(min = 0, max = 65535)
     @Column(name = "description", nullable = true, length = 65535, columnDefinition = "text")
     private String description;
@@ -147,7 +144,6 @@ public boolean equalsByUuid(Project otherObject) {
     public static Project newProjectFactoryForParentProject(Project parent) {
         Project thisProject = new Project();
         thisProject.setUuid(UUID.randomUUID());
-        //thisProject.setName("name");
         thisProject.setParent(parent);
         thisProject.setContext(parent.getContext());
         return thisProject;
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/task/Task.java b/src/main/java/org/woehlke/java/simpleworklist/domain/task/Task.java
index 4383af16..78ccc85b 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/domain/task/Task.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/task/Task.java
@@ -10,10 +10,6 @@
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
-//import org.hibernate.annotations.*;
-//import org.hibernate.annotations.CascadeType;
-//import org.hibernate.annotations.NamedQueries;
-//import org.hibernate.annotations.NamedQuery;
 import org.hibernate.annotations.LazyToOne;
 import org.hibernate.annotations.OnDelete;
 import org.hibernate.annotations.OnDeleteAction;
@@ -27,8 +23,6 @@
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
-//import org.hibernate.validator.constraints.SafeHtml;
-//import org.springframework.data.jpa.repository.Temporal;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.woehlke.java.simpleworklist.domain.taskworkflow.TaskState;
 import org.woehlke.java.simpleworklist.domain.user.account.UserAccount;
@@ -48,15 +42,7 @@
         @UniqueConstraint(
             name="ux_task",
             columnNames = {"uuid", "context_id" }
-        )/*,
-        @UniqueConstraint(
-            name="ux_task_order_id_project",
-            columnNames = {"order_id_project", "project_id", "context_id", "user_account_id"}
-        ),
-        @UniqueConstraint(
-            name="ux_task_order_id_task_state",
-            columnNames = {"order_id_task_state", "task_state", "context_id", "user_account_id"}
-        )*/
+        )
     },
     indexes = {
         @Index(name = "ix_task_uuid", columnList = "uuid"),
@@ -153,7 +139,6 @@ public class Task extends AuditModel implements Serializable, ComparableById<Tas
     private Context context;
 
 
-    //@SafeHtml(whitelistType= SafeHtml.WhiteListType.NONE)
     @NotBlank
     @Length(min=1,max=255)
     @Column(name = "title", nullable = false)
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/task/TaskRepository.java b/src/main/java/org/woehlke/java/simpleworklist/domain/task/TaskRepository.java
index 7a863441..96337c55 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/domain/task/TaskRepository.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/task/TaskRepository.java
@@ -21,7 +21,6 @@ public interface TaskRepository extends JpaRepository<Task, Long> {
     Page<Task> findByProjectIsNullAndContext(Context context, Pageable request);
 
     List<Task> findByContext(Context context);
-    Page<Task> findByContext(Context context, Pageable pageable);
 
     Task findTopByTaskStateAndContextOrderByOrderIdTaskStateDesc(TaskState taskState, Context context);
     Task findTopByProjectIsNullAndContextOrderByOrderIdProjectDesc(Context context);
@@ -36,14 +35,7 @@ public interface TaskRepository extends JpaRepository<Task, Long> {
     List<Task> findByTaskStateAndContextOrderByOrderIdTaskStateAsc(
         TaskState taskState, Context context
     );
-    Page<Task> findByTaskStateAndContextOrderByOrderIdTaskStateAsc(
-        TaskState taskState, Context context, Pageable request
-    );
 
-    //TODO: #249 move the JQL Query-String to Entity as Prepared Statement
-    //@Query("select t from Task t"
-    //        + " where t.orderIdTaskState > :lowerOrderIdTaskState and t.orderIdTaskState < :higherOrderIdTaskState"
-    //        + " and t.taskState = :taskState and t.context = :context")
     @Query(name="queryGetTasksByOrderIdTaskStateBetweenLowerTaskAndHigherTask")
     List<Task> getTasksByOrderIdTaskStateBetweenLowerTaskAndHigherTask(
         @Param("lowerOrderIdTaskState") long lowerOrderIdTaskState,
@@ -52,17 +44,6 @@ List<Task> getTasksByOrderIdTaskStateBetweenLowerTaskAndHigherTask(
         @Param("context") Context context
     );
 
-    //TODO: #249 move the JQL Query-String to Entity as Prepared Statement
-    @Query(name="queryGetTasksByOrderIdTaskStateBetweenLowerTaskAndHigherTask")
-    Page<Task> getTasksByOrderIdTaskStateBetweenLowerTaskAndHigherTask(
-        @Param("lowerOrderIdTaskState") long lowerOrderIdTaskState,
-        @Param("higherOrderIdTaskState") long higherOrderIdTaskState,
-        @Param("taskState") TaskState taskState,
-        @Param("context") Context context,
-        Pageable request
-    );
-
-    //TODO: #249 move the JQL Query-String to Entity as Prepared Statement
     @Query(name="queryGetTasksByOrderIdProjectBetweenLowerTaskAndHigherTask")
     List<Task> getTasksByOrderIdProjectBetweenLowerTaskAndHigherTask(
         @Param("lowerOrderIdProject") long lowerOrderIdProject,
@@ -70,22 +51,6 @@ List<Task> getTasksByOrderIdProjectBetweenLowerTaskAndHigherTask(
         @Param("project") Project project
     );
 
-    //TODO: #249 move the JQL Query-String to Entity as Prepared Statement
-    //@Query("select t from Task t"
-    //    + " where t.orderIdProject > :lowerOrderIdProject and t.orderIdProject < :higherOrderIdProject"
-    //    + " and t.project = :project")
-    @Query(name="queryGetTasksByOrderIdProjectBetweenLowerTaskAndHigherTask")
-    Page<Task> getTasksByOrderIdProjectBetweenLowerTaskAndHigherTask(
-        @Param("lowerOrderIdProject") long lowerOrderIdProject,
-        @Param("higherOrderIdProject") long higherOrderIdProject,
-        @Param("project") Project project,
-        Pageable request
-    );
-
-    //TODO: #249 move the JQL Query-String to Entity as Prepared Statement
-    //@Query("select t from Task t"
-    //    + " where t.orderIdProject > :lowerOrderIdProject and t.orderIdProject < :higherOrderIdProject"
-    //    + " and t.project is null and t.context = :context ")
     @Query(name = "queryGetTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask")
     List<Task> getTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask(
         @Param("lowerOrderIdProject") long lowerOrderIdProject,
@@ -93,16 +58,5 @@ List<Task> getTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask(
         @Param("context") Context context
     );
 
-    //TODO: #249 move the JQL Query-String to Entity as Prepared Statement
-    //@Query("select t from Task t"
-    //    + " where t.orderIdProject > :lowerOrderIdProject and t.orderIdProject < :higherOrderIdProject"
-    //    + " and t.project is null and t.context = :context ")
-    @Query(name = "queryGetTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask")
-    Page<Task> getTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask(
-        @Param("lowerOrderIdProject") long lowerOrderIdProject,
-        @Param("higherOrderIdProject") long higherOrderIdProject,
-        @Param("context") Context context,
-        Pageable request
-    );
 
 }
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/task/TaskServiceImpl.java b/src/main/java/org/woehlke/java/simpleworklist/domain/task/TaskServiceImpl.java
index c60a7486..0c752958 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/domain/task/TaskServiceImpl.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/task/TaskServiceImpl.java
@@ -89,8 +89,6 @@ public Task findOne(@Min(1L) long taskId) {
     @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
     public Task updatedViaTaskstate(@NotNull Task task) {
         log.info("updatedViaTaskstate");
-        //long maxOrderIdTaskState = this.getMaxOrderIdTaskState(task.getTaskState(),task.getContext());
-        //task.setOrderIdTaskState(++maxOrderIdTaskState);
         task = taskRepository.saveAndFlush(task);
         log.info("persisted: " + task.outTaskstate());
         return task;
@@ -100,8 +98,6 @@ public Task updatedViaTaskstate(@NotNull Task task) {
     @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
     public Task updatedViaProject(@NotNull Task task) {
         log.info("updatedViaProject");
-        //long maxOrderIdProject = this.getMaxOrderIdProject(task.getProject(), task.getContext());
-        //task.setOrderIdProject(++maxOrderIdProject);
         task = taskRepository.saveAndFlush(task);
         log.info("persisted Task: " + task.outProject());
         return task;
@@ -111,8 +107,6 @@ public Task updatedViaProject(@NotNull Task task) {
     @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
     public Task updatedViaProjectRoot(@NotNull Task task) {
         log.info("updatedViaProject");
-        //long maxOrderIdProject = this.getMaxOrderIdProjectRoot(task.getContext());
-        //task.setOrderIdProject(++maxOrderIdProject);
         task = taskRepository.saveAndFlush(task);
         log.info("persisted Task: " + task.outProject());
         return task;
@@ -332,14 +326,11 @@ public void moveTasksUpByProjectRoot(@NotNull Task sourceTask, @NotNull Task des
         Context context = sourceTask.getContext();
         long lowerOrderIdProject = destinationTask.getOrderIdProject();
         long higherOrderIdProject = sourceTask.getOrderIdProject();
-        //TODO: #244 change List<Task> to Page<Task>
-        //noinspection deprecation
         List<Task> tasks = taskRepository.getTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask(
             lowerOrderIdProject,
             higherOrderIdProject,
             context
         );
-        //TODO: #244 change List<Task> to Page<Task>
         List<Task> tasksMoved = new ArrayList<>(tasks.size()+2);
         for(Task task:tasks){
             task.moveUpByProject();
@@ -366,14 +357,11 @@ public void moveTasksDownByProjectRoot(@NotNull Task sourceTask, @NotNull Task d
         Context context = sourceTask.getContext();
         final long lowerOrderIdProject = sourceTask.getOrderIdProject();
         final long higherOrderIdProject = destinationTask.getOrderIdProject();
-        //TODO: #244 change List<Task> to Page<Task>
-        //noinspection deprecation
         List<Task> tasks = taskRepository.getTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask(
             lowerOrderIdProject,
             higherOrderIdProject,
             context
         );
-        //TODO: #244 change List<Task> to Page<Task>
         List<Task> tasksMoved = new ArrayList<>(tasks.size()+2);
         for(Task task:tasks){
             task.moveDownByProject();
@@ -401,14 +389,11 @@ public void moveTasksUpByProject(@NotNull Task sourceTask, @NotNull Task destina
         log.info("-------------------------------------------------------------------------------");
         long lowerOrderIdProject = destinationTask.getOrderIdProject();
         long higherOrderIdProject = sourceTask.getOrderIdProject();
-        //TODO: #244 change List<Task> to Page<Task>
-        //noinspection deprecation
         List<Task> tasks = taskRepository.getTasksByOrderIdProjectBetweenLowerTaskAndHigherTask(
             lowerOrderIdProject,
             higherOrderIdProject,
             project
         );
-        //TODO: #244 change List<Task> to Page<Task>
         List<Task> tasksMoved = new ArrayList<>(tasks.size()+2);
         for(Task task:tasks){
             task.moveUpByProject();
@@ -437,13 +422,11 @@ public void moveTasksDownByProject(@NotNull Task sourceTask, @NotNull Task desti
         log.info("-------------------------------------------------------------------------------");
         final long lowerOrderIdProject = sourceTask.getOrderIdProject();
         final long higherOrderIdProject = destinationTask.getOrderIdProject();
-        //TODO: #244 change List<Task> to Page<Task>
         List<Task> tasks = taskRepository.getTasksByOrderIdProjectBetweenLowerTaskAndHigherTask(
             lowerOrderIdProject,
             higherOrderIdProject,
             project
         );
-        //TODO: #244 change List<Task> to Page<Task>
         List<Task> tasksMoved = new ArrayList<>(tasks.size()+2);
         for(Task task:tasks){
             task.moveDownByProject();
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/user/access/UserAuthorizationServiceImpl.java b/src/main/java/org/woehlke/java/simpleworklist/domain/user/access/UserAuthorizationServiceImpl.java
index d08a8ac3..c4b8f7bc 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/domain/user/access/UserAuthorizationServiceImpl.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/user/access/UserAuthorizationServiceImpl.java
@@ -31,7 +31,6 @@ public UserAuthorizationServiceImpl(
     ) {
         this.userAccountRepository = userAccountRepository;
         this.authenticationManager = authenticationManager;
-        //TODO:
         int strength = 10;
         this.encoder = new BCryptPasswordEncoder(strength);
     }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index bfa8e9b1..b1d03beb 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -115,6 +115,7 @@ org:
             - "/user/resetPassword/**"
             - "/user/resetPassword/confirm/**"
             - "/error*"
+            - "/information*"
 logging:
   level:
     root: INFO
diff --git a/src/main/resources/messages_de.properties b/src/main/resources/messages_de.properties
index 3890ffa3..ece81b09 100644
--- a/src/main/resources/messages_de.properties
+++ b/src/main/resources/messages_de.properties
@@ -63,6 +63,7 @@ pages.chatMessages.newMessage=Neue Nachricht\:
 pages.chatMessages.newUserMessageButton=Sende Nachricht
 pages.chatMessages.showAllText1=Zeige alle Nachrichten
 pages.chatMessages.showAllText2=(hier werden nur die letzten 20 Angezeigt)
+pages.information.h1=Informationen
 project.add.h1=Neues Projekt
 project.add.description=Beschreibung
 project.add.button=Neues Projekt speichern
diff --git a/src/main/resources/messages_en.properties b/src/main/resources/messages_en.properties
index 79d64788..a4de71ba 100644
--- a/src/main/resources/messages_en.properties
+++ b/src/main/resources/messages_en.properties
@@ -270,4 +270,5 @@ user.loginForm.email.placeholder=Enter your Email
 user.loginForm.password.label=Password
 user.loginForm.password.placeholder=Enter your Password
 user.registerSentMail.action=Please check the Inbox of your Email-Client.
+pages.information.h1=Information
 
diff --git a/src/main/resources/templates/layout/navbartop.html b/src/main/resources/templates/layout/navbartop.html
index 0302d64c..4679887b 100644
--- a/src/main/resources/templates/layout/navbartop.html
+++ b/src/main/resources/templates/layout/navbartop.html
@@ -20,6 +20,7 @@
           </a>
 
           <div id="mynavbar" class="collapse navbar-collapse">
+
             <ul class="navbar-nav me-auto mb-2 mb-lg-0" sec:authorize="isAuthenticated()">
               <li class="nav-item dropdown">
                 <a class="nav-link dropdown-toggle" id="contextMenu" role="button"
@@ -54,27 +55,10 @@
                 </a>
               </li>
             </ul>
-            <ul class="navbar-nav me-auto mb-2 mb-lg-0" sec:authorize="isAnonymous()">
-              <li class="nav-item">
-                <a class="nav-link" th:href="@{/user/register/}">
-                  <i class="fas fa-user"></i>
-                  <span th:text="#{layout.page.register}">Register as New User</span>
-                </a>
-              </li>
-              <li class="nav-item">
-                <a class="nav-link" th:href="@{/user/login/}">
-                  <i class="fas fa-sign-in-alt"></i>
-                  <span th:text="#{layout.page.login}">Login</span>
-                </a>
-              </li>
-              <li class="nav-item">
-                <a class="nav-link" th:href="@{/user/resetPassword/}">
-                  <i class="fas fa-question-circle"></i>
-                  <span th:text="#{layout.page.passwordForgotten}">Password forgotten?</span>
-                </a>
-              </li>
-            </ul>
-            <ul class="navbar-nav mr-auto">
+
+            <ul class="navbar-nav me-auto mb-2 mb-lg-0" sec:authorize="isAnonymous()"></ul>
+
+            <ul class="navbar-nav me-2">
               <li class="nav-item dropdown">
                 <a id="languageMenu" class="nav-link dropdown-toggle"
                    role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" href="#">
diff --git a/src/main/resources/templates/layout/projects.html b/src/main/resources/templates/layout/projects.html
index f0e88367..1c311841 100644
--- a/src/main/resources/templates/layout/projects.html
+++ b/src/main/resources/templates/layout/projects.html
@@ -44,21 +44,22 @@
           ondrop="drop2project(event)"
           ondragover="allowDrop2Project(event)"
           draggable="true" ondragstart="dragProject(event)"
-          class="btn btn-dark btn-sm">
+          class="m-2 btn btn-dark btn-sm">
         <i class="fa-solid fa-diagram-project" th:id="'project_' + ${project.id} + '_i'"></i>
         <strong th:text="${project.name}" th:id="'project_' + ${project.id} + '_strong'"></strong>
     </span>
-    <span th:id="'project_' + ${project.id}"
-          th:if="${project != thisProject}"
-          ondrop="drop2project(event)"
-          ondragover="allowDrop2Project(event)"
-          draggable="true" ondragstart="dragProject(event)"
-          class="m-2 btn btn-outline-dark btn-sm">
-      <a th:href="@{/project/{id}(id=${project.id})}" th:id="'project_' + ${project.id} + '_a'">
-        <i class="fa-solid fa-diagram-project" th:id="'project_' + ${project.id} + '_a_i'"></i>
-        <span th:text="${project.name}" th:id="'project_' + ${project.id} + '_a_span'"></span>
-      </a>
-    </span>
+
+    <a th:href="@{/project/{id}(id=${project.id})}"
+       th:if="${project != thisProject}"
+       th:id="'project_' + ${project.id} + '_a'"
+       ondrop="drop2project(event)"
+       ondragover="allowDrop2Project(event)"
+       draggable="true" ondragstart="dragProject(event)"
+       class="m-2 btn btn-outline-dark btn-sm">
+      <i class="fa-solid fa-diagram-project" th:id="'project_' + ${project.id} + '_a_i'"></i>
+      <span th:text="${project.name}" th:id="'project_' + ${project.id} + '_a_span'"></span>
+    </a>
+
     <span th:if="${project.children.size() gt 0}">
       <ul th:include="this :: tw-project-submenu(projectList=${project.children},thisProject=${thisProject})"
           style="list-style: none;">
diff --git a/src/main/resources/templates/pages/information.html b/src/main/resources/templates/pages/information.html
new file mode 100644
index 00000000..13f6e8aa
--- /dev/null
+++ b/src/main/resources/templates/pages/information.html
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<html th:lang="${#locale.language}"
+      xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:th="http://www.thymeleaf.org"
+      xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
+      xmlns:sd="http://www.thymeleaf.org/spring-data">
+<head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)">
+  <title th:text="'SimpleWorklist | ' + #{pages.information.h1}">Information</title>
+</head>
+<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{})">
+
+<div th:fragment="mytwtitle">
+  <div id="tw-content-title">
+    <div class="row">
+      <h1 class="col-md-12 mb-12">
+        <i class="fas fa-inbox"></i>
+        <span th:utext="#{pages.information.h1}">Information</span>
+      </h1>
+    </div>
+  </div>
+</div>
+
+<div th:fragment="mytwcontent">
+  <div id="user-login-form-more-information">
+    <div>
+      <span th:text="#{user.loginForm.moreInformation}">For More Information please visit:</span>
+      <ul>
+        <li><span th:utext="#{user.loginForm.github}">Github:</span> <a
+          href="https://github.com/Spring-Framework-Java-Apps/simpleworklist/" target="_blank">https://github.com/Spring-Framework-Java-Apps/simpleworklist/</a>
+        </li>
+        <li><span th:utext="#{user.loginForm.myBlog}">My Blog:</span> <a href="http://thomas-woehlke.blogspot.de/"
+                                                                         target="_blank">http://thomas-woehlke.blogspot.de/</a>
+        </li>
+        <li><span th:utext="#{user.loginForm.projectPage}">The Project Page:</span> <a
+          href="http://woehlke.org/p/simpleworklist/" target="_blank">http://woehlke.org/p/simpleworklist/</a></li>
+        <li>Getting Things Done&reg; @ Wikipedia:
+          <a href="https://de.wikipedia.org/wiki/Getting_Things_Done" target="_blank" th:if="${locale == 'de'}">https://de.wikipedia.org/wiki/Getting_Things_Done/</a>
+          <a href="https://en.wikipedia.org/wiki/Getting_Things_Done" target="_blank" th:if="${locale != 'de'}">https://en.wikipedia.org/wiki/Getting_Things_Done</a>
+        </li>
+      </ul>
+    </div>
+    <div>
+      <small>
+					<span th:utext="#{user.loginForm.gtd.copyright}">GTD&reg; and Getting Things Done&reg; are registered trademarks of the David Allen Company. SimpleWorklist is
+					not affiliated with or endorsed by the David Allen Company.</span>
+      </small>
+    </div>
+  </div>
+</div>
+
+</body>
+</html>
diff --git a/src/main/resources/templates/user/login/loginForm.html b/src/main/resources/templates/user/login/loginForm.html
index bc582db0..17dc2d6e 100644
--- a/src/main/resources/templates/user/login/loginForm.html
+++ b/src/main/resources/templates/user/login/loginForm.html
@@ -47,46 +47,19 @@ <h2><span th:utext="#{user.loginForm.h2}">Your Todo-List for Getting Things Done
             </button>
           </div>
           <div class="col align-middle m-2 p-1">
-            <i class="fas fa-user"></i>
-            <a id="registerButton" th:href="@{/user/register/}" class="align-middle">
-              <span th:utext="#{user.loginForm.register}" class="align-middle">register as new user</span>
-            </a>
+              <a id="registerButton" th:href="@{/user/register/}" class="btn btn-outline-secondary btn-block">
+                <i class="fas fa-user"></i><span th:utext="#{user.loginForm.register}"></span>
+              </a>
           </div>
           <div class="col align-middle m-2 p-1">
-            <i class="fas fa-question-circle"></i>
-            <a id="passwordResetButton" th:href="@{/user/resetPassword}" class="align-middle">
-              <span th:utext="#{user.loginForm.passwordReset}" class="align-middle">Password forgotten?</span>
-            </a>
+              <a id="passwordResetButton" th:href="@{/user/resetPassword}" class="btn btn-outline-secondary btn-block">
+                <i class="fas fa-question-circle"></i><span th:utext="#{user.loginForm.passwordReset}"></span>
+              </a>
           </div>
         </div>
       </div>
     </div>
   </form>
-  <div id="user-login-form-more-information">
-    <div>
-      <span th:text="#{user.loginForm.moreInformation}">For More Information please visit:</span>
-      <ul>
-        <li><span th:utext="#{user.loginForm.github}">Github:</span> <a
-          href="https://github.com/Spring-Framework-Java-Apps/simpleworklist/" target="_blank">https://github.com/Spring-Framework-Java-Apps/simpleworklist/</a>
-        </li>
-        <li><span th:utext="#{user.loginForm.myBlog}">My Blog:</span> <a href="http://thomas-woehlke.blogspot.de/"
-                                                                         target="_blank">http://thomas-woehlke.blogspot.de/</a>
-        </li>
-        <li><span th:utext="#{user.loginForm.projectPage}">The Project Page:</span> <a
-          href="http://woehlke.org/p/simpleworklist/" target="_blank">http://woehlke.org/p/simpleworklist/</a></li>
-        <li>Getting Things Done&reg; @ Wikipedia:
-          <a href="https://de.wikipedia.org/wiki/Getting_Things_Done" target="_blank" th:if="${locale == 'de'}">https://de.wikipedia.org/wiki/Getting_Things_Done/</a>
-          <a href="https://en.wikipedia.org/wiki/Getting_Things_Done" target="_blank" th:if="${locale != 'de'}">https://en.wikipedia.org/wiki/Getting_Things_Done</a>
-        </li>
-      </ul>
-    </div>
-    <div>
-      <small>
-					<span th:utext="#{user.loginForm.gtd.copyright}">GTD&reg; and Getting Things Done&reg; are registered trademarks of the David Allen Company. SimpleWorklist is
-					not affiliated with or endorsed by the David Allen Company.</span>
-      </small>
-    </div>
-  </div>
 </div>
 
 </body>