diff --git a/_config.yml b/_config.yml
index b6da3fb..c94120d 100644
--- a/_config.yml
+++ b/_config.yml
@@ -2,7 +2,7 @@
 title:            Kemal
 email:            dogruyolserdar@gmail.com
 description:      'Lightning Fast, Super Simple web framework for Crystal. Inspired by Sinatra'
-baseurl:          "http://serdardogruyol.com/kemal/" # the subpath of your site, e.g. /blog
+baseurl:          "/kemal" # the subpath of your site, e.g. /blog
 url:              "" # the base hostname & protocol for your site
 twitter_username: sdogruyol
 github_username:  sdogruyol
@@ -18,11 +18,11 @@ collections:
 
 nav_bars:
   - title: "Documents"
-    url: "/docs/getting_started"
+    url: "/kemal/docs/getting_started"
   - title: "Blog"
     url: "/blog"
   - title: "Github"
-    url: "http://github.com/sdogruyol/kemal"
+    url: "https://github.com/sdogruyol/kemal"
 
 examples:
   - title: "How to connect to Database"
diff --git a/index.html b/index.html
index e631df8..02fbefa 100644
--- a/index.html
+++ b/index.html
@@ -8,11 +8,11 @@ layout: home
     Kemal
   </h1>
   <h2>
-    Kemal is a micro web framework written in Crystal language.
+    Kemal is a fast, easy to use micro web framework written in Crystal language.
     <br />
-    It's strongly inspired from Sinatra.
+    It's inspired from Sinatra.
   </h2>
-  <a href="/docs/getting_started" class="button">Start Now!</a>
+  <a href="/kemal/docs/getting_started" class="button">Start Now!</a>
 </div>
 
 <div class="wrapper block">
@@ -20,20 +20,20 @@ layout: home
     <div class="col-md-6">
       <h1>Super Simple</h1>
 
-      {% highlight ruby %}
-      require "kemal"
+{% highlight ruby %}
+require "kemal"
 
-      # Matches GET "http://host:port/"
-      get "/" do
-      "Hello World!"
-      end
+# Matches GET "http://host:port/"
+get "/" do
+  "Hello World!"
+end
 
-      # Creates a WebSocket handler.
-      # Matches "ws://host:port/socket"
-      ws "/socket" do |socket|
-      socket.send "Hello from Kemal!"
-      end
-      {% endhighlight %}
+# Creates a WebSocket handler.
+# Matches "ws://host:port/socket"
+ws "/socket" do |socket|
+  socket.send "Hello from Kemal!"
+end
+{% endhighlight %}
     </div>
 
     <div class="col-md-6">
@@ -42,7 +42,7 @@ layout: home
         <li>Support all REST verbs</li>
         <li>Websocket support</li>
         <li>Request/Response context, easy parameter handling</li>
-        <li>Middlewares</li>
+        <li>Custom and built-in middlewares</li>
         <li>Built-in JSON support</li>
         <li>Built-in static file serving</li>
         <li>Built-in view templating via ecr</li>