diff --git a/eip-template.md b/eip-template.md
index f0b91df8eb4bc4..a4d693414f5150 100644
--- a/eip-template.md
+++ b/eip-template.md
@@ -18,7 +18,7 @@ requires: <EIP number(s)> # Only required when you reference an EIP in the `Spec
   Note that an EIP number will be assigned by an editor. When opening a pull request to submit your EIP, please use an abbreviated title in the filename, `eip-draft_title_abbrev.md`.
 
   The title should be 44 characters or less. It should not repeat the EIP number in title, irrespective of the category.
-  
+
   TODO: Remove this comment before submitting
 -->
 
@@ -26,7 +26,7 @@ requires: <EIP number(s)> # Only required when you reference an EIP in the `Spec
 
 <!--
   The Abstract is a multi-sentence (short paragraph) technical summary. This should be a very terse and human-readable version of the specification section. Someone should be able to read only the abstract to get the gist of what this specification does.
-  
+
   TODO: Remove this comment before submitting
 -->
 
@@ -35,9 +35,9 @@ requires: <EIP number(s)> # Only required when you reference an EIP in the `Spec
 <!--
   This section is optional.
   The motivation section should include a description of any nontrivial problems the EIP solves. It should not describe how the EIP solves those problems, unless it is not immediately obvious. It should not describe why the EIP should be made into a standard, unless it is not immediately obvious.
-  
+
   With a few exceptions, external links are not allowed. If you feel that a particular resource would demonstrate a compelling case for your EIP, then save it as a printer-friendly PDF, put it in the assets folder, and link to that copy.
-  
+
   TODO: Remove this comment before submitting
 -->
 
@@ -45,9 +45,9 @@ requires: <EIP number(s)> # Only required when you reference an EIP in the `Spec
 
 <!--
   The Specification section should describe the syntax and semantics of any new feature. The specification should be detailed enough to allow competing, interoperable implementations for any of the current Ethereum platforms (besu, erigon, ethereumjs, go-ethereum, nethermind, or others).
-  
+
   It is recommended to follow RFC 2119 and RFC 8170. Do not remove the key word definitions if RFC 2119 and RFC 8170 are followed.
-  
+
   TODO: Remove this comment before submitting
 -->
 
@@ -59,7 +59,7 @@ The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD", "S
   The rationale fleshes out the specification by describing what motivated the design and why particular design decisions were made. It should describe alternate designs that were considered and related work, e.g. how the feature is supported in other languages.
 
   The current placeholder is acceptable for a draft.
-  
+
   TODO: Remove this comment before submitting
 -->
 
@@ -70,10 +70,11 @@ TBD
 <!--
 
   This section is optional.
+
   All EIPs that introduce backwards incompatibilities must include a section describing these incompatibilities and their severity. The EIP must explain how the author proposes to deal with these incompatibilities. EIP submissions without a sufficient backwards compatibility treatise may be rejected outright.
 
   The current placeholder is acceptable for a draft.
-  
+
   TODO: Remove this comment before submitting
 -->
 
@@ -83,16 +84,18 @@ No backward compatibility issues found.
 
 <!--
   This section is optional for non-Core EIPs.
+
   The Test Cases section should include expected input/output pairs, but may include a succinct set of executable tests. It should not include project build files. No new requirements may be be introduced here (meaning an implementation following only the Specification section should pass all tests here.)
   If the test suite is too large to reasonably be included inline, then consider adding it as one or more files in `../assets/eip-####/`. External links will not be allowed
 
   TODO: Remove this comment before submitting
 -->
-  
+
 ## Reference Implementation
 
 <!--
   This section is optional.
+
   The Reference Implementation section should include a minimal implementation that assists in understanding or implementing this specification. It should not include project build files. The reference implementation is not a replacement for the Specification section, and the proposal should still be understandable without it.
   If the reference implementation is too large to reasonably be included inline, then consider adding it as one or more files in `../assets/eip-####/`. External links will not be allowed.
 
@@ -105,7 +108,7 @@ No backward compatibility issues found.
   All EIPs must contain a section that discusses the security implications/considerations relevant to the proposed change. Include information that might be important for security discussions, surfaces risks and can be used throughout the life cycle of the proposal. For example, include security-relevant design decisions, concerns, important discussions, implementation-specific guidance and pitfalls, an outline of threats and risks and how they are being addressed. EIP submissions missing the "Security Considerations" section will be rejected. An EIP cannot proceed to status "Final" without a Security Considerations discussion deemed sufficient by the reviewers.
 
   The current placeholder is acceptable for a draft.
-  
+
   TODO: Remove this comment before submitting
 -->
 
diff --git a/index.html b/index.html
index 8ef51c6686e5ee..7f7c55bae4922c 100644
--- a/index.html
+++ b/index.html
@@ -12,7 +12,7 @@ <h1 class="page-heading">EIPs
 <p>Ethereum Improvement Proposals (EIPs) describe standards for the Ethereum platform, including core protocol specifications, client APIs, and contract standards. Network upgrades are discussed separately in the <a target="_blank" href="https://github.com/ethereum/pm/">Ethereum Project Management</a> repository.</p>
 
 <h2>Contributing</h2>
-<p>First review <a href="EIPS/eip-1">EIP-1</a>. Then clone the repository and add your EIP to it. There is a <a href="https://github.com/ethereum/EIPs/blob/master/eip-template.md">template EIP here</a>. Then submit a Pull Request to Ethereum's <a href="https://github.com/ethereum/EIPs">EIPs repository</a>.</p>
+<p>First review <a href="EIPS/eip-1">EIP-1</a>. Then clone the repository and add your EIP to it. There is a <a href="https://github.com/ethereum/EIPs/blob/master/eip-template.md?plain=1">template EIP here</a>. Then submit a Pull Request to Ethereum's <a href="https://github.com/ethereum/EIPs">EIPs repository</a>.</p>
 
 <h2>EIP status terms</h2>
 <ul>