diff --git a/_config.yml b/_config.yml
index 1814626..d6cd9d3 100644
--- a/_config.yml
+++ b/_config.yml
@@ -8,20 +8,21 @@ title: "OpenJCE"
 description: > # this means to ignore newlines until "email:"
    Free Your Academic Data
 
+url: "http://liranbg.github.io/JceManager" # the base hostname & protocol for your site
+baseur: "/JceManager"
+
 email: sagidayan@gmail.com
 #blog logo
-logo: "{{ site.baseurl }}/assets/images/logo.png"
+logo: "/assets/images/logo.png"
 # blog cover
-cover: "{{ site.baseurl }}/assets/images/background_image.jpg"
+cover: "/assets/images/background_image.jpg"
 
 name: 'OpenJCE'
 author: 'OpenJCE Teem'
 author_image: "/assets/images/author.jpg"
 
-paginate:	5
+paginate: 5
 
-url: "http://liranbg.github.io/JceManager" # the base hostname & protocol for your site
-baseur: "/JceManager"
 
 # social icons and sharing options
 social:
diff --git a/_includes/footer.html b/_includes/footer.html
index f23e4a1..47694bd 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,7 +1,7 @@
 <!-- footer start -->
 
 <footer class="site-footer">
-  <a class="subscribe" href="{{ "/feed.xml" | prepend: site.baseurl }}"> <span class="tooltip"> <i class="fa fa-rss"></i> Subscribe!</span></a>
+  <a class="subscribe" href="{{ "{{ site.baseurl }}/feed.xml" | prepend: site.baseurl }}"> <span class="tooltip"> <i class="fa fa-rss"></i> Subscribe!</span></a>
     <div class="inner">
          <section class="copyright">All content copyright <a href="mailto:{{ site.email}}">{{ site.name }}</a> &copy; 2014 &bull; All rights reserved.</section>
          <section class="poweredby">Made with <a href="http://jekyllrb.com"> Jekyll</a></section>
diff --git a/_includes/head.html b/_includes/head.html
index 0ca7c98..d7cbfa5 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -15,16 +15,16 @@
 
   <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
 
-  <link rel="shortcut icon" href="{{ "/assets/images/favicon.ico" | prepend: site.baseurl }}">
+  <link rel="shortcut icon" href="{{ "{{ site.baseurl }}/assets/images/favicon.ico" | prepend: site.baseurl }}">
 <!--  <link rel="stylesheet" href="{{asset "js/styles/obsidian.css"}}"> -->
   <link rel="stylesheet" href="http://brick.a.ssl.fastly.net/Linux+Libertine:400,400i,700,700i/Open+Sans:400,400i,700,700i">
   <link rel="stylesheet" href="http://netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css" >
 
-  <link rel="stylesheet" type="text/css" media="screen" href="{{ "/css/main.css"  | prepend: site.baseurl  }}" />
-  <link rel="stylesheet" type="text/css" media="print" href="{{ "/css/print.css"  | prepend: site.baseurl  }}" />
+  <link rel="stylesheet" type="text/css" media="screen" href="{{ "{{ site.baseurl }}/css/main.css"  | prepend: site.baseurl  }}" />
+  <link rel="stylesheet" type="text/css" media="print" href="{{ "{{ site.baseurl }}/css/print.css"  | prepend: site.baseurl  }}" />
   <script src="https://code.jquery.com/jquery-1.11.0.min.js"></script>
 
-  <script type="text/javascript" src="{{ "/assets/js/jquery.fitvids.js" | prepend: site.baseurl  }}"></script>
-  <script type="text/javascript" src="{{ "/assets/js/index.js" | prepend: site.baseurl  }}"></script>
-  <script type="text/javascript" src="{{ "/assets/js/readingTime.min.js" | prepend: site.baseurl  }}"></script>
+  <script type="text/javascript" src="{{ "{{ site.baseurl }}/assets/js/jquery.fitvids.js" | prepend: site.baseurl  }}"></script>
+  <script type="text/javascript" src="{{ "{{ site.baseurl }}/assets/js/index.js" | prepend: site.baseurl  }}"></script>
+  <script type="text/javascript" src="{{ "{{ site.baseurl }}/assets/js/readingTime.min.js" | prepend: site.baseurl  }}"></script>
 </head>
diff --git a/_includes/header.html b/_includes/header.html
index 2ab934c..3429362 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -1,5 +1,5 @@
 <!-- header start -->
 
-<a href="{{ site.url }}" class="logo-readium"><span class="logo" style="background-image: url({{ site.logo }})"></span></a>
+<a href="{{ site.baseurl }}{{ site.url }}" class="logo-readium"><span class="logo" style="background-image: url({{ site.logo }})"></span></a>
 
 <!-- header end -->
diff --git a/index.html b/index.html
index e93336e..837f2bb 100644
--- a/index.html
+++ b/index.html
@@ -98,14 +98,14 @@ layout: default
 
     <nav class="pagination" role="navigation">
       {% if paginator.next_page %}
-        <a class="newer-posts" href="/page{{paginator.next_page}}">&larr; Older posts</a>
+        <a class="newer-posts" href="{{ site.baseurl }}/page{{paginator.next_page}}">&larr; Older posts</a>
       {% endif %}
       <span class="page-number">Page {{ paginator.page }} of {{ paginator.total_pages }}</span>
       {% if paginator.previous_page %}
         {% if paginator.page == 2 %}
-          <a class="older-posts" href="/">Newer posts &rarr;</a>
+          <a class="older-posts" href="{{ site.baseurl }}/">Newer posts &rarr;</a>
         {% else %}
-          <a class="older-posts" href="/page{{paginator.previous_page}}">Newer posts &rarr;</a>
+          <a class="older-posts" href="{{ site.baseurl }}/page{{paginator.previous_page}}">Newer posts &rarr;</a>
         {% endif %}
       {% endif %}
     </nav>