diff --git a/_includes/footer.html b/_includes/footer.html
index 35f3b4b13..17fff6a6e 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,5 +1,5 @@
-<footer class="site-footer">
-  <div class="wrapper">
-        <p class="footer-copy"> &copy; Copyright {{ site.time | date: '%Y' }} Samsung Electronics Co., Ltd., Licensed under the  <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-  </div>
+<footer class="footer">
+  <div class="container">
+      <p class="copyright_and_license_notice"> &copy; Copyright {{ site.time | date: '%Y' }} Samsung Electronics Co., Ltd. JerryScript is open source under the <a href="http://www.apache.org/licenses/">Apache License, Version 2.0. </a></p>
+   </div>
 </footer>
diff --git a/_includes/head.html b/_includes/head.html
index 47057b504..8c19fe16d 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -3,10 +3,56 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
 
-  <title>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
   <meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
+  <meta name="author" content="IoTjs">
 
-  <link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
-  <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
-  <link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" />
+  <title>JavaScript engine for Internet of Things{% if page.title %}: {{ page.title }} {% endif %}</title>
+
+  <!-- Bootstrap core CSS -->
+  <link href="{{ site.baseurl }}/bootstrap.min.css" rel="stylesheet">
+  <style>
+      html {
+           position: relative;
+            min-height: 100%;
+      }
+      body {
+        padding-top: 50px;
+        margin-bottom: 50px;
+      }
+      .footer {
+        position: absolute;
+        bottom: 0;
+        width: 100%;
+        height: 40px;
+        background-color: #f5f5f5;
+      }
+      .project_title h1{
+         font-size: 64px; text-align: center;
+         font-weight: bold;
+       }
+      .project_title {
+        padding: 40px 20px;
+         text-align: center;
+         border-radius: 6px;
+       }
+       .lead {
+           color:#245580;
+       }
+       .project_overview {
+           font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;
+           font-size: 18px;
+           padding: 40px; padding-bottom: 20px;
+           background-color: #f5f5f5;
+       }
+       .learn_more {
+           font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;
+           font-size: 18px;
+           padding: 40px; padding-bottom: 20px;
+       }
+       .container .copyright_and_license_notice {
+           margin: 8px 0;
+           font-size:14px; text-align: center;
+           color:#3C3C3C;
+       }
+  </style>
 </head>
diff --git a/_includes/header.html b/_includes/header.html
index a7fa95906..9e43f9076 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -1,45 +1,33 @@
-<header class="site-header">
-
-  <div style="background-color: #2388DB;">
-      <div class="wrapper">
-
-        <a class="site-title" href="{{ site.baseurl }}/">{{ site.title }}</a>
-
-        <nav class="site-nav">
-          <a href="#" class="menu-icon" id="menu-icon">
-            <svg viewBox="0 0 18 15">
-              <path fill="#424242" d="M18,1.484c0,0.82-0.665,1.484-1.484,1.484H1.484C0.665,2.969,0,2.304,0,1.484l0,0C0,0.665,0.665,0,1.484,0 h15.031C17.335,0,18,0.665,18,1.484L18,1.484z"/>
-              <path fill="#424242" d="M18,7.516C18,8.335,17.335,9,16.516,9H1.484C0.665,9,0,8.335,0,7.516l0,0c0-0.82,0.665-1.484,1.484-1.484 h15.031C17.335,6.031,18,6.696,18,7.516L18,7.516z"/>
-              <path fill="#424242" d="M18,13.516C18,14.335,17.335,15,16.516,15H1.484C0.665,15,0,14.335,0,13.516l0,0 c0-0.82,0.665-1.484,1.484-1.484h15.031C17.335,12.031,18,12.696,18,13.516L18,13.516z"/>
-            </svg>
-          </a>
-
-          <div class="trigger" id="div-menu-items-wrapper">
-            {% for page in site.pages %}
-              {% if page.title %}
-              <a class="page-link" href="{{ page.url | prepend: site.baseurl }}">{{ page.title }}</a>
-              {% endif %}
-            {% endfor %}
-          </div>
-        </nav>
-
-      </div>
+<nav class="navbar navbar-inverse navbar-fixed-top">
+  <div class="container">
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" href="#"><b>JerryScript</b></a>
+    </div>
+    <div id="navbar" class="collapse navbar-collapse">
+      <ul class="nav navbar-nav">
+        {% if page.url == "/" %}
+          <li class="active"><a href="{{ site.baseurl }}/">Home</a></li>
+        {% else %}
+          <li><a href="{{ site.baseurl }}/">Home</a></li>
+        {% endif %}
+        <li><a href="http://github.com/Samsung/jerryscript">View on Github</a></li>
+        <li><a href="http://www.iotjs.net">Powering <b>IoT.js</b></a></li>
+        {% for p in site.pages %}
+          {% if p.title %}
+            {% if page.url == p.url %}
+              <li class="active"><a href="{{ p.url | prepend: site.baseurl }}" >{{ p.title }}</a></li>
+            {% else %}
+              <li><a href="{{ p.url | prepend: site.baseurl }}" >{{ p.title }}</a></li>
+            {% endif %}
+            {% endif %}
+        {% endfor %}
+      </ul>
+    </div><!--/.nav-collapse -->
   </div>
-
-</header>
-<script type="text/javascript">
-    function toggleMenu()
-    {
-        var el = document.getElementById("menu-icon");
-        if (el.style.display != "none")
-        {
-            el = document.getElementById("div-menu-items-wrapper");
-            el.style.display = (el.style.display != "block") ? "block" : "none";
-        }
-    }
-
-    window.onload = function()
-    {
-        document.getElementById("menu-icon").addEventListener('click' , toggleMenu);
-    }
-</script>
+</nav>
diff --git a/_layouts/default.html b/_layouts/default.html
index acc6bc15c..66c60f7b7 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -1,19 +1,21 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
 
   {% include head.html %}
 
   <body>
-      <div style="min-height: 100%; position: relative;">
+
     {% include header.html %}
 
-    <div class="page-content">
-      <div class="wrapper">
+    <div class="container">
         {{ content }}
-      </div>
-    </div>
+    </div><!-- /.container -->
 
     {% include footer.html %}
-</div>
+
+    <!-- Bootstrap core JavaScript -->
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+    <script src="bootstrap.min.js"></script>
+
   </body>
 </html>
diff --git a/index.html b/index.html
index 16c6ace56..4c31a72b7 100644
--- a/index.html
+++ b/index.html
@@ -1,119 +1,23 @@
+---
+layout: default
+permalink: /
+---
+<div class="project_title">
+<h1>JerryScript</h1>
+<p class="lead">A JavaScript engine for <strong>Internet of Things</strong></p>
+</div>
+<div class="project_overview">
 
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-
-    <meta name="description" content="Project page of IoT.js">
-    <meta name="author" content="IoTjs">
-
-    <title>JavaScript engine for Internet of Things</title>
-
-    <!-- Bootstrap core CSS -->
-    <link href="bootstrap.min.css" rel="stylesheet">
-    <style>
-    	html {
- 			position: relative;
-  			min-height: 100%;
-		}
-    	body {
-		  padding-top: 50px;
-		  margin-bottom: 50px;
-		}
-		.footer {
-		  position: absolute;
-		  bottom: 0;
-		  width: 100%;
-		  height: 40px;
-		  background-color: #f5f5f5;
-		}
-		.project_title h1{
- 		  font-size: 64px; text-align: center;
- 		  font-weight: bold;
- 		}
-    	.project_title {
-		  padding: 40px 20px;
- 		  text-align: center;
- 		  border-radius: 6px;
- 		}
- 		.lead {
- 			color:#245580;
- 		}
- 		.project_overview {
- 			font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;
- 			font-size: 18px;
- 			padding: 40px; padding-bottom: 20px;
- 			background-color: #f5f5f5;
- 		}
- 		.learn_more {
- 			font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;
- 			font-size: 18px;
- 			padding: 40px; padding-bottom: 20px;
- 		}
- 		.container .copyright_and_license_notice {
- 			margin: 8px 0;
- 			font-size:14px; text-align: center;
- 			color:#3C3C3C;
- 		}
-    </style>
-  </head>
-
-  <body>
-
-    <nav class="navbar navbar-inverse navbar-fixed-top">
-      <div class="container">
-        <div class="navbar-header">
-          <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
-            <span class="sr-only">Toggle navigation</span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </button>
-          <a class="navbar-brand" href="#"><b>JerryScript</b></a>
-        </div>
-        <div id="navbar" class="collapse navbar-collapse">
-          <ul class="nav navbar-nav">
-            <li class="active"><a href="#">Home</a></li>
-            <li><a href="http://github.com/Samsung/jerryscript">View on Github</a></li>
-            <li><a href="http://www.iotjs.net">Powering <b>IoT.js</b></a></li>
-          </ul>
-        </div><!--/.nav-collapse -->
-      </div>
-    </nav>
-
-    <div class="container">
-      <div class="project_title">
-        <h1>JerryScript</h1>
-        <p class="lead">A JavaScript engine for <strong>Internet of Things</strong></p>
-      </div>
-      <div class="project_overview">
-	  
-		<p>JerryScript is a lightweight JavaScript engine intended to run on a very constrained devices such as microcontrollers:</p>
-          <ul>
-			<li>Only few kilobytes of RAM available to the engine (&lt;64 KB RAM)</li>
-			<li>Constrained ROM space for the code of the engine (&lt;200 KB ROM)</li>
-			<li>On-device compilation and execution</li>
-			<li>The engine provides access to peripherals from JavaScript</li>
-		  </ul>
-      </div>
-      <div class="learn_more">
-        <p>To learn more, please visit the <a href="http://github.com/Samsung/jerryscript">project on Github.</a></p>
-        <p>If you want to try JerryScript take a look at our documentation. It includes <a href="https://github.com/Samsung/jerryscript/wiki">Getting Started</a> guides and the <a href="https://github.com/Samsung/jerryscript/wiki/API">JerryScript APIs reference</a>. </p>
-		<p>Please, report all found bugs and request new features at <a href="https://github.com/Samsung/jerryscript/issues">JerryScript issue tracker</a>. Feel free to ask questions on <a href="https://github.com/Samsung/jerryscript/labels/question">issue tracker</a> and don’t forget to label it with 'question' or 'discussion'.</p>
-      </div>
-    </div><!-- /.container -->
-
-    <footer class="footer">
-      <div class="container">
-      	<p class="copyright_and_license_notice">JerryScript is open source under the <a href="http://www.apache.org/licenses/">Apache License, Version 2.0. </a></p>
-       </div>
-    </footer>
-
-    <!-- Bootstrap core JavaScript -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-    <script src="bootstrap.min.js"></script>
-
-  </body>
-</html>
+<p>JerryScript is a lightweight JavaScript engine intended to run on a very constrained devices such as microcontrollers:</p>
+  <ul>
+	<li>Only few kilobytes of RAM available to the engine (&lt;64 KB RAM)</li>
+	<li>Constrained ROM space for the code of the engine (&lt;200 KB ROM)</li>
+	<li>On-device compilation and execution</li>
+	<li>The engine provides access to peripherals from JavaScript</li>
+  </ul>
+</div>
+<div class="learn_more">
+<p>To learn more, please visit the <a href="http://github.com/Samsung/jerryscript">project on Github.</a></p>
+<p>If you want to try JerryScript take a look at our documentation. It includes <a href="https://github.com/Samsung/jerryscript/wiki">Getting Started</a> guides and the <a href="https://github.com/Samsung/jerryscript/wiki/API">JerryScript APIs reference</a>. </p>
+<p>Please, report all found bugs and request new features at <a href="https://github.com/Samsung/jerryscript/issues">JerryScript issue tracker</a>. Feel free to ask questions on <a href="https://github.com/Samsung/jerryscript/labels/question">issue tracker</a> and don’t forget to label it with 'question' or 'discussion'.</p>
+</div>
diff --git a/index.md b/index.md
deleted file mode 100644
index eb1e2fefb..000000000
--- a/index.md
+++ /dev/null
@@ -1,26 +0,0 @@
----
-layout: default
----
-
-JerryScript is a lightweight JavaScript engine intended to run on a very constrained devices such as microcontrollers:
-
-- Only few kilobytes of RAM available to the engine (<64 KB RAM)
-- Constrained ROM space for the code of the engine (<200 KB ROM)
-- On-device compilation and execution
-- The engine provides access to peripherals from JavaScript
-
-```js
-print_hello("Tom")
-
-function print_hello (name) {
-  print ("Hi, " + name)
-}
-```
-
-Check out the [JerryScript sources][jerryscript] and start using JerryScript in you projects. Please, report all found bugs and request new features at [JerryScript issue tracker][jerryscript-issue]. If you have questions, feel free to ask them on [issue tracker][jerryscript-issue-questions] and don't forget to label it with `question` or `discussion`.
-
-[jerryscript]:                  http://github.com/Samsung/jerryscript
-[jerryscript-issue]:            http://github.com/Samsung/jerryscript/issues
-[jerryscript-pull]:             http://github.com/Samsung/jerryscript/pulls
-[jerryscript-issue-questions]:  http://github.com/Samsung/jerryscript/labels/question
-[jerryscript-wiki]:             http://github.com/Samsung/jerryscript/wiki