diff --git a/.phrozn/entries/faq/index.twig b/.phrozn/entries/faq/index.twig
index 7ad3fb9..5eea0aa 100755
--- a/.phrozn/entries/faq/index.twig
+++ b/.phrozn/entries/faq/index.twig
@@ -1,9 +1,29 @@
 id: faq
 title: Frequently Asked Questions
+q_alternative: Instead of implementing a SMS gateway as an Android app, why not use X instead? (where X = Twilio, Tropo, Clickatell, FrontlineSMS, RapidSMS, Kannel, etc.)
+q_phones: What phones are compatible with EnvayaSMS?
+q_envaya_org: What is the relationship between EnvayaSMS and envaya.org?
+q_kalsms: What is the relationship between EnvayaSMS and KalSMS?
+
 ---
 
-<h4>
-    Instead of implementing a SMS gateway as an Android app, why not use X instead? (where X = Twilio, Tropo, Clickatell, FrontlineSMS, RapidSMS, Kannel, etc.)
+<ul class='faq_links'>
+    <li>
+        <a href='#q_alternative'>{{ this.q_alternative }}</a>
+    </li>
+    <li>
+        <a href='#q_phones'>{{ this.q_phones }}</a>
+    </li>
+    <li>
+        <a href='#q_envaya_org'>{{ this.q_envaya_org }}</a>
+    </li>    
+    <li>
+        <a href='#q_kalsms'>{{ this.q_kalsms }}</a>
+    </li>        
+</ul>
+
+<h4 id='q_alternative'>
+    {{ this.q_alternative }}
 </h4>
 
 <p> 
@@ -75,9 +95,7 @@ title: Frequently Asked Questions
 </p>
 
 
-<h4>
-What phones are compatible with EnvayaSMS?
-</h4>
+<h4 id='q_phones'>{{ this.q_phones }}</h4>
 
 <p>
 EnvayaSMS should work on any phone with Android 1.6 (Donut) or higher. As of 9/23/2011, over 579 different phone models are compatible with EnvayaSMS.
@@ -102,7 +120,7 @@ In particular, you do not need to register for <a href='http://envaya.org'>envay
 For information about configuring a web server to connect to EnvayaSMS, see the <a href='serverapi.html'>API Reference</a> page.
 </p>
 
-<h4>What is the relationship between EnvayaSMS and envaya.org?</h4>
+<h4 id='q_envaya_org'>{{ this.q_envaya_org }}</h4>
 
 <p>
 We originally developed EnvayaSMS to enable civil society organizations in East Africa to interact with
@@ -118,7 +136,7 @@ Development of EnvayaSMS is currently led by the <a href='http://envaya.org'>env
 but anyone is welcome to contribute to improve it.
 </p>
 
-<h4>What is the relationship between EnvayaSMS and KalSMS?</h4>
+<h4 id='q_kalsms'>{{ this.q_kalsms }}</h4>
 
 <p>
 The source code for EnvayaSMS was originally based on <a href='https://github.com/niryariv/kalsms/'>KalSMS</a>, an open-source project 
diff --git a/.phrozn/styles/site.css b/.phrozn/styles/site.css
index fdda47b..50ade16 100755
--- a/.phrozn/styles/site.css
+++ b/.phrozn/styles/site.css
@@ -85,4 +85,19 @@ a.button:hover
 img
 {
     border:0px;
+}
+
+.faq_links li
+{
+    padding-bottom:5px;
+}
+
+.faq_links a
+{
+    text-decoration:none;
+}
+
+.faq_links a:hover
+{
+    text-decoration:underline;
 }
\ No newline at end of file
diff --git a/faq/index.html b/faq/index.html
index bd227b8..2aa6cba 100755
--- a/faq/index.html
+++ b/faq/index.html
@@ -39,7 +39,22 @@
     <h2>Frequently Asked Questions</h2>
   
     
-<h4>
+<ul class='faq_links'>
+    <li>
+        <a href='#q_alternative'>Instead of implementing a SMS gateway as an Android app, why not use X instead? (where X = Twilio, Tropo, Clickatell, FrontlineSMS, RapidSMS, Kannel, etc.)</a>
+    </li>
+    <li>
+        <a href='#q_phones'>What phones are compatible with EnvayaSMS?</a>
+    </li>
+    <li>
+        <a href='#q_envaya_org'>What is the relationship between EnvayaSMS and envaya.org?</a>
+    </li>    
+    <li>
+        <a href='#q_kalsms'>What is the relationship between EnvayaSMS and KalSMS?</a>
+    </li>        
+</ul>
+
+<h4 id='q_alternative'>
     Instead of implementing a SMS gateway as an Android app, why not use X instead? (where X = Twilio, Tropo, Clickatell, FrontlineSMS, RapidSMS, Kannel, etc.)
 </h4>
 
@@ -112,9 +127,7 @@
 </p>
 
 
-<h4>
-What phones are compatible with EnvayaSMS?
-</h4>
+<h4 id='q_phones'>What phones are compatible with EnvayaSMS?</h4>
 
 <p>
 EnvayaSMS should work on any phone with Android 1.6 (Donut) or higher. As of 9/23/2011, over 579 different phone models are compatible with EnvayaSMS.
@@ -139,7 +152,7 @@ In particular, you do not need to register for <a href='http://envaya.org'>envay
 For information about configuring a web server to connect to EnvayaSMS, see the <a href='serverapi.html'>API Reference</a> page.
 </p>
 
-<h4>What is the relationship between EnvayaSMS and envaya.org?</h4>
+<h4 id='q_envaya_org'>What is the relationship between EnvayaSMS and envaya.org?</h4>
 
 <p>
 We originally developed EnvayaSMS to enable civil society organizations in East Africa to interact with
@@ -155,7 +168,7 @@ Development of EnvayaSMS is currently led by the <a href='http://envaya.org'>env
 but anyone is welcome to contribute to improve it.
 </p>
 
-<h4>What is the relationship between EnvayaSMS and KalSMS?</h4>
+<h4 id='q_kalsms'>What is the relationship between EnvayaSMS and KalSMS?</h4>
 
 <p>
 The source code for EnvayaSMS was originally based on <a href='https://github.com/niryariv/kalsms/'>KalSMS</a>, an open-source project 
diff --git a/styles/site.css b/styles/site.css
index fdda47b..50ade16 100755
--- a/styles/site.css
+++ b/styles/site.css
@@ -85,4 +85,19 @@ a.button:hover
 img
 {
     border:0px;
+}
+
+.faq_links li
+{
+    padding-bottom:5px;
+}
+
+.faq_links a
+{
+    text-decoration:none;
+}
+
+.faq_links a:hover
+{
+    text-decoration:underline;
 }
\ No newline at end of file