diff --git a/akvo/rsr/static/rsr/v3/css/src/main.css b/akvo/rsr/static/rsr/v3/css/src/main.css
index 8232b8361f..306e294e48 100755
--- a/akvo/rsr/static/rsr/v3/css/src/main.css
+++ b/akvo/rsr/static/rsr/v3/css/src/main.css
@@ -233,9 +233,6 @@ dl.dl-horizontal dt {
   dl.dl-horizontal dt.totalFinance {
     margin-top: 30px;
     font-weight: bold; }
-@media only screen and (max-width: 768px) {
-  dl.dl-horizontal dd {
-    margin-left: 100px; } }
 dl.dl-horizontal dd.totalFinance {
   margin-top: 30px;
   font-weight: bold; }
@@ -503,8 +500,15 @@ nav.navbar-fixed-top {
       color: white; }
     @media only screen and (max-width: 768px) {
       .twoColumns a {
-        width: 95%;
-        padding: 2px 5%;
+        width: 98%;
+        padding: 2px 1%;
+        float: none;
+        margin: 2px 0 2px 0;
+        display: block; } }
+    @media only screen and (min-width: 768px) and (max-width: 1024px) {
+      .twoColumns a {
+        width: 98%;
+        padding: 2px 1%;
         float: none;
         margin: 2px 0 2px 0;
         display: block; } }
@@ -815,6 +819,12 @@ h4.detailedInfo {
     color: rgba(32, 32, 36, 0.5); }
   .main-list li .additionalInfo div span {
     margin-left: 5px; }
+  @media only screen and (max-width: 768px) {
+    .main-list li dl.dl-horizontal dd {
+      margin-left: 100px; } }
+  @media only screen and (min-width: 768px) and (max-width: 1024px) {
+    .main-list li dl.dl-horizontal dd {
+      margin-left: 80px; } }
 .main-list .excerpt {
   overflow: hidden;
   text-overflow: ellipsis;
@@ -964,6 +974,9 @@ header.projectHeader {
     width: calc(100%-2px);
     height: 300px; }
 
+.orgMap .mapInfoWindow img {
+  display: none; }
+
 div.projectTopRow {
   position: relative;
   background: rgba(245, 245, 245, 0.5);
diff --git a/akvo/rsr/static/rsr/v3/css/src/main.scss b/akvo/rsr/static/rsr/v3/css/src/main.scss
index d4d1b00ed8..54e737e9f9 100755
--- a/akvo/rsr/static/rsr/v3/css/src/main.scss
+++ b/akvo/rsr/static/rsr/v3/css/src/main.scss
@@ -240,10 +240,6 @@ dl {
             }
         }
         dd {
-            @include responsive(small-max-screens) {
-                margin-left: 100px;
-            }
-
             &.totalFinance {
                 margin-top: 30px;
                 font-weight: bold;
@@ -407,11 +403,12 @@ nav.navbar-fixed-top {
         }
     }
 }
-@include responsive (ipadAir) {
- .navbar-header {
+
+@include responsive(ipadAir) {
+    .navbar-header {
         float: none;
     }
-    .navbar-left,.navbar-right {
+    .navbar-left, .navbar-right {
         float: none !important;
     }
     .navbar-toggle {
@@ -419,28 +416,28 @@ nav.navbar-fixed-top {
     }
     .navbar-collapse {
         border-top: 1px solid transparent;
-        box-shadow: inset 0 1px 0 rgba(255,255,255,0.1);
+        box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1);
     }
     .navbar-fixed-top {
         top: 0;
         border-width: 0 0 1px;
     }
     .navbar-collapse.collapse {
-        display: none!important;
+        display: none !important;
     }
     .navbar-nav {
-        float: none!important;
+        float: none !important;
         margin-top: 7.5px;
     }
-    .navbar-nav>li {
+    .navbar-nav > li {
         float: none;
     }
-    .navbar-nav>li>a {
+    .navbar-nav > li > a {
         padding-top: 10px;
         padding-bottom: 10px;
     }
-    .collapse.in{
-        display:block !important;
+    .collapse.in {
+        display: block !important;
     }
 }
 
@@ -541,8 +538,15 @@ nav.navbar-fixed-top {
             color: white;
         }
         @include responsive(small-max-screens) {
-            width: 95%;
-            padding: 2px 5%;
+            width: 98%;
+            padding: 2px 1%;
+            float: none;
+            margin: 2px 0 2px 0;
+            display: block;
+        }
+        @include responsive(ipadAir) {
+            width: 98%;
+            padding: 2px 1%;
             float: none;
             margin: 2px 0 2px 0;
             display: block;
@@ -930,6 +934,18 @@ h4.detailedInfo {
                 }
             }
         }
+        dl {
+            &.dl-horizontal {
+                dd {
+                    @include responsive(small-max-screens) {
+                        margin-left: 100px;
+                    }
+                    @include responsive(ipadAir) {
+                        margin-left: 80px;
+                    }
+                }
+            }
+        }
     }
     .excerpt {
         @include noWrapBlockTxt;
@@ -1132,7 +1148,13 @@ header {
         height: 300px;
     }
 }
-
+.orgMap {
+    .mapInfoWindow {
+        img {
+            display: none;
+        }
+    }
+}
 div.projectTopRow {
     position: relative;
     background: rgba(245, 245, 245, 0.5);
diff --git a/akvo/templates/myrsr/my_projects.html b/akvo/templates/myrsr/my_projects.html
index 63669b3f7a..5a44bcecc8 100644
--- a/akvo/templates/myrsr/my_projects.html
+++ b/akvo/templates/myrsr/my_projects.html
@@ -5,10 +5,10 @@
 {% block title %}{% trans "MyRSR - my projects" %}{% endblock %}
 
 {% block myrsr_main %}
-<div class="table-responsive">
+<div>
   <h3>{% trans "My project" %}s</h3>
   {% if page %}
-  <table class="table table-striped">
+  <table class="table table-striped table-responsive">
     <thead>
       <tr>
           <th>Project</th><th>Location</th><th>Status</th><th>Actions</th></tr>
@@ -50,7 +50,7 @@ <h4 class="media-heading">{{ project.title }}</h4>
               </a>
               {% endif %}
               {% has_perm 'rsr.post_updates' project as can_add_update %}
-              <a href="{% url 'add-update' project.pk %}">Add an update</a>
+              <a href="{% url 'add-update' project.pk %}">Add update</a>
             </div>
           </td>
       </tr>
diff --git a/akvo/templates/myrsr/my_updates.html b/akvo/templates/myrsr/my_updates.html
index 65286a8ced..067347eb7c 100644
--- a/akvo/templates/myrsr/my_updates.html
+++ b/akvo/templates/myrsr/my_updates.html
@@ -7,8 +7,8 @@
 {% block myrsr_main %}
     <h3>My updates</h3>
     {% if page %}
-        <div class="table-responsive" id="updates">
-            <table class="table table-striped">
+        <div id="updates">
+            <table class="table table-striped table-responsive">
                 <thead><tr><th>Media</th><th>Title</th><th>Date</th><th>Project</th><th>Actions</th></tr></thead>
                 <tbody>
                 {% for update in page %}
diff --git a/akvo/templates/myrsr/myrsr_base.html b/akvo/templates/myrsr/myrsr_base.html
index 1abee81c7f..c0ac4b886f 100644
--- a/akvo/templates/myrsr/myrsr_base.html
+++ b/akvo/templates/myrsr/myrsr_base.html
@@ -6,7 +6,7 @@
 <div class="container">
     <div class="row">
         {% block myrsr_menu %}
-        <div class="col-sm-2 myRsrMenu">
+        <div class="col-md-2 myRsrMenu">
             <h4 class="hidden">MyRSR</h4>
             {% with current_path=request.get_full_path %}
             <nav class="navbar navbar-nav" role="navigation">
@@ -26,7 +26,7 @@ <h4 class="hidden">MyRSR</h4>
             {% endwith %}
         </div>
         {% endblock %}
-        <div class="col-sm-10">
+        <div class="col-md-10">
                 {% block myrsr_main %}{% endblock %}
         </div>
     </div>
diff --git a/akvo/templates/organisation_directory.html b/akvo/templates/organisation_directory.html
index 3c61d245bf..d5a0b27ab2 100644
--- a/akvo/templates/organisation_directory.html
+++ b/akvo/templates/organisation_directory.html
@@ -3,7 +3,7 @@
 {% block title %}{% trans 'Organisations' %}{% endblock %}
 {% block maincontent %}
 
-<section id="map" class="touch-navbar">
+<section id="map" class="touch-navbar orgMap">
   {% coll_map page '100%' '100%' %}
 </section>
 
diff --git a/akvo/templates/project_finance.html b/akvo/templates/project_finance.html
index 6bb2a45a1a..98a42e4fca 100644
--- a/akvo/templates/project_finance.html
+++ b/akvo/templates/project_finance.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% load compressed i18n rsr_utils %}
+{% load compressed i18n rsr_utils humanize %}
 
 {% block title %}{{project.title}}{% endblock title%}
 
@@ -14,17 +14,17 @@
                     <h4 class="">{% trans "Project financial details" %}:</h4>
                     <dl class="dl-horizontal">
                         {% for budget_item in project.budget_items.all %}
-                        <dt>{{budget_item.label.label}}:</dt><dd><span class="currency">{% if project.currency = 'EUR' %}€{% elif project.currency = 'USD' %}${% endif %}</span>{{budget_item.amount}}</dd>
+                        <dt>{{budget_item.label.label}}:</dt><dd><span class="currency">{{project.get_currency_display}}</span>{{budget_item.amount|floatformat|intcomma}}</dd>
                         {% endfor %}
-                        <dt class="totalFinance">{% trans "Total" %}:</dt><dd class="totalFinance"><span class="currency">{% if project.currency = 'EUR' %}€{% elif project.currency = 'USD' %}${% endif %}</span>{{project.budget}}</dd>
+                        <dt class="totalFinance">{% trans "Total" %}:</dt><dd class="totalFinance"><span class="currency">{{project.get_currency_display}}</span>{{project.budget|floatformat|intcomma}}</dd>
                     </dl>
                 </div>
                 <div class="col-sm-4">
                     <h4 class="">{% trans "Project funding" %}:</h4>
                     <dl class="dl-horizontal">
-                        <dt>{% trans "Budget" %}:</dt><dd><span class="currency">{% if project.currency = 'EUR' %}€{% elif project.currency = 'USD' %}${% endif %}</span>{{project.budget}}</dd>
-                        <dt>{% trans "Funded" %}:</dt><dd><span class="currency">{% if project.currency = 'EUR' %}€{% elif project.currency = 'USD' %}${% endif %}</span>{{project.funds}}</dd>
-                        <dt class="totalFinance">{% trans "Funds needed" %}:</dt><dd class="totalFinance"><span class="currency">{% if project.currency = 'EUR' %}€{% elif project.currency = 'USD' %}${% endif %}</span>{{project.funds_needed}}</dd>
+                        <dt>{% trans "Budget" %}:</dt><dd><span class="currency">{{project.get_currency_display}}</span>{{project.budget|floatformat|intcomma}}</dd>
+                        <dt>{% trans "Funded" %}:</dt><dd><span class="currency">{{project.get_currency_display}}</span>{{project.funds|floatformat|intcomma}}</dd>
+                        <dt class="totalFinance">{% trans "Funds needed" %}:</dt><dd class="totalFinance"><span class="currency">{{project.get_currency_display}}</span>{{project.funds_needed|floatformat|intcomma}}</dd>
                     </dl>
                 </div>
                 <div class="col-sm-4">
@@ -34,19 +34,19 @@ <h4 class="">{% trans "Current funders" %}:</h4>
                         <dt><a href="{% url 'organisation-main' partnership.organisation.pk %}">{% img partnership.organisation 80 60 partnership.organisation.name %}</a></dt>
                         <dd>
                             <a href="{% url 'organisation-main' partnership.organisation.pk %}">{{partnership.organisation}}</a>
-                            <br><span class="currency">{% if project.currency = 'EUR' %}€{% elif project.currency = 'USD' %}${% endif %}</span>{{partnership.funding_amount}}
+                            <br><span class="currency">{{project.get_currency_display}}</span>{{partnership.funding_amount|floatformat|intcomma}}
                         </dd>
                     </dl>
                     {% endfor %}
                     <h4>{% trans "Donations" %}:</h4>
                     <dl class="dl-horizontal">
                         {% for donation in project.all_donations %}
-                        <dt>{% if donation.is_anonymous %}{% trans "Anonymous" %}{% else %}{{donation.name}}{% endif %}:</dt><dd><span class="currency">{% if project.currency = 'EUR' %}€{% elif project.currency = 'USD' %}${% endif %}</span>{{donation.amount}}</dd>
+                        <dt>{% if donation.is_anonymous %}{% trans "Anonymous" %}{% else %}{{donation.name}}{% endif %}:</dt><dd><span class="currency">{{project.get_currency_display}}</span>{{donation.amount|floatformat|intcomma}}</dd>
                         {% empty %}
                         <dt>{% trans "No donations" %}</dt><dd></dd>
                         {% endfor %}
                         {% if project.all_donations %}
-                        <dt class="totalFinance">{% trans "Total" %}:</dt><dd class="totalFinance"><span class="currency">{% if project.currency = 'EUR' %}€{% elif project.currency = 'USD' %}${% endif %}</span>{{project.all_donations_amount}}</dd>
+                        <dt class="totalFinance">{% trans "Total" %}:</dt><dd class="totalFinance"><span class="currency">{{project.get_currency_display}}</span>{{project.all_donations_amount|floatformat|intcomma}}</dd>
                         {% endif %}
                     </dl>
                 </div>
@@ -54,7 +54,7 @@ <h4>{% trans "Donations" %}:</h4>
 			<div class="row verticalPadding">
 	    		<h4 class="">{% trans "Project transactions" %}:</h4>
                 {% for transaction in project.transactions.all %}
-                <dt>{{transaction.description}}:</dt><dd><span class="currency">{% if transaction.currency = 'EUR' %}€{% elif project.currency = 'USD' %}${% endif %}</span>{{transaction.value}}</dd>
+                <dt>{{transaction.description}}:</dt><dd><span class="currency">{{project.get_currency_display}}</span>{{transaction.value|floatformat|intcomma}}</dd>
                 {% empty %}
 	    		<p class="small noInfoBlock"><i class="noItem">{% trans "No transactions for this project" %}</i></p>
                 {% endfor %}