diff --git a/_config.yml b/_config.yml
index ad59bb252..a36ec4e9d 100644
--- a/_config.yml
+++ b/_config.yml
@@ -10,7 +10,7 @@ redcarpet:
 ### The following properties will change on a project-by-project basis
 
 # Context path in the remote website (usually /<project>), will be prepended to absolute URLs for static resources
-baseurl: /gh-pages
+baseurl: /spring-data-elasticsearch
 
 # Name of the project for display in places like page titles
 name: Spring Data Elasticsearch
@@ -22,9 +22,6 @@ project: spring-data-elasticsearch
 # Project github URL
 github_repo_url: http://github.com/spring-projects/spring-data-elasticsearch
 
-# Project forum URL
-forum: http://forum.spring.io/forum/spring-projects/data
-
 # If you want to include a custom pom.xml or gradle template set these value to true and add _include files
 custom_pom_template: false
 custom_gradle_template: false
diff --git a/index.html b/index.html
index 991b13a58..54c402f0a 100644
--- a/index.html
+++ b/index.html
@@ -21,10 +21,6 @@ badges:
       url:  https://build.springsource.org/browse/SPRINGDATAES-DATAES
       icon: ci
 
-    - name: Forum
-      url:  http://forum.spring.io/forum/spring-projects/data
-      icon: forum
-
     - name: StackOverflow
       url:  http://stackoverflow.com/questions/tagged/spring-data-elasticsearch
       icon: stackoverflow
@@ -57,8 +53,8 @@ The Spring Data Elasticsearch project provides integration with the Elasticsearc
 
 ## Features
 
-* Spring configuration support using Java based @Configuration classes or an XML namespace for a ES clients instances.
-* ElasticsearchTemplate helper class that increases productivity performing common ES operations. Includes integrated object mapping between documents and POJOs.
+* Spring configuration support using Java based `@Configuration` classes or an XML namespace for a ES clients instances.
+* `ElasticsearchTemplate` helper class that increases productivity performing common ES operations. Includes integrated object mapping between documents and POJOs.
 * Feature Rich Object Mapping integrated with Spring's Conversion Service
 * Annotation based mapping metadata but extensible to support other metadata formats
 * Automatic implementation of Repository interfaces including support for custom finder methods.