diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a0382cc..631cfa76 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,20 @@
-## [Unreleased](https://github.com/rubycdp/ferrum/compare/v0.12...main) ##
+## [Unreleased](https://github.com/rubycdp/ferrum/compare/v0.13...main) ##
+
+### Added
+- `Ferrum::Network::Exchange#xhr?` determines if the exchange is XHR
+- `Ferrum::Network::Request#xhr?` determines if the request is XHR
+- `Ferrum::Network::Response#loaded?` returns true if the response is fully loaded
+- `Ferrum::Node#in_viewport?` checks if the element in viewport (optional argument `scope` as `Ferrum::Node`)
+- `Ferrum::Node#scroll_into_view` - scrolls to element if needed (when it's not in the viewport)
+
+### Changed
+
+### Fixed
+- `Ferrum::Network::Exchange#finished?` returns `true` only fully loaded responses
+
+### Removed
+
+## [0.13](https://github.com/rubycdp/ferrum/compare/v0.12...v0.13) - (Nov 12, 2022) ##
 
 ### Added
 
diff --git a/README.md b/README.md
index 89704468..3b3c3754 100644
--- a/README.md
+++ b/README.md
@@ -1128,6 +1128,8 @@ frame.at_css("//a[text() = 'Log in']") # => Node
 #### evaluate
 #### selected : `Array<Node>`
 #### select
+#### scroll_into_view
+#### in_viewport?(of: `Node | nil`) : `Boolean`
 
 (chainable) Selects options by passed attribute.
 
diff --git a/lib/ferrum/browser/client.rb b/lib/ferrum/browser/client.rb
index b5284e00..d7dc6c44 100644
--- a/lib/ferrum/browser/client.rb
+++ b/lib/ferrum/browser/client.rb
@@ -43,7 +43,7 @@ def command(method, params = {})
         @pendings.delete(message[:id])
 
         raise DeadBrowserError if data.nil? && @ws.messages.closed?
-        raise TimeoutError unless data
+        raise TimeoutError.new() unless data
 
         error, response = data.values_at("error", "result")
         raise_browser_error(error) if error
diff --git a/lib/ferrum/errors.rb b/lib/ferrum/errors.rb
index 2c46071f..ce28a1b0 100644
--- a/lib/ferrum/errors.rb
+++ b/lib/ferrum/errors.rb
@@ -27,11 +27,17 @@ def initialize(url, pendings = [])
   end
 
   class TimeoutError < Error
-    def message
-      "Timed out waiting for response. It's possible that this happened " \
-        "because something took a very long time (for example a page load " \
-        "was slow). If so, setting the :timeout option to a higher value might " \
-        "help."
+    attr_reader :pending_connections_info
+
+    def initialize(pending_connections_info = [])
+      @pending_connections_info = pending_connections_info
+
+      message = "Timed out waiting for response. It's possible that this happened " \
+                "because something took a very long time (for example a page load " \
+                "was slow). If so, setting the :timeout option to a higher value might " \
+                "help."
+      message = "#{message}\nConnections still pending:\n #{pending_connections_info.join(', ')}" unless pending_connections_info.empty?
+      super(message)
     end
   end
 
diff --git a/lib/ferrum/frame.rb b/lib/ferrum/frame.rb
index d2530c7e..5c3266c9 100644
--- a/lib/ferrum/frame.rb
+++ b/lib/ferrum/frame.rb
@@ -113,6 +113,7 @@ def content=(html)
         document.close();
         arguments[1](true);
       ), @page.timeout, html)
+      @page.document_node_id
     end
     alias set_content content=
 
diff --git a/lib/ferrum/network.rb b/lib/ferrum/network.rb
index 623751ad..9c9ac324 100644
--- a/lib/ferrum/network.rb
+++ b/lib/ferrum/network.rb
@@ -11,9 +11,10 @@ module Ferrum
   class Network
     CLEAR_TYPE = %i[traffic cache].freeze
     AUTHORIZE_TYPE = %i[server proxy].freeze
-    RESOURCE_TYPES = %w[Document Stylesheet Image Media Font Script TextTrack
-                        XHR Fetch EventSource WebSocket Manifest
-                        SignedExchange Ping CSPViolationReport Other].freeze
+    REQUEST_STAGES = %i[Request Response].freeze
+    RESOURCE_TYPES = %i[Document Stylesheet Image Media Font Script TextTrack
+                        XHR Fetch Prefetch EventSource WebSocket Manifest
+                        SignedExchange Ping CSPViolationReport Preflight Other].freeze
     AUTHORIZE_BLOCK_MISSING = "Block is missing, call `authorize(...) { |r| r.continue } " \
                               "or subscribe to `on(:request)` events before calling it"
     AUTHORIZE_TYPE_WRONG = ":type should be in #{AUTHORIZE_TYPE}"
@@ -62,7 +63,15 @@ def wait_for_idle(connections: 0, duration: 0.05, timeout: @page.browser.timeout
       start = Utils::ElapsedTime.monotonic_time
 
       until idle?(connections)
-        raise TimeoutError if Utils::ElapsedTime.timeout?(start, timeout)
+        if Utils::ElapsedTime.timeout?(start, timeout)
+          if @page.browser.options.pending_connection_errors
+            pending_connections = traffic.select(&:pending?)
+            pending_connections_info = pending_connections.map(&:response).map do |connection|
+              {status: connection.status, status_text: connection.status_text, url: connection.url } unless connection.nil?
+            end
+          end
+          raise TimeoutError.new(pending_connections_info = pending_connections_info)
+        end
 
         sleep(duration)
       end
@@ -187,11 +196,20 @@ def whitelist=(patterns)
     #   end
     #   browser.go_to("https://google.com")
     #
-    def intercept(pattern: "*", resource_type: nil)
+    def intercept(pattern: "*", resource_type: nil, request_stage: nil, handle_auth_requests: true)
       pattern = { urlPattern: pattern }
-      pattern[:resourceType] = resource_type if resource_type && RESOURCE_TYPES.include?(resource_type.to_s)
 
-      @page.command("Fetch.enable", handleAuthRequests: true, patterns: [pattern])
+      if resource_type && RESOURCE_TYPES.none?(resource_type.to_sym)
+        raise ArgumentError, "Unknown resource type '#{resource_type}' must be #{RESOURCE_TYPES.join(' | ')}"
+      end
+
+      if request_stage && REQUEST_STAGES.none?(request_stage.to_sym)
+        raise ArgumentError, "Unknown request stage '#{request_stage}' must be #{REQUEST_STAGES.join(' | ')}"
+      end
+
+      pattern[:resourceType] = resource_type if resource_type
+      pattern[:requestStage] = request_stage if request_stage
+      @page.command("Fetch.enable", patterns: [pattern], handleAuthRequests: handle_auth_requests)
     end
 
     #
@@ -374,8 +392,12 @@ def subscribe_response_received
 
     def subscribe_loading_finished
       @page.on("Network.loadingFinished") do |params|
-        exchange = select(params["requestId"]).last
-        exchange.response.body_size = params["encodedDataLength"] if exchange&.response
+        response = select(params["requestId"]).last&.response
+
+        if response
+          response.loaded = true
+          response.body_size = params["encodedDataLength"]
+        end
       end
     end
 
diff --git a/lib/ferrum/network/exchange.rb b/lib/ferrum/network/exchange.rb
index f6f3b7d2..a4bc60cf 100644
--- a/lib/ferrum/network/exchange.rb
+++ b/lib/ferrum/network/exchange.rb
@@ -79,7 +79,7 @@ def blocked?
       # @return [Boolean]
       #
       def finished?
-        blocked? || !response.nil? || !error.nil?
+        blocked? || response&.loaded? || !error.nil?
       end
 
       #
@@ -100,6 +100,15 @@ def intercepted?
         !intercepted_request.nil?
       end
 
+      #
+      # Determines if the exchange is XHR.
+      #
+      # @return [Boolean]
+      #
+      def xhr?
+        !!request&.xhr?
+      end
+
       #
       # Returns request's URL.
       #
diff --git a/lib/ferrum/network/request.rb b/lib/ferrum/network/request.rb
index 40c203ac..800c9b15 100644
--- a/lib/ferrum/network/request.rb
+++ b/lib/ferrum/network/request.rb
@@ -50,6 +50,15 @@ def type?(value)
         type.downcase == value.to_s.downcase
       end
 
+      #
+      # Determines if the request is XHR.
+      #
+      # @return [Boolean]
+      #
+      def xhr?
+        type?("xhr")
+      end
+
       #
       # The frame ID of the request.
       #
diff --git a/lib/ferrum/network/response.rb b/lib/ferrum/network/response.rb
index f3bca622..2a02b389 100644
--- a/lib/ferrum/network/response.rb
+++ b/lib/ferrum/network/response.rb
@@ -18,8 +18,13 @@ class Response
       # @return [Hash{String => Object}]
       attr_reader :params
 
+      # The response is fully loaded by the browser.
       #
-      # Initializes the respones object.
+      # @return [Boolean]
+      attr_writer :loaded
+
+      #
+      # Initializes the responses object.
       #
       # @param [Page] page
       #   The page associated with the network response.
@@ -121,9 +126,8 @@ def body_size=(size)
       #
       def body
         @body ||= begin
-          body, encoded = @page
-                          .command("Network.getResponseBody", requestId: id)
-                          .values_at("body", "base64Encoded")
+          body, encoded = @page.command("Network.getResponseBody", requestId: id)
+                               .values_at("body", "base64Encoded")
           encoded ? Base64.decode64(body) : body
         end
       end
@@ -135,6 +139,13 @@ def main?
         @page.network.response == self
       end
 
+      # The response is fully loaded by the browser or not.
+      #
+      # @return [Boolean]
+      def loaded?
+        @loaded
+      end
+
       #
       # Comapres the respones ID to another response's ID.
       #
diff --git a/lib/ferrum/node.rb b/lib/ferrum/node.rb
index 9758023b..1c94456e 100644
--- a/lib/ferrum/node.rb
+++ b/lib/ferrum/node.rb
@@ -88,6 +88,26 @@ def hover
       raise NotImplementedError
     end
 
+    def scroll_into_view
+      tap { page.command("DOM.scrollIntoViewIfNeeded", nodeId: node_id) }
+    end
+
+    def in_viewport?(of: nil)
+      function = <<~JS
+        function(element, scope) {
+          const rect = element.getBoundingClientRect();
+          const [height, width] = scope
+            ? [scope.offsetHeight, scope.offsetWidth]
+            : [window.innerHeight, window.innerWidth];
+          return rect.top >= 0 &&
+           rect.left >= 0 &&
+           rect.bottom <= height &&
+           rect.right <= width;
+        }
+      JS
+      page.evaluate_func(function, self, of)
+    end
+
     def select_file(value)
       page.command("DOM.setFileInputFiles", slowmoable: true, nodeId: node_id, files: Array(value))
     end
diff --git a/lib/ferrum/page.rb b/lib/ferrum/page.rb
index 5ca03c54..169954be 100644
--- a/lib/ferrum/page.rb
+++ b/lib/ferrum/page.rb
@@ -282,7 +282,7 @@ def command(method, wait: 0, slowmoable: false, **params)
         @event.wait(wait)
         if iteration != @event.iteration
           set = @event.wait(timeout)
-          raise TimeoutError unless set
+          raise TimeoutError.new() unless set
         end
       end
       result
@@ -325,6 +325,10 @@ def use_authorized_proxy?
       use_proxy? && @proxy_user && @proxy_password
     end
 
+    def document_node_id
+      command("DOM.getDocument", depth: 0).dig("root", "nodeId")
+    end
+
     private
 
     def subscribe
@@ -441,10 +445,6 @@ def combine_url!(url_or_path)
       (nil_or_relative ? @browser.base_url.join(url.to_s) : url).to_s
     end
 
-    def document_node_id
-      command("DOM.getDocument", depth: 0).dig("root", "nodeId")
-    end
-
     def ws_url
       "ws://#{@browser.process.host}:#{@browser.process.port}/devtools/page/#{@target_id}"
     end
diff --git a/spec/frame_spec.rb b/spec/frame_spec.rb
index 9bba6c96..247c92f3 100644
--- a/spec/frame_spec.rb
+++ b/spec/frame_spec.rb
@@ -181,9 +181,10 @@
   end
 
   it "can set page content" do
-    browser.content = "<html><head></head><body>Voila!</body></html>"
+    browser.content = "<html><head></head><body>Voila! <a href='#'>Link</a></body></html>"
 
     expect(browser.body).to include("Voila!")
+    expect(browser.at_css("a").text).to eq("Link")
   end
 
   it "gets page doctype" do
diff --git a/spec/network/response_spec.rb b/spec/network/response_spec.rb
index d34874a7..d513a42f 100644
--- a/spec/network/response_spec.rb
+++ b/spec/network/response_spec.rb
@@ -81,7 +81,7 @@
         %r{/ferrum/jquery.min.js$} => File.size("#{PROJECT_ROOT}/spec/support/public/jquery-1.11.3.min.js"),
         %r{/ferrum/jquery-ui.min.js$} => File.size("#{PROJECT_ROOT}/spec/support/public/jquery-ui-1.11.4.min.js"),
         %r{/ferrum/test.js$} => File.size("#{PROJECT_ROOT}/spec/support/public/test.js"),
-        %r{/ferrum/with_js$} => 2343
+        %r{/ferrum/with_js$} => 2312
       }
 
       resources_size.each do |resource, size|
diff --git a/spec/network_spec.rb b/spec/network_spec.rb
index 1b207aa3..ce89d506 100644
--- a/spec/network_spec.rb
+++ b/spec/network_spec.rb
@@ -302,6 +302,55 @@
   end
 
   describe "#intercept" do
+    it "supports :pattern argument" do
+      network.intercept(pattern: "*/ferrum/frame_child")
+      page.on(:request) do |request|
+        request.respond(body: "<h1>hello</h1>")
+      end
+
+      page.go_to("/ferrum/frame_parent")
+
+      expect(network.status).to eq(200)
+      frame = page.at_xpath("//iframe").frame
+      expect(frame.body).to include("hello")
+    end
+
+    context "with :resource_type argument" do
+      it "raises an error with wrong type" do
+        expect { network.intercept(resource_type: :BlaBla) }.to raise_error(ArgumentError)
+      end
+
+      it "intercepts only given type" do
+        network.intercept(resource_type: :Document)
+        page.on(:request) do |request|
+          request.respond(body: "<h1>hello</h1>")
+        end
+
+        page.go_to("/ferrum/non_existing")
+
+        expect(network.status).to eq(200)
+        expect(page.body).to include("hello")
+      end
+    end
+
+    context "with :request_stage argument" do
+      it "raises an error with wrong stage" do
+        expect { network.intercept(request_stage: :BlaBla) }.to raise_error(ArgumentError)
+      end
+
+      it "intercepts only given stage" do
+        network.intercept(request_stage: :Response)
+        page.on(:request) do |request|
+          request.respond(body: "<h1>hello</h1>")
+        end
+
+        page.go_to("/ferrum/index")
+
+        expect(network.status).to eq(200)
+        expect(page.body).to include("hello")
+      end
+    end
+
     it "supports custom responses" do
       network.intercept
       page.on(:request) do |request|
diff --git a/spec/node_spec.rb b/spec/node_spec.rb
index 963a13a8..14143d8e 100644
--- a/spec/node_spec.rb
+++ b/spec/node_spec.rb
@@ -72,19 +72,33 @@
       end
     end
 
-    context "when the element is not in the viewport of parent element", skip: true do
-      before do
-        browser.go_to("/ferrum/scroll")
-      end
+    context "when the element is not in the viewport of parent element" do
+      before { page.go_to("/ferrum/scroll") }
+
+      it "scrolls into view if element outside viewport" do
+        link = page.at_xpath("//a[text() = 'Link outside viewport']")
+        link.click
+        expect(page.current_url).to eq(base_url("/ferrum/scroll"))
 
-      it "scrolls into view", skip: "needs fix" do
-        browser.at_xpath("//a[text() = 'Link outside viewport']").click
-        expect(browser.current_url).to eq("/")
+        expect(link.in_viewport?).to eq(true)
+        box = page.at_xpath("//div[@id='overflow-box']")
+        expect(link.in_viewport?(of: box)).to eq(false)
+
+        link.scroll_into_view
+        expect(link.in_viewport?(of: box)).to eq(true)
+        link.click
+        expect(page.current_url).to eq(base_url("/"))
       end
 
-      it "scrolls into view if scrollIntoViewIfNeeded fails" do
-        browser.click_link "Below the fold"
-        expect(browser.current_path).to eq("/")
+      it "scrolls into view if element below the fold" do
+        link = page.at_xpath("//a[*//text() = 'Below the fold']")
+        expect(link.in_viewport?).to eq(false)
+
+        link.scroll_into_view
+
+        expect(link.in_viewport?).to eq(true)
+        link.click
+        expect(page.current_url).to eq(base_url("/"))
       end
     end
   end
diff --git a/spec/support/views/animated.erb b/spec/support/views/animated.erb
index 770cb485..559e5c7a 100644
--- a/spec/support/views/animated.erb
+++ b/spec/support/views/animated.erb
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
diff --git a/spec/support/views/attach_file.erb b/spec/support/views/attach_file.erb
index 1bcad007..8544e318 100644
--- a/spec/support/views/attach_file.erb
+++ b/spec/support/views/attach_file.erb
@@ -1,10 +1,10 @@
 <script>
-window.onload = function() {
-  var file = document.getElementById("file")
-  file.onchange = function() {
-    file.parentElement.removeChild(file)
+  window.onload = function() {
+    var file = document.getElementById("file")
+    file.onchange = function() {
+      file.parentElement.removeChild(file)
+    }
   }
-}
 </script>
 
 <input type="file" id="file">
diff --git a/spec/support/views/auto_refresh.erb b/spec/support/views/auto_refresh.erb
index 43c63de9..bec9b959 100644
--- a/spec/support/views/auto_refresh.erb
+++ b/spec/support/views/auto_refresh.erb
@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
 <html>
   <head>
   </head>
diff --git a/spec/support/views/buttons.erb b/spec/support/views/buttons.erb
index 3276fb67..65c61ab1 100644
--- a/spec/support/views/buttons.erb
+++ b/spec/support/views/buttons.erb
@@ -1,4 +1,3 @@
-
 <h1>Buttons</h1>
 <button>Click me!</button>
 <button id="click_me_123">Click me by id!</button>
diff --git a/spec/support/views/click_coordinates.erb b/spec/support/views/click_coordinates.erb
index 3b342b3b..336473ac 100644
--- a/spec/support/views/click_coordinates.erb
+++ b/spec/support/views/click_coordinates.erb
@@ -1,30 +1,30 @@
 <!DOCTYPE html>
 <html>
-<head>
-  <style type="text/css">
-    body {
-      width: 800px;
-      margin: 0;
-    }
-    #box {
-      width: 800px;
-      height: 600px;
-      background: red;
-    }
-  </style>
-  <script type="text/javascript">
-  window.onload = function() {
-    var log = document.querySelector("#log")
-    var boxes = document.querySelector("#box")
-    boxes.onclick = function(event) {
-      var text = "x: " + event.pageX + ", y: " + event.pageY;
-      log.textContent = text
-    }
-  }
-  </script>
-</head>
-<body>
-  <div id="box"></div>
-  <div id="log"></div>
-</body>
+  <head>
+    <style>
+      body {
+        width: 800px;
+        margin: 0;
+      }
+      #box {
+        width: 800px;
+        height: 600px;
+        background: red;
+      }
+    </style>
+    <script type="text/javascript">
+      window.onload = function() {
+        var log = document.querySelector("#log")
+        var boxes = document.querySelector("#box")
+        boxes.onclick = function(event) {
+          var text = "x: " + event.pageX + ", y: " + event.pageY;
+          log.textContent = text
+        }
+      }
+    </script>
+  </head>
+  <body>
+    <div id="box"></div>
+    <div id="log"></div>
+  </body>
 </html>
diff --git a/spec/support/views/click_test.erb b/spec/support/views/click_test.erb
index c9572c28..aa687933 100644
--- a/spec/support/views/click_test.erb
+++ b/spec/support/views/click_test.erb
@@ -1,52 +1,52 @@
 <!DOCTYPE html>
 <html>
-<head>
-  <style type="text/css">
-    body {
-      width: 800px;
-      margin: 0;
-    }
-    .box {
-      width: 200px;
-      height: 200px;
-      float: left;
-      margin: 100px;
-    }
-    #one {
-      background: red;
-    }
-    #two {
-      background: orange
-    }
-    #three {
-      background: blue;
-    }
-    #four {
-      background: green;
-    }
-  </style>
-  <script type="text/javascript">
-  window.onload = function() {
-    var log = document.querySelector("#log")
-    var boxes = document.querySelectorAll(".box")
-    for (var i = 0; i < boxes.length; i++) {
-      var el = boxes[i]
-      el.onclick = function() {
-        log.textContent = this.id
+  <head>
+    <style>
+      body {
+        width: 800px;
+        margin: 0;
       }
-    }
-  }
-  </script>
-</head>
-<body>
-  <div id="one" class="box"></div>
-  <div id="two" class="box"></div>
-  <div id="three" class="box"></div>
-  <div id="four" class="box"></div>
-  <div id="log"></div>
-  <svg id="svg" class="box"></svg>
-  <svg xmlns="http://www.w3.org/2000/svg" version="1.1">
-    <rect id="myrect" width="300" height="100" style="fill:rgb(0,0,255);stroke-width:1;stroke:rgb(0,0,0)" />
-  </svg>
-</body>
+      .box {
+        width: 200px;
+        height: 200px;
+        float: left;
+        margin: 100px;
+      }
+      #one {
+        background: red;
+      }
+      #two {
+        background: orange
+      }
+      #three {
+        background: blue;
+      }
+      #four {
+        background: green;
+      }
+    </style>
+    <script type="text/javascript">
+      window.onload = function() {
+        var log = document.querySelector("#log")
+        var boxes = document.querySelectorAll(".box")
+        for (var i = 0; i < boxes.length; i++) {
+          var el = boxes[i]
+          el.onclick = function() {
+            log.textContent = this.id
+          }
+        }
+      }
+    </script>
+  </head>
+  <body>
+    <div id="one" class="box"></div>
+    <div id="two" class="box"></div>
+    <div id="three" class="box"></div>
+    <div id="four" class="box"></div>
+    <div id="log"></div>
+    <svg id="svg" class="box"></svg>
+    <svg xmlns="http://www.w3.org/2000/svg" version="1.1">
+      <rect id="myrect" width="300" height="100" style="fill:rgb(0,0,255);stroke-width:1;stroke:rgb(0,0,0)" />
+    </svg>
+  </body>
 </html>
diff --git a/spec/support/views/computed_style.erb b/spec/support/views/computed_style.erb
index d451445c..14e98340 100644
--- a/spec/support/views/computed_style.erb
+++ b/spec/support/views/computed_style.erb
@@ -1,6 +1,6 @@
 <style>
-.foo { color: red; }
-.bar { font-weight: bold; }
+  .foo { color: red; }
+  .bar { font-weight: bold; }
 </style>
 
 <span id="test_node" class="foo bar">Test</span>
diff --git a/spec/support/views/console_log.erb b/spec/support/views/console_log.erb
index 0eded64f..8e12a083 100644
--- a/spec/support/views/console_log.erb
+++ b/spec/support/views/console_log.erb
@@ -1,12 +1,11 @@
 <!DOCTYPE html>
 <html>
-<head>
-  <script type="text/javascript">
-  window.onload = function() {
-    console.log("Hello world");
-  }
-  </script>
-</head>
-<body>
-</body>
+  <head>
+    <script type="text/javascript">
+      window.onload = function() {
+        console.log("Hello world");
+      }
+    </script>
+  </head>
+  <body></body>
 </html>
diff --git a/spec/support/views/custom_html_size.erb b/spec/support/views/custom_html_size.erb
index 881e7ff4..3397824e 100644
--- a/spec/support/views/custom_html_size.erb
+++ b/spec/support/views/custom_html_size.erb
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
   <head>
     <title>custom_size</title>
@@ -8,6 +9,5 @@
       }
     </style>
   </head>
-  <body>
-  </body>
+  <body></body>
 </html>
diff --git a/spec/support/views/custom_html_size_100%.erb b/spec/support/views/custom_html_size_100%.erb
index d56171ab..e375ba69 100644
--- a/spec/support/views/custom_html_size_100%.erb
+++ b/spec/support/views/custom_html_size_100%.erb
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
   <head>
     <title>custom_size</title>
diff --git a/spec/support/views/date_fields.erb b/spec/support/views/date_fields.erb
index 7928f653..a378ccd7 100644
--- a/spec/support/views/date_fields.erb
+++ b/spec/support/views/date_fields.erb
@@ -1,4 +1,5 @@
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+<!DOCTYPE html>
+<html>
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
   </head>
diff --git a/spec/support/views/datepicker.erb b/spec/support/views/datepicker.erb
index 05ad2dce..b683dc43 100644
--- a/spec/support/views/datepicker.erb
+++ b/spec/support/views/datepicker.erb
@@ -1,4 +1,5 @@
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+<!DOCTYPE html>
+<html>
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
     <title>ferrum and datepicker</title>
diff --git a/spec/support/views/double_click_test.erb b/spec/support/views/double_click_test.erb
index 055c1d28..47cd9d58 100644
--- a/spec/support/views/double_click_test.erb
+++ b/spec/support/views/double_click_test.erb
@@ -1,48 +1,48 @@
 <!DOCTYPE html>
 <html>
-<head>
-  <style type="text/css">
-    body {
-      width: 800px;
-      margin: 0;
-    }
-    .box {
-      width: 200px;
-      height: 200px;
-      float: left;
-      margin: 100px;
-    }
-    #one {
-      background: red;
-    }
-    #two {
-      background: orange
-    }
-    #three {
-      background: blue;
-    }
-    #four {
-      background: green;
-    }
-  </style>
-  <script type="text/javascript">
-  window.onload = function() {
-    var log = document.querySelector("#log")
-    var boxes = document.querySelectorAll(".box")
-    for (var i = 0; i < boxes.length; i++) {
-      var el = boxes[i]
-      el.ondblclick = function() {
-        log.textContent = this.id
+  <head>
+    <style>
+      body {
+        width: 800px;
+        margin: 0;
       }
-    }
-  }
-  </script>
-</head>
-<body>
-  <div id="one" class="box"></div>
-  <div id="two" class="box"></div>
-  <div id="three" class="box"></div>
-  <div id="four" class="box"></div>
-  <div id="log"></div>
-</body>
+      .box {
+        width: 200px;
+        height: 200px;
+        float: left;
+        margin: 100px;
+      }
+      #one {
+        background: red;
+      }
+      #two {
+        background: orange
+      }
+      #three {
+        background: blue;
+      }
+      #four {
+        background: green;
+      }
+    </style>
+    <script type="text/javascript">
+      window.onload = function() {
+        var log = document.querySelector("#log")
+        var boxes = document.querySelectorAll(".box")
+        for (var i = 0; i < boxes.length; i++) {
+          var el = boxes[i]
+          el.ondblclick = function() {
+            log.textContent = this.id
+          }
+        }
+      }
+    </script>
+  </head>
+  <body>
+    <div id="one" class="box"></div>
+    <div id="two" class="box"></div>
+    <div id="three" class="box"></div>
+    <div id="four" class="box"></div>
+    <div id="log"></div>
+  </body>
 </html>
diff --git a/spec/support/views/drag.erb b/spec/support/views/drag.erb
index 53a578ff..9f93b3c5 100644
--- a/spec/support/views/drag.erb
+++ b/spec/support/views/drag.erb
@@ -1,11 +1,12 @@
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+<!DOCTYPE html>
+<html>
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
     <title>ferrum drag_to and drag_by</title>
     <script src="/ferrum/jquery.min.js" type="text/javascript" charset="utf-8"></script>
     <script src="/ferrum/jquery-ui.min.js" type="text/javascript" charset="utf-8"></script>
 
-    <style type="text/css">
+    <style>
       #drag_by {
         position: relative;
         width: 200px;
@@ -22,28 +23,24 @@
     </style>
 
     <script>
-    $(function() {
-      $( ".draggable" ).draggable();
-      $( "#droppable" ).droppable({
-        drop: function( event, ui ) {
-          $( this )
-            .addClass( "dropped" )
-            .find( "p" )
-              .html( "Dropped!" );
-        }
+      $(function() {
+        $( ".draggable" ).draggable();
+        $( "#droppable" ).droppable({
+          drop: function( event, ui ) {
+            $( this )
+              .addClass( "dropped" )
+              .find( "p" )
+                .html( "Dropped!" );
+          }
+        });
       });
-    });
     </script>
   </head>
-
-
   <body>
-
     <div id="drag_to">
       <div id="draggable" class="draggable">
         <p>Drag me</p>
       </div>
-
       <div id="droppable">
         <p>Drop here</p>
       </div>
@@ -54,6 +51,5 @@
         <p>Drag me by</p>
       </div>
     </div>
-
   </body>
 </html>
diff --git a/spec/support/views/fieldsets.erb b/spec/support/views/fieldsets.erb
index e4b6cd23..c05a5587 100644
--- a/spec/support/views/fieldsets.erb
+++ b/spec/support/views/fieldsets.erb
@@ -1,13 +1,10 @@
-
 <form action="/form" method="post">
   <fieldset id="agent_fieldset">
     <legend>Agent</legend>
-  
     <p>
       <label for="form_agent_name">Name</label>
       <input type="text" name="form[agent_name]" value="James" id="form_agent_name"/>
     </p>
-  
     <p>
       <input type="submit" value="Create"/>
     </p>
@@ -17,12 +14,10 @@
 <form action="/form" method="post">
   <fieldset id="villain_fieldset">
     <legend>Villain</legend>
-  
     <p>
       <label for="form_villain_name">Name</label>
       <input type="text" name="form[villain_name]" value="Ernst" id="form_villain_name"/>
     </p>
-  
     <p>
       <input type="submit" value="Create"/>
     </p>
diff --git a/spec/support/views/form.erb b/spec/support/views/form.erb
index dcee0594..43c5f09f 100644
--- a/spec/support/views/form.erb
+++ b/spec/support/views/form.erb
@@ -1,5 +1,4 @@
 <h1>Form</h1>
-
 <form action="/form" method="post" novalidate>
   <p>
     <label for="form_title">Title</label>
@@ -9,7 +8,7 @@
       <option>Miss</option>
       <option disabled="disabled">Other</option>
     </select>
-    </p>
+  </p>
 
   <p>
     <label for="customer_name">Customer Name
diff --git a/spec/support/views/form_iframe.erb b/spec/support/views/form_iframe.erb
index 6e3f8e55..61a789c0 100644
--- a/spec/support/views/form_iframe.erb
+++ b/spec/support/views/form_iframe.erb
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
   <body>
     <select id="select">
diff --git a/spec/support/views/frame_child.erb b/spec/support/views/frame_child.erb
index 0583f1ab..d0ce9ad5 100644
--- a/spec/support/views/frame_child.erb
+++ b/spec/support/views/frame_child.erb
@@ -1,18 +1,18 @@
-
+<!DOCTYPE html>
 <html>
-    <head>
-        <title>This is the child frame title</title>
-        <script>
-        function closeWin() {
-          var iframe = window.parent.document.getElementById('childFrame');
-          iframe.parentNode.removeChild(iframe)
-        }
-        </script>
-    </head>
-    <body id="childBody">
-      <a href="javascript:void(0)" onClick="closeWin()">Close Window Now</a>
-      <a href="javascript:void(0)" onClick="setTimeout(function(){closeWin()}, 10)">Close Window Soon</a>
-      <iframe src="/frame_one" id="grandchildFrame1"></iframe>
-      <iframe src="/frame_two" id="grandchildFrame2"></iframe>
-    </body>
+  <head>
+    <title>This is the child frame title</title>
+    <script>
+      function closeWin() {
+        var iframe = window.parent.document.getElementById('childFrame');
+        iframe.parentNode.removeChild(iframe)
+      }
+    </script>
+  </head>
+  <body id="childBody">
+    <a href="javascript:void(0)" onClick="closeWin()">Close Window Now</a>
+    <a href="javascript:void(0)" onClick="setTimeout(function(){closeWin()}, 10)">Close Window Soon</a>
+    <iframe src="/frame_one" id="grandchildFrame1"></iframe>
+    <iframe src="/frame_two" id="grandchildFrame2"></iframe>
+  </body>
 </html>
diff --git a/spec/support/views/frame_one.erb b/spec/support/views/frame_one.erb
index 58e52edf..bac65fb6 100644
--- a/spec/support/views/frame_one.erb
+++ b/spec/support/views/frame_one.erb
@@ -1,10 +1,10 @@
-
+<!DOCTYPE html>
 <html>
-    <head>
-        <title>This is the title of frame one</title>
-    </head>
-    <body>
-        <div id="divInFrameOne">This is the text of divInFrameOne</div>
-        <div id="otherDivInFrameOne">Some other text</div>
-    </body>
+  <head>
+    <title>This is the title of frame one</title>
+  </head>
+  <body>
+    <div id="divInFrameOne">This is the text of divInFrameOne</div>
+    <div id="otherDivInFrameOne">Some other text</div>
+  </body>
 </html>
diff --git a/spec/support/views/frame_parent.erb b/spec/support/views/frame_parent.erb
index 151665ec..95b511cf 100644
--- a/spec/support/views/frame_parent.erb
+++ b/spec/support/views/frame_parent.erb
@@ -1,9 +1,9 @@
-
+<!DOCTYPE html>
 <html>
-    <head>
-        <title>This is the parent frame title</title>
-    </head>
-    <body id="parentBody">
-      <iframe src='/frame_child' id='childFrame'></iframe>
-    </body>
+  <head>
+    <title>This is the parent frame title</title>
+  </head>
+  <body id="parentBody">
+    <iframe src='/ferrum/frame_child' id='childFrame'></iframe>
+  </body>
 </html>
diff --git a/spec/support/views/frame_two.erb b/spec/support/views/frame_two.erb
index c1e6d623..7bbeb0ad 100644
--- a/spec/support/views/frame_two.erb
+++ b/spec/support/views/frame_two.erb
@@ -1,9 +1,9 @@
-
+<!DOCTYPE html>
 <html>
-    <head>
-        <title>This is the title of frame two</title>
-    </head>
-    <body>
-        <div id="divInFrameTwo">This is the text of divInFrameTwo</div>
-    </body>
+  <head>
+    <title>This is the title of frame two</title>
+  </head>
+  <body>
+    <div id="divInFrameTwo">This is the text of divInFrameTwo</div>
+  </body>
 </html>
diff --git a/spec/support/views/frames.erb b/spec/support/views/frames.erb
index 0431a6e2..50a4b80b 100644
--- a/spec/support/views/frames.erb
+++ b/spec/support/views/frames.erb
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <html>
-<body>
-<iframe name="frame"></iframe>
-<iframe></iframe>
-<iframe id="id_frame"></iframe>
-</body>
-<script type="text/javascript">
-document.getElementsByName("frame")[0].src = "http://localhost:" + location.port + "/ferrum/slow";
-document.querySelector("iframe:not([name]):not([id])").src = "http://localhost:" + location.port + "/ferrum/headers";
-document.querySelector("#id_frame").src = "http://localhost:" + location.port + "/ferrum/get_cookie";
-</script>
+  <body>
+    <iframe name="frame"></iframe>
+    <iframe></iframe>
+    <iframe id="id_frame"></iframe>
+  </body>
+  <script type="text/javascript">
+    document.getElementsByName("frame")[0].src = "http://localhost:" + location.port + "/ferrum/slow";
+    document.querySelector("iframe:not([name]):not([id])").src = "http://localhost:" + location.port + "/ferrum/headers";
+    document.querySelector("#id_frame").src = "http://localhost:" + location.port + "/ferrum/get_cookie";
+  </script>
 </html>
diff --git a/spec/support/views/grid.erb b/spec/support/views/grid.erb
index 0a68a07a..2dc57de6 100644
--- a/spec/support/views/grid.erb
+++ b/spec/support/views/grid.erb
@@ -28,7 +28,6 @@
 </script>
 
 <style>
-
   body {
     margin: 0;
     padding: 0;
diff --git a/spec/support/views/header_links.erb b/spec/support/views/header_links.erb
index ef4b4128..f4b7e521 100644
--- a/spec/support/views/header_links.erb
+++ b/spec/support/views/header_links.erb
@@ -1,4 +1,3 @@
-
 <p>
   <a href="/get_header">Link</a>
 </p>
diff --git a/spec/support/views/headers_with_ajax.erb b/spec/support/views/headers_with_ajax.erb
index 4371b1ee..246d5ed7 100644
--- a/spec/support/views/headers_with_ajax.erb
+++ b/spec/support/views/headers_with_ajax.erb
@@ -1,25 +1,25 @@
 <!DOCTYPE html>
 <html>
-<head>
-  <script type="text/javascript">
-    window.onload = function() {
-      var request = new XMLHttpRequest();
-      request.open("GET", "/ferrum/headers", false);
-      request.send();
+  <head>
+    <script type="text/javascript">
+      window.onload = function() {
+        var request = new XMLHttpRequest();
+        request.open("GET", "/ferrum/headers", false);
+        request.send();
 
-      if (request.status === 200) {
-        var div = document.getElementById("ajax_request");
-        div.innerHTML = request.responseText;
+        if (request.status === 200) {
+          var div = document.getElementById("ajax_request");
+          div.innerHTML = request.responseText;
+        }
       }
-    }
-  </script>
-</head>
-<body>
-  <div id="initial_request">
-    <% for header in request.env.select {|k,v| k.match("^HTTP.*")} %>
-      <%=header[0].split("_",2)[1]%>: <%=header[1]%>
-    <% end %>
-  </div>
-  <div id="ajax_request"></div>
-</body>
+    </script>
+  </head>
+  <body>
+    <div id="initial_request">
+      <% for header in request.env.select {|k,v| k.match("^HTTP.*")} %>
+        <%=header[0].split("_",2)[1]%>: <%=header[1]%>
+      <% end %>
+    </div>
+    <div id="ajax_request"></div>
+  </body>
 </html>
diff --git a/spec/support/views/host_links.erb b/spec/support/views/host_links.erb
index 3c139d6e..2051cdd3 100644
--- a/spec/support/views/host_links.erb
+++ b/spec/support/views/host_links.erb
@@ -1,4 +1,3 @@
-
 <p>
   <a href="/host">Relative Host</a>
   <a href="<%= params[:absolute_host] %>/host">Absolute Host</a>
diff --git a/spec/support/views/image_map.erb b/spec/support/views/image_map.erb
index 27ee15b9..dec56c02 100644
--- a/spec/support/views/image_map.erb
+++ b/spec/support/views/image_map.erb
@@ -1,32 +1,32 @@
 <!DOCTYPE html>
 <html>
-<head>
-  <style type="text/css">
-    img {
-      display: block;
-      height: 100px;
-      width: 100px;
-    }
-  </style>
-  <script>
-    function log_msg(msg) {
-      document.getElementById("log").textContent = msg;
-    }
-  </script>
-</head>
-<body>
-  <img usemap="#testmap" src="data:image/gif;base64,R0lGODlhAQABAAAAACwAAAAAAQABAAA="/>
-  <map name="testmap">
-    <area shape="rect" coords="10,10,55,55" href="#" onclick="log_msg('rect clicked')">
-    <area shape="circle" coords="70,70,10" href="#" onclick="log_msg('circle clicked')">
-  </map>
+  <head>
+    <style type="text/css">
+      img {
+        display: block;
+        height: 100px;
+        width: 100px;
+      }
+    </style>
+    <script>
+      function log_msg(msg) {
+        document.getElementById("log").textContent = msg;
+      }
+    </script>
+  </head>
+  <body>
+    <img usemap="#testmap" src="data:image/gif;base64,R0lGODlhAQABAAAAACwAAAAAAQABAAA="/>
+    <map name="testmap">
+      <area shape="rect" coords="10,10,55,55" href="#" onclick="log_msg('rect clicked')">
+      <area shape="circle" coords="70,70,10" href="#" onclick="log_msg('circle clicked')">
+    </map>
 
-  <img usemap="#testmap2" style="display: none;" src="data:image/gif;base64,R0lGODlhAQABAAAAACwAAAAAAQABAAA="/>
-  <map name="testmap2">
-    <area shape="rect" coords="10,10,55,55" href="#" onclick="log_msg('rect2 clicked')">
-    <area shape="circle" coords="70,70,10" href="#" onclick="log_msg('circle2 clicked')">
-  </map>
-  <div id="log">
-  </div>
-</body>
+    <img usemap="#testmap2" style="display: none;" src="data:image/gif;base64,R0lGODlhAQABAAAAACwAAAAAAQABAAA="/>
+    <map name="testmap2">
+      <area shape="rect" coords="10,10,55,55" href="#" onclick="log_msg('rect2 clicked')">
+      <area shape="circle" coords="70,70,10" href="#" onclick="log_msg('circle2 clicked')">
+    </map>
+    <div id="log">
+    </div>
+  </body>
 </html>
diff --git a/spec/support/views/initial_alert.erb b/spec/support/views/initial_alert.erb
index c0294d79..5c61d95c 100644
--- a/spec/support/views/initial_alert.erb
+++ b/spec/support/views/initial_alert.erb
@@ -1,4 +1,5 @@
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+<!DOCTYPE html>
+<html>
   <body>
     <div>
       Initial alert page
diff --git a/spec/support/views/input_events.erb b/spec/support/views/input_events.erb
index 8b1cfdb2..5b339ba7 100644
--- a/spec/support/views/input_events.erb
+++ b/spec/support/views/input_events.erb
@@ -1,4 +1,5 @@
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+<!DOCTYPE html>
+<html>
   <body>
     <input id="input" type="text">
     <div id="output"></div>
diff --git a/spec/support/views/nested_frame_test.erb b/spec/support/views/nested_frame_test.erb
index f8e72fa7..c1cb06d9 100644
--- a/spec/support/views/nested_frame_test.erb
+++ b/spec/support/views/nested_frame_test.erb
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <html>
-<head>
-  <style type="text/css">
-    body {
-      background: yellow;
-    }
-  </style>
-</head>
-<body>
-  <iframe src="/ferrum/click_test" name="inner_frame"></iframe>
-</body>
+  <head>
+    <style type="text/css">
+      body {
+        background: yellow;
+      }
+    </style>
+  </head>
+  <body>
+    <iframe src="/ferrum/click_test" name="inner_frame"></iframe>
+  </body>
 </html>
diff --git a/spec/support/views/obscured.erb b/spec/support/views/obscured.erb
index 5f8e020a..570be7ff 100644
--- a/spec/support/views/obscured.erb
+++ b/spec/support/views/obscured.erb
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
diff --git a/spec/support/views/offset.erb b/spec/support/views/offset.erb
index 7db2dbfa..5f6166fa 100644
--- a/spec/support/views/offset.erb
+++ b/spec/support/views/offset.erb
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
@@ -29,4 +30,4 @@
       <div id="clicker"></div>
     </div>
   </body>
-  </html>
\ No newline at end of file
+</html>
diff --git a/spec/support/views/orig_scroll.erb b/spec/support/views/orig_scroll.erb
index d95c9318..92eeb086 100644
--- a/spec/support/views/orig_scroll.erb
+++ b/spec/support/views/orig_scroll.erb
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html style="height: 250%; width: 150%">
   <head>
     <style>
@@ -15,6 +16,5 @@
         <div id="inner">inner</div>
       </div>
     </div>
-  </div>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/spec/support/views/orig_with_js.erb b/spec/support/views/orig_with_js.erb
index a9da121d..77ae9e72 100644
--- a/spec/support/views/orig_with_js.erb
+++ b/spec/support/views/orig_with_js.erb
@@ -1,4 +1,5 @@
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+<!DOCTYPE html>
+<html>
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
     <title>with_js</title>
@@ -6,7 +7,6 @@
     <script src="/ferrum/jquery-ui.min.js" type="text/javascript" charset="utf-8"></script>
     <script src="/test.js" type="text/javascript" charset="utf-8"></script>
   </head>
-
   <body id="with_js">
     <h1>FooBar</h1>
 
diff --git a/spec/support/views/path.erb b/spec/support/views/path.erb
index 8c43921e..c6bfe9c4 100644
--- a/spec/support/views/path.erb
+++ b/spec/support/views/path.erb
@@ -1,5 +1,5 @@
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+<!DOCTYPE html>
+<html>
   <body>
     <div>
       <a href="#">First Link</a>
diff --git a/spec/support/views/popup_one.erb b/spec/support/views/popup_one.erb
index 3f6e62db..0d83bc4e 100644
--- a/spec/support/views/popup_one.erb
+++ b/spec/support/views/popup_one.erb
@@ -1,9 +1,9 @@
-
+<!DOCTYPE html>
 <html>
-    <head>
-        <title>Title of the first popup</title>
-    </head>
-    <body>
-        <div id="divInPopupOne">This is the text of divInPopupOne</div>
-    </body>
+  <head>
+    <title>Title of the first popup</title>
+  </head>
+  <body>
+    <div id="divInPopupOne">This is the text of divInPopupOne</div>
+  </body>
 </html>
diff --git a/spec/support/views/popup_two.erb b/spec/support/views/popup_two.erb
index ef6f8bf0..15977d1d 100644
--- a/spec/support/views/popup_two.erb
+++ b/spec/support/views/popup_two.erb
@@ -1,4 +1,4 @@
-
+<!DOCTYPE html>
 <html>
     <head>
         <title>Title of popup two</title>
diff --git a/spec/support/views/postback.erb b/spec/support/views/postback.erb
index dcd7e88a..4c77922c 100644
--- a/spec/support/views/postback.erb
+++ b/spec/support/views/postback.erb
@@ -1,4 +1,3 @@
-
 <h1>Postback</h1>
 
 <form method="get">
diff --git a/spec/support/views/react.erb b/spec/support/views/react.erb
index 78e00d18..dee1974e 100644
--- a/spec/support/views/react.erb
+++ b/spec/support/views/react.erb
@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
 <html>
   <head>
     <script src="https://unpkg.com/react/umd/react.development.js"></script>
@@ -42,4 +42,4 @@
         document.getElementById('root'));
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/spec/support/views/requiring_custom_extension.erb b/spec/support/views/requiring_custom_extension.erb
index 5c0828bb..38e405bc 100644
--- a/spec/support/views/requiring_custom_extension.erb
+++ b/spec/support/views/requiring_custom_extension.erb
@@ -1,14 +1,13 @@
 <!DOCTYPE html>
 <html>
-<head>
-</head>
-<body>
-  <p>Location: <span id="location"></span></p>
+  <head></head>
+  <body>
+    <p>Location: <span id="location"></span></p>
 
-  <script type="text/javascript">
-    navigator.geolocation.getCurrentPosition(function(position) {
-      document.getElementById("location").innerHTML = position.coords.latitude + "," + position.coords.longitude;
-    });
-  </script>
-</body>
+    <script type="text/javascript">
+      navigator.geolocation.getCurrentPosition(function(position) {
+        document.getElementById("location").innerHTML = position.coords.latitude + "," + position.coords.longitude;
+      });
+    </script>
+  </body>
 </html>
diff --git a/spec/support/views/scroll.erb b/spec/support/views/scroll.erb
index be445af1..01fd8ce3 100644
--- a/spec/support/views/scroll.erb
+++ b/spec/support/views/scroll.erb
@@ -3,13 +3,11 @@
   <head>
     <title>scroll</title>
   </head>
-
   <body>
-    <div style="height: 100px; overflow-y: auto">
+    <div id="overflow-box" style="height: 100px; overflow-y: auto">
       <div style="height: 300px;">
         <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin lacus odio, dapibus id bibendum in, rhoncus sed dolor. In quis nulla at diam euismod suscipit vitae vitae sapien. Nam viverra hendrerit augue a accumsan. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce fermentum tortor at neque malesuada sodales. Nunc quis augue a quam venenatis pharetra sit amet et risus. Nulla pharetra enim a leo varius scelerisque aliquam urna vestibulum. Sed felis eros, iaculis convallis fermentum ac, condimentum ac lacus. Sed turpis magna, tristique eu faucibus non, faucibus vitae elit. Morbi venenatis adipiscing aliquam.</p>
       </div>
-
       <p>
         <a href="/">Link outside viewport</a>
       </p>
diff --git a/spec/support/views/set.erb b/spec/support/views/set.erb
index 1e9289ea..58319589 100644
--- a/spec/support/views/set.erb
+++ b/spec/support/views/set.erb
@@ -1,4 +1,5 @@
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+<!DOCTYPE html>
+<html>
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
   </head>
diff --git a/spec/support/views/tables.erb b/spec/support/views/tables.erb
index 4fe44b6d..b13fe0ef 100644
--- a/spec/support/views/tables.erb
+++ b/spec/support/views/tables.erb
@@ -1,4 +1,3 @@
-
 <form action="/form" method="post">
   <table id="agent_table">
     <caption>Agent</caption>
diff --git a/spec/support/views/type.erb b/spec/support/views/type.erb
index bdad2cc1..434d3aca 100644
--- a/spec/support/views/type.erb
+++ b/spec/support/views/type.erb
@@ -1,4 +1,5 @@
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+<!DOCTYPE html>
+<html>
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
   </head>
diff --git a/spec/support/views/visible.erb b/spec/support/views/visible.erb
index 0209ddc7..70cab15e 100644
--- a/spec/support/views/visible.erb
+++ b/spec/support/views/visible.erb
@@ -3,7 +3,6 @@
   <head>
     <title>Test</title>
   </head>
-
   <body>
     <ul>
       <li>Visible</li>
diff --git a/spec/support/views/with_animation.erb b/spec/support/views/with_animation.erb
index c64ae040..7baec4dd 100644
--- a/spec/support/views/with_animation.erb
+++ b/spec/support/views/with_animation.erb
@@ -1,5 +1,5 @@
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+<!DOCTYPE html>
+<html>
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
     <title>with_animation</title>
@@ -44,8 +44,8 @@
       }
 
       @keyframes animation {
-          0%   {height: 20px; width: 100%;}
-          100% {height: 0px; width: 0%;}
+          0%   { height: 20px; width: 100%; }
+          100% { height: 0px; width: 0%; }
       }
 
       a.animation.away {
@@ -55,7 +55,7 @@
       }
 
       @keyframes pseudo_grow {
-        100% { height: 100px, width: 100px };
+        100% { height: 100px; width: 100px; }
       }
 
       a.animation.pseudo::after {
@@ -71,4 +71,3 @@
     </a>
   </body>
 </html>
-
diff --git a/spec/support/views/with_base_tag.erb b/spec/support/views/with_base_tag.erb
index 77cfdcd8..d1d118b4 100644
--- a/spec/support/views/with_base_tag.erb
+++ b/spec/support/views/with_base_tag.erb
@@ -1,5 +1,5 @@
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+<!DOCTYPE html>
+<html>
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
     <base href="http://example2.com" />
@@ -8,4 +8,4 @@
   <body id="with_js">
     <h1>FooBar</h1>
   </body>
-</html
+</html>
diff --git a/spec/support/views/with_count.erb b/spec/support/views/with_count.erb
index 571a5927..64a8c4a6 100644
--- a/spec/support/views/with_count.erb
+++ b/spec/support/views/with_count.erb
@@ -1,4 +1,3 @@
-
 <h1>This page is used for testing number options of has_text?</h1>
 
 <p>count1</p>
diff --git a/spec/support/views/with_different_resources.erb b/spec/support/views/with_different_resources.erb
index 59713080..f56b7695 100644
--- a/spec/support/views/with_different_resources.erb
+++ b/spec/support/views/with_different_resources.erb
@@ -1,4 +1,5 @@
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+<!DOCTYPE html>
+<html>
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
     <title>ferrum with_different_resources</title>
diff --git a/spec/support/views/with_dragula.erb b/spec/support/views/with_dragula.erb
index d788e4b9..eb2c1fad 100644
--- a/spec/support/views/with_dragula.erb
+++ b/spec/support/views/with_dragula.erb
@@ -1,4 +1,5 @@
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+<!DOCTYPE html>
+<html>
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
     <title>with_dragula</title>
diff --git a/spec/support/views/with_fixed_header_footer.erb b/spec/support/views/with_fixed_header_footer.erb
index 826748c8..6c8627d4 100644
--- a/spec/support/views/with_fixed_header_footer.erb
+++ b/spec/support/views/with_fixed_header_footer.erb
@@ -1,17 +1,19 @@
+<!DOCTYPE html>
 <html>
-<head>
-  <style>
-    header { height: 45px; position: fixed; top: 0; background-color: red; width: 100%;}
-    footer { height: 45px; position: fixed; bottom: 0; background-color: red; width: 100%;}
-    #main { margin: 45px;}
-    #tall { display: block; height: 2000px;}
-  </style>
-</head>
-<body>
-  <header>My headers</header>
-    <div id="main">
-      <div id="tall">A tall block</div>
-      <a href="/">Go to root</a>
-    </div>
-  <footer>My footer</footer>
-</body>
\ No newline at end of file
+  <head>
+    <style>
+      header { height: 45px; position: fixed; top: 0; background-color: red; width: 100%;}
+      footer { height: 45px; position: fixed; bottom: 0; background-color: red; width: 100%;}
+      #main { margin: 45px;}
+      #tall { display: block; height: 2000px;}
+    </style>
+  </head>
+  <body>
+    <header>My headers</header>
+      <div id="main">
+        <div id="tall">A tall block</div>
+        <a href="/">Go to root</a>
+      </div>
+    <footer>My footer</footer>
+  </body>
+</html>
diff --git a/spec/support/views/with_hover.erb b/spec/support/views/with_hover.erb
index ddb11e62..6bed6453 100644
--- a/spec/support/views/with_hover.erb
+++ b/spec/support/views/with_hover.erb
@@ -1,5 +1,4 @@
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+<html>
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
     <title>with_hover</title>
diff --git a/spec/support/views/with_hover1.erb b/spec/support/views/with_hover1.erb
index 19df3489..f7b4112c 100644
--- a/spec/support/views/with_hover1.erb
+++ b/spec/support/views/with_hover1.erb
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html>
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
   </head>
@@ -7,4 +7,4 @@
   <body>
     <a href="with_hover">Go back</a>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/spec/support/views/with_html.erb b/spec/support/views/with_html.erb
index 62a566a2..40164fd0 100644
--- a/spec/support/views/with_html.erb
+++ b/spec/support/views/with_html.erb
@@ -1,4 +1,3 @@
-
 <style>
   p { display: block; }
 </style>
diff --git a/spec/support/views/with_html5_svg.erb b/spec/support/views/with_html5_svg.erb
index e931f861..b4b38fdf 100644
--- a/spec/support/views/with_html5_svg.erb
+++ b/spec/support/views/with_html5_svg.erb
@@ -15,6 +15,6 @@
         <rect x="150" y="150" width="25" height="25" style="fill:url(#gradient)" />
         <circle cx="50" cy="50" r="30" style="fill:url(#gradient)" />
       </svg>
-    <div>
+    </div>
   </body>
 </html>
diff --git a/spec/support/views/with_js.erb b/spec/support/views/with_js.erb
index 2ddefe35..ac1c8013 100644
--- a/spec/support/views/with_js.erb
+++ b/spec/support/views/with_js.erb
@@ -1,4 +1,5 @@
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+<!DOCTYPE html>
+<html>
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
     <title>ferrum with_js</title>
diff --git a/spec/support/views/with_jstree.erb b/spec/support/views/with_jstree.erb
index 31a57dd8..96b2fd8c 100644
--- a/spec/support/views/with_jstree.erb
+++ b/spec/support/views/with_jstree.erb
@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
 <html>
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
diff --git a/spec/support/views/with_namespace.erb b/spec/support/views/with_namespace.erb
index f4d4c421..fcab32d5 100644
--- a/spec/support/views/with_namespace.erb
+++ b/spec/support/views/with_namespace.erb
@@ -1,4 +1,5 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html>
+<html>
   <head>
     <title>Namespace</title>
   </head>
@@ -15,6 +16,6 @@
         <rect x="150" y="150" width="25" height="25" style="fill:url(#gradient)" />
         <circle cx="50" cy="50" r="30" style="fill:url(#gradient)" />
       </svg>
-    <div>
+    </div>
   </body>
 </html>
diff --git a/spec/support/views/with_scope.erb b/spec/support/views/with_scope.erb
index 638e62dc..7a3d2046 100644
--- a/spec/support/views/with_scope.erb
+++ b/spec/support/views/with_scope.erb
@@ -1,4 +1,3 @@
-
 <h1>This page is used for testing various scopes</h1>
 
 <p id="for_foo">
diff --git a/spec/support/views/with_scope_other.erb b/spec/support/views/with_scope_other.erb
index 9abe4d3a..67707b3f 100644
--- a/spec/support/views/with_scope_other.erb
+++ b/spec/support/views/with_scope_other.erb
@@ -1,4 +1,3 @@
-
 <h1>This page is used for testing various scopes</h1>
 
 <p id="for_foo">
diff --git a/spec/support/views/with_slow_unload.erb b/spec/support/views/with_slow_unload.erb
index 49d2b07e..50244c5d 100644
--- a/spec/support/views/with_slow_unload.erb
+++ b/spec/support/views/with_slow_unload.erb
@@ -1,17 +1,18 @@
+<!DOCTYPE html>
 <html>
-<head>
-  <script>
-    function delay_unload() {
-      var start = new Date();
-      var i = 0;
-      while ((new Date()) - start < 1000){ i = i + 1; };
-      return null;
-    }
-    window.onbeforeunload = delay_unload;
-    window.onunload = delay_unload;
-  </script>
-</head>
-<body>
-  <div>This delays unload by 2 seconds</div>
-</body>
-</html>
\ No newline at end of file
+  <head>
+    <script>
+      function delay_unload() {
+        var start = new Date();
+        var i = 0;
+        while ((new Date()) - start < 1000){ i = i + 1; };
+        return null;
+      }
+      window.onbeforeunload = delay_unload;
+      window.onunload = delay_unload;
+    </script>
+  </head>
+  <body>
+    <div>This delays unload by 2 seconds</div>
+  </body>
+</html>
diff --git a/spec/support/views/with_sortable_js.erb b/spec/support/views/with_sortable_js.erb
index 97192ff8..8e03be78 100644
--- a/spec/support/views/with_sortable_js.erb
+++ b/spec/support/views/with_sortable_js.erb
@@ -1,4 +1,5 @@
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+<!DOCTYPE html>
+<html>
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
     <title>with_sortable_js</title>
diff --git a/spec/support/views/with_title.erb b/spec/support/views/with_title.erb
index 283df4e4..77ab4654 100644
--- a/spec/support/views/with_title.erb
+++ b/spec/support/views/with_title.erb
@@ -1,4 +1,3 @@
-
 <title>Test Title</title>
 <body>
   <svg><title>abcdefg</title></svg>
diff --git a/spec/support/views/with_unload_alert.erb b/spec/support/views/with_unload_alert.erb
index 4bcb4cd0..c4c05fc1 100644
--- a/spec/support/views/with_unload_alert.erb
+++ b/spec/support/views/with_unload_alert.erb
@@ -1,14 +1,15 @@
+<!DOCTYPE html>
 <html>
-<head>
-  <script>
-      window.onbeforeunload = function(e) {
-        return 'Unload?';
-      };
-  </script>
-</head>
-<body>
-  <div>This triggers an alert on unload</div>
+  <head>
+    <script>
+        window.onbeforeunload = function(e) {
+          return 'Unload?';
+        };
+    </script>
+  </head>
+  <body>
+    <div>This triggers an alert on unload</div>
 
-  <a href="/">Go away</a>
-</body>
+    <a href="/">Go away</a>
+  </body>
 </html>
diff --git a/spec/support/views/with_user_js.erb b/spec/support/views/with_user_js.erb
index f28f0e06..fb39adde 100644
--- a/spec/support/views/with_user_js.erb
+++ b/spec/support/views/with_user_js.erb
@@ -1,4 +1,5 @@
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+<!DOCTYPE html>
+<html>
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
     <title>ferrum with_user_js</title>
diff --git a/spec/support/views/with_windows.erb b/spec/support/views/with_windows.erb
index e098d99c..7bd0882f 100644
--- a/spec/support/views/with_windows.erb
+++ b/spec/support/views/with_windows.erb
@@ -1,4 +1,4 @@
-
+<!DOCTYPE html>
 <html>
   <head>
     <title>With Windows</title>
diff --git a/spec/support/views/within_frames.erb b/spec/support/views/within_frames.erb
index fc211cd2..30934c18 100644
--- a/spec/support/views/within_frames.erb
+++ b/spec/support/views/within_frames.erb
@@ -1,15 +1,15 @@
-
+<!DOCTYPE html>
 <html>
-    <head>
-        <title>With Frames</title>
-    </head>
-    <body>
-        <div id="divInMainWindow">
-          This is the text for divInMainWindow
-          <iframe src="/frame_parent" id="innerParentFrame"></iframe>
-        </div>
-    <iframe src="/frame_one" id="frameOne" name="my frame one"></iframe>
-    <iframe src="/frame_two" id="frameTwo"></iframe>
-    <iframe src="/frame_parent" id="parentFrame"></iframe>
-    </body>
+  <head>
+    <title>With Frames</title>
+  </head>
+  <body>
+    <div id="divInMainWindow">
+      This is the text for divInMainWindow
+      <iframe src="/frame_parent" id="innerParentFrame"></iframe>
+    </div>
+  <iframe src="/frame_one" id="frameOne" name="my frame one"></iframe>
+  <iframe src="/frame_two" id="frameTwo"></iframe>
+  <iframe src="/frame_parent" id="parentFrame"></iframe>
+  </body>
 </html>