diff --git a/wise-editor/pom.xml b/wise-editor/pom.xml
index 50d53e33..83f7dde7 100644
--- a/wise-editor/pom.xml
+++ b/wise-editor/pom.xml
@@ -2,8 +2,8 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>wise-editor</artifactId>
-    <packaging>jar</packaging>
-    <name>WiseMapping Standalone Editor Distribution</name>
+    <packaging>war</packaging>
+    <name>WiseMapping Editor</name>
     <url>http://www.wisemapping.org</url>
     <parent>
         <groupId>org.wisemapping</groupId>
@@ -26,4 +26,64 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.mortbay.jetty</groupId>
+                <artifactId>maven-jetty-plugin</artifactId>
+                <version>6.1.26</version>
+                <configuration>
+                    <connectors>
+                        <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+                            <port>8080</port>
+                            <maxIdleTime>60000</maxIdleTime>
+                        </connector>
+                    </connectors>
+                    <webApp>${project.build.directory}/wise-editor-3.0-SNAPSHOT.war</webApp>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>2.1.1</version>
+                <configuration>
+                    <warSourceExcludes>js/mindplot-min.js</warSourceExcludes>
+                    <overlays>
+                        <overlay>
+                            <groupId>org.wisemapping</groupId>
+                            <artifactId>core-js</artifactId>
+                            <type>jar</type>
+                            <targetPath>js</targetPath>
+                            <includes>
+                                <include>*.js</include>
+                            </includes>
+                        </overlay>
+                        <overlay>
+                            <groupId>org.wisemapping</groupId>
+                            <artifactId>mindplot</artifactId>
+                            <type>jar</type>
+                            <targetPath>css</targetPath>
+                            <includes>
+                                <include>**/*.css</include>
+                                <include>**/*.html</include>
+                            </includes>
+                        </overlay>
+                        <overlay>
+                            <groupId>org.wisemapping</groupId>
+                            <artifactId>mindplot</artifactId>
+                            <type>jar</type>
+                            <targetPath>js</targetPath>
+                            <includes>
+                                <include>*.js</include>
+                            </includes>
+                        </overlay>
+                    </overlays>
+                </configuration>
+
+            </plugin>
+        </plugins>
+    </build>
+
+
 </project>
diff --git a/wise-editor/src/main/webapp/WEB-INF/web.xml b/wise-editor/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 00000000..4135b67b
--- /dev/null
+++ b/wise-editor/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+         version="2.4">
+
+
+</web-app>
\ No newline at end of file
diff --git a/wise-editor/src/main/webapp/index.html b/wise-editor/src/main/webapp/index.html
index 280da913..7e1907b5 100644
--- a/wise-editor/src/main/webapp/index.html
+++ b/wise-editor/src/main/webapp/index.html
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
 <head>
-    <meta HTTP-EQUIV="REFRESH" content="0; url=/html/editor.html">
+    <meta HTTP-EQUIV="REFRESH" content="0; url=html/editor.html">
 </head>
 </html>
diff --git a/wise-webapp/pom.xml b/wise-webapp/pom.xml
index 700422b0..0761226c 100644
--- a/wise-webapp/pom.xml
+++ b/wise-webapp/pom.xml
@@ -39,6 +39,7 @@
             <artifactId>wise-editor</artifactId>
             <version>3.0-SNAPSHOT</version>
             <scope>provided</scope>
+            <type>war</type>
         </dependency>
         <dependency>
             <groupId>org.wisemapping</groupId>
@@ -347,6 +348,19 @@
                 <configuration>
                     <warName>wisemapping</warName>
                     <overlays>
+                        <overlay>
+                            <groupId>org.wisemapping</groupId>
+                            <artifactId>wise-editor</artifactId>
+                            <type>war</type>
+                            <targetPath>css</targetPath>
+                            <includes>
+                                <include>**/*.css</include>
+                                <include>**/*.jpg</include>
+                                <include>**/*.ico</include>
+                                <include>**/*.jpg</include>
+                                <include>**/*.less</include>
+                            </includes>
+                        </overlay>
                         <overlay>
                             <groupId>org.wisemapping</groupId>
                             <artifactId>core-js</artifactId>
diff --git a/wise-webapp/src/main/webapp/images/es.gif b/wise-webapp/src/main/webapp/images/es.gif
new file mode 100644
index 00000000..beca3a94
Binary files /dev/null and b/wise-webapp/src/main/webapp/images/es.gif differ
diff --git a/wise-webapp/src/main/webapp/images/fr.gif b/wise-webapp/src/main/webapp/images/fr.gif
new file mode 100644
index 00000000..50497a8e
Binary files /dev/null and b/wise-webapp/src/main/webapp/images/fr.gif differ
diff --git a/wise-webapp/src/main/webapp/images/icon_triangle_grey_12x13.gif b/wise-webapp/src/main/webapp/images/icon_triangle_grey_12x13.gif
new file mode 100644
index 00000000..0bb01df5
Binary files /dev/null and b/wise-webapp/src/main/webapp/images/icon_triangle_grey_12x13.gif differ
diff --git a/wise-webapp/src/main/webapp/images/info.png b/wise-webapp/src/main/webapp/images/info.png
new file mode 100644
index 00000000..12cd1aef
Binary files /dev/null and b/wise-webapp/src/main/webapp/images/info.png differ
diff --git a/wise-webapp/src/main/webapp/images/uk.gif b/wise-webapp/src/main/webapp/images/uk.gif
new file mode 100644
index 00000000..ed00d9b2
Binary files /dev/null and b/wise-webapp/src/main/webapp/images/uk.gif differ
