diff --git a/index.html b/index.html
index 3af682f8..c6319366 100644
--- a/index.html
+++ b/index.html
@@ -1297,8 +1297,27 @@
 			<h1><a href="#messaging" class="titleanchor"><span class="glyphicon glyphicon-link"></span></a> Email Alternatives</h1>
 		</div>
 		<div class="row">
+			
 			<div class="col-sm-4">
 				<div class="panel panel-success">
+					<div class="panel-heading">
+						<h3 class="panel-title">I2P-Bote</h3>
+					</div>
+					<div class="panel-body">
+						<p><img src="img/tools/I2P.png" alt="I2P-Bote" align="right" style="margin-left:5px;">I2P-Bote is a fully decentralized and distributed email system. It supports different identities and does not expose email headers. Currently (2015), it is still
+							in beta version and can be accessed via its web application interface or IMAP and SMTP. All bote-mails are transparently end-to-end encrypted and, optionally, signed by the sender's private key.</p>
+						<p>
+							<a href="https://i2pbote.xyz/">
+								<button type="button" class="btn btn-success">Website: i2pbote.xyz</button>
+							</a>
+						</p>
+						<p>OS: Windows, Mac, Linux, Android, F-Droid.</p>
+					</div>
+				</div>
+			</div>
+
+			<div class="col-sm-4">
+				<div class="panel panel-info">
 					<div class="panel-heading">
 						<h3 class="panel-title">Bitmessage</h3>
 					</div>
@@ -1307,7 +1326,7 @@
 							meaning that you need-not inherently trust any entities like root certificate authorities. It uses strong authentication which means that the sender of a message cannot be spoofed, and it aims to hide "non-content" data.</p>
 						<p>
 							<a href="https://bitmessage.org/">
-								<button type="button" class="btn btn-success">Website: bitmessage.org</button>
+								<button type="button" class="btn btn-info">Website: bitmessage.org</button>
 							</a>
 						</p>
 						<p>OS: Windows, Mac, Linux.</p>
@@ -1315,24 +1334,6 @@
 				</div>
 			</div>
 
-			<div class="col-sm-4">
-				<div class="panel panel-info">
-					<div class="panel-heading">
-						<h3 class="panel-title">I2P-Bote</h3>
-					</div>
-					<div class="panel-body">
-						<p><img src="img/tools/I2P.png" alt="I2P-Bote" align="right" style="margin-left:5px;">I2P-Bote is a fully decentralized and distributed email system. It supports different identities and does not expose email headers. Currently (2015), it is still
-							in beta version and can be accessed via its web application interface or IMAP and SMTP. All bote-mails are transparently end-to-end encrypted and, optionally, signed by the sender's private key.</p>
-						<p>
-							<a href="http://i2pbote.i2p.us/">
-								<button type="button" class="btn btn-info">Website: i2pbote.i2p.us</button>
-							</a>
-						</p>
-						<p>OS: Windows, Mac, Linux, Android, F-Droid.</p>
-					</div>
-				</div>
-			</div>
-
 			<div class="col-sm-4">
 				<div class="panel panel-warning">
 					<div class="panel-heading">