diff --git a/site/layouts/page/subpage.html b/site/layouts/page/subpage.html
index 0451aad..7e37382 100644
--- a/site/layouts/page/subpage.html
+++ b/site/layouts/page/subpage.html
@@ -17,10 +17,8 @@
         {{ partial "sub-pages/section_end.html" . }}
         
         {{ if eq .Params.sigtable true }}
+          {{ partial "sub-pages/action.html" . }}
           {{ partial "organisations.html" . }}
-        {{ end }}
-
-        {{ if eq .Params.sigtable true }}
           {{ partial "sub-pages/sigtable.html" . }}
         {{ end }}
         
diff --git a/site/layouts/partials/action.html b/site/layouts/partials/action.html
index 196b7cf..436dc5a 100644
--- a/site/layouts/partials/action.html
+++ b/site/layouts/partials/action.html
@@ -8,77 +8,8 @@
                 <p id="actionintro">{{ .Site.Params.action.intro | markdownify }}</p>
                 <p><strong>{{ .Site.Params.action.demand | markdownify }}</strong></p>
                 <p>{{ (replace (replace .Site.Params.action.description "$ORGS" (partial "functions/count_organisations.html" .) ) "$INDS" (partial "functions/count_signatures.html" .))  | markdownify }}</p>
-                
-                <form action="https://forms.fsfe.org/email" method="post">
-                  <input name="appid" type="hidden" value="pmpc-sign" />
-                  <label class="sign-input form-na">
-                    <input name="name" placeholder="{{ .Site.Params.action.form.name }}" type="text" required />
-                  </label>
-                  <label class="sign-input form-em">
-                    <input name="confirm" placeholder="{{ .Site.Params.action.form.email }}" type="email" required />
-                  </label>
-                  <br />
-                  <label class="sign-input form-cn">
-                    <select name="country">
-                      <option value="">{{ .Site.Params.action.form.country }}</option>
-                      <option value="Austria">Austria</option>
-                      <option value="Belgium">Belgium</option>
-                      <option value="Bulgaria">Bulgaria</option>
-                      <option value="Croatia">Croatia</option>
-                      <option value="Cyprus">Cyprus</option>
-                      <option value="Czech Republic">Czech Republic</option>
-                      <option value="Denmark">Denmark</option>
-                      <option value="Estonia">Estonia</option>
-                      <option value="Finland">Finland</option>
-                      <option value="France">France</option>
-                      <option value="Germany">Germany</option>
-                      <option value="Greece">Greece</option>
-                      <option value="Hungary">Hungary</option>
-                      <option value="Ireland">Ireland</option>
-                      <option value="Italy">Italy</option>
-                      <option value="Latvia">Latvia</option>
-                      <option value="Lithuania">Lithuania</option>
-                      <option value="Luxembourg">Luxembourg</option>
-                      <option value="Malta">Malta</option>
-                      <option value="Netherlands">Netherlands</option>
-                      <option value="Poland">Poland</option>
-                      <option value="Portugal">Portugal</option>
-                      <option value="Romania">Romania</option>
-                      <option value="Slovakia">Slovakia</option>
-                      <option value="Slovenia">Slovenia</option>
-                      <option value="Spain">Spain</option>
-                      <option value="Sweden">Sweden</option>
-                      <option value="United Kingdom">United Kingdom</option>
-                      <option value="Outside the EU">Outside the EU</option>
-                    </select>
-                  </label>
-                  <label class="sign-input form-zp">
-                    <input name="zip" placeholder="{{ .Site.Params.action.form.zip }}" type="text" />
-                  </label>
-                  <label class="sign-input form-co">
-                    <input name="comment" placeholder="{{ .Site.Params.action.form.comment }}" type="text" maxlength="140" />
-                  </label>
-                  <p class="form-pe">
-                    <label class="form-pe">
-                      <input name="permissionPriv" value="yes" type="checkbox" required /> {{ .Site.Params.action.form.permPriv | markdownify }}
-                    </label>
-                    <br />
-                    <label class="form-pe">
-                      <input name="permissionPub" value="yes" type="checkbox" /> {{ .Site.Params.action.form.permPub | markdownify}}
-                    </label>
-                    <br />
-                    <label class="form-pe">
-                      <input name="permissionNews" value="yes" type="checkbox" checked="checked" /> {{ .Site.Params.action.form.permNews | markdownify }}
-                    </label>
-                  </p>
-                  
-                  <label id="honey"> <!-- Honeypot for spam -->
-                    <p>Please do not put anything here:</p>
-                    <input name="url" type="text" />
-                  </label>
-                  <br />
-                  <button name="action" value="sign" type="submit" class="btn btn-default btn-xl">{{ .Site.Params.action.form.submit }}</button>
-                </form>
+
+                {{ partial "functions/sign-form.html" . }}
             </div>
         </div>
     </div>
diff --git a/site/layouts/partials/functions/sign-form.html b/site/layouts/partials/functions/sign-form.html
new file mode 100644
index 0000000..f18b5ca
--- /dev/null
+++ b/site/layouts/partials/functions/sign-form.html
@@ -0,0 +1,70 @@
+<form action="https://forms.fsfe.org/email" method="post">
+  <input name="appid" type="hidden" value="pmpc-sign" />
+  <label class="sign-input form-na">
+    <input name="name" placeholder="{{ .Site.Params.action.form.name }}" type="text" required />
+  </label>
+  <label class="sign-input form-em">
+    <input name="confirm" placeholder="{{ .Site.Params.action.form.email }}" type="email" required />
+  </label>
+  <br />
+  <label class="sign-input form-cn">
+    <select name="country">
+      <option value="">{{ .Site.Params.action.form.country }}</option>
+      <option value="Austria">Austria</option>
+      <option value="Belgium">Belgium</option>
+      <option value="Bulgaria">Bulgaria</option>
+      <option value="Croatia">Croatia</option>
+      <option value="Cyprus">Cyprus</option>
+      <option value="Czech Republic">Czech Republic</option>
+      <option value="Denmark">Denmark</option>
+      <option value="Estonia">Estonia</option>
+      <option value="Finland">Finland</option>
+      <option value="France">France</option>
+      <option value="Germany">Germany</option>
+      <option value="Greece">Greece</option>
+      <option value="Hungary">Hungary</option>
+      <option value="Ireland">Ireland</option>
+      <option value="Italy">Italy</option>
+      <option value="Latvia">Latvia</option>
+      <option value="Lithuania">Lithuania</option>
+      <option value="Luxembourg">Luxembourg</option>
+      <option value="Malta">Malta</option>
+      <option value="Netherlands">Netherlands</option>
+      <option value="Poland">Poland</option>
+      <option value="Portugal">Portugal</option>
+      <option value="Romania">Romania</option>
+      <option value="Slovakia">Slovakia</option>
+      <option value="Slovenia">Slovenia</option>
+      <option value="Spain">Spain</option>
+      <option value="Sweden">Sweden</option>
+      <option value="United Kingdom">United Kingdom</option>
+      <option value="Outside the EU">Outside the EU</option>
+    </select>
+  </label>
+  <label class="sign-input form-zp">
+    <input name="zip" placeholder="{{ .Site.Params.action.form.zip }}" type="text" />
+  </label>
+  <label class="sign-input form-co">
+    <input name="comment" placeholder="{{ .Site.Params.action.form.comment }}" type="text" maxlength="140" />
+  </label>
+  <p class="form-pe">
+    <label class="form-pe">
+      <input name="permissionPriv" value="yes" type="checkbox" required /> {{ .Site.Params.action.form.permPriv | markdownify }}
+    </label>
+    <br />
+    <label class="form-pe">
+      <input name="permissionPub" value="yes" type="checkbox" /> {{ .Site.Params.action.form.permPub | markdownify}}
+    </label>
+    <br />
+    <label class="form-pe">
+      <input name="permissionNews" value="yes" type="checkbox" checked="checked" /> {{ .Site.Params.action.form.permNews | markdownify }}
+    </label>
+  </p>
+  
+  <label id="honey"> <!-- Honeypot for spam -->
+    <p>Please do not put anything here:</p>
+    <input name="url" type="text" />
+  </label>
+  <br />
+  <button name="action" value="sign" type="submit" class="btn btn-default btn-xl">{{ .Site.Params.action.form.submit }}</button>
+</form>
diff --git a/site/layouts/partials/sub-pages/action.html b/site/layouts/partials/sub-pages/action.html
new file mode 100644
index 0000000..45a33a5
--- /dev/null
+++ b/site/layouts/partials/sub-pages/action.html
@@ -0,0 +1,13 @@
+{{ "<!-- SIGN -->" | safeHTML }}
+<section class="bg-primary" id="action">
+    <div class="container">
+        <div class="row">
+            <div class="col-lg-8 col-lg-offset-2 text-center">
+                <h2 class="section-heading">{{ .Site.Params.action.headline }}</h2>
+                <hr class="light">
+
+                {{ partial "functions/sign-form.html" . }}
+            </div>
+        </div>
+    </div>
+</section>