diff --git a/CHANGES.txt b/CHANGES.txt
index d1654658b26..d21cfff5410 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -380,6 +380,7 @@ Release 0.21.0 - Unreleased
    HBASE-2616  TestHRegion.testWritesWhileGetting flaky on trunk
    HBASE-2684  TestMasterWrongRS flaky in trunk
    HBASE-2691  LeaseStillHeldException totally ignored by RS, wrongly named
+   HBASE-2703  ui not working in distributed context
 
   IMPROVEMENTS
    HBASE-1760  Cleanup TODOs in HTable
diff --git a/bin/hbase b/bin/hbase
index b5293b6b17d..0882d3ac210 100755
--- a/bin/hbase
+++ b/bin/hbase
@@ -136,19 +136,6 @@ add_maven_test_classes_to_classpath() {
   fi
 }
 
-add_maven_target_dir_to_classpath() {
-  # I never seem to *have* such a dir. -tlipcon
-  HBASE_VER=`grep '<version>' $HBASE_HOME/pom.xml | head -1 | sed 's/.*<version>\(.*\)<\/version>/\1/'`
-  MAVEN_TARGET_DIR=$HBASE_HOME/target/hbase-$HBASE_VER-bin/hbase-$HBASE_VER
-  if [ -d "$MAVEN_TARGET_DIR" ]; then
-    for f in $MAVEN_TARGET_DIR/*.jar $MAVEN_TARGET_DIR/lib/*.jar; do
-      if [ -f $f ]; then
-        CLASSPATH=${CLASSPATH}:$f;
-      fi
-    done
-  fi
-}
-
 # Add maven target directory
 if $in_sources_dir; then
   add_maven_deps_to_classpath
@@ -158,11 +145,18 @@ fi
 
 # For releases, add hbase & webapps to CLASSPATH
 # Webapps must come first else it messes up Jetty
-if [ -d "$HBASE_HOME/webapps" ]; then
+if [ -d "$HBASE_HOME/hbase-webapps" ]; then
   CLASSPATH=${CLASSPATH}:$HBASE_HOME
 fi
+if [ -d "$HBASE_HOME/target/hbase-webapps" ]; then
+  CLASSPATH="${CLASSPATH}:${HBASE_HOME}/target"
+fi
 for f in $HBASE_HOME/hbase*.jar; do
-  if [ -f $f ]; then
+  if [[ $f = *sources.jar ]]
+  then
+    : # Skip sources.jar
+  elif [ -f $f ]
+  then
     CLASSPATH=${CLASSPATH}:$f;
   fi
 done
diff --git a/pom.xml b/pom.xml
index 03c6ec84209..87b5bd49fa4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,13 +7,11 @@
   <packaging>jar</packaging>
   <version>0.21.0-SNAPSHOT</version>
   <name>HBase</name>
-  <!-- START SNIPPET: description -->
   <description>
   HBase is the &amp;lt;a href="http://hadoop.apache.org"&amp;rt;Hadoop&lt;/a&amp;rt; database. Use it when you need random, realtime read/write access to your Big Data.
     This project's goal is the hosting of very large tables -- billions of rows X millions of columns -- atop clusters
     of commodity hardware.
   </description>
-  <!-- END SNIPPET: description -->
   <url>http://hbase.apache.org</url>
 
   <licenses>
@@ -286,15 +284,15 @@
 
     <resources>
       <resource>
-        <directory>src/main/resources</directory>
+        <directory>src/main/resources/</directory>
+        <includes>
+          <include>hbase-default.xml</include>
+        </includes>
       </resource>
       <resource>
-        <directory>src/main/hbase-webapps</directory>
+          <directory>${project.build.directory}</directory>
         <includes>
-          <include>*/.gif</include>
-          <include>*/.css</include>
-          <include>*/.html</include>
-          <include>*/.xml</include>
+            <include>hbase-webapps/**</include>
         </includes>
       </resource>
     </resources>
@@ -375,32 +373,43 @@
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
           <execution>
-            <id>JSPC</id>
+            <id>generate</id>
             <phase>generate-sources</phase>
             <configuration>
               <tasks>
+                <property name="build.webapps"
+                  location="${project.build.directory}/hbase-webapps" />
+                <property name="src.webapps"
+                  location="${basedir}/src/main/resources/hbase-webapps" />
+                <property name="generated.sources"
+                  location="${project.build.directory}/generated-sources" />
+
+                <mkdir dir="${build.webapps}"/>
+                <copy todir="${build.webapps}">
+                  <fileset dir="${src.webapps}">
+                    <exclude name="**/*.jsp" />
+                    <exclude name="**/.*" />
+                    <exclude name="**/*~" />
+                  </fileset>
+                </copy>
+
+                <!--The compile.classpath is passed in by maven-->
                 <taskdef classname="org.apache.jasper.JspC" name="jspcompiler" classpathref="maven.compile.classpath"/>
-                <jspcompiler uriroot="${basedir}/src/main/resources/hbase-webapps/master"
-                             outputdir="${project.build.directory}/jspc"
-                             package="org.apache.hadoop.hbase.generated.master"
-                             webxml="${basedir}/src/main/resources/hbase-webapps/master/WEB-INF/web.xml"/>
-                <jspcompiler uriroot="${basedir}/src/main/resources/hbase-webapps/regionserver"
-                             outputdir="${project.build.directory}/jspc"
-                             package="org.apache.hadoop.hbase.generated.regionserver"
-                             webxml="${basedir}/src/main/resources/hbase-webapps/regionserver/WEB-INF/web.xml"/>
-              </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>package-info</id>
-            <phase>generate-sources</phase>
-            <configuration>
-              <tasks>
+
+                <mkdir dir="${build.webapps}/master/WEB-INF"/>
+                <jspcompiler uriroot="${src.webapps}/master"
+                    outputdir="${generated.sources}"
+                  package="org.apache.hadoop.hbase.generated.master"
+                  webxml="${build.webapps}/master/WEB-INF/web.xml"/>
+
+                <mkdir dir="${build.webapps}/regionserver/WEB-INF"/>
+                <jspcompiler uriroot="${src.webapps}/regionserver"
+                    outputdir="${generated.sources}"
+                  package="org.apache.hadoop.hbase.generated.regionserver"
+                  webxml="${build.webapps}/regionserver/WEB-INF/web.xml"/>
+
                 <exec executable="sh">
-                  <arg line="${basedir}/src/saveVersion.sh ${project.version} ${project.build.directory}/generated-sources"/>
+                    <arg line="${basedir}/src/saveVersion.sh ${project.version} ${generated.sources}"/>
                 </exec>
               </tasks>
             </configuration>
diff --git a/src/assembly/bin.xml b/src/assembly/bin.xml
index 95227c9858b..4705d2f9a8b 100644
--- a/src/assembly/bin.xml
+++ b/src/assembly/bin.xml
@@ -34,11 +34,8 @@
       </includes>
     </fileSet>
     <fileSet>
-      <directory>target/classes/hbase-webapps</directory>
+      <directory>target/hbase-webapps</directory>
       <outputDirectory>hbase-webapps</outputDirectory>
-      <excludes>
-        <exclude>**/*.jsp</exclude>
-      </excludes>
     </fileSet>
     <fileSet>
       <directory>target/site</directory>
diff --git a/src/main/resources/hbase-webapps/static/hbase_logo_med.gif b/src/main/resources/hbase-webapps/static/hbase_logo_med.gif
new file mode 100644
index 00000000000..36d3e3c9127
Binary files /dev/null and b/src/main/resources/hbase-webapps/static/hbase_logo_med.gif differ