diff --git a/src/views/index.mustache b/src/views/index.mustache
index e9f1eef..0d79750 100644
--- a/src/views/index.mustache
+++ b/src/views/index.mustache
@@ -73,7 +73,9 @@
             <p><strong>Darkwire Version:</strong> <span id="appVersion">v{{APP.version}}</span> (<a href="https://github.com/seripap/darkwire.io/releases/tag/v{{APP.version}}" target="_blank">View Release Notes</a>)<br></p>
           </div>
           <div class="modal-body">
-            {{>partials/disclaimer}}
+            {{>partials/ip}}
+
+            <p class="bold">WARNING: Darkwire does not mask IP addresses nor can verify the integrity of parties recieving messages. Proceed with caution and always confirm recipients before starting a chat session.</p>
 
             <p>Questions/comments? Email us at hello[at]darkwire.io<br>
                Found a bug or want a new feature? <a href="https://github.com/seripap/darkwire.io/issues" target="_blank">Open a ticket on Github</a>.</p>
@@ -120,7 +122,9 @@
           </div>
           <div class="modal-body">
             <h6>We've placed you in a new chat room</h6>
-            {{>partials/disclaimer}}
+            <p class="bold">This software uses the <a href="https://developer.mozilla.org/en-US/docs/Web/API/Crypto" target="_blank">Crypto Web API</a> to encrypt data which is transferred using <a href="https://en.wikipedia.org/wiki/WebSocket" target="_blank">secure WebSockets</a>. <a href="javascript:void(0)" id="about-nav" data-dismiss="modal">See Disclaimer</a>.</p>
+
+<p><a href="https://github.com/seripap/darkwire.io" target="_blank">We believe in your privacy and full transparency. View the source code and documentation on Github.</a></p>
             <br>
             <h6>Invite People to This Room</h6>
             <p>
diff --git a/src/views/partials/disclaimer.mustache b/src/views/partials/disclaimer.mustache
deleted file mode 100644
index d6e7ab4..0000000
--- a/src/views/partials/disclaimer.mustache
+++ /dev/null
@@ -1,8 +0,0 @@
-<p class="bold">DISCLAIMER: This software uses the <a href="https://developer.mozilla.org/en-US/docs/Web/API/Crypto" target="_blank">Crypto Web API</a> to encrypt data which is transferred using <a href="https://en.wikipedia.org/wiki/WebSocket" target="_blank">secure WebSockets</a>. Darkwire does not mask IP addresses nor can verify the integrity parties recieving messages. Proceed with caution and always confirm recipients before continuing.</p>
-
-<p><a href="https://github.com/seripap/darkwire.io" target="_blank">Darkwire.io believes in privacy and full transparency. View the source code and documentation on Github.</a></p>
-
-{{#APP.ip}}
-<p class="bold">Recognized IP: <a href="http://ipinfo.io/{{APP.ip}}/json" target="_blank">{{APP.ip}}</a>*</p>
-<p>*This IP is your public IP recognized by all web servers. If this IP and/or its location data seems familiar to you, we recommend using <a href="https://www.torproject.org/" target="_blank">TOR</a> or a proxy before starting a new chat session.</p>
-{{/APP.ip}}
diff --git a/src/views/partials/ip.mustache b/src/views/partials/ip.mustache
new file mode 100644
index 0000000..6189b18
--- /dev/null
+++ b/src/views/partials/ip.mustache
@@ -0,0 +1,4 @@
+{{#APP.ip}}
+<p class="bold">Recognized IP: <a href="http://ipinfo.io/{{APP.ip}}/json" target="_blank">{{APP.ip}}</a>*</p>
+<p>*This IP is your public IP recognized by all web servers. If this IP and/or its location data seems familiar to you, we recommend using <a href="https://www.torproject.org/" target="_blank">TOR</a> or a proxy before starting a new chat session.</p>
+{{/APP.ip}}