diff --git a/_includes/aside.html b/_includes/aside.html
index 91160b2..3808f78 100644
--- a/_includes/aside.html
+++ b/_includes/aside.html
@@ -1,6 +1,6 @@
-<aside class="sidebar" role="navigation">
+<aside class="sidebar">
     <div class="avatar">
-        <img alt="Avatar" src="{{ site.avatar | strip_newlines | strip_html | strip | normalize_whitespace | relative_url | uri_escape }}" />
+        <img alt="[Avatar]" src="{{ site.avatar | strip_newlines | strip_html | strip | normalize_whitespace | relative_url | uri_escape }}" />
     </div>
 
     <p>{{ site.description | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }}</p>
diff --git a/_includes/disqus.html b/_includes/disqus.html
index 4292176..4ebcc7e 100644
--- a/_includes/disqus.html
+++ b/_includes/disqus.html
@@ -1,5 +1,5 @@
 <div id="disqus_thread"></div>
-<script defer type="text/javascript">
+<script type="text/javascript">
     var disqus_config = function () {
         this.page.identifier = '{{ page.id | strip_newlines | strip_html | strip | normalize_whitespace | slugify }}';
         this.page.title = '{{ page.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }}';
diff --git a/_layouts/default.html b/_layouts/default.html
index 5da4845..bff82d3 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -3,7 +3,7 @@ layout: compress
 ---
 
 <!DOCTYPE html>
-<html class="no-js" lang="{{ site.lang | strip_newlines | strip_html | strip | slugify }}">
+<html lang="{{ site.lang | strip_newlines | strip_html | strip | slugify }}">
     {% include head.html %}
 
     <body>
diff --git a/_layouts/page.html b/_layouts/page.html
index 561017a..01d6fcd 100644
--- a/_layouts/page.html
+++ b/_layouts/page.html
@@ -2,7 +2,7 @@
 layout: default
 ---
 
-<main class="container" role="main">
+<main class="container">
     <header>
         <h1>{{ page.title | default: site.title | strip_newlines | strip_html| strip | normalize_whitespace | smartify | xml_escape }}</h1>
     </header>
diff --git a/_layouts/post.html b/_layouts/post.html
index c792d23..e4aaa10 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -2,7 +2,7 @@
 layout: default
 ---
 
-<article class="container" role="main">
+<article class="container">
     <header>
         <h1>{{ page.title | strip_newlines | strip_html| strip | normalize_whitespace | smartify | xml_escape }}</h1>
 
