diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 94ad1b8f..ecdf712d 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -15,7 +15,7 @@
 
 {{ if gt $paginator.TotalPages 0 }}
 {{ range $index, $page := $paginator.Pages }}
-<article class="post-entry">
+<article class="{{ if and $.IsHome (eq $paginator.PageNumber 1) (eq $index 0) }}first-entry{{ else }}post-entry{{ end }}">
   <header class="entry-header">
     <h2>{{ .Title }}</h2>
   </header>
@@ -34,10 +34,10 @@
 <footer class="page-footer">
   <nav class="pagination">
     {{ if $paginator.HasPrev }}
-    <a class="prev" href="{{ $paginator.Prev.URL }}">← {{ i18n "prevPage" }}</a>
+    <a class="prev" href="{{ $paginator.Prev.URL }}">← {{ i18n "prev_page" }}</a>
     {{ end }}
     {{ if $paginator.HasNext }}
-    <a class="next" href="{{ $paginator.Next.URL }}">{{ i18n "nextPage" }} →</a>
+    <a class="next" href="{{ $paginator.Next.URL }}">{{ i18n "next_page" }} →</a>
     {{ end }}
   </nav>
 </footer>
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 25fdb5c2..60bc6f9c 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,4 +1,5 @@
 {{ partial "header.html" . }}
+
 <article class="post-single">
   <header class="post-header">
     <h1 class="post-title">{{ .Title }}</h1>
@@ -18,13 +19,13 @@
     </ul>
     {{ end }}
   </footer>
-  <!-- Comments system area start -->
+  <!-- Comments area start -->
   {{ if not (eq .Params.comments false) }}
   {{ if .Site.DisqusShortname }}
   <div id="disqus_thread"></div>
   <script>
     var disqus_shortname = '{{ .Site.DisqusShortname }}';
-    (function() { // DON'T EDIT BELOW THIS LINE
+    (function() {
       var d = document, s = d.createElement('script');
       s.src = 'https://' + disqus_shortname + '.disqus.com/embed.js';
       s.setAttribute('data-timestamp', +new Date());
@@ -35,8 +36,9 @@
     Please enable JavaScript to view the
     <a href="https://disqus.com/?ref_noscript">comments powered by Disqus.</a>
   </noscript>
-  <!-- Comments system area end -->
+  <!-- Comments area end -->
   {{ end }}
   {{ end }}
 </article>
+
 {{ partial "footer.html" . }}