diff --git a/akvo/rsr/iati/sector_mappings.py b/akvo/rsr/iati/sector_mappings.py
index 51335cc0b4..57032ccf38 100644
--- a/akvo/rsr/iati/sector_mappings.py
+++ b/akvo/rsr/iati/sector_mappings.py
@@ -79,6 +79,10 @@
     115: (41081,),
     116: (41082,),
     122: (41020,),
+    123: (25010,),
+    124: (25010,),
+    125: (31130,),
+    126: (15150,),
     24: (),
     21: (),
     25: (),
diff --git a/akvo/rsr/models/project.py b/akvo/rsr/models/project.py
index c4bf45ceb8..a0638862e0 100644
--- a/akvo/rsr/models/project.py
+++ b/akvo/rsr/models/project.py
@@ -734,6 +734,18 @@ def siblings(self):
         return (Project.objects.filter(related_projects__related_project=self, related_projects__relation=3) |
                 Project.objects.filter(related_to_projects__project=self, related_to_projects__relation=3)).distinct()
 
+    def has_results(self):
+        for result in self.results.all():
+            if result.title or result.type or result.aggregation_status or result.description:
+                return True
+        return False
+
+    def has_indicators(self):
+        for result in self.results.all():
+            if result.indicators.all():
+                return True
+        return False
+
     class Meta:
         app_label = 'rsr'
         verbose_name = _(u'project')
diff --git a/akvo/rsr/models/result.py b/akvo/rsr/models/result.py
index 882209ea9a..a9d0cc74b0 100644
--- a/akvo/rsr/models/result.py
+++ b/akvo/rsr/models/result.py
@@ -28,6 +28,11 @@ def __unicode__(self):
     def iati_type(self):
         return dict(codelists.RESULT_TYPE)[self.type] if self.type else ""
 
+    def has_info(self):
+        if self.title or self.type or self.aggregation_status or self.description:
+            return True
+        return False
+
     class Meta:
         app_label = 'rsr'
         verbose_name = _(u'result')
diff --git a/akvo/templates/partials/project_header.html b/akvo/templates/partials/project_header.html
index 6ac9ef09fe..05e8826714 100644
--- a/akvo/templates/partials/project_header.html
+++ b/akvo/templates/partials/project_header.html
@@ -16,7 +16,9 @@ <h1><a href="{% url 'project-main' project.pk %}">{{project.title}}</a></h1>
                         <a href="#" class="btn btn-primary">Follow project</a>
                         {% url 'project-report' project.pk as report_url %}
                         {% if not request.get_full_path == report_url %}
-                        <a href="{% url 'project-report' project.pk %}" class="btn"><i class="fa fa-th-list"></i> Show full data report</a>
+                        <a href="{% url 'project-report' project.pk %}" class="btn"><i class="fa fa-bar-chart"></i> Show full data report</a>
+                        {% else %}
+                        <a href="javascript:window.print();" class="btn"><i class="fa fa-print"></i> Print this page</a>
                         {% endif %}
                     </nav>
                 </div>
diff --git a/akvo/templates/project_report.html b/akvo/templates/project_report.html
index a95a6f9d81..bb821cdcc5 100644
--- a/akvo/templates/project_report.html
+++ b/akvo/templates/project_report.html
@@ -22,7 +22,7 @@ <h4>{% trans "Identifiers" %}</h4>
                             {% for partnership in project.partnerships.all %}
                             {% if partnership.internal_id %}
                             <tr>
-                                <th scope="row">{{partnership.organisation.name}} {% trans "ID" %}</th>
+                                <th scope="row">{{partnership.organisation}} {% trans "ID" %}</th>
                                 <td>{{partnership.internal_id}}</td>
                             </tr>
                             {% endif %}
@@ -435,21 +435,41 @@ <h4>{% trans "Conditions" %}</h4>
                 </tbody>
             </table>
             {% endif %}
-            {% if project.results.all %}
+            {% if project.has_results %}
             <h4>{% trans "Results" %}</h4>
+            <table class="table table-striped table-bordered">
+                <thead>
+                    <tr>
+                        <th>{% trans "Result" %}</th>
+                        <th>{% trans "Type" %}</th>
+                        <th>{% trans "Aggregation Status" %}</th>
+                        <th>{% trans "Description" %}</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {% for result in project.results.all %}
+                    {% if result.has_info %}
+                    <tr>
+                        <td>{{result.title}}</td>
+                        <td>{{result.iati_type}}</td>
+                        <td>{{result.aggregation_status|yesno:"Aggregatable,Not Aggregatable,"}}</td>
+                        <td>{{result.description}}</td>
+                    </tr>
+                    {% endif %}
+                    {% endfor %}
+                </tbody>
+            </table>
+            {% endif%}
+            {% if project.has_indicators %}
+            <h4>{% trans "Indicators" %}</h4>
             <div class="table-responsive">
                 <table class="table table-striped table-bordered">
                     <thead>
                         <tr>
-                            <th>{% trans "Result" %}</th>
-                            <th>{% trans "Type" %}</th>
-                            <th>{% trans "Aggregation Status" %}</th>
                             <th>{% trans "Indicator" %}</th>
                             <th>{% trans "Measure" %}</th>
                             <th>{% trans "Ascending" %}</th>
                             <th>{% trans "Baseline" %}</th>
-                            <th>{% trans "Baseline Year" %}</th>
-                            <th>{% trans "Baseline Value" %}</th>
                             <th>{% trans "Period Start" %}</th>
                             <th>{% trans "Period End" %}</th>
                             <th>{% trans "Target Value" %}</th>
@@ -458,23 +478,18 @@ <h4>{% trans "Results" %}</h4>
                     </thead>
                     <tbody>
                         {% for result in project.results.all %}
+                        {% for indicator in result.indicators.all %}
                         <tr>
-                            <td>{{result.title}}</td>
-                            <td>{{result.iati_type}}</td>
-                            <td>{{result.aggregation_status|yesno:"Aggregatable,Not Aggregatable,"}}</td>
-                            {% for indicator in result.indicators.all %}
-                            {% if not forloop.first %}
-                            <tr><td></td><td></td><td></td>
-                            {% endif %}
                             <td>{{indicator.title}}</td>
                             <td>{{indicator.iati_measure}}</td>
                             <td>{{indicator.ascending|yesno:"Ascending,Descending,"}}</td>
-                            <td>{{indicator.baseline_comment}}</td>
-                            <td>{{indicator.baseline_year|default_if_none:""}}</td>
-                            <td>{{indicator.baseline_value}}</td>
+                            <td>{% if indicator.baseline_year %}{% trans "In" %}: {{indicator.baseline_year}}{% endif %}
+                                {{indicator.baseline_value}}
+                                {% if indicator.baseline_comment %}({{indicator.baseline_comment}}){% endif %}
+                            </td>
                             {% for period in indicator.periods.all %}
                             {% if not forloop.first %}
-                            <tr><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td>
+                            <tr><td></td><td></td><td></td><td></td><td></td><td></td>
                             {% endif %}
                             <td>{{period.period_start|default_if_none:""}}</td>
                             <td>{{period.period_end|default_if_none:""}}</td>
@@ -483,11 +498,9 @@ <h4>{% trans "Results" %}</h4>
                             {% empty %}
                             <td></td><td></td><td></td><td></td>
                             {% endfor %}
-                            {% empty %}
-                            <td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td>
-                            {% endfor %}
                         </tr>
                         {% endfor %}
+                        {% endfor %}
                     </tbody>
                 </table>
             </div>