diff --git a/content/_index.md b/content/_index.md
index e96efaf..a401f92 100644
--- a/content/_index.md
+++ b/content/_index.md
@@ -26,7 +26,7 @@ Fill out now!
 
 > If you need to fill out a camp health form, please do so [here](/camp-health-form).
 
-> If you need to pay for your camp form, pay for registration ($85) [here](https://secure.myvanco.com/L-Z772/campaign/C-13JPJ) or pay for the full price ($185) [here](https://secure.myvanco.com/L-Z772/campaign/C-13JQE).
+> If you need to pay for your camp form, pay for registration ($100) [here](https://secure.myvanco.com/L-Z772/campaign/C-13JPJ) or pay for the full price ($200) [here](https://secure.myvanco.com/L-Z772/campaign/C-13JQE).
 
 {{ spacing(height="h-8") }}
 {{ pt(src="https://videos.tfcconnection.org/videos/embed/0e6378c4-bb58-4fb1-8edf-72b73efc5ad2") }}
diff --git a/content/camp-form.md b/content/camp-form.md
index 95692b9..2c5c603 100644
--- a/content/camp-form.md
+++ b/content/camp-form.md
@@ -9,17 +9,16 @@ template: "simple_page.html"
 {{ floating_button(icon="chevron-down" text="To the form!" link="#form")}}
 
 {{ pt(src="https://videos.tfcconnection.org/videos/embed/757dc0dd-9bdc-4d79-8f81-754249ff23d2" width="700" height="576")}}
-{{ spacing(height="h-8")}}
+{{ spacing(height="h-4")}}
 
 We hope you are as excited about camp as we are! If there is anything we can do to answer your questions and help you to get signed up for camp, please let us know! You can email any of us by going to the [contact page](/contact).
 
 ## Dates
 - Week 1 - July 21 - July 25 
-- Week 2 - July 28 - Aug 1
+- ~~Week 2 - July 28 - Aug 1~~ Week 2 is filled, if you can't go week 1 we may put you on a waiting list, but there is not guarantee you'll get in.
 
 ## Cost
 We have an early bird registration, so if you register by certain dates, you'll save some money!
-{{ spacing(height="h-4")}}
 - By May 7: $85 with registration plus $100 due at camp and a free t shirt!
 - By June 25: $100 with registration plus $100 due at camp and a free t shirt!
 - After June 25: $100 with registration plus $100 due at camp... _NO FREE T SHIRT!!!_
@@ -30,7 +29,7 @@ Camp Joy in Republican City, NE
 [70790 Corp Rd 23, Republican City, NE 68971](https://maps.google.com/maps?z=16&q=70790%2Bcorp%2Brd%2B23%2Brepublican%2Bcity%2C%2Bne%2B68971)
 <!-- http://umap.openstreetmap.fr/en/map/anonymous-edit/888075:134YBQNTmQ2pkJ76ur0PJ8KPuAc -->
 
-<!-- {{< map mapName="campmap_888075" >}} -->
+{{ map(mapName="campmap_888075") }}
 
 {{ spacing(height="h-4")}}
 {{ camp_form() }}
diff --git a/static/css/main.css b/static/css/main.css
index e30e6a4..b51b833 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -1353,6 +1353,11 @@
       --tw-ring-color: var(--color-blue-700);
     }
   }
+  .focus\:ring-gray-700 {
+    &:focus {
+      --tw-ring-color: var(--color-gray-700);
+    }
+  }
   .focus\:ring-white {
     &:focus {
       --tw-ring-color: var(--color-white);
@@ -1603,6 +1608,11 @@
       background-color: #ef4444;
     }
   }
+  .dark\:bg-blue-700 {
+    @media (prefers-color-scheme: dark) {
+      background-color: var(--color-blue-700);
+    }
+  }
   .dark\:bg-blue-800 {
     @media (prefers-color-scheme: dark) {
       background-color: var(--color-blue-800);
@@ -1657,6 +1667,15 @@
       }
     }
   }
+  .dark\:hover\:\!bg-blue-900 {
+    @media (prefers-color-scheme: dark) {
+      &:hover {
+        @media (hover: hover) {
+          background-color: var(--color-blue-900) !important;
+        }
+      }
+    }
+  }
   .dark\:hover\:bg-gray-600 {
     @media (prefers-color-scheme: dark) {
       &:hover {
diff --git a/templates/shortcodes/camp_form.html b/templates/shortcodes/camp_form.html
index e0e23ad..776a564 100644
--- a/templates/shortcodes/camp_form.html
+++ b/templates/shortcodes/camp_form.html
@@ -145,11 +145,11 @@
         <input type="text" id="allergies" name="allergies"
                class="basis-full form-input {{ formClasses }}">
 
-        <label for="week" class="basis-full">My Camp Plan (The first week is filled, so if you'd like to be on a waiting list, you'll have to check the second option.)<span class='inline-block text-[#f39] text-sm align-sub'>* required</span></label>
+        <label for="week" class="basis-full">My Camp Plan (The second week is filled, so if you'd like to be on a waiting list, you'll have to check the second option.) <span class='inline-block text-[#f39] text-sm align-sup'>* required</span></label>
         <select id="week" name="week" class="flex-auto form-select {{ formClasses }}">
             <option value="week1">Week 1: July 21-25</option>
-            <option value="week2">Week 2: July 28-Aug 1</option>
-            <!-- <option value="waiting-list">Week 2: July 29-Aug 2, but on a waiting list for week 1</option> -->
+            <!-- <option value="week2">Week 2: July 28-Aug 1</option> -->
+            <option value="waiting-list">Week 1: July 21-25, but on a waiting list for week 2</option>
         </select> 
 
         <label for="shirt" class="basis-full">T-Shirt Size <span class='inline-block text-[#f39] text-sm'>all t-shirts are in adult sizes only</span></label>
@@ -199,21 +199,21 @@
             <input type="radio" value="now" id="registration" name="registration"
                    class="form-input {{ formClasses }}" checked>
             <label for="registration" class="">
-                Now - $85
+                Now - $100
             </label>
         </div>
         <div class="basis-full">
             <input type="radio" value="full" id="registration" name="registration"
                    class="form-input {{ formClasses }}">
             <label for="registration" class="">
-                Full Cost - $185
+                Full Cost - $200
             </label>
         </div>
         <div class="basis-full mb-4">
             <input type="radio" value="later" id="registration" name="registration"
                    class="form-input {{ formClasses }}">
             <label for="registration" class="">
-                Later - Send $85 or $185 to the TFC Office
+                Later - Send $100 or $200 to the TFC Office
             </label>
         </div>
         <!-- For after early bird prices -->
@@ -239,7 +239,7 @@
              </label>
              </div> -->
         <div class="basis-full mt-8">
-            <button type="submit" class="content-right rounded-lg bg-gray-700 h-12 w-24 focus:bg-gray-900 focus:ring focus:ring-primary-700 hover:bg-gray-900 float-right">Submit</button>
+            <button type="submit" class="content-right rounded-lg bg-blue-700 h-12 w-24 focus:bg-blue-900 focus:ring focus:ring-blue-700 hover:bg-blue-900 float-right">Submit</button>
         </div>
     </form>
 </div>
diff --git a/templates/shortcodes/floating_button.html b/templates/shortcodes/floating_button.html
index 8fb6463..565de24 100644
--- a/templates/shortcodes/floating_button.html
+++ b/templates/shortcodes/floating_button.html
@@ -6,7 +6,7 @@
  }
 </script>
 
-<button class="rounded-lg bg-blue-600 px-4 py-2 !text-neutral !no-underline hover:!bg-blue-500 dark:bg-blue-800 dark:hover:!bg-blue-700 fixed bottom-4 right-8" type="button" name="floatbutt" onclick="floatButton()" id="floatbutt">
+<button class="rounded-lg bg-blue-700 px-4 py-2 !text-neutral !no-underline hover:!bg-blue-500 dark:bg-blue-700 dark:hover:!bg-blue-900 fixed bottom-4 right-8" type="button" name="floatbutt" onclick="floatButton()" id="floatbutt">
     <i>{{ text }}</i> 
     <span class="relative inline-block align-sub size-5 fill-current flex-auto">
         {{ load_data(path="icons/" ~ icon ~ ".svg") | safe }}
diff --git a/templates/shortcodes/health_form.html b/templates/shortcodes/health_form.html
index 95ee0d1..9c85a55 100644
--- a/templates/shortcodes/health_form.html
+++ b/templates/shortcodes/health_form.html
@@ -234,13 +234,6 @@
             <input type="text" id="last-name" name="last-name" required
                    placeholder="Last Name" class="flex-1 form-input {{ formClasses }}">
         </div>
-        <div class="basis-full my-8">
-            <div class="">
-                <label for="birth-date" class="">When were you born? <span class='inline-block text-[#f39] text-sm'>* required</span></label>
-                <input type="date" id="birth-date" name="birth-date"
-                       class="form-date {{ formClasses }}" required>
-            </div>
-        </div>
         <div class="basis-full flex flex-wrap my-4">
             <label for="parent-first-name" class="basis-full">What is your parent's first and last name? <span class='inline-block text-[#f39] text-sm'>* required</span></label>
             <input type="text" id="parent-first-name" name="parent-first-name"
@@ -250,6 +243,13 @@
                    class="flex-1 form-input {{ formClasses }}"
                    placeholder="Last Name" required>
         </div>
+        <div class="basis-full my-8">
+            <div class="flex flex-wrap">
+                <label for="birth-date" class="basis-full">When were you born? <span class='inline-block text-[#f39] text-sm'>* required</span></label>
+                <input type="date" id="birth-date" name="birth-date"
+                       class="form-date flex-auto {{ formClasses }}" required>
+            </div>
+        </div>
         <div class="basis-full flex flex-wrap my-4">
             <label for="street" class="basis-full">What is your address? <span class='inline-block text-[#f39] text-sm'>* required</span></label>
             <input type="text" id="street" name="street"
@@ -267,12 +267,12 @@
         </div>
         <div class="basis-full flex flex-wrap items-center my-8">
             <div class="flex-auto flex flex-wrap items-center">
-                <label for="cell-phone" class="mr-4">Parent Cell phone</label>
+                <label for="cell-phone" class="basis-full mr-4">Parent Cell phone</label>
                 <input type="tel" id="cell-phone" name="cell-phone"
                        class="flex-auto form-input {{ formClasses }}">
             </div>
             <div class="flex-auto flex flex-wrap items-center">
-                <label for="home-phone" class="mr-4">Home phone</label>
+                <label for="home-phone" class="basis-full mr-4">Home phone</label>
                 <input type="tel" id="home-phone" name="home-phone"
                        class="flex-auto form-input {{ formClasses }}">
             </div>
@@ -336,13 +336,19 @@
 
         <div class="basis-full flex flex-wrap items-center">
             <h3 class="basis-full">Please read and agree to the following</h3>
-            <li>On this <span id="current_date"></span>, I/we the parent(s)/legal guardian(s) of the above-named child ("Participant") do hereby delegate to the TFC Connection Staff a "Power of Attorney" for the above-named child for the purpose of having custody of my/our child and my/our consent to any needed emergency/medical treatment and administration of prescribed medications of my/our child.
-                <li>In the event that I cannot be reached in an emergency during the dates specified on this form, I hereby give my permission to the physician or dentist selected by the TFC Connection Staff to hospitalize, to secure proper treatment, and/or order any injection, anesthesia, or surgery for my son or daughter as deemed necessary.
-                    <li>I understand that every activity sponsored by TFC Connection is carefully planned and adequately supervised by mature adults. However, even with the best planning and precaution, unforeseen events can occur. By signing this form as parent/guardian, I/we agree to assume and accept all risks and hazards inherent in ministry-related activities and events. I/we acknowledge that participation in TFC Connection ministry activities and events involves risk to the participant (and to the participant's parents or guardians, if the participant is a minor), and may result in various types of injury including, but not limited to, the following: sickness, exposure to infectious/communicable disease, bodily injury, death, emotional injury, personal injury, property damage, and financial damage.
-                        <li>In consideration for the opportunity to participate in TFC Connection activities and events, the participant (or parent/guardian if the participant is a minor) acknowledges and accepts the risks of injury associated with participation in and transportation to and from the activities or events. The participant (or parent/guardian) accepts personal financial responsibility for any injury or other loss sustained during the activity or event, or during transportation to and from the activity or event, as well as for any medical treatment rendered to the participant that is authorized by the sponsor or its agents, employees, volunteers, or any other representatives (collectively referred to as the "activity sponsor"). Further, the participant (or parent/guardian) releases and promises to indemnify, defend, and hold harmless the activity sponsor for any injury arising directly or indirectly out of ministry activities and events, or transportation to and from activities and events, whether such injury arises out of the negligence of the activity sponsor, the participant, or otherwise.
-                            <li>I/we also agree not to hold TFC Connection, it's employees or volunteer assistants liable for damages, losses, or injuries to the participant or their personal property. As parent/guardian, I understand that I am signing for the minor named on this form and the signatures are to provide for the medical release and the liability release.
-                                <li>Further, should it be necessary for the participant to return home due to medical reasons, disciplinary action, or otherwise, I/we hereby assume transportation costs for their return.
-                                    <li>I give permission to TFC Connection to use my child's image in photos or videos taken at TFC sponsored activities and events in order to publicize or promote TFC activities, including promotional materials, the TFC website, and social media pages.
+            <li>On this <span id="current_date"></span>, I/we the parent(s)/legal guardian(s) of the above-named child ("Participant") do hereby delegate to the TFC Connection Staff a "Power of Attorney" for the above-named child for the purpose of having custody of my/our child and my/our consent to any needed emergency/medical treatment and administration of prescribed medications of my/our child.</li>
+            <br/>
+            <li>In the event that I cannot be reached in an emergency during the dates specified on this form, I hereby give my permission to the physician or dentist selected by the TFC Connection Staff to hospitalize, to secure proper treatment, and/or order any injection, anesthesia, or surgery for my son or daughter as deemed necessary.</li>
+            <br/>
+            <li>I understand that every activity sponsored by TFC Connection is carefully planned and adequately supervised by mature adults. However, even with the best planning and precaution, unforeseen events can occur. By signing this form as parent/guardian, I/we agree to assume and accept all risks and hazards inherent in ministry-related activities and events. I/we acknowledge that participation in TFC Connection ministry activities and events involves risk to the participant (and to the participant's parents or guardians, if the participant is a minor), and may result in various types of injury including, but not limited to, the following: sickness, exposure to infectious/communicable disease, bodily injury, death, emotional injury, personal injury, property damage, and financial damage.</li>
+            <br/>
+            <li>In consideration for the opportunity to participate in TFC Connection activities and events, the participant (or parent/guardian if the participant is a minor) acknowledges and accepts the risks of injury associated with participation in and transportation to and from the activities or events. The participant (or parent/guardian) accepts personal financial responsibility for any injury or other loss sustained during the activity or event, or during transportation to and from the activity or event, as well as for any medical treatment rendered to the participant that is authorized by the sponsor or its agents, employees, volunteers, or any other representatives (collectively referred to as the "activity sponsor"). Further, the participant (or parent/guardian) releases and promises to indemnify, defend, and hold harmless the activity sponsor for any injury arising directly or indirectly out of ministry activities and events, or transportation to and from activities and events, whether such injury arises out of the negligence of the activity sponsor, the participant, or otherwise.</li>
+            <br/>
+            <li>I/we also agree not to hold TFC Connection, it's employees or volunteer assistants liable for damages, losses, or injuries to the participant or their personal property. As parent/guardian, I understand that I am signing for the minor named on this form and the signatures are to provide for the medical release and the liability release.</li>
+            <br/>
+            <li>Further, should it be necessary for the participant to return home due to medical reasons, disciplinary action, or otherwise, I/we hereby assume transportation costs for their return.</li>
+            <br/>
+            <li>I give permission to TFC Connection to use my child's image in photos or videos taken at TFC sponsored activities and events in order to publicize or promote TFC activities, including promotional materials, the TFC website, and social media pages.</li>
         </div>
 
         <div class="basis-full my-4 flex flex-wrap items-center">
@@ -513,6 +519,5 @@
                     You have not included a copy of your insurance card.
                 </span>
             </div>
-
     </form>
-        </div>
+</div>
diff --git a/templates/shortcodes/map.html b/templates/shortcodes/map.html
new file mode 100644
index 0000000..2a31076
--- /dev/null
+++ b/templates/shortcodes/map.html
@@ -0,0 +1,18 @@
+{% if not mapWidth %} {% set mapWidth = "100%" -%} {% endif %}
+{% if not mapHeight %} {% set mapHeight = "600px" -%} {% endif %}
+{% if not scaleControl %} {% set scaleControl = "true" -%} {% endif %}
+{% if not miniMap %} {% set miniMap = "false" -%} {% endif %}
+{% if not scrollWheelZoom %} {% set scrollWheelZoom = "true" -%} {% endif %}
+{% if not zoomControl %} {% set zoomControl = "true" -%} {% endif %}
+{% if not allowEdit %} {% set allowEdit = "false" -%} {% endif %}
+{% if not moreControl %} {% set moreControl = "true" -%} {% endif %}
+{% if not searchControl %} {% set searchControl = "true" -%} {% endif %}
+{% if not tilelayersControl %} {% set tilelayersControl = "null" -%} {% endif %}
+{% if not embedControl %} {% set embedControl = "null" -%} {% endif %}
+{% if not datalayersControl %} {% set datalayersControl = "true" -%} {% endif %}
+{% if not onLoadPanel %} {% set onLoadPanel = "none" -%} {% endif %}
+{% if not captionBar %} {% set captionBar = "true" -%} {% endif %}
+
+<div style="display: flex;" class="w-full">
+    <iframe class="flex-auto rounded-lg " width="{{ mapWidth }}" height="{{ mapHeight }}" frameBorder="0" src="https://umap.openstreetmap.fr/en/map/{{ mapName }}?scaleControl={{ scaleControl }}&miniMap={{ miniMap }}&scrollWheelZoom={{ scrollWheelZoom }}&zoomControl={{ zoomControl }}&allowEdit={{ allowEdit }}&moreControl={{ moreControl }}&searchControl={{ searchControl }}&tilelayersControl={{ tilelayersControl }}&embedControl={{ embedControl }}&datalayersControl={{ datalayersControl }}&onLoadPanel={{ onLoadPanel }}&captionBar={{ captionBar }}{% if scale %}#{{ scale }}{% endif %}/{% if coordX %}{{ coordX }}{% endif %}/{% if coordY %}{{ coordY }}{% endif %}"></iframe>
+</div>