diff --git a/_templates/exchanges.html b/_templates/exchanges.html
index fb70d290..fce42cdd 100644
--- a/_templates/exchanges.html
+++ b/_templates/exchanges.html
@@ -73,17 +73,16 @@ id: exchanges
         <a href="https://bitcoincambodia.com/">Bitcoin Cambodia</a>
       </p>
     </div>
+  </div>
+  <div>
     <div>
       <h3 id="canada"><img src="/img/flags/CA.png" alt="Canadian flag">Canada</h3>
       <p>
-        <a href="https://bitaccess.co/">Bitaccess</a><br>	  
+        <a href="https://bitaccess.co/">Bitaccess</a><br>   
         <a href="https://www.canadianbitcoins.com/">Canadian Bitcoins</a><br>
         <a href="https://quickbt.com/">QuickBT</a>
       </p>
-    </div>
-  </div>
-  <div>
-  <div>	
+    </div>	
     <div>
       <h3 id="china"><img src="/img/flags/CN.png" alt="Chinese flag">China</h3>
       <p>
@@ -92,6 +91,14 @@ id: exchanges
         <a href="https://www.okcoin.cn/">OKCoin</a>
       </p>
     </div>
+    <div>
+      <h3 id="costa-rica"><img src="/img/flags/CR.png" alt="Costa Rican flag">Costa Rica</h3>
+      <p>
+        <a href="https://www.bitmae.com/">BitMae</a>
+      </p>
+    </div>    
+  </div>
+  <div>
     <div>
       <h3 id="france"><img src="/img/flags/FR.png" alt="French flag">France</h3>
       <p>
@@ -104,8 +111,6 @@ id: exchanges
         <a href="https://www.bitcoin.de/">Bitcoin.de</a>
       </p>
     </div>
-  </div>
-  <div>
     <div>
       <h3 id="india"><img src="/img/flags/IN.png" alt="Indian flag">India</h3>
       <p>
@@ -115,14 +120,14 @@ id: exchanges
         <a href="https://www.zebpay.com">Zebpay</a>
       </p>
     </div>
+  </div>
+  <div>
     <div>
       <h3 id="indonesia"><img src="/img/flags/ID.png" alt="Indonesian flag">Indonesia</h3>
       <p>
         <a href="https://www.bitcoin.co.id/">Bitcoin Indonesia</a>
       </p>
-    </div>	
-  </div>
-  <div>
+    </div>  
     <div>
       <h3 id="israel"><img src="/img/flags/IL.png" alt="Israeli flag">Israel</h3>
       <p>
@@ -130,14 +135,14 @@ id: exchanges
         <a href="https://www.bitsofgold.co.il/">Bits of Gold</a><br>
       </p>
     </div>
-  </div>
-  <div>
     <div>
       <h3 id="italy"><img src="/img/flags/IT.png" alt="Italian flag">Italy</h3>
       <p>
         <a href="https://posteb.it/">Postebit</a><br>
       </p>
     </div>
+  </div>
+  <div>
     <div>
       <h3 id="japan"><img src="/img/flags/JP.png" alt="Japanese flag">Japan</h3>
       <p>
@@ -145,9 +150,7 @@ id: exchanges
         <a href="https://www.btcbox.co.jp/">BtcBox</a><br>
         <a href="https://coincheck.com/">Coincheck</a>
       </p>
-    </div>	
-  </div>
-  <div>
+    </div>  
     <div>
       <h3 id="mexico"><img src="/img/flags/MX.png" alt="Mexican flag">Mexico</h3>
       <p>
@@ -155,15 +158,13 @@ id: exchanges
         <a href="https://www.volabit.com/">Volabit</a>
       </p>
     </div>
-  </div>
-  <div>
     <div>
       <h3 id="south-africa"><img src="/img/flags/ZA.png" alt="South African flag">South Africa</h3>
       <p>
         <a href="https://www.ice3x.com/">iceCUBED</a><br>
         <a href="https://www.luno.com/">Luno</a>
       </p>
-    </div>	
+    </div>
   </div>
   <div>
     <div>
@@ -174,65 +175,36 @@ id: exchanges
         <a href="https://www.korbit.co.kr/">Korbit</a>
       </p>
     </div>
-    <div>
-      <h3 id="united-arab-emirates"><img src="/img/flags/UAE.png" alt="United Arab Emirates flag">United Arab Emirates</h3>
-      <p>
-        <a href="https://bitoasis.net/">BitOasis</a>
-      </p>
-    </div>   
-  </div>
-  <div>
-    </div>
-    <div>
-      <h3 id="united-kingdom"><img src="/img/flags/UK.png" alt="United Kingdom flag">United Kingdom</h3>
-      <p>
-        <a href="https://bittylicious.com/">Bittylicious</a><br>
-        <a href="https://www.coincorner.com/">CoinCorner</a><br>
-        <a href="https://www.coinfloor.co.uk/">Coinfloor</a>
-      </p>
-    </div> 
-    <div>
-      <h3 id="united-states"><img src="/img/flags/US.png" alt="United States flag">United States</h3>
-      <p>
-        <a href="https://www.coinbase.com/">Coinbase</a><br>
-        <a href="https://gemini.com/">Gemini</a>
-      </p>
-    </div>
-        <div>
-      <h3 id="venezuela"><img src="/img/flags/VE.png" alt="Venezuelan flag">Venezuela</h3>
-      <p>
-        <a href="https://www.cryptobuyer.io/">Cryptobuyer</a>
-      </p>
-    </div>
-  </div>
-    <div>
     <div>
       <h3 id="ukraine"><img src="/img/flags/UA.png" alt="Ukraine flag">Ukraine</h3>
       <p>
         <a href="https://kuna.io/">Kuna</a>
       </p>
-    </div>	
+    </div> 
+    <div>
+      <h3 id="united-arab-emirates"><img src="/img/flags/UAE.png" alt="United Arab Emirates flag">United Arab Emirates</h3>
+      <p>
+        <a href="https://bitoasis.net/">BitOasis</a>
+      </p>
+    </div>  
   </div>
   <div>
-     <div>
+    <div>
       <h3 id="united-kingdom"><img src="/img/flags/UK.png" alt="United Kingdom flag">United Kingdom</h3>
       <p>
         <a href="https://bittylicious.com/">Bittylicious</a><br>
         <a href="https://www.coincorner.com/">CoinCorner</a><br>
         <a href="https://www.coinfloor.co.uk/">Coinfloor</a>
       </p>
-    </div> 
-    </div>	
-  </div>
-  <div>
+    </div>
     <div>
       <h3 id="united-states"><img src="/img/flags/US.png" alt="United States flag">United States</h3>
       <p>
         <a href="https://www.coinbase.com/">Coinbase</a><br>
         <a href="https://gemini.com/">Gemini</a>
       </p>
-    </div>
-        <div>
+    </div> 
+    <div>
       <h3 id="venezuela"><img src="/img/flags/VE.png" alt="Venezuelan flag">Venezuela</h3>
       <p>
         <a href="https://www.cryptobuyer.io/">Cryptobuyer</a>
@@ -243,4 +215,4 @@ id: exchanges
 
 <div class="introlink">Visit <a href="https://www.buybitcoinworldwide.com/">Buy Bitcoin Worldwide</a> for
     user reviews on some of the above exchanges.</div>
-<div class="introlink">To find local bitcoin ATMs, you can visit <a href="https://coinatmradar.com/">Coin ATM Radar</a></div>
+<div class="introlink">Visit <a href="https://coinatmradar.com/">Coin ATM Radar</a> to find local Bitcoin ATMs.</div>
diff --git a/img/flags/CR.png b/img/flags/CR.png
new file mode 100644
index 00000000..95206cfb
Binary files /dev/null and b/img/flags/CR.png differ