5 files changed, 26 insertions, 9 deletions
diff --git a/templates/email/fiksgatami/login.txt b/templates/email/fiksgatami/login.txt
index 170350590..4247fba6a 100644
--- a/templates/email/fiksgatami/login.txt
+++ b/templates/email/fiksgatami/login.txt
@@ -1,4 +1,6 @@
-Subject: [% loc('Your FixMyStreet.com account details') %]
+Subject: Bekreft din konto på FiksGataMi.no
+
+Hei,
 
 Vennligst klikk på linken under for å bekrefte din e-post. Når dette
 er gjort vil du lett kunne holde oversikt over dine problemrapporter.
@@ -6,4 +8,3 @@ er gjort vil du lett kunne holde oversikt over dine problemrapporter.
 
 Vennlig hilsen,  
 FiksGataMi-gruppen
-
diff --git a/templates/web/fiksgatami/about/_sidebar.html b/templates/web/fiksgatami/about/_sidebar.html
new file mode 100644
index 000000000..0a21454f5
--- /dev/null
+++ b/templates/web/fiksgatami/about/_sidebar.html
@@ -0,0 +1,15 @@
+<div class="sticky-sidebar">
+    <aside>
+        <ul class="plain-list">
+            <li>[% INCLUDE link h='/faq' t=loc('Frequently Asked Questions') %]</li>
+            <!-- <li>[% INCLUDE link h='/privacy' t=loc('Privacy and cookies') %]</li> -->
+            <li>[% INCLUDE link h='/contact' t=tprintf(loc("Contact %s", "%s is the site name"), site_name) %]</li>
+        </ul>
+    </aside>
+</div>
+
+[% BLOCK link -%]
+<[% IF c.req.uri.path == h %]strong[% ELSE %]a href="[% h %]"[% END %]>
+[%- t -%]
+</[% IF c.req.uri.path == h %]strong[% ELSE %]a[% END %]>
+[%- END %]
diff --git a/templates/web/fiksgatami/about/faq-nb.html b/templates/web/fiksgatami/about/faq-nb.html
index da35cb03c..3ce0ef12e 100644
--- a/templates/web/fiksgatami/about/faq-nb.html
+++ b/templates/web/fiksgatami/about/faq-nb.html
@@ -1,4 +1,6 @@
-[% INCLUDE 'header.html', title => loc('Frequently Asked Questions') %]
+[% INCLUDE 'header.html', title => loc('Frequently Asked Questions'), bodyclass = 'twothirdswidthpage' %]
+
+[% INCLUDE 'about/_sidebar.html' %]
 
 <h1>Ofte stilte spørsmål</h1>
 <dl>
@@ -159,4 +161,4 @@
 
   </dl>
 
-[% INCLUDE 'footer.html' %]
+[% INCLUDE 'footer.html', pagefooter = 'yes' %]
diff --git a/templates/web/fiksgatami/about/faq-nn.html b/templates/web/fiksgatami/about/faq-nn.html
index 161cfbea5..df7ff5e40 100644
--- a/templates/web/fiksgatami/about/faq-nn.html
+++ b/templates/web/fiksgatami/about/faq-nn.html
@@ -1,4 +1,6 @@
-[% INCLUDE 'header.html', title => loc('Frequently Asked Questions') %]
+[% INCLUDE 'header.html', title => loc('Frequently Asked Questions'), bodyclass = 'twothirdswidthpage' %]
+
+[% INCLUDE 'about/_sidebar.html' %]
 
 <h1>Ofte stilte spurnader</h1>
 <dl>
@@ -160,4 +162,4 @@
 
   </dl>
 
-[% INCLUDE 'footer.html' %]
+[% INCLUDE 'footer.html', pagefooter = 'yes' %]
diff --git a/templates/web/fiksgatami/front/footer-marketing.html b/templates/web/fiksgatami/front/footer-marketing.html
index 6069c8793..da59fe6e6 100644
--- a/templates/web/fiksgatami/front/footer-marketing.html
+++ b/templates/web/fiksgatami/front/footer-marketing.html
@@ -1,8 +1,5 @@
                         <div class="tablewrapper bordered">
                             <div id="footer-mobileapps">
-                                <p>
-                                    <a href="http://wiki.nuug.no/grupper/fiksgatami/android">Last ned FiksGataMi-app for din Android-telefon.</a>
-                                </p>
                             </div>
 
                             <div id="footer-help">