diff --git a/src/app/statistics/statistics.component.html b/src/app/statistics/statistics.component.html
index 377d695..674fa85 100644
--- a/src/app/statistics/statistics.component.html
+++ b/src/app/statistics/statistics.component.html
@@ -7,181 +7,172 @@
         <div class="uk-grid">
             <ul class="uk-tab uk-tab-left uk-width-1-5 uk-margin-top" data-uk-tab="{connect:'#tabs'}">
                 <li (click)="charts.timelines.publications.load = true"><a href="#">Publications</a></li>
-                <li (click)="charts.timelines.datasets.load = true"><a href="#" disabled>Research Data</a></li>
+                <li (click)="charts.timelines.datasets.load = true"><a href="#">Research Data</a></li>
                 <li (click)="charts.timelines.software.load = true"><a href="#">Software</a></li>
             </ul>
 
             <ul id="tabs" class="uk-switcher uk-margin uk-width-4-5" style="min-height:450px; padding-left:40px;">
                 <li>
-                    <div>
-                        <div class="uk-text-uppercase uk-text-bold uk-heading-divider">
-                            <h2>Publications statistics</h2>
-                            <div *ngIf="statistics.publications.total" class="uk-text-small">
-                                <span>{{statistics.publications.total}} publications from {{statistics.total_projects}} projects.</span><br>
-                                <span>{{statistics.publications.open_access}} are OA</span>
-                                <span *ngIf="statistics.publications.restricted && statistics.publications.restricted > 0">,
-                                    {{statistics.publications.restricted}} are restricted
-                                </span>
-                                <span *ngIf="statistics.publications.embargo && statistics.publications.embargo > 0">
-                                    and {{statistics.publications.embargo}} are still in embargo
-                                </span>
-                            </div>
+                    <div class="uk-text-uppercase uk-text-bold uk-heading-divider">
+                        <h2>Research data statistics</h2>
+                        <div *ngIf="statistics.publications.total" class="uk-text-small">
+                            <span>{{statistics.publications.total}} datasets from {{statistics.total_projects}} projects.</span><br>
+                            <span>{{statistics.publications.open_access}} are OA</span>
+                            <span *ngIf="statistics.publications.restricted && statistics.publications.restricted > 0">,
+                                {{statistics.publications.restricted}} are restricted
+                            </span>
+                            <span *ngIf="statistics.publications.embargo && statistics.publications.embargo > 0">
+                                and {{statistics.publications.embargo}} are still in embargo
+                            </span>
                         </div>
                     </div>
                     <div *ngIf="statistics.publications.total">
-                        <ul class="uk-tab uk-margin-top" data-uk-tab="{connect: '#pubTimelines'">
-                            <li (click)="charts.timelines.publications.load = true"
-                                (toggle)="toggleLoadChart('timelines','publications')">
-                                <a href="#">Timeline</a></li>
-                            <li (click)="charts['graphs']['pubGraph']['load'] = true"
-                                (close)="charts.graphs.pubGraph.load = false"><a href="#">Graph</a></li>
-                        </ul>
-                        <ul id="pudTimelines" class="uk-switcher uk-margin">
-                            <li>
-                                <div *ngIf="charts.timelines.publications.load">
-                                    <i-frame  [url]=charts.timelines.publications.url width="1000" height="450"></i-frame>
-                                </div>
-                            </li>
-                            <li>
-                                <div *ngIf="charts.graphs.pubGraph.load">
-                                    <i-frame  [url]=charts.graphs.pubGraph.url width="1000" height="450"></i-frame>
-                                </div>
-                            </li>
-                        </ul>
+                        <div *ngIf="charts.timelines.publications.load">
+                            <i-frame  [url]=charts.timelines.publications.url width="1000" height="450"></i-frame>
+                        </div>
+                        <div *ngIf="charts.graphs.pubGraph.load">
+                            <i-frame  [url]=charts.graphs.pubGraph.url width="1000" height="600"></i-frame>
+                        </div>
+                        <hr>
+                        <div>
+                            <h4 class="uk-text-uppercase uk-text-bold">Publications per project</h4>
+                        </div>
+                        <div>
+                            <ul class="uk-tab uk-margin-top" data-uk-tab="{connect: '#pubTabs'">
+                                <li (click)="charts.projectPublications.columns.load = true"><a href="#">Columns</a></li>
+                                <li (click)="charts.projectPublications.pie.load = true"><a href="#">Pie</a></li>
+                                <li (click)="charts.projectPublications.table.load = true"><a href="#">Table</a></li>
+                            </ul>
+                            <ul id="pubTabs" class="uk-switcher uk-margin">
+                                <li>
+                                    <div *ngIf="charts.projectPublications.columns.load">
+                                        <i-frame  [url]=charts.projectPublications.columns.url width="1000" height="450"></i-frame>
+                                    </div>
+                                </li>
+                                <li>
+                                    <div *ngIf="charts.projectPublications.pie.load">
+                                        <i-frame  [url]=charts.projectPublications.pie.url width="1000" height="450"></i-frame>
+                                    </div>
+                                </li>
+                                <li>
+                                    <div *ngIf="charts.projectPublications.table.load">
+                                        <i-frame  [url]=charts.projectPublications.table.url width="1000" height="450"></i-frame>
+                                    </div>
+                                </li>
+                            </ul>
+                        </div>
                     </div>
                     <div *ngIf="statistics.publications.total == 0" class="uk-alert uk-alert-primary">
-                        No publications available
-                    </div>
-                    <hr>
-                    <div>
-                        <h4 class="uk-text-uppercase uk-text-bold">Publications per project</h4>
-                    </div>
-                    <div>
-                        <ul class="uk-tab uk-margin-top" data-uk-tab="{connect: '#pubTabs'">
-                            <li (click)="charts.projectPublications.columns.load = true"><a href="#">Columns</a></li>
-                            <li (click)="charts.projectPublications.pie.load = true"><a href="#">Pie</a></li>
-                            <li (click)="charts.projectPublications.table.load = true"><a href="#">Table</a></li>
-                        </ul>
-                        <ul id="pubTabs" class="uk-switcher uk-margin">
-                            <li>
-                                <div *ngIf="charts.projectPublications.columns.load">
-                                    <i-frame  [url]=charts.projectPublications.columns.url width="1000" height="450"></i-frame>
-                                </div>
-                            </li>
-                            <li>
-                                <div *ngIf="charts.projectPublications.pie.load">
-                                    <i-frame  [url]=charts.projectPublications.pie.url width="1000" height="450"></i-frame>
-                                </div>
-                            </li>
-                            <li>
-                                <div *ngIf="charts.projectPublications.table.load">
-                                    <i-frame  [url]=charts.projectPublications.table.url width="1000" height="450"></i-frame>
-                                </div>
-                            </li>
-                        </ul>
+                        No research data available
                     </div>
                 </li>
                 <li>
-                    <div>
-                        <div class="uk-text-uppercase uk-text-bold uk-heading-divider">
-                            <h2>Research data statistics</h2>
-                            <div class="uk-text-small">
-                                <span>{{statistics.datasets.total}} datasets from {{statistics.total_projects}} projects.</span><br>
-                                <span>{{statistics.datasets.open_access}} are OA</span>
-                                <span *ngIf="statistics.datasets.restricted && statistics.datasets.restricted > 0">,
-                                    {{statistics.datasets.restricted}} are restricted
-                                </span>
-                                <span *ngIf="statistics.datasets.embargo && statistics.datasets.embargo > 0">
-                                    and {{statistics.datasets.embargo}} are still in embargo
-                                </span>
-                            </div>
+                    <div class="uk-text-uppercase uk-text-bold uk-heading-divider">
+                        <h2>Research data statistics</h2>
+                        <div *ngIf="statistics.datasets.total" class="uk-text-small">
+                            <span>{{statistics.datasets.total}} datasets from {{statistics.total_projects}} projects.</span><br>
+                            <span>{{statistics.datasets.open_access}} are OA</span>
+                            <span *ngIf="statistics.datasets.restricted && statistics.datasets.restricted > 0">,
+                                {{statistics.datasets.restricted}} are restricted
+                            </span>
+                            <span *ngIf="statistics.datasets.embargo && statistics.datasets.embargo > 0">
+                                and {{statistics.datasets.embargo}} are still in embargo
+                            </span>
                         </div>
                     </div>
-                    <div *ngIf="charts.timelines.datasets.load && statistics.datasets.total > 0">
-                        <i-frame  [url]=charts.timelines.datasets.url width="1000" height="450"></i-frame>
+                    <div *ngIf="statistics.datasets.total">
+                        <div *ngIf="charts.timelines.datasets.load">
+                            <i-frame  [url]=charts.timelines.datasets.url width="1000" height="450"></i-frame>
+                        </div>
+                        <div *ngIf="charts.graphs.dataGraph.load">
+                            <i-frame  [url]=charts.graphs.dataGraph.url width="1000" height="450"></i-frame>
+                        </div>
+                        <hr>
+                        <div>
+                            <h4 class="uk-text-uppercase uk-text-bold">Research data per project</h4>
+                        </div>
+                        <div>
+                            <ul class="uk-tab uk-margin-top" data-uk-tab="{connect: '#dataTabs'">
+                                <li (click)="charts.projectDatasets.columns.load = true"><a href="#">Columns</a></li>
+                                <li (click)="charts.projectDatasets.pie.load = true"><a href="#">Pie</a></li>
+                                <li (click)="charts.projectDatasets.table.load = true"><a href="#">Table</a></li>
+                            </ul>
+                            <ul id="dataTabs" class="uk-switcher uk-margin">
+                                <li>
+                                    <div *ngIf="charts.projectDatasets.columns.load">
+                                        <i-frame  [url]=charts.projectDatasets.columns.url width="1000" height="450"></i-frame>
+                                    </div>
+                                </li>
+                                <li>
+                                    <div *ngIf="charts.projectDatasets.pie.load">
+                                        <i-frame  [url]=charts.projectDatasets.pie.url width="1000" height="450"></i-frame>
+                                    </div>
+                                </li>
+                                <li>
+                                    <div *ngIf="charts.projectDatasets.table.load">
+                                        <i-frame  [url]=charts.projectDatasets.table.url width="1000" height="450"></i-frame>
+                                    </div>
+                                </li>
+                            </ul>
+                        </div>
                     </div>
                     <div *ngIf="statistics.datasets.total == 0" class="uk-alert uk-alert-primary">
                         No research data available
                     </div>
-                    <hr>
-                    <div>
-                        <h4 class="uk-text-uppercase uk-text-bold">Research data per project</h4>
-                    </div>
-                    <div>
-                        <ul class="uk-tab uk-margin-top" data-uk-tab="{connect: '#dataTabs'">
-                            <li (click)="charts.projectDatasets.columns.load = true"><a href="#">Columns</a></li>
-                            <li (click)="charts.projectDatasets.pie.load = true"><a href="#">Pie</a></li>
-                            <li (click)="charts.projectDatasets.table.load = true"><a href="#">Table</a></li>
-                        </ul>
-                        <ul id="dataTabs" class="uk-switcher uk-margin">
-                            <li>
-                                <div *ngIf="charts.projectDatasets.columns.load">
-                                    <i-frame  [url]=charts.projectDatasets.columns.url width="1000" height="450"></i-frame>
-                                </div>
-                            </li>
-                            <li>
-                                <div *ngIf="charts.projectDatasets.pie.load">
-                                    <i-frame  [url]=charts.projectDatasets.pie.url width="1000" height="450"></i-frame>
-                                </div>
-                            </li>
-                            <li>
-                                <div *ngIf="charts.projectDatasets.table.load">
-                                    <i-frame  [url]=charts.projectDatasets.table.url width="1000" height="450"></i-frame>
-                                </div>
-                            </li>
-                        </ul>
-                    </div>
                 </li>
                 <li>
-                    <div>
-                        <div class="uk-text-uppercase uk-text-bold uk-heading-divider">
-                            <h2>Software statistics</h2>
-                            <div class="uk-text-small">
-                                <span>{{statistics.software.total}} publications from {{statistics.total_projects}} projects.</span><br>
-                                <span>{{statistics.software.open_access}} are OA</span>
-                                <span *ngIf="statistics.software.restricted && statistics.software.restricted > 0">,
-                                    {{statistics.software.restricted}} are restricted
-                                </span>
-                                <span *ngIf="statistics.software.embargo && statistics.software.embargo > 0">
-                                    and {{statistics.software.embargo}} are still in embargo
-                                </span>
-                            </div>
+                    <div class="uk-text-uppercase uk-text-bold uk-heading-divider">
+                        <h2>Software statistics</h2>
+                        <div *ngIf="statistics.software.total" class="uk-text-small">
+                            <span>{{statistics.software.total}} datasets from {{statistics.total_projects}} projects.</span><br>
+                            <span>{{statistics.software.open_access}} are OA</span>
+                            <span *ngIf="statistics.software.restricted && statistics.software.restricted > 0">,
+                                {{statistics.software.restricted}} are restricted
+                            </span>
+                            <span *ngIf="statistics.software.embargo && statistics.software.embargo > 0">
+                                and {{statistics.software.embargo}} are still in embargo
+                            </span>
                         </div>
                     </div>
-                    <div *ngIf="charts.timelines.software.load && statistics.software.total > 0">
-                        <i-frame  [url]=charts.timelines.software.url width="1000" height="450"></i-frame>
+                    <div *ngIf="statistics.software.total">
+                        <div *ngIf="charts.timelines.software.load">
+                            <i-frame  [url]=charts.timelines.software.url width="1000" height="450"></i-frame>
+                        </div>
+                        <div *ngIf="charts.graphs.softwareGraph.load">
+                            <i-frame  [url]=charts.graphs.softwareGraph.url width="1000" height="450"></i-frame>
+                        </div>
+                        <hr>
+                        <div>
+                            <h4 class="uk-text-uppercase uk-text-bold">Software per project</h4>
+                        </div>
+                        <div>
+                            <ul class="uk-tab uk-margin-top" data-uk-tab="{connect: '#softwareTabs'">
+                                <li (click)="charts.projectSoftware.columns.load = true"><a href="#">Columns</a></li>
+                                <li (click)="charts.projectSoftware.pie.load = true"><a href="#">Pie</a></li>
+                                <li (click)="charts.projectSoftware.table.load = true"><a href="#">Table</a></li>
+                            </ul>
+                            <ul id="softwareTabs" class="uk-switcher uk-margin">
+                                <li>
+                                    <div *ngIf="charts.projectSoftware.columns.load">
+                                        <i-frame  [url]=charts.projectSoftware.columns.url width="1000" height="450"></i-frame>
+                                    </div>
+                                </li>
+                                <li>
+                                    <div *ngIf="charts.projectSoftware.pie.load">
+                                        <i-frame  [url]=charts.projectSoftware.pie.url width="1000" height="450"></i-frame>
+                                    </div>
+                                </li>
+                                <li>
+                                    <div *ngIf="charts.projectSoftware.table.load">
+                                        <i-frame  [url]=charts.projectSoftware.table.url width="1000" height="450"></i-frame>
+                                    </div>
+                                </li>
+                            </ul>
+                        </div>
                     </div>
                     <div *ngIf="statistics.software.total == 0" class="uk-alert uk-alert-primary">
                         No software available
                     </div>
-                    <hr>
-                    <div>
-                        <h4 class="uk-text-uppercase uk-text-bold">Software per project</h4>
-                    </div>
-                    <div>
-                        <ul class="uk-tab uk-margin-top" data-uk-tab="{connect: '#softwareTabs'">
-                            <li (click)="charts.projectSoftware.columns.load = true"><a href="#">Columns</a></li>
-                            <li (click)="charts.projectSoftware.pie.load = true"><a href="#">Pie</a></li>
-                            <li (click)="charts.projectSoftware.table.load = true"><a href="#">Table</a></li>
-                        </ul>
-                        <ul id="softwareTabs" class="uk-switcher uk-margin">
-                            <li>
-                                <div *ngIf="charts.projectSoftware.columns.load">
-                                    <i-frame  [url]=charts.projectSoftware.columns.url width="1000" height="450"></i-frame>
-                                </div>
-                            </li>
-                            <li>
-                                <div *ngIf="charts.projectSoftware.pie.load">
-                                    <i-frame  [url]=charts.projectSoftware.pie.url width="1000" height="450"></i-frame>
-                                </div>
-                            </li>
-                            <li>
-                                <div *ngIf="charts.projectSoftware.table.load">
-                                    <i-frame  [url]=charts.projectSoftware.table.url width="1000" height="450"></i-frame>
-                                </div>
-                            </li>
-                        </ul>
-                    </div>
                 </li>
             </ul>
         </div>
diff --git a/src/app/statistics/statistics.component.ts b/src/app/statistics/statistics.component.ts
index 6e20a25..ff3e3fd 100644
--- a/src/app/statistics/statistics.component.ts
+++ b/src/app/statistics/statistics.component.ts
@@ -95,14 +95,14 @@ export class StatisticsComponent {
      this.charts = {
        graphs: {
            pubGraph:
-           {url: this.properties.statisticsFrameAPIURL +  'chart.php?com=query&data={"query":"comOAPubs","comId":"'+ this.communityId + '","table":"result","fields":[{"fld":"number","agg":"count","type":"pie","yaxis":1,"c":false}],"xaxis":{"name":"bestlicense","agg":"avg"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":"-","s":"-","l":"-","ft":"-","wt":"-"},"order":"d","yaxisheaders":[""],"fieldsheaders":[""],"in":[],"filters":[],"having":[],"incfilters":[],"inchaving":[],"title":"Publications by access mode","subtitle":"","xaxistitle":"","nulls":true}&w=50%&h=83%',
-           load:false},
+           {url: this.properties.statisticsFrameAPIURL +  'chart.php?com=query&data={"query":"comOAPubs","comId":"'+ this.communityId + '","table":"result","fields":[{"fld":"number","agg":"count","type":"pie","yaxis":1,"c":false}],"xaxis":{"name":"bestlicense","agg":"avg"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":"-","s":"-","l":"-","ft":"-","wt":"-"},"order":"d","yaxisheaders":[""],"fieldsheaders":[""],"in":[],"filters":[],"having":[],"incfilters":[],"inchaving":[],"title":"Publications by access mode","subtitle":"","xaxistitle":"","nulls":true}&w=500&amph=600',
+           load:true},
            dataGraph:
            {url: this.properties.statisticsFrameAPIURL + 'chart.php?com=query&data={"query":"comOAData","comId":"'+ this.communityId +'","table":"result","fields":[{"fld":"number","agg":"count","type":"pie","yaxis":1,"c":false}],"xaxis":{"name":"bestlicense","agg":"avg"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":"-","s":"-","l":"-","ft":"-","wt":"-"},"order":"d","yaxisheaders":[""],"fieldsheaders":[""],"in":[],"filters":[],"having":[],"incfilters":[],"inchaving":[],"title":"Datasets by access mode","subtitle":"","xaxistitle":"","nulls":true}&w=500&amph=600',
-           load: false},
+           load: true},
            softwareGraph:
            {url: this.properties.statisticsFrameAPIURL + 'chart.php?com=query&data={"query":"comOASoft","comId":"'+ this.communityId +'","table":"result","fields":[{"fld":"number","agg":"count","type":"pie","yaxis":1,"c":false}],"xaxis":{"name":"bestlicense","agg":"avg"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":"-","s":"-","l":"-","ft":"-","wt":"-"},"order":"d","yaxisheaders":[""],"fieldsheaders":[""],"in":[],"filters":[],"having":[],"incfilters":[],"inchaving":[],"title":"Software by access mode","subtitle":"","xaxistitle":"","nulls":true}&w=500&amph=600',
-           load:false}
+           load:true}
        },
        timelines: {
          publications: