diff --git a/_config.yml b/_config.yml
index f356250..323b403 100644
--- a/_config.yml
+++ b/_config.yml
@@ -2,8 +2,22 @@
 title: Your awesome title
 email: your-email@domain.com
 description: "Write an awesome description for your new site here. You can edit this line in _config.yml. It will appear in your document head meta (for Google search results) and in your feed.xml site description."
-twitter_username: jekyllrb
-github_username:  jekyll
+
+# Social media usernames
+twitter: jekyllrb
+facebook: 
+google-plus:
+linkedin: 
+dribbble: 
+flickr: 
+bitbucket: jekyll
+github: jekyll
+
+# Postal address
+address-line1: 3481 Melrose Place
+address-line2: Beverly Hills, CA 90210
+address-line3:
+address-line4:
 
 # Build settings
 markdown: kramdown
diff --git a/_includes/footer.html b/_includes/footer.html
index ff45e7f..9661099 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -5,30 +5,68 @@
                 <div class="row">
                     <div class="footer-col col-md-4">
                         <h3>Location</h3>
-                        <p>3481 Melrose Place<br>Beverly Hills, CA 90210</p>
+                        <p>
+                            {% if site.address-line1 %}
+                                {{ site.address-line1 }}
+                            {% endif %}
+                            {% if site.address-line2 %}
+                                <br>{{ site.address-line2 }}
+                            {% endif %}
+                            {% if site.address-line3 %}
+                                <br>{{ site.address-line3 }}
+                            {% endif %}
+                            {% if site.address-line4 %}
+                                <br>{{ site.address-line4 }}
+                            {% endif %}
+                        </p>
                     </div>
                     <div class="footer-col col-md-4">
                         <h3>Around the Web</h3>
                         <ul class="list-inline">
+                            {% if site.facebook %}
                             <li>
-                                <a href="#" class="btn-social btn-outline"><i class="fa fa-fw fa-facebook"></i></a>
+                                <a href="{{ site.facebook }}" class="btn-social btn-outline"><i class="fa fa-fw fa-facebook"></i></a>
                             </li>
+                            {% endif %}
+                            {% if site.google-plus %}
                             <li>
-                                <a href="#" class="btn-social btn-outline"><i class="fa fa-fw fa-google-plus"></i></a>
+                                <a href="{{ site.google-plus }}" class="btn-social btn-outline"><i class="fa fa-fw fa-google-plus"></i></a>
                             </li>
+                            {% endif %}
+                            {% if site.twitter %}
                             <li>
-                                <a href="#" class="btn-social btn-outline"><i class="fa fa-fw fa-twitter"></i></a>
+                                <a href="{{ site.twitter }}" class="btn-social btn-outline"><i class="fa fa-fw fa-twitter"></i></a>
                             </li>
+                            {% endif %}
+                            {% if site.linkedin %}
                             <li>
-                                <a href="#" class="btn-social btn-outline"><i class="fa fa-fw fa-linkedin"></i></a>
+                                <a href="{{ site.linkedin }}" class="btn-social btn-outline"><i class="fa fa-fw fa-linkedin"></i></a>
                             </li>
+                            {% endif %}
+                            {% if site.dribbble %}
                             <li>
-                                <a href="#" class="btn-social btn-outline"><i class="fa fa-fw fa-dribbble"></i></a>
+                                <a href="{{ site.dribbble }}" class="btn-social btn-outline"><i class="fa fa-fw fa-dribbble"></i></a>
                             </li>
+                            {% endif %}
+                            {% if site.flickr %}
+                            <li>
+                                <a href="{{ site.flickr }}" class="btn-social btn-outline"><i class="fa fa-fw fa-flickr"></i></a>
+                            </li>
+                            {% endif %}
+                            {% if site.bitbucket %}
+                            <li>
+                                <a href="{{ site.bitbucket }}" class="btn-social btn-outline"><i class="fa fa-fw fa-bitbucket"></i></a>
+                            </li>
+                            {% endif %}
+                            {% if site.github %}
+                            <li>
+                                <a href="{{ site.github }}" class="btn-social btn-outline"><i class="fa fa-fw fa-github"></i></a>
+                            </li>
+                            {% endif %}
                         </ul>
                     </div>
                     <div class="footer-col col-md-4">
-                        <h3>About Freelancer</h3>
+                        <h3>Credits</h3>
                         <p>Freelance is a free to use, open source Bootstrap theme created by <a href="http://startbootstrap.com">Start Bootstrap</a>.</p>
                     </div>
                 </div>
@@ -38,7 +76,7 @@
             <div class="container">
                 <div class="row">
                     <div class="col-lg-12">
-                        Copyright &copy; Your Website 2014
+                        Copyright &copy; 20{{ site.time | date: '%y' }}
                     </div>
                 </div>
             </div>
diff --git a/_layouts/default.html b/_layouts/default.html
index 4ded93b..b8e225c 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -9,16 +9,6 @@
     {% include portfolio_grid.html %}
     {% include about.html %}
     {% include contact.html %}
-
-
-    <!--
-      <div class="page-content">
-        <div class="wrap">
-        {{ content }}
-        </div>
-      </div>
-    -->
-
     {% include footer.html %}
     {% include modals.html %}
     {% include js.html %}
diff --git a/index.html b/index.html
index 62a0273..a9f5097 100644
--- a/index.html
+++ b/index.html
@@ -4,7 +4,7 @@ layout: default
 
 <div class="home">
 
-  <h1>Postsss</h1>
+  <h1>Posts</h1>
 
   <ul class="posts">
     {% for post in site.posts %}