diff --git a/wise-webapp/src/main/java/com/wisemapping/controller/KeyboardController.java b/wise-webapp/src/main/java/com/wisemapping/controller/KeyboardController.java
deleted file mode 100644
index 7fa8f39f..00000000
--- a/wise-webapp/src/main/java/com/wisemapping/controller/KeyboardController.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-*    Copyright [2011] [wisemapping]
-*
-*   Licensed under WiseMapping Public License, Version 1.0 (the "License").
-*   It is basically the Apache License, Version 2.0 (the "License") plus the
-*   "powered by wisemapping" text requirement on every single page;
-*   you may not use this file except in compliance with the License.
-*   You may obtain a copy of the license at
-*
-*       http://www.wisemapping.org/license
-*
-*   Unless required by applicable law or agreed to in writing, software
-*   distributed under the License is distributed on an "AS IS" BASIS,
-*   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*   See the License for the specific language governing permissions and
-*   limitations under the License.
-*/
-
-package com.wisemapping.controller;
-
-import org.springframework.web.servlet.ModelAndView;
-import org.springframework.web.servlet.mvc.multiaction.NoSuchRequestHandlingMethodException;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-public class KeyboardController extends BaseMultiActionController {
-    public ModelAndView handleNoSuchRequestHandlingMethod(NoSuchRequestHandlingMethodException noSuchRequestHandlingMethodException, HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception {
-        return newsPage(httpServletRequest, httpServletResponse);
-    }
-
-    public ModelAndView newsPage(HttpServletRequest request, HttpServletResponse response) {
-        logger.info("Keyboard");
-        return new ModelAndView("keyboard");
-    }
-}
diff --git a/wise-webapp/src/main/java/com/wisemapping/controller/PublicPagesController.java b/wise-webapp/src/main/java/com/wisemapping/controller/PublicPagesController.java
deleted file mode 100644
index 317f77fd..00000000
--- a/wise-webapp/src/main/java/com/wisemapping/controller/PublicPagesController.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-*    Copyright [2011] [wisemapping]
-*
-*   Licensed under WiseMapping Public License, Version 1.0 (the "License").
-*   It is basically the Apache License, Version 2.0 (the "License") plus the
-*   "powered by wisemapping" text requirement on every single page;
-*   you may not use this file except in compliance with the License.
-*   You may obtain a copy of the license at
-*
-*       http://www.wisemapping.org/license
-*
-*   Unless required by applicable law or agreed to in writing, software
-*   distributed under the License is distributed on an "AS IS" BASIS,
-*   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*   See the License for the specific language governing permissions and
-*   limitations under the License.
-*/
-
-package com.wisemapping.controller;
-
-import org.springframework.web.servlet.ModelAndView;
-import org.springframework.web.servlet.mvc.multiaction.NoSuchRequestHandlingMethodException;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.wisemapping.model.MindMap;
-
-public class PublicPagesController extends BaseMultiActionController {
-
-    public ModelAndView handleNoSuchRequestHandlingMethod(NoSuchRequestHandlingMethodException noSuchRequestHandlingMethodException, HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception {
-        return this.home(httpServletRequest, httpServletResponse);
-    }
-
-    public ModelAndView faq(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception {
-        return new ModelAndView("faq");
-    }
-
-    public ModelAndView aboutUs(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception {
-        return new ModelAndView("aboutUs");
-    }
-
-    public ModelAndView video(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception {
-        return new ModelAndView("video");
-    }
-
-    public ModelAndView crew(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception {
-        return new ModelAndView("crew");
-    }
-
-    public ModelAndView privacyPolicy(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception {
-        return new ModelAndView("privacyPolicy");
-    }
-
-    public ModelAndView installCFG(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception {
-        return new ModelAndView("installCFG");
-    }
-
-    public ModelAndView home(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception {
-        return new ModelAndView("homepage");
-    }
-
-    public ModelAndView tryEditor(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception {
-
-        final MindMap mindmap = getMindmapService().getMindmapById(TRY_EXAMPLE_MINDMAP_ID);
-
-        ModelAndView view = new ModelAndView("mindmapEditor", "mindmap", mindmap);
-        final String xmlMap = mindmap.getXmlAsJsLiteral();
-        view.addObject(MAP_XML_PARAM, xmlMap);
-        view.addObject("editorTryMode", true);
-        view.addObject("showHelp", true);
-        return view;
-    }
-
-    public ModelAndView termsOfUse(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception {
-        return new ModelAndView("termsOfUse");
-    }
-
-    public static final int TRY_EXAMPLE_MINDMAP_ID = 3;
-    public static final String MAP_XML_PARAM = "mapXml";
-
-}
diff --git a/wise-webapp/src/main/java/com/wisemapping/ncontroller/ExtensionsController.java b/wise-webapp/src/main/java/com/wisemapping/ncontroller/ExtensionsController.java
new file mode 100644
index 00000000..251f7cca
--- /dev/null
+++ b/wise-webapp/src/main/java/com/wisemapping/ncontroller/ExtensionsController.java
@@ -0,0 +1,63 @@
+/*
+*    Copyright [2011] [wisemapping]
+*
+*   Licensed under WiseMapping Public License, Version 1.0 (the "License").
+*   It is basically the Apache License, Version 2.0 (the "License") plus the
+*   "powered by wisemapping" text requirement on every single page;
+*   you may not use this file except in compliance with the License.
+*   You may obtain a copy of the license at
+*
+*       http://www.wisemapping.org/license
+*
+*   Unless required by applicable law or agreed to in writing, software
+*   distributed under the License is distributed on an "AS IS" BASIS,
+*   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*   See the License for the specific language governing permissions and
+*   limitations under the License.
+*/
+
+package com.wisemapping.ncontroller;
+
+import com.wisemapping.model.MindMap;
+import com.wisemapping.service.MindmapService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.io.IOException;
+
+@Controller
+@RequestMapping("/c/")
+public class ExtensionsController {
+    @Autowired
+    private MindmapService mindmapService;
+
+    @RequestMapping(value = "try")
+    public ModelAndView tryEditor() throws IOException {
+
+        final MindMap mindmap = mindmapService.getMindmapById(TRY_EXAMPLE_MINDMAP_ID);
+
+        ModelAndView view = new ModelAndView("mindmapEditor", "mindmap", mindmap);
+        final String xmlMap = mindmap.getXmlAsJsLiteral();
+        view.addObject(MAP_XML_PARAM, xmlMap);
+        view.addObject("editorTryMode", true);
+        view.addObject("showHelp", true);
+        return view;
+    }
+
+    @RequestMapping(value = "privacyPolicy")
+    public ModelAndView privacyPolicy() {
+        return new ModelAndView("privacyPolicy");
+    }
+
+    @RequestMapping(value = "termsOfUse")
+    public ModelAndView termsOfUse() {
+        return new ModelAndView("termsOfUse");
+    }
+
+
+    public static final int TRY_EXAMPLE_MINDMAP_ID = 3;
+    public static final String MAP_XML_PARAM = "mapXml";
+
+}
diff --git a/wise-webapp/src/main/java/com/wisemapping/ncontroller/PublicPagesController.java b/wise-webapp/src/main/java/com/wisemapping/ncontroller/PublicPagesController.java
new file mode 100644
index 00000000..1fddd7b5
--- /dev/null
+++ b/wise-webapp/src/main/java/com/wisemapping/ncontroller/PublicPagesController.java
@@ -0,0 +1,62 @@
+/*
+*    Copyright [2011] [wisemapping]
+*
+*   Licensed under WiseMapping Public License, Version 1.0 (the "License").
+*   It is basically the Apache License, Version 2.0 (the "License") plus the
+*   "powered by wisemapping" text requirement on every single page;
+*   you may not use this file except in compliance with the License.
+*   You may obtain a copy of the license at
+*
+*       http://www.wisemapping.org/license
+*
+*   Unless required by applicable law or agreed to in writing, software
+*   distributed under the License is distributed on an "AS IS" BASIS,
+*   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*   See the License for the specific language governing permissions and
+*   limitations under the License.
+*/
+
+package com.wisemapping.ncontroller;
+
+import com.wisemapping.service.MindmapService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.servlet.ModelAndView;
+
+@Controller
+@RequestMapping("/c/")
+public class PublicPagesController {
+    @Autowired
+    private MindmapService mindmapService;
+
+    @RequestMapping(value = "faq")
+    public ModelAndView faq() {
+        return new ModelAndView("faq");
+    }
+
+    @RequestMapping(value = "aboutUs")
+    public ModelAndView aboutUs() {
+        return new ModelAndView("aboutUs");
+    }
+
+    @RequestMapping(value = "crew")
+    public ModelAndView crew() {
+        return new ModelAndView("crew");
+    }
+
+    @RequestMapping(value = "installCFG")
+    public ModelAndView installCFG() {
+        return new ModelAndView("installCFG");
+    }
+
+    @RequestMapping(value = "keyboard")
+    public ModelAndView newsPage() {
+        return new ModelAndView("keyboard");
+    }
+
+    @RequestMapping(value = "home")
+    public ModelAndView home() {
+        return new ModelAndView("homepage");
+    }
+}
diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml
index d89d2494..fb5dc2bf 100644
--- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml
+++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml
@@ -14,7 +14,7 @@
     </bean>
 
     <!--<bean id="localeResolver"-->
-          <!--class="org.springframework.web.servlet.i18n.AcceptHeaderLocaleResolver">-->
+    <!--class="org.springframework.web.servlet.i18n.AcceptHeaderLocaleResolver">-->
     <!--</bean>-->
 
     <bean id="homeResolver" class="org.springframework.web.servlet.mvc.multiaction.PropertiesMethodNameResolver">
@@ -26,11 +26,6 @@
         </property>
     </bean>
 
-    <bean id="homeController" class="com.wisemapping.controller.PublicPagesController">
-        <property name="methodNameResolver" ref="homeResolver"/>
-        <property name="mindmapService" ref="mindmapService"/>
-    </bean>
-
 
     <bean id="cookerController" class="com.wisemapping.controller.MindmapCooker">
         <property name="methodNameResolver" ref="paramResolverByAction"/>
@@ -131,7 +126,7 @@
         <property name="userService" ref="userService"/>
     </bean>
 
-      <bean id="importMapController" class="com.wisemapping.controller.ImportController">
+    <bean id="importMapController" class="com.wisemapping.controller.ImportController">
         <property name="sessionForm" value="false"/>
         <property name="commandName" value="importMap"/>
         <property name="commandClass" value="com.wisemapping.view.ImportMapBean"/>
@@ -166,11 +161,6 @@
         <property name="userService" ref="userService"/>
     </bean>
 
-    <bean id="keyboardController" class="com.wisemapping.controller.KeyboardController">
-        <property name="methodNameResolver" ref="paramResolverByAction"/>
-        <property name="mindmapService" ref="mindmapService"/>
-    </bean>
-
     <bean id="publicView" class="com.wisemapping.controller.PublicViewController">
         <property name="methodNameResolver" ref="paramResolverByAction"/>
         <property name="mindmapService" ref="mindmapService"/>
@@ -190,9 +180,15 @@
         </property>
         <property name="mappings">
             <props>
+                <prop key="/c/map/import.htm">importMapController</prop>
+
+                <!-- Review -->
+                <prop key="/c/publicView.htm">publicView</prop>
+                <prop key="/c/embeddedView.htm">embeddedView</prop>
+
+                <!-- Forms based -->
                 <prop key="/c/userRegistration.htm">userController</prop>
                 <prop key="/c/sharing.htm">sharingController</prop>
-                <prop key="/c/home.htm">homeController</prop>
                 <prop key="/c/login.htm">loginController</prop>
                 <prop key="/c/forgotPassword.htm">forgotPasswordController</prop>
                 <prop key="/c/activation.htm">activationController</prop>
@@ -201,11 +197,7 @@
                 <prop key="/c/settings.htm">settingsController</prop>
                 <prop key="/c/editProfile.htm">editProfileController</prop>
                 <prop key="/c/tags.htm">tagsController</prop>
-                <prop key="/c/publicView.htm">publicView</prop>
-                <prop key="/c/embeddedView.htm">embeddedView</prop>
-                <prop key="/c/map/import.htm">importMapController</prop>
                 <prop key="/c/history.htm">historyController</prop>
-                <prop key="/c/installCFG.htm">homeController</prop>
             </props>
         </property>
     </bean>