diff --git a/checkoutSite.sh b/checkoutSite.sh
index 5e582bd..4762b09 100755
--- a/checkoutSite.sh
+++ b/checkoutSite.sh
@@ -27,7 +27,7 @@
 # is rather large and we don't want to checkout the complete data.
 #
 
-SITE_DIR=".site-content"
+SITE_DIR="site-content"
 GIT_REMOTE=""
 
 GIT_USER=$(git config user.name)
@@ -42,6 +42,7 @@
 FORCE=1
 MODULE_DIR="${MY_PWD}"
 PATTERN=""
+BRANCH="master"
 while [ ! -z "$1" ]; do
   case "$1" in
     -f) 
@@ -67,6 +68,11 @@
       MODULE_DIR="$1"
       shift
       ;;
+    -b)
+      shift
+      BRANCH="$1"
+      shift
+      ;;
     *)
       GIT_REMOTE="$1"
       shift
@@ -119,6 +125,8 @@
 
 cd "${SITE_DIR}" || { echo "Could not change to site dir ${SITE_DIR}"; exit 1; }
 
+git checkout "${BRANCH}"
+
 git config core.sparsecheckout true
 git config user.name "${GIT_USER}"
 git config user.email "${GIT_EMAIL}"
diff --git a/deploySite.sh b/deploySite.sh
index b8307c6..3227c32 100755
--- a/deploySite.sh
+++ b/deploySite.sh
@@ -26,40 +26,48 @@
 
 THIS_DIR=$(dirname $0)
 THIS_DIR=$(readlink -f ${THIS_DIR})
-CONTENT_DIR="site-content"
+CONTENT_DIR=".site-content"
+BRANCH="asf-staging-3.0"
+SUB_DIR="/redback"
 
-SUB_DIR="redback"
+if grep -q '<scmPublishBranch>' pom.xml; then
+  BRANCH=$(sed -n -e 's/.*<scmPublishBranch>\(.*\)<\/scmPublishBranch>.*/\1/p' pom.xml)
+fi
+
+if grep -q '<scmPubCheckoutDirectory>' pom.xml; then
+  CONTENT_DIR=$(sed -n -e 's/.*<scmPubCheckoutDirectory>\(.*\)<\/scmPubCheckoutDirectory>.*/\1/p' pom.xml)
+fi
+
+
 
 if [ -d "${CONTENT_DIR}/.git" ]; then
   git -C "${CONTENT_DIR}" fetch origin
-  git -C "${CONTENT_DIR}" reset --hard origin/master
+  git -C "${CONTENT_DIR}" reset --hard origin/${BRANCH}
+  git -C "${CONTENT_DIR}" clean -f -d
 fi
 
 echo ">>>> Creating site and reports <<<<" 
-mvn clean site site:stage "$@"
-
-if [ $? -ne 0 ]; then
-  echo ">>>> Error occurred. Stopping now. <<<<"
-  exit 1
-fi
+mvn clean site "$@"
+mvn site:stage "$@"
 
 echo "*****************************************"
 echo ">>>> Finished the site stage process <<<<"
 echo "> You can check the content in the folder target/staging or by opening the following url"
-echo "> file://${THIS_DIR}/target/staging/${SUB_DIR}/index.html"
+echo "> file://${THIS_DIR}/target/staging${SUB_DIR}/index.html"
 echo "> "
 echo "> If everything is fine enter yes. After that the publish process will be started."
 echo -n "Do you want to publish (yes/no)? "
 read ANSWER
 
-if [ "${ANSWER}" == "yes" -o "${ANSWER}" == "YES" ]; then
+if [ "${ANSWER}" == "yes" -o "${ANSWER}" == "YES" -o "${ANSWER}" == "y" -o "${ANSWER}" == "Y" ]; then
   echo "> Starting publish process"
   mvn scm-publish:publish-scm "$@"
 else
   echo "> Aborting now"
-  echo "> Running git reset in ${CONTENT_DIR} directory"
+  echo "> Running git reset in .site-content directory" 
   git -C "${CONTENT_DIR}" fetch origin
-  git -C "${CONTENT_DIR}" reset --hard origin/master
+  git -C "${CONTENT_DIR}" reset --hard origin/${BRANCH}
+  git -C "${CONTENT_DIR}" clean -f -d
   echo ">>>> Finished <<<<"
 fi
 
diff --git a/git-sparse-checkout-pattern b/git-sparse-checkout-pattern
index 22f20b8..f394df2 100644
--- a/git-sparse-checkout-pattern
+++ b/git-sparse-checkout-pattern
@@ -1,2 +1,2 @@
 /redback
-!/redback/components
+!/redback/components
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 205dcdd..afd4a57 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,6 +32,7 @@
     <redbackVersion>${project.version}</redbackVersion>
 
     <scmPubCheckoutDirectory>site-content</scmPubCheckoutDirectory>
+    <scmPublishBranch>asf-staging</scmPublishBranch>
 
     <siteRepositoryUrl>scm:git:https://gitbox.apache.org/repos/asf/archiva-web-content.git</siteRepositoryUrl>
     <site.staging.base>${project.basedir}</site.staging.base>
@@ -62,6 +63,10 @@
           <skipDeletedFiles>true</skipDeletedFiles>
           <content>${project.build.directory}/staging</content>
           <tryUpdate>true</tryUpdate>
+          <ignorePathsToDelete>
+            <ignorePathToDelete>redback/components**</ignorePathToDelete>
+          </ignorePathsToDelete>
+          <scmBranch>${scmPublishBranch}</scmBranch>
         </configuration>
         <executions>
           <execution>
@@ -157,6 +162,8 @@
                   <arguments>
                     <argument>-d</argument>
                     <argument>${scmPubCheckoutDirectory}</argument>
+                    <argument>-b</argument>
+                    <argument>${scmPublishBranch}</argument>
                     <argument>${siteRepositoryUrl}</argument>
                   </arguments>
                 </configuration>
diff --git a/src/site/apt/authentication.apt b/src/site/apt/authentication.apt
index 86db838..385a290 100644
--- a/src/site/apt/authentication.apt
+++ b/src/site/apt/authentication.apt
@@ -2,7 +2,7 @@
  Authentication       
  -----
  -----
- 2 June 2007
+ 2007-06-02
  -----
 
 ~~ Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/site/apt/authorization.apt b/src/site/apt/authorization.apt
index e123a3b..e10da7f 100644
--- a/src/site/apt/authorization.apt
+++ b/src/site/apt/authorization.apt
@@ -2,7 +2,7 @@
  Authorization       
  -----
  -----
- 2 June 2007
+ 2007-06-02
  -----
 
 ~~ Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/site/apt/configuration.apt b/src/site/apt/configuration.apt
index 998aa5e..fc7f5bf 100644
--- a/src/site/apt/configuration.apt
+++ b/src/site/apt/configuration.apt
@@ -2,7 +2,7 @@
  Configuration     
  -----
  -----
- 23 May 2014
+ 2014-05-23
  -----
 
 ~~ Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/site/apt/development/extending-authn.apt b/src/site/apt/development/extending-authn.apt
index 3dcd3c3..757a720 100644
--- a/src/site/apt/development/extending-authn.apt
+++ b/src/site/apt/development/extending-authn.apt
@@ -2,7 +2,7 @@
  Development
  -----
  -----
- 30 September 2008
+ 2008-09-30
  -----
 
 ~~ Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/site/apt/key-store.apt b/src/site/apt/key-store.apt
index ce5f2f1..a7029a2 100644
--- a/src/site/apt/key-store.apt
+++ b/src/site/apt/key-store.apt
@@ -2,7 +2,7 @@
  Keystore       
  -----
  -----
- 2 June 2007
+ 2007-06-02
  -----
 
 ~~ Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/site/apt/rbac/introduction.apt b/src/site/apt/rbac/introduction.apt
index 278616e..b8dd829 100644
--- a/src/site/apt/rbac/introduction.apt
+++ b/src/site/apt/rbac/introduction.apt
@@ -2,7 +2,7 @@
  An Introduction to Role Based Access
  -----
  -----
- 28 June 2006
+ 2006-06-28
  -----
 
 ~~ Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/site/apt/rbac/role-management.apt b/src/site/apt/rbac/role-management.apt
index 2eb62d3..814bcc4 100644
--- a/src/site/apt/rbac/role-management.apt
+++ b/src/site/apt/rbac/role-management.apt
@@ -2,7 +2,7 @@
  Redback Role Management
  -----
  -----
- 14 May 2007
+ 2007-05-14
  -----
 
 ~~ Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/site/apt/user-management.apt b/src/site/apt/user-management.apt
index bec996b..069081d 100644
--- a/src/site/apt/user-management.apt
+++ b/src/site/apt/user-management.apt
@@ -2,7 +2,7 @@
  User Management       
  -----
  -----
- 2 June 2007
+ 2007-06-02
  -----
 
 ~~ Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/site/resources/css/site.css b/src/site/resources/css/site.css
new file mode 100644
index 0000000..18bc1bc
--- /dev/null
+++ b/src/site/resources/css/site.css
@@ -0,0 +1,166 @@
+body {
+    padding-top: 1px;
+}
+
+a.externalLink[href^="https"] {
+    background: url('../images/external-link-12x12.png') right center no-repeat;
+    padding-right: 18px;
+}
+
+#leftColumn {
+  display: none !important
+}
+
+#bodyColumn {
+  margin-left: 1.5em;
+}
+
+div#rhs {
+  float: right;
+  text-align: center;
+}
+
+div.mainBox {
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 1em;
+  margin-bottom: 1em;
+  width: 75%;
+  background-color: #ccc;
+  position: relative;
+  padding-left: 5em;
+  border-top-right-radius: 6px;
+  border-bottom-right-radius: 6px;
+}
+
+div.mainBox div {
+  padding: 0.4em;
+}
+
+div.newsBox {
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 1em;
+  margin-bottom: 1em;
+  width: 75%;
+  background-color: #ccc;
+  position: relative;
+  padding-left: 8em;
+  border-top-right-radius: 8px;
+  border-bottom-right-radius: 8px;
+}
+
+div.newsBox div {
+  padding: 0.6em;
+}
+
+div.mainBox span + p a {
+  background: url(../images/arrow.png) no-repeat;
+  background-size: 16px 16px;
+  background-position: right;
+  padding-right: 20px;
+}
+
+div.mainBox span + p a {
+  font-size: 1.5em;
+  /*color: black;*/ 
+}
+
+div.mainBox span + p a:hover {
+  /*color: blue;*/
+}
+
+.bignumber {
+  position: absolute;
+  color: white;
+  left: 0.25em;
+  font-size: 1.9em;
+}
+
+div.linkBox p {
+  text-align: right;
+  margin-bottom: 0;
+  margin-top: 0;
+  padding-top: 0;
+}
+
+#banner {
+  background: none;
+}
+
+#banner img {
+  margin: 10px;
+}
+
+div.jqmWindow h2, div.jqmWindow p {
+  text-align: center;
+}
+
+span.jqmClose {
+  position: absolute;
+  cursor: pointer;
+  right: 4px;
+  top: 6px;
+}
+
+
+ div.section {
+  margin-right: 110px;
+  margin-left: 10px;
+ }
+ 
+.hero-unit p {
+ /* font-weight: inherit;*/
+}
+
+.archivascreenshots {
+  border: 1px solid silver; 
+  margin-left: 0.25em; 
+  margin-bottom: 0.25em
+}
+
+.rhs span {
+  display: block; 
+  font-size: 13px; 
+  font-weight: bold; 
+  margin-top: 1.5em; 
+  margin-bottom: 1.5em;    
+}
+
+.container ul li iframe {
+  margin-top: 4px;
+  margin-right: 4px;
+}
+
+.modal-body table {
+  border: 0px;
+}
+
+
+.features-preview:after {
+    background-color: #F5F5F5;
+    border: 1px solid #DDDDDD;
+    border-radius: 4px 0 4px 0;
+    color: #9DA0A4;
+    content: "New web UI";
+    font-size: 12px;
+    font-weight: bold;
+    left: -1px;
+    padding: 3px 7px;
+    position: absolute;
+    top: -1px;
+
+}
+.features-preview {
+    background-color: #FFFFFF;
+    border: 1px solid #DDDDDD;
+    border-radius: 4px 4px 4px 4px;
+    margin: 15px 0;
+    padding: 39px 19px 14px;
+    position: relative;
+    min-height: 450px;
+}
+
+.carousel .item > img {
+  min-height: 400px;
+}
\ No newline at end of file
diff --git a/src/site/resources/images/external-link-12x12.png b/src/site/resources/images/external-link-12x12.png
new file mode 100644
index 0000000..8ea642e
--- /dev/null
+++ b/src/site/resources/images/external-link-12x12.png
Binary files differ
diff --git a/src/site/resources/images/external-link.png b/src/site/resources/images/external-link.png
new file mode 100644
index 0000000..bd5fbd4
--- /dev/null
+++ b/src/site/resources/images/external-link.png
Binary files differ
diff --git a/src/site/site.xml b/src/site/site.xml
index 7761327..f1aa7e8 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -66,7 +66,6 @@
 
     <menu name="Development">
       <item name="Extending Redback Authentication" href="development/extending-authn.html"/>
-      <item name="Redback Components" href="http://archiva.apache.org/redback/components"/>
       <item name="Redback Core" href="http://archiva.apache.org/redback/core"/>
     </menu>
     
@@ -79,6 +78,13 @@
       <item name="Thanks" href="http://www.apache.org/foundation/thanks.html"/>
     </menu>
 
+    <breadcrumbs>
+      <item name="Apache" href="https://www.apache.org" />
+      <item name="Archiva" href="../" />
+      <item name="Redback" href="/" />
+    </breadcrumbs>
+
+
     <footer>
       <![CDATA[
       <div class="row span12">Apache Redback, Redback, Apache, the Apache feather logo, and the Apache Archiva project logos are trademarks of The Apache Software Foundation.</div>