diff --git a/call.html b/call.html
index 487e095..dcdd07c 100644
--- a/call.html
+++ b/call.html
@@ -1,5 +1,25 @@
 {% extends "./wrapper.html" %}{% load actionkit_tags %}
 {% block content %}
+<script type="text/javascript">
+$(document).ready(function() {
+  var original_onTargets = actionkit.forms.onTargets;
+  actionkit.forms.onTargets = function () {
+
+      var checkboxes = actionkit.context.targets.checkboxes_html;
+    checkboxes = checkboxes.replace(/(class="ak-target-contact">)(*?)(<)/g,
+      function ( match, pre, num, post ) {
+        return pre + '<a href="tel:' + num + '">' + num + '</a>' + post
+      } 
+				    
+    );
+    console.log(checkboxes);
+    actionkit.context.targets.checkboxes_html = checkboxes;  
+	  
+    original_onTargets();
+  };
+});
+
+</script>
 
 <div class="ak-grid-row">
     <div class="ak-grid-col-12-of-12">
@@ -18,7 +38,11 @@ <h2>{{ page.title }}</h2>
                 {% autoescape off %}
                 {% include_tmpl form.introduction_text %}
                 {% endautoescape %}
-
+<div id="all_fields"></div>
+<script type="text/ak-template" for="all_fields">
+<p><b>Current context:</b></p>
+[%=JSON.stringify(actionkit.context)%]
+</script>
             </div>
 
         </div>
diff --git a/event_attend.html b/event_attend.html
index 880bae6..1ca29df 100644
--- a/event_attend.html
+++ b/event_attend.html
@@ -23,9 +23,9 @@
         <input type="hidden" name="page" id="id_page" value="{{ page.name }}">
 
         <input type="hidden" name="event_id" value="{{ args.event_id }}">
+{% if request.GET.selfredirect %}<input type="hidden" name="redirect" value="/event/{{campaign.local_name}}/{{event.id}}?hidewrapper=1&selfredirect=1&nr=1&no_akid=1">{% endif %}
 
-
-
+{% if not request.GET.hidewrapper %}
         <div class="ak-grid-row">
 
             <div class="ak-grid-col-10-of-12">
@@ -55,7 +55,7 @@ <h2>Update Signup Information</h2>
             </div>
 
         </div>
-
+{% endif %}
 
 
         <div class="ak-grid-row">
@@ -72,11 +72,13 @@ <h2>Update Signup Information</h2>
 
                     <!-- If you're embedding this page on your own site, remove everything from here... -->
 
+{% if not request.GET.hidewrapper %}
                     {% with 1 as hide_map %}
 
                     {% include "./event_search_results.html" %}
 
                     {% endwith %}
+{% endif %}
 
                     <!-- ...to here -->
 
@@ -116,11 +118,14 @@ <h2>Update Signup Information</h2>
 
 
 
-            <div class="ak-grid-col-6-of-12">
-{% if event.is_in_past %}
+{% if event.is_in_past and not request.GET.hidewrapper %} <div class="ak-grid-col-6-of-12">
 <h3>Sorry, it's too late to sign up for this event.</h3>
-{% else %}
+{% elif request.GET.hidewrapper %}
+<div class="ak-grid-col-12-of-12">
+{% elif not event.is_in_past and not request.GET.hidewrapper %}
+<div class="ak-grid-col-6-of-12">
             		<h3>RSVP to attend this event</h3>
+{% endif %}
 
             	    <div id="event-attend-form" class="ak-errs-below">
 
@@ -264,4 +269,4 @@ <h2>Sorry, this event isn't available for signup.</h2>
 
 
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/event_host_tools.html b/event_host_tools.html
index c7e3c8e..66cb216 100644
--- a/event_host_tools.html
+++ b/event_host_tools.html
@@ -219,9 +219,13 @@ <h3>
                     {% include "./event_invite.html" %}
                 </div>
             {% endif %}
+            
         </div>
     </div>
-
+<!----------ADDING ONSITE SIGNUPS------------->
+<h3>Onsite Registrants</h3>
+<iframe src="/event/{{campaign.local_name}}/{{event.id}}?hidewrapper=1&selfredirect=1" style="border:0;width:100%;min-height:400px;"></iframe>
+<!--- End onsite signups --->   
 {% else %}
 
     <div class="ak-grid-row">
diff --git a/letter.html b/letter.html
index 1f77d5f..63b4d76 100644
--- a/letter.html
+++ b/letter.html
@@ -2,7 +2,171 @@
 
 {% block content %}
 
-<form class="ak-form" name="act" method="POST" action="/act/" accept-charset="utf-8">
+<style type="text/css">
+	.call-page .ak-steps-area h3 ~ div { display: block!important; }
+.ak-field-box.ak-labels-overlaid label .ak-target-titlename {
+    font-weight:bold;
+ /*   display:inline-block; */
+    margin: -3px 0 0 25px;
+}
+/* #target_checkboxes label {
+   position: relative!important;
+}
+
+span.ak-target-phone.office_phone {
+    display: inline-block;
+} */
+span.ak-target-contact {
+    padding-left: 25px;
+}
+
+label.ak-step-label {
+    display: none;
+}
+
+.ak-quote {
+    background: #ffffff;
+    border-left: solid 2px #2285d7;
+    padding-top: 0;
+}
+.ak-fieldbox.ak-labels-overlaid label .ak-target-titlename {
+    display: inline-block;
+}
+
+.ak-target-entry {
+    height: 60px;
+}
+</style>
+<div class="ak-grid-row">
+    <div class="ak-grid-col-12-of-12">
+        <h2>{{ page.title }}</h2>
+    </div>
+</div>
+
+<form class="ak-form ak-styled-fields" name="act" method="POST" action="/act/" accept-charset="utf-8">
+    <input type="hidden" name="page" value="{{ page.name }}">
+
+
+    <div class="ak-grid-row">
+        <div class="ak-grid-col-8-of-12">
+		<div id="all_fields"></div>
+<script type="text/ak-template" for="all_fields">
+<p><b>Current context:</b></p>
+[%=JSON.stringify(actionkit.context)%]
+</script>
+
+            <div id="call-story">
+
+                {% autoescape off %}
+                {% include_tmpl form.statement_leadin %}
+                {% endautoescape %}
+
+            </div>
+<div id="what_to_say"></div>
+            <script type="text/ak-template" for="what_to_say">
+            
+                [% if (!incomplete) { %]
+					<h3>
+                        <label class="ak-step-label">
+                            <div class="ak-step-number">1</div> Review Script 
+                        </label>
+                    </h3>
+<textarea id="id_comment" name="action_comment" style="height:10em; width:95%;" class="letter-area">{% include_tmpl form.letter_text escaped %}</textarea>
+                <div class="ak-quote">{% include_tmpl form.script_text %}</div>
+                [% } 
+                %]
+
+                [% if (incomplete) { %]
+                    <style>
+                        #what_to_say { display: none; }
+                    </style>
+                [% } 
+                %]
+
+            </script>
+        </div>
+        <div class="ak-grid-col-4-of-12">
+        
+            {% if page.custom_fields.featured_image %}
+                <img class="ak-featured-img" src="{{page.custom_fields.featured_image}}">
+            {% endif %}
+
+            {% include "./progress_meter.html" %}
+
+            <div id="call-form" class="ak-styled-fields ak-field-box">
+<div class="ak-labels-overlaid">
+                <div id="need_contact_info"></div>
+                <script type="text/ak-template" for="need_contact_info">
+                    [% if (incomplete) { %]
+                        <div class="ak-instructions">{% filter ak_text:"call_needs_contact_info" %}Fill out the form below so we can find the number for you to call.{% endfilter %}</div>
+                    [% } %]
+                </script>
+
+                {% include "./user_form_wrapper_local.html" %}
+                                {% include "./optin.html" %}
+		    <div id="submit_contact_info_form"></div>
+                <script type="text/ak-template" for="submit_contact_info_form">
+                    [% if (incomplete) { %]
+                        <button type="submit" class="ak-styled-submit-button">Submit</button>
+                        [% } %]
+                </script>
+</div>
+<div id="who_called"></div>
+            <script type="text/ak-template" for="who_called">
+                [% if (!incomplete) { %]
+					<h3>
+                        <label class="ak-step-label">
+                            <div class="ak-step-number">2</div> Make the Call
+                        </label>
+                    </h3>
+          	
+                    <div>Who did you call?</div>
+                [% } %]
+            </script>
+
+            <div id="target_checkboxes"></div>
+
+            <div id="ak-survey_question"></div>
+            
+            <script type="text/ak-template" for="ak-survey_question">
+                [% if (!incomplete) { %]
+					 <h3 id="report-call">
+                        <label class="ak-step-label">
+                            <div class="ak-step-number">3</div> Report the Call
+                        </label>
+                    </h3>
+            		<div class="ak-labels-overlaid">
+                    	{% autoescape off %}
+                    	<label for="id_action_survey">How'd it go?</label>
+                    	{% endautoescape %}
+                		<textarea id="id_action_survey" name="action_survey"></textarea>
+               		 </div>
+               		<button type="submit" class="ak-styled-submit-button">Submit</button>
+                [% } %]
+            </script>
+
+            
+	 		
+        </div>
+            </div>
+        </div>
+    </div>
+    
+    <div class="ak-grid-row ak-steps-area">
+        <div class="ak-grid-col-4-of-12">
+
+            
+        </div>
+        <div class="ak-grid-col-4-of-12">
+
+            
+    </div>
+   
+</form>
+
+
+
+<!--<form class="ak-form" name="act" method="POST" action="/act/" accept-charset="utf-8">
     <input type="hidden" name="page" value="{{ page.name }}">
 
     <div class="ak-grid-row">
@@ -16,10 +180,31 @@ <h2>{{ page.title }}</h2>
 
             <div id="letter-story">
 
+
                 {% autoescape off %}
                 <div>{% include_tmpl form.about_text %}</div>
                 {% endautoescape %}
-
+           {% if page.custom_fields.fallback %}
+               
+                <div id="leadin-letter"></div>
+                    <script type="text/ak-template" for="leadin-letter">
+                         [% if (!incomplete { %]
+                              {% if form.statement_leadin %}
+                              {% autoescape off %}
+                              <div class="ak-p-before-textarea ak-margin-top-3">
+                                	{% include_tmpl form.statement_leadin %}
+                              </div>
+                              {% endautoescape %}
+                              {% endif %}
+                               <textarea id="id_comment" name="action_comment" style="height:10em; width:95%;" class="letter-area">{% include_tmpl form.letter_text escaped %}</textarea>
+                        [% }  %]
+                [% if (incomplete) { %]
+                    <style>
+                        #leadin-letter { display: none; }
+                    </style>
+                [% }  %]
+                </script>
+           {% else %}
                 {% if form.statement_leadin %}
                 {% autoescape off %}
                 <div class="ak-p-before-textarea ak-margin-top-3">
@@ -27,8 +212,8 @@ <h2>{{ page.title }}</h2>
                 </div>
                 {% endautoescape %}
                 {% endif %}
-
                 <textarea id="id_comment" name="action_comment" style="height:10em; width:95%;" class="letter-area">{% include_tmpl form.letter_text escaped %}</textarea>
+            {% endif %}
 
             </div>
 
@@ -42,17 +227,32 @@ <h2>{{ page.title }}</h2>
             {% endif %}
 
             <div id="letter-form" class="ak-styled-fields ak-labels-overlaid ak-field-box ak-field-box-borderless">
+            {% if page.custom_fields.fallback %}
+                <div id="need_contact_info"></div>
+                <script type="text/ak-template" for="need_contact_info">
+                    [% if (incomplete) { %]
+                        <div class="ak-instructions">{% filter ak_text:"call_needs_contact_info" %}Fill out the form below so we can find the number for you to call.{% endfilter %}</div>
+                    [% } %]
+                </script>
 
+                {% include "./user_form_wrapper_local.html" %}
+                                {% include "./optin.html" %}
+		    <div id="submit_contact_info_form"><button type="submit" class="ak-styled-submit-button">Submit</button></div>
+                <script type="text/ak-template" for="submit_contact_info_form">
+                    [% if (incomplete) { %]
+                        <button type="submit" class="ak-styled-submit-button">Submit</button>
+                        [% } %]
+                </script>
+            {% else %}
                 <h3>{% if page.custom_fields.contact_us %}Get in Touch{% else %}Send the letter{% endif %}</h3>
 
                 {% include "./user_form_wrapper.html" %}
 
                 {% include "./inline_tellafriend.html" %}
-<inputtype="hidden" name="opt_in" value="1" />
-<input type="checkbox" id="id_list_1" name="lists" value="1" checked />
-<label for="id_list_1" style="padding-left:30px;padding-top:0;"> Send me action alerts.</label>
+                {% include "./optin.html" %}
 
                 <button type="submit" class="ak-styled-submit-button">Send Letter</button>
+           {% endif %}
 
             </div>
 
@@ -60,6 +260,6 @@ <h3>{% if page.custom_fields.contact_us %}Get in Touch{% else %}Send the letter{
 
     </div>
 
-</form>
+</form>-->
 
 {% endblock %}
diff --git a/survey.html b/survey.html
index dc8112c..567627b 100644
--- a/survey.html
+++ b/survey.html
@@ -45,7 +45,7 @@ <h2>{{ page.title }}</h2>
                     {% endfor %}
                 {% endautoescape %}
 
-                <button type="submit" class="ak-styled-submit-button">Submit</button>
+                <button type="submit" class="ak-styled-submit-button">{% if page.custom_fields.button_text %}{{ page.custom_fields.button_text }}{% else %}Send Letter{% endif %}</button>
             </div>
         </div>
 
diff --git a/wrapper.html b/wrapper.html
index 7bd35ea..6691e02 100644
--- a/wrapper.html
+++ b/wrapper.html
@@ -40,7 +40,10 @@
     {% end %}
     {% block script_additions %}{% endblock %}
 </head>
-<body class="{{ filename|split:'.'|nth:0 }}-page lang-{{page.lang.iso_code|default:'unknown'}}{% if page.lang.is_rtl %} ak-rtl{% endif %} ak-no-js">
+
+{% if not request.GET.hidewrapper %}
+	<body class="{{ filename|split:'.'|nth:0 }}-page lang-{{page.lang.iso_code|default:'unknown'}}{% if page.lang.is_rtl %} ak-rtl{% endif %} ak-no-js">
+
     <script type="text/javascript">actionkit.forms.initPage()</script>
 
     <div class="Rails">
@@ -54,12 +57,15 @@
         </div>
       </div>
     </div>
-
+{% endif %}
     <div class="ak-page-container">
+      
 
         {% block content %}{% endblock %}
 
-    </div>
+
+    </div>{% if not request.GET.hidewrapper %}
+
     <div class="Action u-section u-overflow">
   <div class="l-padding">
     <div class="l-wrap">
@@ -172,7 +178,8 @@
         </div>
       </div>
     </div>
-
+    
+{% endif %}
     {% block below_form %}
     <script type="text/javascript">
         actionkit.forms.contextRoot = '/context/';