diff --git a/App/Data/2019Data.jsx b/App/Data/2019Data.jsx
new file mode 100644
index 0000000..d8c44dd
--- /dev/null
+++ b/App/Data/2019Data.jsx
@@ -0,0 +1,66 @@
+import React from 'react';
+import { MDBDataTable } from 'mdbreact';
+import WMOExtremeClimateIndicesreport2019FIN from '../content/pdfs/WMOExtremeClimateIndicesreport2019FIN.pdf'
+import AnnualStateoftheClimate2019 from '../content/pdfs/AnnualStateoftheClimate2019.pdf'
+
+const ReportYearData = () => {
+  const data = {
+    columns: [
+      {
+        label: 'Title',
+        field: 'title',
+        sort: 'asc',
+        width: 150
+      },
+      {
+        label: 'Source',
+        field: 'source',
+        sort: 'asc',
+        width: 150
+      },
+      {
+        label: 'Document Reference',
+        field: 'docref',
+        sort: 'asc',
+        width: 150
+      },
+      {
+        label: 'Link',
+        field: 'link',
+        sort: 'asc',
+        width: 150
+      }
+    ],
+    rows: [
+      {
+        title: "Annual State of the Climate of South Africa 2019",
+        source: "SAWS",
+        docref: "WCS-CLS-CI-ASC-2019",
+        link: [<a className="dataLink" href={AnnualStateoftheClimate2019} target="_blank">link</a>]
+      },
+      {
+        title: "Trends in Extreme Climate Indices in South Africa 2019",
+        source: "SAWS",
+        docref: "WCS-CLS-WMO_EXTREME_CLIMATE_INDICES_2019.1",
+        link: [<a className="dataLink" href={WMOExtremeClimateIndicesreport2019FIN} target="_blank">link</a>]
+      }
+     ]
+  };
+
+  return (
+    <>
+    <MDBDataTable
+      striped
+      bordered
+      hover
+      data={data}
+      // exportToCSV
+      info={false}
+    />
+    </>
+  );
+}
+
+
+
+export default (ReportYearData);
\ No newline at end of file
diff --git a/App/Data/searchTerms.json b/App/Data/DELETEsearchTerms.json
similarity index 100%
rename from App/Data/searchTerms.json
rename to App/Data/DELETEsearchTerms.json
diff --git a/App/Data/footerConfig.js b/App/Data/footerConfig.js
index c1c3925..5d9a7d5 100644
--- a/App/Data/footerConfig.js
+++ b/App/Data/footerConfig.js
@@ -1,4 +1,4 @@
-import DEA_Logo from '../images/DEA/environmental_affairs_logo_small.jpg'
+//import DEA_Logo from '../images/DEA/environmental_affairs_logo_small.jpg'
 
 
 export const footerContent = {
@@ -6,7 +6,7 @@ export const footerContent = {
     {
       text: "Technology",
       links: [
-        { text: "DEA NCCIS uses open source, government funded facilities provided by SAEON. The DST and NRF funds the SAEON Open Data Platform (ODP) and associated portals. Developed by SAEON on behalf of DST, DEA, DRDLR, and other stakeholders." },
+        { text: "DEFF NCCIS uses open source, government funded facilities provided by SAEON. The DST and NRF funds the SAEON Open Data Platform (ODP) and associated portals. Developed by SAEON on behalf of DSI, DEFF and DLDLR, and other stakeholders." },
       ]
     },
     {
@@ -29,7 +29,7 @@ export const footerContent = {
     {
       text: "Funding",
       links: [
-        { src: DEA_Logo, width: "100%"/*, link: "http://www.example.com"*/ }
+        //{ src: DEA_Logo, width: "100%"/*, link: "http://www.example.com"*/ }
       ]
     }
   ]
diff --git a/App/Data/guidelinesData.jsx b/App/Data/guidelinesData.jsx
index 7e08d4a..ea07c01 100644
--- a/App/Data/guidelinesData.jsx
+++ b/App/Data/guidelinesData.jsx
@@ -39,7 +39,7 @@ const GuidelinesData = () => {
         {
           type: "Aaptation",
           name: "National Environmental Management Act: Implementation guidelines",
-          description: "The Department of Environmental Affairs (DEA) determined that a guideline on the Environmental Impact Assessmet (EIA) process would be of value in respect of particular types of developments. These are referred to as \"sectors' and the DEA identified 5 sectors that required attention, namely agri-industry projects, energy projects, large-scale developments, social infrastructure and housing projects and linear developments.",
+          description: "The Department of Environment, Forestry and Fisheries (DEFF) determined that a guideline on the Environmental Impact Assessmet (EIA) process would be of value in respect of particular types of developments. These are referred to as \"sectors' and the DEFF identified 5 sectors that required attention, namely agri-industry projects, energy projects, large-scale developments, social infrastructure and housing projects and linear developments.",
           year: 2010,
           link: [<button onClick={(event) => {event.preventDefault(); window.open("https://www.gov.za/documents/national-environmental-management-act-implementation-guidelines-draft-0");}}>link</button>]
         },
@@ -60,14 +60,14 @@ const GuidelinesData = () => {
         {
           type: "Adaptation",
           name: "National Environmental Management: Protected Areas Act: Cultural Heritage Survey guidelines and assessment tools for protected areas in South Africa",
-          description: "The Department of Environmental Affairs (DEA) following the introduction of the Management Effectiveness Tracking Tool (METT-SA) to track protected area management effectiveness, has identified cultural heritage survey, inventory, planning, and condition assessment in relation to planned objectives as a gap in the management of cultural heritage resources in Protected Areas in South Africa.",
+          description: "The Department of Environment, Forestry and Fisheries (DEFF) following the introduction of the Management Effectiveness Tracking Tool (METT-SA) to track protected area management effectiveness, has identified cultural heritage survey, inventory, planning, and condition assessment in relation to planned objectives as a gap in the management of cultural heritage resources in Protected Areas in South Africa.",
           year: 2017,
           link: [<button onClick={(event) => {event.preventDefault(); window.open("https://www.gov.za/documents/national-environmental-management-protected-areas-act-cultural-heritage-survey-0");}}>link</button>]
         },
         {
           type: "Adaptation",
           name: "Guidelines for Ecosystem-based Adaptation (EBA) in South Africa",
-          description: "Ecosystem-based Adaptation (EbA) is the use of biodiversity and ecosystem services as part of an overall adaptation strategy to help people to adapt to the adverse effects of climate change (CBD, 2009; DEA & SANBI, 2016). Ecosystem-based Adaptation (EbA) represents a coherent approach for adaptation to climate change that makes use of the role that well-functioning ecosystems play in achieving positive societal and development outcomes.",
+          description: "Ecosystem-based Adaptation (EbA) is the use of biodiversity and ecosystem services as part of an overall adaptation strategy to help people to adapt to the adverse effects of climate change (CBD, 2009; DEFF & SANBI, 2016). Ecosystem-based Adaptation (EbA) represents a coherent approach for adaptation to climate change that makes use of the role that well-functioning ecosystems play in achieving positive societal and development outcomes.",
           year: 2017,
           link: [<button onClick={(event) => {event.preventDefault(); window.open("https://www.sanbi.org/wp-content/uploads/2018/09/SA-Ecosystem-based-Adaptation-EbA-Guidelines.pdf");}}>link</button>]
         },
diff --git a/App/Data/policyData.jsx b/App/Data/policyData.jsx
index 053c1a1..9cdc6f8 100644
--- a/App/Data/policyData.jsx
+++ b/App/Data/policyData.jsx
@@ -255,7 +255,7 @@ const PolicyLData = () => {
       {
         type: "Adaptation",
         name: "Strategic Framework and Overarching Implementation Plan for Ecosystem-Based Adaptation (EbA) in South Africa 2016 - 2021",
-        description: "Developed under the leadership of the Department of Environmental Affairs (DEA) and the South African National Biodiversity Institute (SANBI) and in consultation with biodiversity and climate change stakeholders, the Strategic Framework and Overarching Implementation Plan for EbA (hereafter referred to as the EbA Strategy) aims to take forward EbA as a central component of South Africa?s programme of work on biodiversity and climate change.",
+        description: "Developed under the leadership of the Department of Environment, Forestry and Fisheries (DEFF) and the South African National Biodiversity Institute (SANBI) and in consultation with biodiversity and climate change stakeholders, the Strategic Framework and Overarching Implementation Plan for EbA (hereafter referred to as the EbA Strategy) aims to take forward EbA as a central component of South Africa?s programme of work on biodiversity and climate change.",
         year: 2016,
         link: [<button onClick={(event) => {event.preventDefault(); window.open("https://www.sanbi.org/wp-content/uploads/2018/09/Strategic-Framework-and-Overarching-Implementation-Plan-for-EbA-in-SA.pdf");}}>link</button>]
       },
diff --git a/App/Data/provincialData.jsx b/App/Data/provincialData.jsx
new file mode 100644
index 0000000..2eb70a3
--- /dev/null
+++ b/App/Data/provincialData.jsx
@@ -0,0 +1,155 @@
+import React from 'react';
+import { MDBDataTable } from 'mdbreact';
+import ClimateChangeStatusQuofortheFreeStateProvince from '../content/pdfs/ClimateChangeStatusQuofortheFreeStateProvince.pdf';
+import ClimateChangeModelProjectionfortheFreeStateProvince from '../content/pdfs/ClimateChangeModelProjectionfortheFreeStateProvince.pdf';
+import VulnerabilityAssessmentforFreeStateProvince from '../content/pdfs/VulnerabilityAssessmentforFreeStateProvince.pdf';
+import KZNDraftClimateChangeActionPlan from '../content/pdfs/KZNDraftClimateChangeActionPlan.pdf';
+import AdaptationStrategiesforLimpopoProvince from '../content/pdfs/AdaptationStrategiesforLimpopoProvince.pdf';
+import AdaptationStrategiesforMpumalangaProvince from '../content/pdfs/AdaptationStrategiesforMpumalangaProvince.pdf';
+import VulnerabilityAssessmentforMpumalangaProvince from '../content/pdfs/VulnerabilityAssessmentforMpumalangaProvince.pdf';
+import VulnerabilityAssessmentforNorthWestProvince from '../content/pdfs/VulnerabilityAssessmentforNorthWestProvince.pdf';
+import AdaptationStrategiesforNorthWestProvince from '../content/pdfs/AdaptationStrategiesforNorthWestProvince.pdf';
+import ClimateChangeModelProjectionsFortheNorthernCapeProvince from '../content/pdfs/ClimateChangeModelProjectionsFortheNorthernCapeProvince.pdf';
+import VulnerabilityAssessmentforNorthernCapeProvince from '../content/pdfs/VulnerabilityAssessmentforNorthernCapeProvince.pdf';
+import ClimateChangeStatusQuofortheNorthernCapeProvince from '../content/pdfs/ClimateChangeStatusQuofortheNorthernCapeProvince.pdf';
+
+
+const ProvincialData = () => {
+  const data = {
+    columns: [
+      {
+        label: 'Province',
+        field: 'province',
+        sort: 'asc',
+        width: 150
+      },
+      {
+        label: 'Document',
+        field: 'document',
+        sort: 'asc',
+        width: 150
+      },
+      {
+        label: 'Date',
+        field: 'date',
+        sort: 'asc',
+        width: 250
+      },
+      {
+        label: 'Link',
+        field: 'link',
+        sort: 'asc',
+        width: 200
+      }
+    ],
+    rows: [
+      {
+        province: "Eastern Cape",
+        document: "Eastern Cape Climate Change Response Strategy",
+        date: 2011,
+        link: [<button onClick={(event) => {event.preventDefault(); window.open("http://www.cityenergy.org.za/uploads/resource_182.pdf");}}>View Document <em className="fa fa-file-pdf-o"></em></button>]
+      },
+      {
+        province: "Free State",
+        document: "Climate Change Status Quo Report",
+        date: 2015,
+        link: [<a className="dataLink" href={ClimateChangeStatusQuofortheFreeStateProvince} target="_blank">View Document <em className="fa fa-file-pdf-o"></em></a>]
+      },
+      {
+        province: "Free State",
+        document: "Climate Change Model Projection for the Free State Province",
+        date: 2015,
+        link: [<a className="dataLink" href={ClimateChangeModelProjectionfortheFreeStateProvince} target="_blank">View Document <em className="fa fa-file-pdf-o"></em></a>]
+      },
+      {
+        province: "Free State",
+        document: "Vulnerability Assessment for the Free State Province",
+        date: 2015,
+        link: [<a className="dataLink" href={VulnerabilityAssessmentforFreeStateProvince} target="_blank">View Document <em className="fa fa-file-pdf-o"></em></a>]
+      },
+      {
+        province: "Gauteng",
+        document: "Report on the updated climate change projections and broad risk and vulnerability assessment of selected sectors",
+        date: 2017,
+        link: [<button onClick={(event) => {event.preventDefault(); window.open("http://www.redirect1.gpg.gov.za/gchip/Documents/Gauteng%20Climate%20Change%20Risk%20and%20vulnerability%20assessment%20-%202017.pdf");}}>View Document <em className="fa fa-file-pdf-o"></em></button>]
+      },
+      {
+        province: "KwaZulu-Natal",
+        document: "Draft Climate Change ActionPlan",
+        date: 2014,
+        link: [<a className="dataLink" href={KZNDraftClimateChangeActionPlan} target="_blank">View Document <em className="fa fa-file-pdf-o"></em></a>]
+      },
+      {
+        province: "Limpopo",
+        document: "Climate Support Programme (CSP) – Climate Change Adaptation Strategies: Adaptation Strategies for Limpopo Province ",
+        date: 2015,
+        link: [<a className="dataLink" href={AdaptationStrategiesforLimpopoProvince} target="_blank">View Document <em className="fa fa-file-pdf-o"></em></a>]
+      },
+      {
+        province: "Limpopo",
+        document: "Climate Support Programme (CSP) - Climate Change Adaptation Strategies: Adaptation Strategies for Limpopo Province",
+        date: 2013,
+        link: [<button onClick={(event) => {event.preventDefault(); window.open("https://www.environment.gov.za/sites/default/files/docs/limpopogreen_economyplan.pdf");}}>View Document <em className="fa fa-file-pdf-o"></em></button>]
+      },
+      {
+        province: "Mpumalanga",
+        document: "Adaptation Strategies for Mpumalanga Province",
+        date: 2015,
+        link: [<a className="dataLink" href={AdaptationStrategiesforMpumalangaProvince} target="_blank">View Document <em className="fa fa-file-pdf-o"></em></a>]
+      },
+      {
+        province: "Mpumalanga",
+        document: "Mpumalanga Provincial Climate Change Vulnerability Assessment Report",
+        date: 2015,
+        link: [<a className="dataLink" href={VulnerabilityAssessmentforMpumalangaProvince} target="_blank">View Document <em className="fa fa-file-pdf-o"></em></a>]
+      },
+      {
+        province: "North West",
+        document: "North West Provincial Climate Change Vulnerability Assessment Report",
+        date: 2015,
+        link: [<a className="dataLink" href={VulnerabilityAssessmentforNorthWestProvince} target="_blank">View Document <em className="fa fa-file-pdf-o"></em></a>]
+      },
+      {
+        province: "North West",
+        document: "Provincial Climate Change Vulnerability Assessment Report",
+        date: 2015,
+        link: [<a className="dataLink" href={AdaptationStrategiesforNorthWestProvince} target="_blank">View Document <em className="fa fa-file-pdf-o"></em></a>]
+      },
+      {
+        province: "Northern Cape",
+        document: "Northern Cape Climate Change Projections",
+        date: 2015,
+        link: [<a className="dataLink" href={ClimateChangeModelProjectionsFortheNorthernCapeProvince} target="_blank">View Document <em className="fa fa-file-pdf-o"></em></a>]
+      },
+      {
+        province: "Northern Cape",
+        document: "Northern Cape Climate Change Vulnerability Assessment",
+        date: 2015,
+        link: [<a className="dataLink" href={VulnerabilityAssessmentforNorthernCapeProvince} target="_blank">View Document <em className="fa fa-file-pdf-o"></em></a>]
+      },
+      {
+        province: "Northern Cape",
+        document: "Northern Cape Climate Change Status Quo",
+        date: 2015,
+        link: [<a className="dataLink" href={ClimateChangeStatusQuofortheNorthernCapeProvince} target="_blank">View Document <em className="fa fa-file-pdf-o"></em></a>]
+      },
+      {
+        province: "Western Cape",
+        document: "Western Cape Climate Change Response Strategy",
+        date: 2014,
+        link: [<button onClick={(event) => {event.preventDefault(); window.open("https://www.westerncape.gov.za/text/2015/march/western_cape_climate_change_response_strategy_2014.pdf");}}>View Document <em className="fa fa-file-pdf-o"></em></button>]
+      }
+     ]
+  };
+
+  return (
+    <MDBDataTable
+      striped
+      bordered
+      hover
+      data={data}
+    />
+  );
+}
+
+export default ProvincialData;
\ No newline at end of file
diff --git a/App/Data/reportData.jsx b/App/Data/reportData.jsx
index 83f5444..79dec20 100644
--- a/App/Data/reportData.jsx
+++ b/App/Data/reportData.jsx
@@ -134,7 +134,7 @@ const DatatablePage = () => {
           type: 'Mitigation',
           program: '',
           name: 'Current carbon stock estimation capability for South African commercial forest plantations',
-          description: 'The South African forest plantation industry requires country-\'specific carbon accounting/ estimation methods that are compatible with a wide range of existing local and/or regional forest plantation inventory and management systems. For this reason the Institute for Commercial Forestry Research (ICFR) was commissioned by the Department of Environmental Affairs (DEA) to conduct a scoping study to assess data availability for the development of local carbon estimation equations for all commercial plantation sites and species within the three major genera grown (i.e. pine, eucalypt and wattle), as well as the availability and access to grower activity data.',
+          description: 'The South African forest plantation industry requires country-\'specific carbon accounting/ estimation methods that are compatible with a wide range of existing local and/or regional forest plantation inventory and management systems. For this reason the Institute for Commercial Forestry Research (ICFR) was commissioned by the Department of Environment, Forestry and Fisheries (DEFF) to conduct a scoping study to assess data availability for the development of local carbon estimation equations for all commercial plantation sites and species within the three major genera grown (i.e. pine, eucalypt and wattle), as well as the availability and access to grower activity data.',
           year: 2014,
           link: [<button onClick={(event) => {event.preventDefault(); window.open("https://www.environment.gov.za/sites/default/files/reports/carbonstocks_report2015_southafrica.pdf");}}>link</button>]
         },
@@ -222,7 +222,7 @@ const DatatablePage = () => {
           type: 'Climate Change',
           program: '',
           name: 'The National Climate Change Response Monitoring and Evaluation System Framework',
-          description: 'The NCCRP notes that the measurement and monitoring of climate change responses are critical in ensuring their effective implementation, and that South Africa, through the coordination of the Department of Environmental Affairs (DEA), will design and publish the country\'s Climate Change Response Monitoring and Evaluation (M&E) System. Details of this M&E system are outlined in specific sections of the NCCRP.',
+          description: 'The NCCRP notes that the measurement and monitoring of climate change responses are critical in ensuring their effective implementation, and that South Africa, through the coordination of the Department of Environment, Forestry and Fisheries (DEFF), will design and publish the country\'s Climate Change Response Monitoring and Evaluation (M&E) System. Details of this M&E system are outlined in specific sections of the NCCRP.',
           year: 2015,
           link: [<button onClick={(event) => {event.preventDefault(); window.open("https://www.environment.gov.za/sites/default/files/reports/nationalclimatechangeresponse_MESF.pdf");}}>link</button>]
         },
@@ -625,6 +625,14 @@ const DatatablePage = () => {
           description: 'This report documents South Africa\'s submission of its national greenhouse gas inventory for the year 2010. The reporting of these emissions is in line with the IPCC 2006 Guidelines.',
           year: 2014,
           link: [<button onClick={(event) => {event.preventDefault(); window.open("https://www.environment.gov.za/sites/default/files/reports/gng_nationalinventoryreport2000_2012.pdf");}}>link</button>]
+        },
+        {
+          type: 'Climate Change',
+          program: '',
+          name: 'Climate change and adolescents in South Africa: The role of youth activism and the health sector in safeguarding adolescents\' health and education',
+          description: 'Today\'s youth will inherit a world made hazardous by greenhouse gases. As a general rule, those chiefly responsible for emitting these gases will be spared the full brunt of their effects. Age has become a clear fault line of this phenomenon: while today’s adults will experience some impacts of these emissions, adolescents and future generations will face their full force in time.',
+          year: 2014,
+          link: [<button onClick={(event) => {event.preventDefault(); window.open("https://doi.org/10.7196/SAMJ.2019.v109i9.14327");}}>link</button>]
         }
        ]
   };
diff --git a/App/Data/servicesData.jsx b/App/Data/servicesData.jsx
new file mode 100644
index 0000000..1809c6b
--- /dev/null
+++ b/App/Data/servicesData.jsx
@@ -0,0 +1,823 @@
+import React from 'react';
+import { MDBDataTable } from 'mdbreact';
+
+const ServicesData = () => {
+  const data = {
+    columns: [
+      {
+        label: 'Category',
+        field: 'category',
+        sort: 'asc',
+        width: 150
+      },
+      {
+        label: 'SAWS products and services to inform policy, planning and decision making',
+        field: 'sawsproduct',
+        sort: 'asc',
+        width: 150
+      },
+      {
+        label: 'Data/information required to create products and data source',
+        field: 'datarequired',
+        sort: 'asc',
+        width: 150
+      },
+      {
+        label: 'Presentation of information and dissemination channels/platforms',
+        field: 'presentation',
+        sort: 'asc',
+        width: 150
+      },
+      {
+        label: 'Users/sector',
+        field: 'sector',
+        sort: 'asc',
+        width: 150
+      },
+      {
+        label: 'Usage',
+        field: 'usage',
+        sort: 'asc',
+        width: 150
+      },
+      {
+        label: 'Relevant NFCS pillar',
+        field: 'pillar',
+        sort: 'asc',
+        width: 150
+      },
+      {
+        label: 'View solution',
+        field: 'link',
+        sort: 'asc',
+        width: 150
+      }
+    ],
+    rows: [
+      {
+        category: "Surface weather observations, forecasts and warnings",
+        sawsproduct: [<ol><li>Surface data – measurements of rain, temp, humidity, pressure, wind speed, wind direction</li><li>Historical, real-time and weather forecast/warnings of meteorological variables for the public.</li></ol>],
+        datarequired: [<ol><li>A range of meteorological variables at various time intervals, i.e. 5 minute, hourly, daily, monthly, annual</li><li>Climate database, forecast data</li></ol>],
+        presentation: [<ol><li>Text, Graphical maps</li><li>Climate Service: info4@weathersa.co.za</li></ol>],
+        sector: "General public",
+        usage: "Commercial",
+        pillar: "2,3",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Surface weather observations, forecasts and warnings",
+        sawsproduct: [<ol><li>Rainfall probability forecasts</li><li>Probability forecast over 14 upcoming days</li></ol>],
+        datarequired: [<ol><li>14 day rainfall probabilities  1mm and 14 day maximum temperature changes > 2 degrees</li><li>Forecast data</li></ol>],
+        presentation: [<ol><li>Text, Graphical maps</li><li>Forecasting: +27 12 367 6041</li></ol>],
+        sector: "General public",
+        usage: "Commercial",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Surface weather observations, forecasts and warnings",
+        sawsproduct: [<ol><li>Hazardous  Weather forecast</li><li>Features/precaution depends on the type of hazard</li></ol>],
+        datarequired: [<ol><li>Tailored warnings and alerts</li><li>Forecast data</li></ol>],
+        presentation: [<ol><li>XML, Text</li><li>SMS/email to clients</li></ol>],
+        sector: "General public",
+        usage: "Commercial",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Surface weather observations, forecasts and warnings",
+        sawsproduct: [<ol><li>Severe thunderstorms</li><li>Advice on safety precautions to be taken. Listen to the radio or TV for warnings and obey the instructions from disaster management officers.</li></ol>],
+        datarequired: [<ol><li>Severe thunderstorms are violent weather phenomena that can be very dangerous. Any thunderstorm can produce any combination of lightning, flash flooding, very strong winds, hail and in some cases tornadoes</li><li>Forecast data</li></ol>],
+        presentation: [<ol><li>Text, Graphical maps</li><li>Forecasting through Media (Radio and TV)</li></ol>],
+        sector: "General public",
+        usage: "Public",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Surface weather observations, forecasts and warnings",
+        sawsproduct: [<ol><li>Strong damaging winds</li><li>Advice on safety precautions to be taken. Listen to the radio or TV for warnings and obey the instructions from disaster management officers</li></ol>],
+        datarequired: [<ol><li>Strong damaging winds also called straight line winds that often come from a thunderstorm. The email communication is accompanied by xml files</li><li>Forecast data</li></ol>],
+        presentation: [<ol><li>Text, graphical maps</li><li>Forecasting through Media (Radio & TV)</li></ol>],
+        sector: "General public",
+        usage: "Public",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Specialized data & products",
+        sawsproduct: [<ol><li>Drought monitoring desk</li><li>Summary of drought conditions</li></ol>],
+        datarequired: [<ol><li>Maps of meteorological drought risk using the standardized precipitation index SPI.</li><li>Long-term rainfall data</li></ol>],
+        presentation: [<ol><li>Text, graphical maps, pdf report</li><li>SAWS website and Climate Service: http://www.weathersa.co.za/Documents/Climate/CLS-CI-Drought%20Monitoring.pdf</li></ol>],
+        sector: "General public, all sectors",
+        usage: "Public",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Specialized data & products",
+        sawsproduct: [<ol><li>A-Pan Evaporation data</li><li>Annual and seasonal totals of pan evaporation. The trend maps are a useful way to compare how pan evaporation has changed in different regions.</li></ol>],
+        datarequired: [<ol><li>A small number of stations as well as a limited number of years</li><li>Climate data</li></ol>],
+        presentation: [<ol><li>Graphical maps, data sets</li><li>Climate Service: info4@weathersa.co.za</li></ol>],
+        sector: "Agriculture / water",
+        usage: "Commercial",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Specialized data & products",
+        sawsproduct: [<ol><li>Enthalpy livestock heat stress</li><li>Enthalpy is computed from meteorological measurements of dry temperature, air pressure and relative humidity</li></ol>],
+        datarequired: [<ol><li>Enthalpy expresses the atmospheric heat content by combining into a single variable air temperature and atmospheric moisture.</li><li>Climate data</li></ol>],
+        presentation: [<ol><li>Text, graphical maps</li><li>Research</li></ol>],
+        sector: "Agriculture",
+        usage: "Commercial",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Specialized data & products",
+        sawsproduct: [<ol><li>Evapotranspiration (ETo)</li><li>Spatial maps available at hourly resolution</li></ol>],
+        datarequired: [<ol><li>Gridded evapotranspiration derived from Numerical Weather Prediction (NWP) model weather variables output (air temperature, relative humidity, wind speed and solar irradiance).</li><li>Model data</li></ol>],
+        presentation: [<ol><li>Text, graphical maps</li><li>Research</li></ol>],
+        sector: "Agriculture",
+        usage: "Commercial",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Specialized data & products",
+        sawsproduct: [<ol><li>Fire Danger Index (FDI) (Wet)/ FDI (Dry)</li><li>The FRDI uses 5 categories to rate the fire danger represented by colour codes. Each danger rating is accompanied by a precaution statement. An estimation of the magnitude, timing and duration using models and predictions.</li></ol>],
+        datarequired: [<ol><li>The FDI (Wet) rating is based on the Lowveld Fire Danger Index formula that uses the last 21 days rainfall (FDI-W). With FDI (Dry) no rainfall is included in the calculation.</li><li>Forecast data</li></ol>],
+        presentation: [<ol><li>Pdf in tabular form, graphical maps</li><li>Forecasting: http://www.weathersa.co.za/home/fireindex</li></ol>],
+        sector: "General public",
+        usage: "Commercial",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Specialized data & products",
+        sawsproduct: [<ol><li>Frost Forecast</li><li>Deposit of soft white ice crystals or frozen dew drops on objects near the ground; formed when the surface temperature falls below freezing point. Frost can have a devastating effects on vegetation and crops</li></ol>],
+        datarequired: [<ol><li>Forecast of the deposition of frost</li><li>Forecast data</li></ol>],
+        presentation: [<ol><li>Text, graphical maps</li><li>Forecasting: +27 12 367 6041</li></ol>],
+        sector: "General public",
+        usage: "Commercial",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Specialized data & products",
+        sawsproduct: [<ol><li>Greenhouse gases (GHG)</li><li>Carbon dioxide (CO2), Methane (CH4), Carbon monoxide (CO),  Nitrous oxide (N2O), Ozone (O3 (ground and total column), Gaseous Elemental Mercury (GEM), Aerosols, Radon (isotopes)</li></ol>],
+        datarequired: [<ol><li>Measurements and sustained observations of greenhouse gas (GHG) datasets for Climate Change studies. Cape Point Global Atmosphere Watch (GAW) Station forms part of the World Meteorological Organizations (WMO) global network of 31 contributing stations that provide long-term observation and analysis of atmospheric chemical composition changes and associated meteorological, geophysical and oceanographic factors in support of international conventions and policy making.</li><li>Trace gas measurements</li></ol>],
+        presentation: [<ol><li>Text</li><li>Research</li></ol>],
+        sector: "Research",
+        usage: "Commercial",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Specialized data & products",
+        sawsproduct: [<ol><li>Heat stress/thermal comfort observations</li><li>Heat stress measurements include: BlackGlobe, WetGlobe, DewPoint. Data available in: <br/>1 minute, Hourly, Daily <br/> Heat stress risk categories are grouped into normal (under 26°C), caution (27-31°C), extreme caution (32-38°C), danger (39-50°C) and extreme danger (greater than 51°C). Feel like temperature accompanied by 11 keys raging from frigidly cold to extremely hot with proper descriptions of each.</li></ol>],
+        datarequired: [<ol><li>Apparent temperature is calculated in accordance with the Australian Bureau of Meteorology (BoM). This calculation uses a combination of the following: - Dry Bulb Temperature, Vapour pressure Humidity and Wind Speed.</li><li>Forecast data</li></ol>],
+        presentation: [<ol><li>Text, colour-coded tables</li><li>Research</li></ol>],
+        sector: "Health, general public",
+        usage: "Commercial",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Specialized data & products",
+        sawsproduct: [<ol><li>Lightning strike detectio</li><li>Text data available on near real-time, spatial maps available every 3 hourly and the next day’s maps.</li></ol>],
+        datarequired: [<ol><li>Near Real-time lightning strike detection from the network of 25 sensors across South Africa.</li><li>Data from lightning detection network, forecasting data</li></ol>],
+        presentation: [<ol><li>Text, spatial maps</li><li>Climate Service: info4@weathersa.co.za</li></ol>],
+        sector: "Insurance, Eskom",
+        usage: "Commercial",
+        pillar: "2, 3",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Specialized data & products",
+        sawsproduct: [<ol><li>Lightning climatology</li><li>Yearly spatial maps e.g. Lightning ground flash density, 12 year averages available since 2006</li></ol>],
+        datarequired: [<ol><li>Lightning climatology based on historic lightning data. Gives the indication of the most lightning prone areas within the country.</li><li>Data from lightning detection network</li></ol>],
+        presentation: [<ol><li>Text, spatial maps</li><li>Climate Service: info4@weathersa.co.za</li></ol>],
+        sector: "Power utilities and municipalities",
+        usage: "Commercial",
+        pillar: "2, 3",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Specialized data & products",
+        sawsproduct: [<ol><li>Observational weather data (SYNOP data)</li><li>Processed data for observation platforms and programmes</li></ol>],
+        datarequired: [<ol><li>Hourly observational weather data from Southern African installations (as distributed through the Global Telecommunication Systems (GTS))</li><li>Real-time observational data</li></ol>],
+        presentation: [<ol><li>Observational codes</li><li>Climate Service (historical): info4@weathersa.co.za /GTS (real-time)</li></ol>],
+        sector: "Aviation",
+        usage: "Commercial",
+        pillar: "2, 3",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Specialized data & products",
+        sawsproduct: [<ol><li>Satellite data</li><li>Availability of high-resolution imagery allowing for observations for places around the globe and the planning of activities related to weather phenomenon</li></ol>],
+        datarequired: [<ol><li>Data supplied from EUMETSAT satellites on observations related to the atmosphere, oceans and land surfaces</li><li>Satellite data</li></ol>],
+        presentation: [<ol><li>Text/NetCDF</li><li>Research/EUMETSAT</li></ol>],
+        sector: "Research/general public",
+        usage: "Commercial",
+        pillar: "2,3",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Specialized data & products",
+        sawsproduct: [<ol><li>Solar Radiation Data</li><li>Data available in 1 minute data, hour data, daily data, monthly</li></ol>],
+        datarequired: [<ol><li>Solar radiation data from 13 stations across South Africa. The following components are measured:  Global Horizontal Irradiance, Diffuse Horizontal Irradiance, Direct Normal Irradiance, Longwave Radiation</li><li>Radiation data</li></ol>],
+        presentation: [<ol><li>Text</li><li>Climate Service: info4@weathersa.co.za</li></ol>],
+        sector: "Research",
+        usage: "Commercial",
+        pillar: "2,3",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Specialized data & products",
+        sawsproduct: [<ol><li>Solar Radiation Atlas</li><li>Global horizontal Irradiance in kWh/m2 – Mainly used by the PV industry, Direct Normal Irradiance in kWh/m2 – for the CSP industry, PV energy yield of global irradiation on optimally inclined plane in kWh/m2 – PV industry, Optimum inclination angle (in degrees) for installations of PV panels.</li></ol>],
+        datarequired: [<ol><li>Regional solar resource data. The atlas was developed using a combination of ground observation data and satellite data.</li><li>Radiation data, satellite data</li></ol>],
+        presentation: [<ol><li>Spatial maps</li><li>Climate Service: info4@weathersa.co.za</li></ol>],
+        sector: "Research/general public",
+        usage: "Commercial",
+        pillar: "2,3",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Specialized data & products",
+        sawsproduct: [<ol><li>Upper-air data</li><li>Establishment of dominant (prevailing) weather patterns</li></ol>],
+        datarequired: [<ol><li>Data measurements at various levels above the surface undertaken at 10 stations across South Africa (including the islands).</li><li>Upper-air data</li></ol>],
+        presentation: [<ol><li>Text</li><li>Climate Service: info4@weathersa.co.za</li></ol>],
+        sector: "Research",
+        usage: "Commercial",
+        pillar: "2,3",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Specialized data & products",
+        sawsproduct: [<ol><li>UVA and UVB</li><li>UV index values and relevant exposure categories are linked to mitigation strategies</li></ol>],
+        datarequired: [<ol><li>Forecasts of expected risk of exposure to the sun</li><li>Forecast data</li></ol>],
+        presentation: [<ol><li>Text</li><li>Forecasting: +27 12 367 6041</li></ol>],
+        sector: "General public",
+        usage: "Commercial",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Specialized data & products",
+        sawsproduct: [<ol><li>UVI</li><li>Five colour coded exposure categories The higher the UVI, the greater the potential for damage to the skin and eye, and the less time it takes for harm to occur.    The UVI is an important vehicle to alert people about the need to use sun protection.</li></ol>],
+        datarequired: [<ol><li>The UVI is a unitless measure of the level of UV radiation.</li><li>Forecast data</li></ol>],
+        presentation: [<ol><li>Text and Graphical maps</li><li>Forecasting: +27 12 367 6041</li></ol>],
+        sector: "General public",
+        usage: "Commercial",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Specialized data & products",
+        sawsproduct: [<ol><li>Visual observations – clouds, hail, dew, frost</li><li>N/A</li></ol>],
+        datarequired: [<ol><li>Average number of days for each parameter provided in-line with client specific requirements.</li><li>Climate observational data</li></ol>],
+        presentation: [<ol><li>Text, maps</li><li>Climate Service: info4@weathersa.co.za</li></ol>],
+        sector: "General public / Research",
+        usage: "Commercial",
+        pillar: "2,3",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Specialized data & products",
+        sawsproduct: [<ol><li>Wind gusts</li><li>Forecast grids</li></ol>],
+        datarequired: [<ol><li>Rapid fluctuations in the wind speed with a variation of 10 knots or more between peaks and lulls. The speed of the gust will be the maximum instantaneous wind speed.</li><li>Forecast data</li></ol>],
+        presentation: [<ol><li>Text, graphical maps</li><li>Forecasting: +27 12 367 6041</li></ol>],
+        sector: "General public, aviation, disaster management",
+        usage: "Commercial",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Products and services/industry services",
+        sawsproduct: [<ol><li>Aeronautical Met Outlook</li><li>Forecast information</li></ol>],
+        datarequired: [<ol><li>Forecast information</li><li>Forecast data</li></ol>],
+        presentation: [<ol><li>Email, ftp,xml,graphics</li><li>Forecasting: +27 12 367 6041</li></ol>],
+        sector: "Aviation",
+        usage: "Commercial",
+        pillar: "2, 3",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Products and services/industry services",
+        sawsproduct: [<ol><li>Specialized aviation forecasts</li><li>Forecast information</li></ol>],
+        datarequired: [<ol><li>Coded forecaster inputted information</li><li>Forecast data</li></ol>],
+        presentation: [<ol><li>Email, ftp,xml,graphics</li><li>Forecasting: +27 12 367 6041</li></ol>],
+        sector: "Aviation",
+        usage: "Commercial",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Products and services/industry services",
+        sawsproduct: [<ol><li>Manning of joint operations centre</li><li>Full spectrum of weather-related services</li></ol>],
+        datarequired: [<ol><li>Advisory services regarding weather and climate</li><li>Forecast and real-time observational data</li></ol>],
+        presentation: [<ol><li>Interaction</li><li>Forecasting: +27 12 367 6041</li></ol>],
+        sector: "Aviation",
+        usage: "Commercial",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Products and services/industry services",
+        sawsproduct: [<ol><li>Climate Change Scenarios</li><li>Downscaled future climate scenarios for regions, provinces and municipalities</li></ol>],
+        datarequired: [<ol><li>Projections of future weather to assess future vulnerability to climate change</li><li>Model projections</li></ol>],
+        presentation: [<ol><li>Various</li><li>Research</li></ol>],
+        sector: "Research / industry / general public",
+        usage: "Commercial",
+        pillar: "2,3",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Products and services/industry services",
+        sawsproduct: [<ol><li>Consultancy Services: Climate change Adaptation, Air quality services, CC Mitigation, Modelling, Training and capacity development (NEPAD & LDARD), Expert Advice</li><li>Provision of sector specific expert knowledge on specialised aspects of weather and climate</li></ol>],
+        datarequired: [<ol><li>Advisory and consulting service</li><li>Various data needs</li></ol>],
+        presentation: [<ol><li>Various</li><li>Expertise dependant</li></ol>],
+        sector: "General public",
+        usage: "Commercial",
+        pillar: "2, 3",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Products and services/industry services",
+        sawsproduct: [<ol><li>Customised specific forecasts</li><li>Tailor-made site-specific forecasts for the following time frames at various resolutions: 2 day, 7 day, 14 day, seasonal climate outlooks</li></ol>],
+        datarequired: [<ol><li>Tailored forecasts against specific criteria to enable improved planning and risk decision making in all sectors</li><li>Forecast and seasonal prediction data</li></ol>],
+        presentation: [<ol><li>Various</li><li>Forecasting/Research: +27 12 367 6041</li></ol>],
+        sector: "General public / all sectors",
+        usage: "Commercial",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Products and services/industry services",
+        sawsproduct: [<ol><li>Lightning products</li><li>Historical data issued according to client specific requirements, Lightning Verification Reports, Lightning Density Maps (updated annually), Lightning Risk Maps (updated annually), Lightning Density Point Values (updated annually), Daily Lightning Stroke Map</li></ol>],
+        datarequired: [<ol><li>Provision of historical data in various formats</li><li>Historical lightning</li></ol>],
+        presentation: [<ol><li>Various</li><li>Climate Service: info4@weathersa.co.za</li></ol>],
+        sector: "General public / all sectors",
+        usage: "Commercial",
+        pillar: "2,3",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Products and services/industry services",
+        sawsproduct: [<ol><li>Precipitation Concentration Index (PCI)</li><li>Three precipitation indices have been generated these are precipitation concentration index, precipitation concentration period and precipitation concentration degree, at different time scales.</li><li>Drought propagation index</li><li>Streamflow</li></ol>],
+        datarequired: [<ol><li>Rainfall</li><li>Minimum and Maximum Temperature</li><li>Streamflow</li></ol>],
+        presentation: [<ol><li>Maps</li></ol>],
+        sector: "General public / all sectors",
+        usage: "Commercial",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Products and services/industry services",
+        sawsproduct: [<ol><li>Product development using NWP models</li><li>Tailored products for client specified requirements such as Frost Forecasts for Agriculture Fog Forecasts for Aviation Heat Stress Index for Manufacturing</li></ol>],
+        datarequired: [<ol><li>Observation</li><li>NWP model data</li></ol>],
+        presentation: [<ol><li>Various</li><li>Research</li></ol>],
+        sector: "General public / all sectors",
+        usage: "Commercial",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Products and services/industry services",
+        sawsproduct: [<ol><li>Radar products</li><li>Historical data issued according to site, date and area as per client requirements, also hail reports, hail mass aloft</li></ol>],
+        datarequired: [<ol><li>NWP model data</li><li>Observation </li><li>Satellite</li><li>Radar data</li></ol>],
+        presentation: [<ol><li>Various</li><li>Research through Climate Service: info4@weathersa.co.za</li></ol>],
+        sector: "General public / all sectors",
+        usage: "Commercial",
+        pillar: "2,3",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Products and services/industry services",
+        sawsproduct: [<ol><li>Rainfall characteristics</li><li>Provides certain number of days of exceeding a particular threshold (above or below)</li></ol>],
+        datarequired: [<ol><li>N/A</li><li>Historical climate data</li></ol>],
+        presentation: [<ol><li>Text</li><li>Climate Service: info4@weathersa.co.za</li></ol>],
+        sector: "All sectors",
+        usage: "Commercial",
+        pillar: "2,3",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Products and services/industry services",
+        sawsproduct: [<ol><li>Rainfall products</li><li>Products: Convection Rain Rate (CRR): real-time satellite-based rainfall estimation adapted from the Nowcasting Satellite Application Facility (SAF), Hydro Estimator (HE): real-time satellite and model-based rainfall estimation, Rapidly Developing Thunderstorm (RDT): monitoring of the growing / decaying phases and movement of thunderstorms, Severe thunderstorm</li></ol>],
+        datarequired: [<ol><li>N/A</li><li>Real time weather, radar and satellite data</li></ol>],
+        presentation: [<ol><li>Various</li><li>Dedicated web service: +27 12 367 6041</li></ol>],
+        sector: "Aviation / Insurance / general public",
+        usage: "Commercial",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Products and services/industry services",
+        sawsproduct: [<ol><li>Sector specific products: Historical Agriculture – Heat and Chill Units</li><li>Spatial-temporal distribution of estimated growth and development of plants and insects during the growing season</li></ol>],
+        datarequired: [<ol><li>Temperature</li></ol>],
+        presentation: [<ol><li>Graphs, tables and maps</li><li>Research through request from Climate Service: info4@weathersa.co.za</li></ol>],
+        sector: "Agriculture",
+        usage: "Commercial",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Products and services/industry services",
+        sawsproduct: [<ol><li>Severe weather warnings</li><li>Radar reflectivity indicating the location and movement of convective clouds, Radar rainfall product: real-time update of rainfall, Hall mass aloft: provides an indication of the occurrence of hail within a thunderstorm (location and intensity), Wind gusts</li></ol>],
+        datarequired: [<ol><li>Various</li><li>Radar</li></ol>],
+        presentation: [<ol><li>Various</li><li>Forecasting: +27 12 367 6041</li></ol>],
+        sector: "All sectors / general public",
+        usage: "Commercial",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Products and services/industry services",
+        sawsproduct: [<ol><li>Aeronautical climatological summary</li><li>Statistical Report on main airports for the Aviation Sector.</li></ol>],
+        datarequired: [<ol><li>Aviation-relevant climate information in tabular format</li><li>Climate data</li></ol>],
+        presentation: [<ol><li>Pdf report</li><li>Climate Service: info4@weathersa.co.za</li></ol>],
+        sector: "Aviation",
+        usage: "Public",
+        pillar: "2,3",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Products and services/industry services",
+        sawsproduct: [<ol><li>Disaster Management Advisory forums</li><li>Advisory services regarding weather and climate</li></ol>],
+        datarequired: [<ol><li>Forecaster inputs</li><li>Forecast/seasonal prediction/observation data</li></ol>],
+        presentation: [<ol><li>Interaction</li><li>Attendance of forums (NDMC)</li></ol>],
+        sector: "Disaster management",
+        usage: "Public",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Products and services/industry services",
+        sawsproduct: [<ol><li>Climate Change Reference Atlas</li><li>Atlas in pdf format. Information about CC and its national, regional and local impacts. Data behind the Atlas includes climate model data</li></ol>],
+        datarequired: [<ol><li>Provision of accessible climate basis for national and local scale climate change impacts, adaptation and response planning</li><li>Climate model data</li></ol>],
+        presentation: [<ol><li>Pdf</li><li>SAWS website: http://www.weathersa.co.za/home/climatechangeatlas</li></ol>],
+        sector: "General public, all sectors",
+        usage: "Public",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Products and services/industry services",
+        sawsproduct: [<ol><li>Global Producing Centre</li><li>Provision of global seasonal climate forecasts</li></ol>],
+        datarequired: [<ol><li>Seasonal climate forecasts on a global scale</li><li>Climate model data</li></ol>],
+        presentation: [<ol><li>Lead centre of GPC-MMS</li><li>Maps</li></ol>],
+        sector: "General public, all sectors",
+        usage: "Public",
+        pillar: "2,3",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Products and services/industry services",
+        sawsproduct: [<ol><li>Solar energy atlas (make sure that it is public good)</li><li>Long-term mean of GHI and DNI maps</li></ol>],
+        datarequired: [<ol><li>Maps of long-term mean of GHI and DNI</li><li>Product is static</li></ol>],
+        presentation: [<ol><li>Maps</li><li>Research</li></ol>],
+        sector: "General public, energy",
+        usage: "Public",
+        pillar: "2,3",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Products and services/industry services",
+        sawsproduct: [<ol><li>Weather forecasts</li><li>N/A</li></ol>],
+        datarequired: [<ol><li>Next day forecast: Minimum and maximum temperatures, rain, weather conditions, wind and wind speed; Herald forecast (3 days forecast), map with weather condition for the day, sun rise and sun set. Tides, rain probability; Radio forecast</li><li>Forecast data</li></ol>],
+        presentation: [<ol><li>Various</li><li>Various incl. print media, tv, radio, web, social media; +27 12 367 6041</li></ol>],
+        sector: "General public, all sectors",
+        usage: "Public",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Products and services/industry services",
+        sawsproduct: [<ol><li>Seasonal outlooks</li><li>3-month outlook of temperature (max and min) and rainfall</li></ol>],
+        datarequired: [<ol><li>Monthly bulletin of 3-month outlook of temperature (max and min) and rainfall</li><li>Seasonal modelling data</li></ol>],
+        presentation: [<ol><li>Pdf report</li><li>SAWS website: http://www.weathersa.co.za/images/data/longrange/gfcsa/scw.pdf</li></ol>],
+        sector: "General public, all sectors",
+        usage: "Public",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Products and services/industry services",
+        sawsproduct: [<ol><li>Air Quality Data</li><li>Air quality parameters includes NO2, SO2, CO, H2S and O3 and particular matter (PM2.5 and PM10).</li></ol>],
+        datarequired: [<ol><li>Data of trace gases and particular matter</li><li>Trace gas measurements</li></ol>],
+        presentation: [<ol><li>Various</li><li>Air Quality through Climate Service: info4@weathersa.co.za</li></ol>],
+        sector: "General public, all sectors",
+        usage: "Public",
+        pillar: "2,3",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Products and services/industry services",
+        sawsproduct: [<ol><li>Climate data</li><li>Data as provided for Industry can also be provided for educational purposes</li></ol>],
+        datarequired: [<ol><li>Various</li><li>Historical climate data</li></ol>],
+        presentation: [<ol><li>Various</li><li>Climate Service: info4@weathersa.co.za</li></ol>],
+        sector: "General public, all sectors",
+        usage: "Public",
+        pillar: "2,3",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Products and services/industry services",
+        sawsproduct: [<ol><li>Lightning products</li><li>Lightning Threat Index (LTI) utilising model data to forecast the occurrence of lightning, Lightning Climatology: based on historic lightning data we can provide the information on high risk areas</li></ol>],
+        datarequired: [<ol><li>Various</li><li>Historical lightning data</li></ol>],
+        presentation: [<ol><li>Various</li><li>Climate Service: info4@weathersa.co.za</li></ol>],
+        sector: "General public, all sectors",
+        usage: "Public",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Products and services/industry services",
+        sawsproduct: [<ol><li>Nowcasting warning and notification service</li><li>1 to 5 day forecast of severe weather including storm tracking, and relevant notifications</li></ol>],
+        datarequired: [<ol><li>N/A</li><li>Radar, satellite, model data</li></ol>],
+        presentation: [<ol><li>Various</li><li>Various incl. print media, tv, radio, web, social media; +27 12 367 6041</li></ol>],
+        sector: "General public, all sectors",
+        usage: "Public",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Products and services/industry services",
+        sawsproduct: [<ol><li>Rainfall products</li><li>Convection Rain Rate (CRR): real-time satellite-based rainfall estimation adapted from the Nowcasting Satellite Application Facility (SAF), Hydro Estimator (HE): real-time satellite and model-based rainfall estimation, Rapidly Developing Thunderstorm (RDT): monitoring of the growing / decaying phases and movement of thunderstorms</li></ol>],
+        datarequired: [<ol><li>N/A</li><li>Real-time radar, satellite, observational data</li></ol>],
+        presentation: [<ol><li>Various</li><li>Forecasting: +27 12 367 6041</li></ol>],
+        sector: "General public, all sectors",
+        usage: "Public",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Products and services/industry services",
+        sawsproduct: [<ol><li>Severe Weather Forecasting Demonstration (SWFDP)</li><li>Various severe weather information maps and products</li></ol>],
+        datarequired: [<ol><li>Various</li><li>Real-time rainfall</li></ol>],
+        presentation: [<ol><li>Various</li><li>SWFDP website; +27 12 367 6041</li></ol>],
+        sector: "General public, all sectors",
+        usage: "Public",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Products and services/industry services",
+        sawsproduct: [<ol><li>Severe Weather Warnings</li><li>Location and movement of convective clouds,  radar rainfall product: real-time update of rainfall, hail mass aloft, gusts</li></ol>],
+        datarequired: [<ol><li>Various</li><li>Real time radar and satellite data</li></ol>],
+        presentation: [<ol><li>Various</li><li>Forecasting: +27 12 367 6041</li></ol>],
+        sector: "General public, all sectors",
+        usage: "Public",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Products and services/industry services",
+        sawsproduct: [<ol><li>Statistical Reports</li><li>Historical Stats: District rainfall and provincial rainfall summary</li></ol>],
+        datarequired: [<ol><li>Average rainfall for 94 rainfall districts, 9 provinces</li><li>Historical rainfall data</li></ol>],
+        presentation: [<ol><li>Various (text, graphs etc)</li><li>Climate Service: info4@weathersa.co.za</li></ol>],
+        sector: "General public, climate research",
+        usage: "Public",
+        pillar: "2,3",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Weather APPS",
+        sawsproduct: [<ol><li>WeatherSMART</li><li>Easy to use application for daily location-based information</li></ol>],
+        datarequired: [<ol><li>Location based forecasting information</li><li>Forecast data, radar data</li></ol>],
+        presentation: [<ol><li>APP</li><li>APP (iStore, Google Store)</li></ol>],
+        sector: "General public, all sectors",
+        usage: "Public",
+        pillar: "2,3",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Weather services support desk",
+        sawsproduct: [<ol><li>Weather lines</li><li>Easy access to weather lines for localised weather parameters</li></ol>],
+        datarequired: [<ol><li>Telephonic weather enquiries</li><li>Various, mainly forecast and real time observations</li></ol>],
+        presentation: [<ol><li>Telephonic</li><li>Telephonic channel to access weather forecasts for specified locations: 083 900 0162, *120*555#, 083 123 0500, *120*7297#</li></ol>],
+        sector: "General public",
+        usage: "Commercial",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Web products",
+        sawsproduct: [<ol><li>AfricaWeather</li><li>Provision of client specific requirements via a web portal</li></ol>],
+        datarequired: [<ol><li>Easy to use application with access control for users in the Construction, Insurance, Mining and Agriculture sectors</li><li>Mainly forecasting data</li></ol>],
+        presentation: [<ol><li>Web</li><li>Website: www.africaweather.co.za</li></ol>],
+        sector: "General public / all sectors",
+        usage: "Commercial",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Web products",
+        sawsproduct: [<ol><li>WeatherSA</li><li>Comprehensive website providing information on products and services</li></ol>],
+        datarequired: [<ol><li>Provision of contact information to access channels for data and products</li><li>Various</li></ol>],
+        presentation: [<ol><li>Web</li><li>Website: www.weathersa.co.za</li></ol>],
+        sector: "General public, all sectors",
+        usage: "Public",
+        pillar: "2,3",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Climate resources library",
+        sawsproduct: "Rainbows in the Mist: Indigenous Weather Knowledge, Beliefs and Folklore in South Africa",
+        datarequired: "N/A",
+        presentation: [<ol><li>Hard copy</li><li>Climate Service: http://www.weathersa.co.za/home/aboutclimateatsaws</li></ol>],
+        sector: "General public",
+        usage: "Commercial",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Climate resources library",
+        sawsproduct: "Daily Weather Bulletin",
+        datarequired: "N/A",
+        presentation: [<ol><li>Hard copy</li><li>Climate Service: http://www.weathersa.co.za/home/aboutclimateatsaws</li></ol>],
+        sector: "General public",
+        usage: "Commercial",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Climate resources library",
+        sawsproduct: "Climate Summary of South Africa",
+        datarequired: "N/A",
+        presentation: [<ol><li>Hard copy</li><li>Climate Service: http://www.weathersa.co.za/home/aboutclimateatsaws</li></ol>],
+        sector: "General public",
+        usage: "Commercial",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Climate resources library",
+        sawsproduct: "Technical Papers no 22,23,25,26,27,28,29,30,31,21",
+        datarequired: "N/A",
+        presentation: [<ol><li>Hard copy</li><li>Climate Service: http://www.weathersa.co.za/home/aboutclimateatsaws</li></ol>],
+        sector: "General public",
+        usage: "Commercial",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Climate resources library",
+        sawsproduct: "Climate of SA WB28: General survey",
+        datarequired: "N/A",
+        presentation: [<ol><li>Hard copy</li><li>Climate Service: http://www.weathersa.co.za/home/aboutclimateatsaws</li></ol>],
+        sector: "General public",
+        usage: "Commercial",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Climate resources library",
+        sawsproduct: "Climate of SA  WB36: Extreme values",
+        datarequired: "N/A",
+        presentation: [<ol><li>Hard copy</li><li>Climate Service: http://www.weathersa.co.za/home/aboutclimateatsaws</li></ol>],
+        sector: "All sectors / research",
+        usage: "Commercial",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Climate resources library",
+        sawsproduct: "The weather and climate of the extreme south-western Cape",
+        datarequired: "N/A",
+        presentation: [<ol><li>Hard copy</li><li>Climate Service: http://www.weathersa.co.za/home/aboutclimateatsaws</li></ol>],
+        sector: "General public",
+        usage: "Commercial",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Climate resources library",
+        sawsproduct: "Tornadoes in South Africa",
+        datarequired: "N/A",
+        presentation: [<ol><li>Hard copy</li><li>Climate Service: http://www.weathersa.co.za/home/aboutclimateatsaws</li></ol>],
+        sector: "General public / all sectors",
+        usage: "Commercial",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Climate resources library",
+        sawsproduct: "Climate of SA WB41: Upper-air-statistics",
+        datarequired: "N/A",
+        presentation: [<ol><li>Hard copy</li><li>Climate Service: http://www.weathersa.co.za/home/aboutclimateatsaws</li></ol>],
+        sector: "General public",
+        usage: "Commercial",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Climate resources library",
+        sawsproduct: "Climate of SA WS43: Surface Winds",
+        datarequired: "N/A",
+        presentation: [<ol><li>Hard copy</li><li>Climate Service: http://www.weathersa.co.za/home/aboutclimateatsaws</li></ol>],
+        sector: "General public",
+        usage: "Commercial",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Climate resources library",
+        sawsproduct: "Climate of SA WS44: Climate Controls",
+        datarequired: "N/A",
+        presentation: [<ol><li>Hard copy</li><li>Climate Service: http://www.weathersa.co.za/home/aboutclimateatsaws</li></ol>],
+        sector: "General public",
+        usage: "Commercial",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Climate resources library",
+        sawsproduct: "Climate of SA WS45: Climate Regions",
+        datarequired: "N/A",
+        presentation: [<ol><li>Hard copy</li><li>Climate Service: http://www.weathersa.co.za/home/aboutclimateatsaws</li></ol>],
+        sector: "General public",
+        usage: "Commercial",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Climate resources library",
+        sawsproduct: "Climate of SA  WS46: Sunshine and Cloudiness",
+        datarequired: "N/A",
+        presentation: [<ol><li>Hard copy</li><li>Climate Service: http://www.weathersa.co.za/home/aboutclimateatsaws</li></ol>],
+        sector: "General public",
+        usage: "Commercial",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Climate resources library",
+        sawsproduct: "Climate of SA WS47: Precipitation",
+        datarequired: "N/A",
+        presentation: [<ol><li>Hard copy</li><li>Climate Service: http://www.weathersa.co.za/home/aboutclimateatsaws</li></ol>],
+        sector: "General public",
+        usage: "Commercial",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Climate resources library",
+        sawsproduct: "Climate of SA WS48: Surface Temperature",
+        datarequired: "N/A",
+        presentation: [<ol><li>Hard copy</li><li>Climate Service: http://www.weathersa.co.za/home/aboutclimateatsaws</li></ol>],
+        sector: "General public",
+        usage: "Commercial",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      },
+      {
+        category: "Climate resources library",
+        sawsproduct: "Educational Unit Grade 1&2, Educational Unit Grade 3",
+        datarequired: "N/A",
+        presentation: [<ol><li>Hard copy</li><li>Climate Service: http://www.weathersa.co.za/home/aboutclimateatsaws</li></ol>],
+        sector: "General public",
+        usage: "Commercial",
+        pillar: "",
+        link: [<a className="dataLink" href="#" target="_blank">link</a>]
+      }
+     ]
+  };
+
+  return (
+    <>
+    <div className="filterTable">
+      <div id="record-filters" className="btn-group" data-toggle="buttons" >
+        <label>Filter records:</label>
+        <label id="gridDisplayPublicDeadLabel" className="btn btn-primary">
+          <input type="radio" name="GridDisplay" id="gridDisplayDead" value="Public" /> Public
+        </label>
+        <label id="gridDisplayCommercialLabel" className="btn btn-primary">
+          <input type="radio" name="GridDisplay" id="gridDisplayAlive" value="Commercial" /> Commercial
+        </label>
+        <label id="gridDisplayAllLabel" className="btn btn-primary active">
+          <input type="radio" name="GridDisplay" id="gridDisplayAll" value="all" defaultChecked /> All
+        </label>
+      </div>
+    <MDBDataTable
+      striped
+      bordered
+      hover
+      data={data}
+      // exportToCSV
+      searching={false}
+      paging={false}
+      info={false}
+      id="servicesTable"
+    />
+    </div>
+    </>
+  );
+}
+
+
+
+export default (ServicesData);
\ No newline at end of file
diff --git a/App/Data/toolsData.jsx b/App/Data/toolsData.jsx
index 1fa3c4f..69b63b7 100644
--- a/App/Data/toolsData.jsx
+++ b/App/Data/toolsData.jsx
@@ -1,5 +1,7 @@
 import React from 'react';
 import { MDBDataTable } from 'mdbreact';
+import NCCRD_Training_Manual_V1 from '../content/pdfs/NCCRD_Training_Manual_V1.pdf';
+import NDAO_Training_Manual_V1 from '../content/pdfs/NDAO_Training_Manual_V1.pdf';
 
 const ToolsData = () => {
   const data = {
@@ -30,6 +32,18 @@ const ToolsData = () => {
       }
     ],
     rows: [
+      {
+        type: "Training material",
+        title: "NCCRD Training Manual V1",
+        description: "This user manual was designed to walk users through the National Climate Change. Response Database and was intended as a resource to inform anyone currently working on climate change adaptation or mitigation on how to add these projects to the NCCRD.",
+        link: [<a className="dataLink" href={NCCRD_Training_Manual_V1} target="_blank">link</a>]
+      },
+      {
+        type: "Training material",
+        title: "NDAO Training Manual V1",
+        description: "This user manual was designed to walk users through the National Desired Adaptation Outcome Questionnaire and is intended as a resource to inform anyone interested in evaluating their climate change adaptation approach of DEFFs current monitoring and evaluation approach and to submit an evaluation questionnaire to DEFF.",
+        link: [<a className="dataLink" href={NDAO_Training_Manual_V1} target="_blank">link</a>]
+      },
       {
         type: "Adaptation",
         title: "GreenBook",
@@ -81,12 +95,12 @@ const ToolsData = () => {
       {
         type: "Adaptation",
         title: "NDMC Disaster Atlas",
-        description: "",
+        description: "This is an ArcGIS Portal for the National Disaster Management Centre.",
         link: [<button onClick={(event) => {event.preventDefault(); window.open("https://gis-portal.ndmc.gov.za/portal/apps/webappviewer/index.html?id=700928590ea84665b234b038eb96c210");}}>link</button>]
       },
       {
         type: "Adaptation",
-        title: "DEA Coastal Viewer",
+        title: "DEFF Coastal Viewer",
         description: "The Coastal Viewer aims to make spatial data relating to the Coastal Zone available to the public. The data is sourced from the relevant custodians to inform decision making processes focussing on the sustainable use of coastal resources and promoting coastal management objectives as described in the National Coastal Management Programme of South Africa.",
         link: [<button onClick={(event) => {event.preventDefault(); window.open("https://mapservice.environment.gov.za/Coastal%20Viewer/");}}>link</button>]
       },
@@ -143,6 +157,84 @@ const ToolsData = () => {
         title: "Environment & Health Research Unit",
         description: "The SAMRC's Environment & Health Research Unit (E&HRU) conducts population-based research on environmental risks to health - with particular emphasis on those living in poverty. The Unit - which is made up of experts in environmental epidemiology, public health, chemistry, geography, botany, and environmental science/management - protects and promotes the health of South African communities by investigating serious health risks such as climate change and rising heat, lead poisoning, air pollution, environmental exposures from living near mining land, and other health hazards specific to urban environments.",
         link: [<button onClick={(event) => {event.preventDefault(); window.open("http://www.mrc.ac.za/intramural-research-units/EnvironmentHealth");}}>link</button>]
+      },
+      {
+        type: "Adaptation",
+        title: "Agricultural Research Council news and articles",
+        description: "This is a collection of news and articles on ​Agricultural Engineering compiled by the Agricultural Research Council.",
+        link: [<button onClick={(event) => {event.preventDefault(); window.open("http://www.arc.agric.za/arc-iscw/Pages/News-Articles.aspx");}}>link</button>]
+      },
+      {
+        type: "Adaptation",
+        title: "Water Research Commission's Drought SA Web Portal",
+        description: "On the Water Research Commission's Drought SA web portal, you will find links to important and up-to-date information about the status of the current drought in South Africa, as well as suggestions and guidelines for conserving water. The portal serves as a platform to educate and inform all South Africans, including all water consumers, government officials, and businesses.",
+        link: [<button onClick={(event) => {event.preventDefault(); window.open("http://www.droughtsa.org.za/");}}>link</button>]
+      },
+      {
+        type: "Adaptation",
+        title: "Poverty Stoplight SA",
+        description: "Poverty Stoplight is an approach that helps people progress out of poverty by empowering them to understand and map their own choices. It encourages households to participate and own their journeys out of poverty, and provides a clear line of sight of how to get there; at the same time allowing organisations delivering support to measure progress against their programme objectives.",
+        link: [<button onClick={(event) => {event.preventDefault(); window.open("http://www.povertystoplight.org.za/index.php/the-tool/");}}>link</button>]
+      },
+      {
+        type: "Mitigation",
+        title: "Carbon Disclosure Project",
+        description: "CDP is a not-for-profit charity that runs the global disclosure system for investors, companies, cities, states and regions to manage their environmental impacts. Over the past 15 years we have created a system that has resulted in unparalleled engagement on environmental issues worldwide.",
+        link: [<button onClick={(event) => {event.preventDefault(); window.open("https://www.cdp.net/en");}}>link</button>]
+      },
+      {
+        type: "Climate Change",
+        title: "ICLEI Carbon Climate Registry",
+        description: "Supporting cities, towns and regions tackling climate change to create transparency, accountability and credibility.",
+        link: [<button onClick={(event) => {event.preventDefault(); window.open("https://iclei.org/en/cCR.html");}}>link</button>]
+      },
+      {
+        type: "Mitigation",
+        title: "South African Waste Information System (SAWIS)",
+        description: "Provides the public, business, industry and government with access to information on the management of waste in South Africa. Captures routine data on the tonnages of waste generated, recycled and disposed of in South Africa on a monthly and annual basis.",
+        link: [<button onClick={(event) => {event.preventDefault(); window.open("http://sawic.environment.gov.za/");}}>link</button>]
+      },
+      {
+        type: "Mitigation",
+        title: "South African Atmospheric Emission Licensing and Inventory Portal (SAAELIP)",
+        description: "SAAELIP is an online portal for the management of Atmospheric Emission Licences (AEL) as well as the estimation and reporting of atmospheric emission inventories terms of the National Environmental Management: Air Quality Act, 2004 (Act No. 39 of 2004). SAAELIP provides a seamless integration between the management of Atmospheric Emission Licences and the reporting of atmospheric emissions into the National Atmospheric Emission Inventory System (NAEIS).",
+        link: [<button onClick={(event) => {event.preventDefault(); window.open("https://saaelip.environment.gov.za/SAAELIP/home");}}>link</button>]
+      },
+      {
+        type: "Mitigation",
+        title: "The Climate Group",
+        description: "Climate change actions by member countries to The Climate Group (TCG) gets reported annually mid-year. KwaZulu Natal climate Change actions have been reported since 2013. A consolidated report of actions update by TCG member states is then compiled for sharing during the annual Under2 General Assembly meetings towards the end of each year on the sidelines of Conference of Parties meetings. Such reports put the Province’s efforts of responding to climate change on an international platform. TCG members (subnational governments ) are required to report to the Climate Disclosure Programme annually in order to: drive climate action and to deliver sustainable economies; ssist states and regions set ambitious climate targets that will limit global warming to 2 degrees; drive global standards of climate leadership; provide a global platform for subnational governments to measure, manage and disclose their environmental impacts; promote transparency and increase climate action, ambition and accountability of these governments.",
+        link: [<button onClick={(event) => {event.preventDefault(); window.open("https://www.theclimategroup.org/our-work");}}>link</button>]
+      },
+      {
+        type: "Adaptation",
+        title: "REGIONSADAPT (Region 4 Sustainable Development)",
+        description: "The Regions4 initiative support participants to: develop regional adaptation strategies or plans utilizing the government expertise within the initiative, and based on the region specific reality; report adaptation actions through the CDP; reported data also goes to the Non-State Actor Zone for Climate Action (NAZCA) platform; establish regional metrics, indicators and methodology for monitoring and follow-up according to the territorial specific vulnerabilities and conditions; promote global peer learning and sharing of best practice models for addressing adaptation issues.",
+        link: [<button onClick={(event) => {event.preventDefault(); window.open("https://www.regions4.org/project/regionsadapt/");}}>link</button>]
+      },
+      {
+        type: "Adaptation",
+        title: "National Integrated Water Information System (NIWIS)",
+        description: "Provides information products, in the form of dashboards, to facilitate efficient analysis and reporting across the water value chain in South Africa. It also provides information on the drought status, and several dashboards including climate change and disaster management.",
+        link: [<button onClick={(event) => {event.preventDefault(); window.open("http://niwis.dws.gov.za/niwis2/");}}>link</button>]
+      },
+      {
+        type: "Adaptation",
+        title: "FlowTracker App",
+        description: "Monitor near real-time river flow and dam levels for the Olifants River Catchment",
+        link: [<button onClick={(event) => {event.preventDefault(); window.open("https://play.google.com/store/apps/details?id=flowtracker.award.org.za.flowtracker");}}>link</button>]
+      },
+      {
+        type: "Climate Change",
+        title: "Climate Risk Adaptation Framework and Taxonomy (CRAFT)",
+        description: "Structured description of the key climate hazards that cities are facing. The Taxonomy was developed by C40 and ARUP with funding from Bloomberg Philanthropies. CRAFT provides clear and concise lexicon of the climate hazards that cities face today, and how those hazards may change in the future. It also give cities a common language with which to discuss, assess and report on action relating to climate change adaptation. The Taxonomy builds upon the UN Disaster Risk Reduction classification of hazards and draws specific focus to the city context and the effects of climate change.",
+        link: [<button onClick={(event) => {event.preventDefault(); window.open("https://www.c40.org/cities");}}>link</button>]
+      },
+      {
+        type: "Mitigation",
+        title: "Bioenergy Atlas for South Africa",
+        description: "The BioEnergy Atlas for South Africa is a public resource to support the development of BioEnergy in South Africa and covers assessments of biomass potentials in the country and the feasibility of its application. ",
+        link: [<button onClick={(event) => {event.preventDefault(); window.open("http://bea.dirisa.org");}}>link</button>]
       }
      ]
   };
diff --git a/App/Data/trackingData.jsx b/App/Data/trackingData.jsx
index 5039e39..fd6dc5c 100644
--- a/App/Data/trackingData.jsx
+++ b/App/Data/trackingData.jsx
@@ -71,7 +71,7 @@ const TrackingData = () => {
       {
         type: "M&E guidelines",
         name: "First Biennial Report to Cabinet on State of Climate Change Science and Technology in South Africa",
-        description: "Outcome 10 of the MTSF calls for a report on the state of climate change science and technology in South Africa to be provided to Cabinet by the DST and the Department of Environmental Affairs (DEA) every two years. This is the first such report.",
+        description: "Outcome 10 of the MTSF calls for a report on the state of climate change science and technology in South Africa to be provided to Cabinet by the DST and the Department of Environment, Forestry and Fisheries (DEFF) every two years. This is the first such report.",
         year: 2017,
         link: [<button onClick={(event) => {event.preventDefault(); window.open("https://www.dst.gov.za/index.php/resource-center/strategies-and-reports/2233-state-of-climate-change-science-and-technology");}}>link</button>],
       },
@@ -211,7 +211,7 @@ const TrackingData = () => {
       {
         type: "GHG inventory reports",
         name: "South African National Land-cover Dataset 1990 to 2013/14 - Report",
-        description: "An assessment of land-cover change has been undertaken using the 1990 and 2013/ 14 South African National Land- cover Datasets. In preparation for the land-cover change assessment, the original 35-class national land-cover datasets were reformated into the DEA-requested, simplified 17-class legend format to be used for land-cover change reporting.",
+        description: "An assessment of land-cover change has been undertaken using the 1990 and 2013/ 14 South African National Land- cover Datasets. In preparation for the land-cover change assessment, the original 35-class national land-cover datasets were reformated into the DEFF-requested, simplified 17-class legend format to be used for land-cover change reporting.",
         year: 2015,
         link: [<button onClick={(event) => {event.preventDefault(); window.open(doc_b4);}}>link</button>],
       },
diff --git a/App/Images/Other/Tsepang.jpg b/App/Images/Other/Tsepang.jpg
new file mode 100644
index 0000000..b5521d6
Binary files /dev/null and b/App/Images/Other/Tsepang.jpg differ
diff --git a/App/Images/Other/amelia.png b/App/Images/Other/amelia.png
new file mode 100644
index 0000000..87b5a86
Binary files /dev/null and b/App/Images/Other/amelia.png differ
diff --git a/App/Images/Other/claire.png b/App/Images/Other/claire.png
new file mode 100644
index 0000000..61bbdbc
Binary files /dev/null and b/App/Images/Other/claire.png differ
diff --git a/App/Images/Other/leo.jpg b/App/Images/Other/leo.jpg
new file mode 100644
index 0000000..01a112f
Binary files /dev/null and b/App/Images/Other/leo.jpg differ
diff --git a/App/Images/Other/t_e_1.gif b/App/Images/Other/t_e_1.gif
new file mode 100644
index 0000000..3895ba1
Binary files /dev/null and b/App/Images/Other/t_e_1.gif differ
diff --git a/App/Images/Other/t_e_2.gif b/App/Images/Other/t_e_2.gif
new file mode 100644
index 0000000..e383aa9
Binary files /dev/null and b/App/Images/Other/t_e_2.gif differ
diff --git a/App/Images/Stats/mapsgraphs/ar-ec.gif b/App/Images/Stats/mapsgraphs/ar-ec.gif
new file mode 100644
index 0000000..bf2923c
Binary files /dev/null and b/App/Images/Stats/mapsgraphs/ar-ec.gif differ
diff --git a/App/Images/Stats/mapsgraphs/ar-fs.gif b/App/Images/Stats/mapsgraphs/ar-fs.gif
new file mode 100644
index 0000000..7ed2790
Binary files /dev/null and b/App/Images/Stats/mapsgraphs/ar-fs.gif differ
diff --git a/App/Images/Stats/mapsgraphs/ar-g.gif b/App/Images/Stats/mapsgraphs/ar-g.gif
new file mode 100644
index 0000000..23dabc3
Binary files /dev/null and b/App/Images/Stats/mapsgraphs/ar-g.gif differ
diff --git a/App/Images/Stats/mapsgraphs/ar-kzn.gif b/App/Images/Stats/mapsgraphs/ar-kzn.gif
new file mode 100644
index 0000000..a7cd9c6
Binary files /dev/null and b/App/Images/Stats/mapsgraphs/ar-kzn.gif differ
diff --git a/App/Images/Stats/mapsgraphs/ar-lim.gif b/App/Images/Stats/mapsgraphs/ar-lim.gif
new file mode 100644
index 0000000..ffbf535
Binary files /dev/null and b/App/Images/Stats/mapsgraphs/ar-lim.gif differ
diff --git a/App/Images/Stats/mapsgraphs/ar-mp.gif b/App/Images/Stats/mapsgraphs/ar-mp.gif
new file mode 100644
index 0000000..5ed95d5
Binary files /dev/null and b/App/Images/Stats/mapsgraphs/ar-mp.gif differ
diff --git a/App/Images/Stats/mapsgraphs/ar-nc.gif b/App/Images/Stats/mapsgraphs/ar-nc.gif
new file mode 100644
index 0000000..4198d31
Binary files /dev/null and b/App/Images/Stats/mapsgraphs/ar-nc.gif differ
diff --git a/App/Images/Stats/mapsgraphs/ar-nw.gif b/App/Images/Stats/mapsgraphs/ar-nw.gif
new file mode 100644
index 0000000..8b28b1f
Binary files /dev/null and b/App/Images/Stats/mapsgraphs/ar-nw.gif differ
diff --git a/App/Images/Stats/mapsgraphs/ar-wc.gif b/App/Images/Stats/mapsgraphs/ar-wc.gif
new file mode 100644
index 0000000..82ac3a4
Binary files /dev/null and b/App/Images/Stats/mapsgraphs/ar-wc.gif differ
diff --git a/App/Images/Stats/mapsgraphs/mr-annual.gif b/App/Images/Stats/mapsgraphs/mr-annual.gif
new file mode 100644
index 0000000..1081cdb
Binary files /dev/null and b/App/Images/Stats/mapsgraphs/mr-annual.gif differ
diff --git a/App/Images/Stats/mapsgraphs/mr-spring.gif b/App/Images/Stats/mapsgraphs/mr-spring.gif
new file mode 100644
index 0000000..056f2e7
Binary files /dev/null and b/App/Images/Stats/mapsgraphs/mr-spring.gif differ
diff --git a/App/Images/Stats/mapsgraphs/mr-summer.gif b/App/Images/Stats/mapsgraphs/mr-summer.gif
new file mode 100644
index 0000000..994cafc
Binary files /dev/null and b/App/Images/Stats/mapsgraphs/mr-summer.gif differ
diff --git a/App/Images/Stats/mapsgraphs/mr-winter.gif b/App/Images/Stats/mapsgraphs/mr-winter.gif
new file mode 100644
index 0000000..df300c3
Binary files /dev/null and b/App/Images/Stats/mapsgraphs/mr-winter.gif differ
diff --git a/App/Images/Stats/mapsgraphs/mt-annual.gif b/App/Images/Stats/mapsgraphs/mt-annual.gif
new file mode 100644
index 0000000..4a51b12
Binary files /dev/null and b/App/Images/Stats/mapsgraphs/mt-annual.gif differ
diff --git a/App/Images/Stats/mapsgraphs/mt-autumn.gif b/App/Images/Stats/mapsgraphs/mt-autumn.gif
new file mode 100644
index 0000000..cc63941
Binary files /dev/null and b/App/Images/Stats/mapsgraphs/mt-autumn.gif differ
diff --git a/App/Images/Stats/mapsgraphs/mt-spring.gif b/App/Images/Stats/mapsgraphs/mt-spring.gif
new file mode 100644
index 0000000..c58b326
Binary files /dev/null and b/App/Images/Stats/mapsgraphs/mt-spring.gif differ
diff --git a/App/Images/Stats/mapsgraphs/mt-summer.gif b/App/Images/Stats/mapsgraphs/mt-summer.gif
new file mode 100644
index 0000000..cca1b9d
Binary files /dev/null and b/App/Images/Stats/mapsgraphs/mt-summer.gif differ
diff --git a/App/Images/Stats/mapsgraphs/mt-winter.gif b/App/Images/Stats/mapsgraphs/mt-winter.gif
new file mode 100644
index 0000000..57f9251
Binary files /dev/null and b/App/Images/Stats/mapsgraphs/mt-winter.gif differ
diff --git a/App/Images/data/agriculture.jpg b/App/Images/data/agriculture.jpg
new file mode 100644
index 0000000..05969e5
Binary files /dev/null and b/App/Images/data/agriculture.jpg differ
diff --git a/App/Images/data/agrohydrological.jpg b/App/Images/data/agrohydrological.jpg
new file mode 100644
index 0000000..f2546c9
Binary files /dev/null and b/App/Images/data/agrohydrological.jpg differ
diff --git a/App/Images/data/biodiversity.jpg b/App/Images/data/biodiversity.jpg
new file mode 100644
index 0000000..f893368
Binary files /dev/null and b/App/Images/data/biodiversity.jpg differ
diff --git a/App/Images/data/coastal.jpg b/App/Images/data/coastal.jpg
new file mode 100644
index 0000000..1a92725
Binary files /dev/null and b/App/Images/data/coastal.jpg differ
diff --git a/App/Images/data/csag.jpg b/App/Images/data/csag.jpg
new file mode 100644
index 0000000..c45c546
Binary files /dev/null and b/App/Images/data/csag.jpg differ
diff --git a/App/Images/data/csir.jpg b/App/Images/data/csir.jpg
new file mode 100644
index 0000000..43275b2
Binary files /dev/null and b/App/Images/data/csir.jpg differ
diff --git a/App/Images/data/demography.jpg b/App/Images/data/demography.jpg
new file mode 100644
index 0000000..a1ee792
Binary files /dev/null and b/App/Images/data/demography.jpg differ
diff --git a/App/Images/data/disasters.jpg b/App/Images/data/disasters.jpg
new file mode 100644
index 0000000..8a99e03
Binary files /dev/null and b/App/Images/data/disasters.jpg differ
diff --git a/App/Images/data/energy.jpg b/App/Images/data/energy.jpg
new file mode 100644
index 0000000..e557bc8
Binary files /dev/null and b/App/Images/data/energy.jpg differ
diff --git a/App/Images/data/health.jpg b/App/Images/data/health.jpg
new file mode 100644
index 0000000..04849ad
Binary files /dev/null and b/App/Images/data/health.jpg differ
diff --git a/App/Images/data/saws.jpg b/App/Images/data/saws.jpg
new file mode 100644
index 0000000..4a250e2
Binary files /dev/null and b/App/Images/data/saws.jpg differ
diff --git a/App/Images/data/settlements.jpg b/App/Images/data/settlements.jpg
new file mode 100644
index 0000000..cd5d4a7
Binary files /dev/null and b/App/Images/data/settlements.jpg differ
diff --git a/App/Images/data/water.jpg b/App/Images/data/water.jpg
new file mode 100644
index 0000000..7b7812b
Binary files /dev/null and b/App/Images/data/water.jpg differ
diff --git a/App/Images/data/weather.jpg b/App/Images/data/weather.jpg
new file mode 100644
index 0000000..7e5560b
Binary files /dev/null and b/App/Images/data/weather.jpg differ
diff --git a/App/JS/App.jsx b/App/JS/App.jsx
index cf20b8b..602432e 100644
--- a/App/JS/App.jsx
+++ b/App/JS/App.jsx
@@ -5,11 +5,19 @@ import 'antd/lib/style/index.css'
 import 'font-awesome/css/font-awesome.min.css'
 import 'bootstrap/dist/css/bootstrap.min.css'
 import 'mdbreact/dist/css/mdb.css'
+import ReactGA from "react-ga"; //Google Analytics
 
 //Components
 import React from 'react';
 import { connect } from 'react-redux';
 import { HashRouter as Router, Redirect, Switch, Route } from 'react-router-dom';
+import DataDownload from './Components/Pages/data-download.jsx';
+import ClimateServices from './Components/Pages/climate-services.jsx';
+import ClimateAtlas from './Components/Pages/climate-atlas.jsx';
+import About from './Components/Pages/about.jsx';
+import MapsGraphs from './Components/Pages/maps-graphs.jsx';
+import Finance from './Components/Pages/finance.jsx';
+import Contact from './components/pages/contact-ccis.jsx';
 import Home from './components/pages/Home/Home.jsx';
 import Login from './components/authentication/Login.jsx';
 import Logout from './components/authentication/Logout.jsx';
@@ -21,6 +29,7 @@ import Header from './components/navigation/Header.jsx';
 // import AME from './components/pages/Adaptation/MonitoringEvaluation/AME.jsx';
 import SideNav from './components/navigation/SideNav.jsx';
 import ComingSoon from './Components/Pages/ComingSoonAE.jsx'; //Created my own temp component
+// import CARBONsinks from './Components/Pages/carbon-sinks.jsx';
 import CICtrends from './Components/Pages/cic-trends.jsx';
 import CICtrendsp from './Components/Pages/cic-trends-prov.jsx';
 import CICtrendscc from './Components/Pages/cic-trends-current.jsx';
@@ -77,9 +86,9 @@ class App extends React.Component {
   }
 
   async componentDidMount() {
+    
     this.saveCurrentURL()
     window.onhashchange = this.saveCurrentURL
-
     try {
       await userManager.signinSilent()
     }
@@ -113,7 +122,12 @@ class App extends React.Component {
 
 
     if (location.hash !== this.state.currentURL && !this.ignoreURL()) {
-      console.log("NAV", location.hash)
+      console.log("NAV", location.hash);
+      ReactGA.initialize('UA-145174772-1');
+      ReactGA.pageview(location.hash);
+      // console.log('test', window.location.pathname + window.location.search)
+
+
       var valuef = location.hash.substring(location.hash.lastIndexOf('#') + 1);
       var valueid = valuef.replace('#','')
       if (!valuef.includes("/")){
@@ -157,6 +171,12 @@ class App extends React.Component {
                   <Route path="/login" component={Login} exact />
                   <Route path="/logout" component={Logout} exact />
                   <Route path="/callback" component={CallbackPage} />
+                  <Route path="/About" component={About} />
+                  <Route path="/climate-services" component={ClimateServices} />
+                  <Route path="/data-download" component={DataDownload} />
+                  <Route path="/maps-graphs" component={MapsGraphs} />
+                  <Route path="/finance" component={Finance} />
+                  <Route path="/contact-ccis" component={Contact} />
                   {/* <Route path="/ame" component={AME} /> */}
                   <Route path="/ComingSoon" component={ComingSoon} />
                   <Route path="/cic" component={CIChome} />
@@ -178,6 +198,8 @@ class App extends React.Component {
                   <Route path="/doc-disclaimer" component={DOCdisclaimer} />
                   <Route path="/doc-conditions" component={DOCconditions} />
                   <Route path="/event-nc6aug2019" component={eventnc6aug2019} />
+                  <Route path="/climate-atlas" component={ClimateAtlas} />
+                  {/* <Route path="/carbon-sinks" component={CARBONsinks} /> */}
                   <Redirect to="/" />
                 </Switch>
               </div>
diff --git a/App/JS/Components/Iconlist/index.jsx b/App/JS/Components/Iconlist/index.jsx
index 399d9fe..67f8648 100644
--- a/App/JS/Components/Iconlist/index.jsx
+++ b/App/JS/Components/Iconlist/index.jsx
@@ -9,6 +9,11 @@ class IconList extends React.Component {
           <>
         <ul className="ea-links">
         <li>
+        <a onClick={() => { location.hash = "/contact-ccis" }} title="Contact Details" className="tooltip-ea tooltip-ea-r">
+        <i className="fa fa-envelope-o"></i>
+        </a>
+        </li>
+        <li>
         <a onClick={() => { location.hash = "/info-events" }} title="Events and news" className="tooltip-ea tooltip-ea-r">
         <i className="fa fa-newspaper-o"></i>
         </a>
@@ -18,6 +23,7 @@ class IconList extends React.Component {
         <i className="fa fa-question-circle"></i>
         </a>
         </li>
+        
         {/* <li>
         <a onClick={() => { location.hash = "/info-documents" }} title="List of climate documents" className="tooltip-ea tooltip-ea-r">
         <i className="fa fa-folder"></i>
diff --git a/App/JS/Components/Pages/About.jsx b/App/JS/Components/Pages/About.jsx
index 420b02c..a2ff397 100644
--- a/App/JS/Components/Pages/About.jsx
+++ b/App/JS/Components/Pages/About.jsx
@@ -4,7 +4,6 @@ import React from 'react'
 import { connect } from 'react-redux'
 import { Row, Col, Button } from 'mdbreact'
 
-
 const mapStateToProps = (state, props) => {
   return {}
 }
@@ -31,7 +30,7 @@ class About extends React.Component {
     this.props.updateNav(location.hash)
     return (
       <>
-       <section class="ea-content-full">
+       <section className="ea-content-full">
           <div className="container-fluid mt-4">
           <div className="row d-sm-none d-md-none d-lg-none">
             <div className="col-6"><h5>Actions</h5></div>
@@ -50,7 +49,6 @@ class About extends React.Component {
           <Col md="auto"><Button type="button" className="btn btn-success btn-lg" onClick={() => { location.hash = "/cic-impacts" }}>
             <em className="fa fa-chevron-right mr-1"></em> Impacts</Button></Col>
           </Row>
-          <hr className="hr-thin" />
           </div>
           </section>
 
diff --git a/App/JS/Components/Pages/Events/event-nc6aug2019.jsx b/App/JS/Components/Pages/Events/event-nc6aug2019.jsx
index a7888e5..bb506d1 100644
--- a/App/JS/Components/Pages/Events/event-nc6aug2019.jsx
+++ b/App/JS/Components/Pages/Events/event-nc6aug2019.jsx
@@ -42,7 +42,7 @@ class eventnc6aug2019 extends React.Component {
     this.props.updateNav(location.hash)
     return (
       <>
-       <section class="ea-content-full">
+       <section className="ea-content-full">
           <div className="container-fluid mt-4">
           <div className="row d-sm-none d-md-none d-lg-none">
             <div className="col-6"><h5>Actions</h5></div>
diff --git a/App/JS/Components/Pages/Home/Home.jsx b/App/JS/Components/Pages/Home/Home.jsx
index d8b69c2..7b8df3f 100644
--- a/App/JS/Components/Pages/Home/Home.jsx
+++ b/App/JS/Components/Pages/Home/Home.jsx
@@ -257,14 +257,6 @@ class Home extends React.Component {
 
     return (
       <>
-      <section className="ea-content dark-grey-bg-2">
-        <div className="container-fluid">
-        <div className="text-white pt-4 pb-3">
-        <p>Please note that you are accessing the Beta Version of NCCIS website, which is in the process of being tested before its official release on March 2020. The sole purpose of this BETA Version is to conduct testing and obtain feedback.</p>
-        <p>Should you encounter any bugs, lack of functionality or other problems on the beta website, please <u className="supportToggle">submit a ticket here</u></p>
-        </div>
-        </div>
-      </section>
        <section className="ea-content">
           <div className="container-fluid mt-4">
           <div className="row d-sm-none d-md-none d-lg-none">
@@ -273,15 +265,13 @@ class Home extends React.Component {
               <IconList></IconList>
             </div>
           </div>
-          <Row>
+          <Row> 
           <Col md="auto"><button type="button" className="btn btn-success btn-lg" onClick={() => { location = "https://ccis.environment.gov.za/nccrd/#/" }}>
-            <em className="fa fa-pencil-square-o mr-1"></em> Submit a climate change response project</button></Col>
-          <Col md="auto"><button type="button" className="btn btn-disabled btn-lg" disabled >
-            <em className="fa fa-pencil-square-o mr-1"></em> Design a climate change plan</button></Col>
+            <em className="fa fa-pencil-square-o mr-1"></em> Submit a project</button></Col>
+          <Col md="auto"><a className="btn btn-success btn-lg" href="http://www.letsrespondtoolkit.org/" target="_blank">
+            <em className="fa fa-pencil-square-o mr-1"></em> Design an adaptation plan</a></Col>
           <Col md="auto"><button type="button" className="btn btn-success btn-lg" onClick={() => { location = "https://ccis.environment.gov.za/ndao/#/" }}>
-            <em className="fa fa-pencil-square-o mr-1"></em> Evaluate a climate change plan</button></Col>
-          <Col md="auto"><button type="button" className="btn btn-disabled btn-lg" disabled>
-            <em className="fa fa-pencil-square-o mr-1"></em> Review Report</button></Col>
+            <em className="fa fa-pencil-square-o mr-1"></em> Evaluate a response</button></Col>
           </Row>
           </div>
           </section>
@@ -303,7 +293,7 @@ class Home extends React.Component {
               </div></div>
             </div>
             <div className="col-9">
-                <iframe src="" id="homemap" class="ea-map-frame round-edge" ></iframe>
+                <iframe src="" id="homemap" className="ea-map-frame round-edge" ></iframe>
             </div>
           </Row>
           
@@ -336,7 +326,7 @@ class Home extends React.Component {
             </div>
           </section>
 
-          <section className="ea-home-maps ea-content light-bg pt-5 pb-5">
+          {/* <section className="ea-home-maps ea-content light-bg pt-5 pb-5">
             <div className="container-fluid">
             <h5 className="pb-3">Maps and Data</h5>
             <Row>
@@ -369,7 +359,7 @@ class Home extends React.Component {
               
             </Row>
             </div>
-          </section>
+          </section> */}
 
 
       </>
diff --git a/App/JS/Components/Pages/carbon-sinks.jsx b/App/JS/Components/Pages/carbon-sinks.jsx
new file mode 100644
index 0000000..a08439a
--- /dev/null
+++ b/App/JS/Components/Pages/carbon-sinks.jsx
@@ -0,0 +1,69 @@
+'use strict'
+
+import React from 'react'
+import { connect } from 'react-redux'
+import { CardBody,Card } from 'mdbreact'
+
+
+const mapStateToProps = (state, props) => {
+  return {}
+}
+
+const mapDispatchToProps = (dispatch) => {
+  return {
+    updateNav: payload => {
+      dispatch({ type: "NAV", payload })
+    }
+  }
+}
+
+class CARBONsinks extends React.Component {
+
+  constructor(props) {
+    super(props);
+  }
+
+  componentDidMount() {
+    
+  }
+
+  render() {
+    this.props.updateNav(location.hash)
+    return (
+      <>
+       <section className="ea-content-full">
+          <div className="container-fluid mt-4">
+          <div className="row d-sm-none d-md-none d-lg-none">
+            <div className="col-6"><h5>Actions</h5></div>
+            <div className="col-6">
+              {/* <IconList></IconList> */}
+            </div>
+          </div>
+          <h5>SA Carbon Sinks Atlas</h5>
+          <Card className="mb-5 mt-5">
+            <CardBody>
+              <div
+                style={{ backgroundColor: 'white', border: '1px solid gainsboro', borderRadius: 10, padding: '15px 15px 5px' }}
+              >
+                <h5 style={{ margin: 0 }}>
+                  <b>Coming Soon</b>
+                </h5>
+
+                <hr style={{ marginTop: 10 }} />
+
+                <p style={{ overflowY: 'auto', paddingRight: 15 }}>
+                  This page will be online in our next release. Come back to check for feature additions
+                </p>
+              </div>
+            </CardBody>
+          </Card>
+          </div>
+          </section>
+
+
+    </>
+    )
+  }
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(CARBONsinks)
\ No newline at end of file
diff --git a/App/JS/Components/Pages/cic-extreme.jsx b/App/JS/Components/Pages/cic-extreme.jsx
index 65c75be..900c9ea 100644
--- a/App/JS/Components/Pages/cic-extreme.jsx
+++ b/App/JS/Components/Pages/cic-extreme.jsx
@@ -70,14 +70,17 @@ class CICextreme extends React.Component {
 
           <section className="ea-content-full pt-4 pb-4 bg-light">
           <div className="container-fluid">
-            <CarouselExtreme />
+          <p>South Africa is susceptible to a number of extreme weather events with the most common being floods, droughts, fires and large storms. Other disaster risks include lighting strikes, heat waves, hail damage, wind storms and sea level rise as well as possible increases in health related disasters.</p>
+<p>Meteorological droughts (below average precipitation) are the most frequent disasters with 237 events being declared between 2006 and 2019. The second and third most frequent disasters are flash floods and riverine floods and the fourth agricultural drought events (low soil moisture).</p>
+<p>Drought impacts stem from a combination of factors. Increasing rainfall variability is one aspect, but how this affects communities depends upon how well people, the economy and the environment can adapt.</p>
+<p>Various factors may undermine people’s ability to withstand reduced water availability (a meteorological drought) and to prevent it from developing into agricultural and hydrological drought with social, economic and environmental impacts.</p>
           </div>
           </section>
 
           <section className="ea-content-full pt-4 pb-4 light-bg">
           <div className="container-fluid">
-          <h3 className="mb-4">Provincial Graphs</h3>
-            <LightboxPage />
+          {/* <h3 className="mb-4">Provincial Graphs</h3> */}
+            <iframe width="100%"  border="none"  style={{ minHeight: "700px", overflowX: 'hidden' }} src="https://gis-portal.ndmc.gov.za/portal/apps/webappviewer/index.html?id=700928590ea84665b234b038eb96c210" />
           </div>
           </section>
           <section className="ea-content-full pt-4 pb-4 light-bg">
@@ -86,13 +89,13 @@ class CICextreme extends React.Component {
             <div className="row">
               <div className="col-6">
               <h3 className="mb-4">Disaster Risk Management and Climate Change Adaptation</h3>
-              <p>Creating an enabling environment for both climate change adaptation and disaster risk management is critical to ensure future resilience. Both disaster risk reduction and climate change adaptation aim to mitigate climate-related risks by reducing and modifying environmental and human factors in order to support sustainable economic and social development (<a href="https://www.csir.co.za/sites/default/files/Documents/SADC%20Handbook_Second%20Edition_full%20report.pdf" target="_blank">Davis-Reddy &amp; Vincent 2017</a>).</p>
-              <p>The National Climate Change Response White Paper (NCCRP) highlights disaster management as a key area of development for the country, due to the expected increase in extreme climatic events. This commitment is illustrated by the fact that the national government’s investment in disaster risk reduction and emergency response has risen from US$ 0.02 bn. to US$ 0.7 bn. between 2010 and 2015, as part of the total increase of investment in adaptation which rose from US$ 1.64 bn. to US$ 2.31 bn.</p>
+              <p>The Climate Risk and Vulnerability Handbook for Southern Africa (2nd Edition), emphasises that creating an enabling environment for both climate change adaptation and disaster risk management is critical to ensure future resilience. Both disaster risk reduction and climate change adaptation aim to mitigate climate-related risks by reducing and modifying environmental and human factors in order to support sustainable economic and social development.</p>
+              <p><a href="https://www.environment.gov.za/sites/default/files/legislations/national_climatechange_response_whitepaper.pdf" target="_blank">The National Climate Change Response White Paper (NCCRP)</a> highlights disaster management as a key area of development for the country, due to the expected increase in extreme climatic events. This commitment is illustrated by the fact that the national government’s investment in disaster risk reduction and emergency response has risen from US$ 0.02 bn. to US$ 0.7 bn. between 2010 and 2015, as part of the total increase of investment in adaptation which rose from US$ 1.64 bn. to US$ 2.31 bn.</p>
               </div>
               <div className="col-6">
               <div className="light-grey-bg p-3 round-edge">
-                <h3>Sendai Framework for Disaster Risk Reduction 2015-2030</h3>
-                <p>In March 2015, the Third United Nations World Conference on Disaster Risk Reduction (WCDRR) adopted the Sendai Framework for Disaster Risk Reduction 2015-2030, which was later endorsed by the UN General Assembly in its 69th session. The Sendai Framework provides the basis for a risk-informed and resilient future. The Sendai Framework specifically addresses climate change and climate action, providing measures, guiding principles and means of implementation. Sendai outcomes are a significant milestone in international cooperation for building resilience to climate-related disasters. The Sendai Framework establishes the significance of ensuring credible links on the post-2015 agenda including the sustainable development goals, financing for development, climate change and disaster risk reduction and the calls for enhanced coherence across policies, institutions, indicators, reporting and measurement systems for implementation (<a href="https://www.unisdr.org/we/coordinate/sendai-framework" target="_blank">UNISDR, 2015</a>).</p>
+                <h3><a href="https://www.preventionweb.net/files/43291_sendaiframeworkfordrren.pdf" target="_blank">Sendai Framework for Disaster Risk Reduction 2015-2030</a></h3>
+                <p>In March 2015, the Third United Nations World Conference on Disaster Risk Reduction (WCDRR) adopted the Sendai Framework for Disaster Risk Reduction 2015-2030, which was later endorsed by the UN General Assembly in its 69th session. The Sendai Framework provides the basis for a risk-informed and resilient future. The Sendai Framework specifically addresses climate change and climate action, providing measures, guiding principles and means of implementation. Sendai outcomes are a significant milestone in international cooperation for building resilience to climate-related disasters. The Sendai Framework establishes the significance of ensuring credible links on the post-2015 agenda including the sustainable development goals, financing for development, climate change and disaster risk reduction and the calls for enhanced coherence across policies, institutions, indicators, reporting and measurement systems for implementation.</p>
               </div>
               </div>
             </div>
diff --git a/App/JS/Components/Pages/cic-ghg.jsx b/App/JS/Components/Pages/cic-ghg.jsx
index 2a43d79..b8cbfea 100644
--- a/App/JS/Components/Pages/cic-ghg.jsx
+++ b/App/JS/Components/Pages/cic-ghg.jsx
@@ -33,7 +33,7 @@ class CICghg extends React.Component {
     this.props.updateNav(location.hash)
     return (
       <>
-       <section class="ea-content-full">
+       <section className="ea-content-full">
           <div className="container-fluid mt-4">
           <div className="row d-sm-none d-md-none d-lg-none">
             <div className="col-6"><h5>Actions</h5></div>
@@ -65,7 +65,7 @@ class CICghg extends React.Component {
              
 
               <div className="col-12 text-center">
-              <iframe className="m-auto" width="100%" height="600" src="https://app.powerbi.com/view?r=eyJrIjoiMDEyMWEzZjYtMWNmNi00YjRiLWFhMmUtZWZhNjllMmRiYWZmIiwidCI6IjgyZmNmOTdlLWJmMGItNDVlMy1iNzIwLTRhNzIzYmJmZWY4MiIsImMiOjl9" frameborder="0" allowfullscreen="true"></iframe>
+              <iframe className="m-auto" width="100%" height="600" src="https://app.powerbi.com/view?r=eyJrIjoiMGFiMzYwYWMtZDI1MS00NmQwLTlmYTctYmQxMWFlMmM5MmZmIiwidCI6IjgyZmNmOTdlLWJmMGItNDVlMy1iNzIwLTRhNzIzYmJmZWY4MiIsImMiOjl9" frameborder="0" allowfullscreen="true"></iframe>
               
               
               
diff --git a/App/JS/Components/Pages/cic-home.jsx b/App/JS/Components/Pages/cic-home.jsx
index 540a6bb..08fd6ef 100644
--- a/App/JS/Components/Pages/cic-home.jsx
+++ b/App/JS/Components/Pages/cic-home.jsx
@@ -33,7 +33,7 @@ class CICghg extends React.Component {
     this.props.updateNav(location.hash)
     return (
       <>
-       <section class="ea-content-full">
+       <section className="ea-content-full">
           <div className="container-fluid mt-4">
           <div className="row d-sm-none d-md-none d-lg-none">
             <div className="col-6"><h5>Actions</h5></div>
@@ -81,13 +81,13 @@ class CICghg extends React.Component {
               <h5 className="mt-4 mb-3">What causes climate change?</h5>
               <p>Anthropogenic emissions of greenhouse gases (the main cause of anthropogenic climate change) have increased steadily since the industrial revolution.</p>
                 <p>The rate of emissions, however, have been steadily increasing over time, and computer models of the earth's climate system (including both natural and human causes) are unable to simulate recent warming unless they include anthropogenic emissions of greenhouse gases. Computer models of the earth’s climate which include only natural forcings (e.g. solar variability due to both internal and orbital variations, volcanic activity etc.) simulate a cooling of the earth after 1960, which is at odds with the observed warming.</p>
-                <p>This has led the Intergovernmental Panel on Climate Change (<span onClick={(event) => {event.preventDefault(); window.open("#/info-glossary/#bm-ipcc");}} class="text-link">IPCC</span>) to conclude recently that most of the warming of the last 50 years is attributable to human activities.</p>
+                <p>This has led the Intergovernmental Panel on Climate Change (<span onClick={(event) => {event.preventDefault(); window.open("#/info-glossary/#bm-ipcc");}} className="text-link">IPCC</span>) to conclude recently that most of the warming of the last 50 years is attributable to human activities.</p>
                 <img src={dtree} />
               </div>
               <div className="col-6 pt-4 mt-3">
-              <p className="mt-4"><b onClick={(event) => {event.preventDefault(); window.open("#/info-glossary/#bm-cc");}} class="text-link">Climate change</b> refers to a change in the average weather experienced in a particular region or location. The change may occur over periods ranging from decades to millennia. It may affect one or more seasons (e.g. summer, winter or the whole year) and involves changes in one or more aspects of the weather e.g. rainfall, temperature or winds. Its causes may be natural (e.g. due to periodic changes in the earth’s orbit, volcanoes and solar variability) or attributable to human (anthropogenic) activities e.g. increasing emissions of greenhouse gases such as CO2, land use change and/or emissions of aerosols. ‘Climate change’ often refers to changes due only to anthropogenic causes.</p>
-              <p><b onClick={(event) => {event.preventDefault(); window.open("#/info-glossary/#bm-gw");}} class="text-link">Global warming</b> refers only to the overall warming of the Earth, based on average increases in temperature over the entire land and ocean surface. Climate change is more than simply an increase in global temperatures; it encompasses changes in regional climate characteristics, including temperature, humidity, rainfall, wind, and extreme weather events, which have economic and social dimensions.</p>
-              <p><b onClick={(event) => {event.preventDefault(); window.open("#/info-glossary/#bm-cv");}} class="text-link">Climate variability</b> refers to variations in climate on all spatial and temporal scales beyond that of individual weather events. This variability may be caused by natural internal processes within the climate system. One of the most important (and widely known) examples of natural climate variability is the <span onClick={(event) => {event.preventDefault(); window.open("#/info-glossary/#bm-enso");}} class="text-link">El Niño-Southern Oscillation (ENSO)</span>. Variations may also be caused by external influences which may be due to naturally-occurring phenomena (such as periodic changes in the earth’s orbit around the sun).</p>
+              <p className="mt-4"><b onClick={(event) => {event.preventDefault(); window.open("#/info-glossary/#bm-cc");}} className="text-link">Climate change</b> refers to a change in the average weather experienced in a particular region or location. The change may occur over periods ranging from decades to millennia. It may affect one or more seasons (e.g. summer, winter or the whole year) and involves changes in one or more aspects of the weather e.g. rainfall, temperature or winds. Its causes may be natural (e.g. due to periodic changes in the earth’s orbit, volcanoes and solar variability) or attributable to human (anthropogenic) activities e.g. increasing emissions of greenhouse gases such as CO2, land use change and/or emissions of aerosols. ‘Climate change’ often refers to changes due only to anthropogenic causes.</p>
+              <p><b onClick={(event) => {event.preventDefault(); window.open("#/info-glossary/#bm-gw");}} className="text-link">Global warming</b> refers only to the overall warming of the Earth, based on average increases in temperature over the entire land and ocean surface. Climate change is more than simply an increase in global temperatures; it encompasses changes in regional climate characteristics, including temperature, humidity, rainfall, wind, and extreme weather events, which have economic and social dimensions.</p>
+              <p><b onClick={(event) => {event.preventDefault(); window.open("#/info-glossary/#bm-cv");}} className="text-link">Climate variability</b> refers to variations in climate on all spatial and temporal scales beyond that of individual weather events. This variability may be caused by natural internal processes within the climate system. One of the most important (and widely known) examples of natural climate variability is the <span onClick={(event) => {event.preventDefault(); window.open("#/info-glossary/#bm-enso");}} className="text-link">El Niño-Southern Oscillation (ENSO)</span>. Variations may also be caused by external influences which may be due to naturally-occurring phenomena (such as periodic changes in the earth’s orbit around the sun).</p>
               </div>
             </div>
           
diff --git a/App/JS/Components/Pages/cic-projections-prov.jsx b/App/JS/Components/Pages/cic-projections-prov.jsx
index fffcaa6..912a792 100644
--- a/App/JS/Components/Pages/cic-projections-prov.jsx
+++ b/App/JS/Components/Pages/cic-projections-prov.jsx
@@ -33,7 +33,7 @@ class CICprojectionsp extends React.Component {
     this.props.updateNav(location.hash)
     return (
       <>
-       <section class="ea-content-full">
+       <section className="ea-content-full">
           <div className="container-fluid mt-4">
           <div className="row d-sm-none d-md-none d-lg-none">
             <div className="col-6"><h5>Actions</h5></div>
diff --git a/App/JS/Components/Pages/cic-projections.jsx b/App/JS/Components/Pages/cic-projections.jsx
index c858225..533e854 100644
--- a/App/JS/Components/Pages/cic-projections.jsx
+++ b/App/JS/Components/Pages/cic-projections.jsx
@@ -35,7 +35,7 @@ class CICprojections extends React.Component {
     this.props.updateNav(location.hash)
     return (
       <>
-       <section class="ea-content-full">
+       <section className="ea-content-full">
           <div className="container-fluid mt-4">
           <div className="row d-sm-none d-md-none d-lg-none">
             <div className="col-6"><h5>Actions</h5></div>
@@ -60,11 +60,10 @@ class CICprojections extends React.Component {
           <div className="container-fluid">
           <div className="row mb-3">
             <div className="col-12">
-              <p>Content written by Claire Davis-Reddy and based on Chapter 3 of South Africa’s Third National Communication to the UNFCCC (<a href="https://unfccc.int/sites/default/files/resource/South%20African%20TNC%20Report%20%20to%20the%20UNFCCC_31%20Aug.pdf" target="_blank">link to Report</a>)</p>
-              <p>In South Africa, significant progress has been made in projecting and understanding climate change for the region, providing an increasingly robust basis for strategy and policy development. The content presented here draws on recent subsets of future climate projections for the country:</p>
+              <p>In South Africa, significant progress has been made in projecting and understanding climate change for the region, providing an increasingly robust basis for strategy and policy development. The content presented here based on the information in Chapter 3 of <a href="https://unfccc.int/sites/default/files/resource/South%20African%20TNC%20Report%20%20to%20the%20UNFCCC_31%20Aug.pdf" target="_blank">South Africa's Third National Communication to the UNFCCC</a> and draws on recent subsets of future climate projections for the country:</p>
               <ul>
                 <li>Dynamically downscaled temperature and rainfall projections from the CSIR (NRE); and</li>
-                <li>Statistically downscaled models from CSAG available from the Climate Information Portal, <a href="cip.csag.uct.ac.za" target="_blank">cip.csag.uct.ac.za</a></li>
+                <li>Statistically downscaled models from CSAG available from the <a href="cip.csag.uct.ac.za" target="_blank">Climate Information Portal</a></li>
               </ul>
               <p>Changes in climate are based on the latest set of Representative Concentration Pathways (RCPs); RCP 4.5 and RCP 8.5. RCP 4.5 describes a future with relatively ambitious emission reductions whereas RCP 8.5 describes a future with no reductions in emissions. Emissions in RCP 4.5 peak around 2040, then decline and in RCP 8.5 emissions continue to rise throughout the 21st century.</p>
             </div>
diff --git a/App/JS/Components/Pages/cic-provincial-cd.jsx b/App/JS/Components/Pages/cic-provincial-cd.jsx
index 0b7e5f3..7083176 100644
--- a/App/JS/Components/Pages/cic-provincial-cd.jsx
+++ b/App/JS/Components/Pages/cic-provincial-cd.jsx
@@ -33,7 +33,7 @@ class CICpcd extends React.Component {
     this.props.updateNav(location.hash)
     return (
       <>
-       <section class="ea-content-full">
+       <section className="ea-content-full">
           <div className="container-fluid mt-4">
           <div className="row d-sm-none d-md-none d-lg-none">
             <div className="col-6"><h5>Actions</h5></div>
diff --git a/App/JS/Components/Pages/cic-trends-current.jsx b/App/JS/Components/Pages/cic-trends-current.jsx
index e3af043..11ea855 100644
--- a/App/JS/Components/Pages/cic-trends-current.jsx
+++ b/App/JS/Components/Pages/cic-trends-current.jsx
@@ -33,7 +33,7 @@ class CICtrendscc extends React.Component {
     this.props.updateNav(location.hash)
     return (
       <>
-       <section class="ea-content-full">
+       <section className="ea-content-full">
           <div className="container-fluid mt-4">
           <div className="row d-sm-none d-md-none d-lg-none">
             <div className="col-6"><h5>Actions</h5></div>
diff --git a/App/JS/Components/Pages/cic-trends-prov.jsx b/App/JS/Components/Pages/cic-trends-prov.jsx
index 861d813..2399173 100644
--- a/App/JS/Components/Pages/cic-trends-prov.jsx
+++ b/App/JS/Components/Pages/cic-trends-prov.jsx
@@ -33,7 +33,7 @@ class CICtrendsp extends React.Component {
     this.props.updateNav(location.hash)
     return (
       <>
-       <section class="ea-content-full">
+       <section className="ea-content-full">
           <div className="container-fluid mt-4">
           <div className="row d-sm-none d-md-none d-lg-none">
             <div className="col-6"><h5>Actions</h5></div>
diff --git a/App/JS/Components/Pages/cic-trends.jsx b/App/JS/Components/Pages/cic-trends.jsx
index 33e564a..147d1df 100644
--- a/App/JS/Components/Pages/cic-trends.jsx
+++ b/App/JS/Components/Pages/cic-trends.jsx
@@ -32,7 +32,7 @@ class CICtrends extends React.Component {
     this.props.updateNav(location.hash)
     return (
       <>
-       <section class="ea-content-full">
+       <section className="ea-content-full">
           <div className="container-fluid mt-4">
           <div className="row d-sm-none d-md-none d-lg-none">
             <div className="col-6"><h5>Actions</h5></div>
@@ -60,12 +60,16 @@ class CICtrends extends React.Component {
               <p>South Africa has been warming significantly over the period 1931-2015. Over the western parts of the country, including much of the Western and Northern Cape, and also in the east over Gauteng, Limpopo and the east coast of KwaZulu-Natal, the observed rate of warming has been 2 °C/century or even higher – in the order of twice the global rate of temperature increase.  </p>
               <p>Associated increases in the annual number of hot days have also occurred, but there have been decreases in the annual number of cold nights over most of the country. </p>
               <p>There is strong evidence of statistically significant increases in rainfall occurring over the southern interior regions, extending from the western interior of the Eastern Cape and eastern interior of the Western Cape northwards into the central interior region of the Northern Cape, over the period 1921-2015. </p>
-              <p>South Africa's 3rd National Communication to the UNFCCC, provides an updated analysis of trends in temperature, rainfall and extreme events.</p>
+              <p>Extreme indices developed by the World Meteorological Organization (WMO) Expert Team on Climate Change Detection and Indices (ETCCDI) provide an understanding on how climate extreme (temperature and rainfall) have changed over time.</p>
             </div>
             <div className="col-6">
-              <p>Extreme indices developed by the World Meteorological Organization (WMO) Expert Team on Climate Change Detection and Indices (ETCCDI) were utilised. The analysis builds on the studies of Kruger & Sekele (2012) and Mackellar et al. (2014).</p>
               <p>A total of 27 weather stations was used for temperature trends analysis spanning the period 1931-2015. For rainfall, a total of 60 weather stations were used for the rainfall trend analysis spanning the period 1921-2015. The base period, from which the annual index values of all indices are determined (except the annual maxima and minima) was selected as 1981 – 2010, which can be considered to be the present general norm for similar trend studies.</p>
               <p>The trends were tested for significance at the 95% confidence level. In each map the arrows indicate the direction of change (increasing or decreasing), and the size of the arrows the magnitude of change.  Shaded symbols indicate significant trends at the 5% level. </p>
+              <div className="credit-bg">
+              <p><strong>Read more</strong></p>
+              <p>Chapter 3 <a href="https://unfccc.int/sites/default/files/resource/South%20African%20TNC%20Report%20%20to%20the%20UNFCCC_31%20Aug.pdf" target="_blank">South Africa's 3rd National Communication to the UNFCCC</a>, provides an updated analysis of trends in temperature, rainfall and extreme events.</p>
+              The analysis builds on the studies of <a href="https://rmets.onlinelibrary.wiley.com/doi/10.1002/joc.3455" target="_blank">Kruger & Sekele (2012)</a> and <a href="https://www.sajs.co.za/article/view/3952" target="_blank">Mackellar et al. (2014)</a>.
+              </div>
             </div>
           </div>
  <Carousel />
diff --git a/App/JS/Components/Pages/cic-vulnerability.jsx b/App/JS/Components/Pages/cic-vulnerability.jsx
index df0b2df..dd84acc 100644
--- a/App/JS/Components/Pages/cic-vulnerability.jsx
+++ b/App/JS/Components/Pages/cic-vulnerability.jsx
@@ -32,7 +32,7 @@ class CICvulnerability extends React.Component {
     this.props.updateNav(location.hash)
     return (
       <>
-       <section class="ea-content-full">
+       <section className="ea-content-full">
           <div className="container-fluid mt-4">
           <div className="row d-sm-none d-md-none d-lg-none">
             <div className="col-6"><h5>Actions</h5></div>
@@ -60,9 +60,8 @@ class CICvulnerability extends React.Component {
           <div className="container-fluid">
           <div className="row mb-3">
             <div className="col-12">
-              <p>Content written by Claire Davis-Reddy and based on Chapter 3 of South Africa’s Third National Communication to the UNFCCC (<a href="https://unfccc.int/sites/default/files/resource/South%20African%20TNC%20Report%20%20to%20the%20UNFCCC_31%20Aug.pdf" target="_blank" >link to Document</a>)</p>
-              <p>There is a constantly growing body of sectoral knowledge on climate change vulnerability. South Africa saw a great expansion of information from the Second National Communication (2011) to the much more detailed and in-depth Long Term Adaptation Scenarios (LTAS)  reports (2013/2014) and the information provided in the <a href="http://www.letsrespondtoolkit.org/" target="_blank">Let's Respond Toolkit</a>. </p>
-              <p>The information on this page provides a summarised review of the  most significant climate change risks and vulnerabilities for the following sectors; Agriculture and Forestry, Water Resources, Forestry, Terrestrial Ecosystems, Coastal Zone, Health, and Urban and Rural Settlements. A summary of the key impacts of climate change on these sectors in shown in Table below.</p>
+              <p>There is a constantly growing body of sectoral knowledge on climate change vulnerability. South Africa saw a great expansion of information from the <a href="https://unfccc.int/sites/default/files/resource/South%20African%20TNC%20Report%20%20to%20the%20UNFCCC_31%20Aug.pdf" target="_blank" >Second National Communication (2011)</a> to the much more detailed and in-depth <a href="https://www.environment.gov.za/sites/default/files/docs/climate_trends_bookV3.pdf" target="_blank">Long Term Adaptation Scenarios (LTAS) reports (2013/2014)</a> and the information provided in the <a href="http://www.letsrespondtoolkit.org/" target="_blank">Let's Respond Toolkit</a>.</p>
+              <p>The information on this page provides a summarised review of the most significant climate change risks and vulnerabilities based on the information in Chapter 3 of <a href="https://unfccc.int/sites/default/files/resource/South%20African%20TNC%20Report%20%20to%20the%20UNFCCC_31%20Aug.pdf" target="_blank">South Africa's Third National Communication to the UNFCCC</a>. Information is presented for the following sectors; Agriculture and Forestry, Water Resources, Forestry, Terrestrial Ecosystems, Coastal Zone, Health, and Urban and Rural Settlements. A summary of the key impacts of climate change on these sectors in shown in Table below.</p>
             </div>
           </div>
           </div>
@@ -316,7 +315,7 @@ class CICvulnerability extends React.Component {
           </div>
           </section>
 
-          <section class="ea-content-full">
+          <section className="ea-content-full">
           <div className="container-fluid mt-4 mb-4">
             <div className="row">
             <TabsVulnerability />
diff --git a/App/JS/Components/Pages/climate-atlas.jsx b/App/JS/Components/Pages/climate-atlas.jsx
new file mode 100644
index 0000000..a537eb2
--- /dev/null
+++ b/App/JS/Components/Pages/climate-atlas.jsx
@@ -0,0 +1,45 @@
+'use strict'
+
+import React from 'react'
+import { connect } from 'react-redux'
+import { Row, Col, Button, Card, CardBody } from 'mdbreact'
+import ServicesData from '../../../Data/servicesData.jsx'
+
+const mapStateToProps = (state, props) => {
+  return {}
+}
+
+const mapDispatchToProps = (dispatch) => {
+  return {
+    updateNav: payload => {
+      dispatch({ type: "NAV", payload })
+    }
+  }
+}
+
+class ClimateAtlas extends React.Component {
+
+  constructor(props) {
+    super(props);
+  }
+
+  componentDidMount() {
+    
+  }
+
+  render() {
+    this.props.updateNav(location.hash)
+    return (
+      <>
+        <section className="ea-content-full light-bg explore-data" style={{ padding: "0"}}>
+          <div className="pt-0 pb-0">
+            <iframe src="https://gisportal.saeon.ac.za/portal/apps/webappviewer/index.html?id=2d572dcf9c5f47c484540f8c934e03f4" frame="none" border="none" style={{ width: "100%" , height: "800px" , border:"none"}} />
+          </div>
+        </section>
+    </>
+    
+    )
+  }
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(ClimateAtlas)
\ No newline at end of file
diff --git a/App/JS/Components/Pages/climate-report-2019.jsx b/App/JS/Components/Pages/climate-report-2019.jsx
new file mode 100644
index 0000000..3c45f89
--- /dev/null
+++ b/App/JS/Components/Pages/climate-report-2019.jsx
@@ -0,0 +1,99 @@
+'use strict'
+
+import React from 'react'
+import { connect } from 'react-redux'
+import { Row, Col, Button, Card, CardBody } from 'mdbreact'
+import ServicesData from '../../../Data/servicesData.jsx'
+
+const mapStateToProps = (state, props) => {
+  return {}
+}
+
+const mapDispatchToProps = (dispatch) => {
+  return {
+    updateNav: payload => {
+      dispatch({ type: "NAV", payload })
+    }
+  }
+}
+
+class ClimateReport extends React.Component {
+
+  constructor(props) {
+    super(props);
+  }
+
+  componentDidMount() {
+    
+  }
+
+  render() {
+    this.props.updateNav(location.hash)
+    return (
+      <>
+       <section className="ea-content-full">
+          <div className="container-fluid mt-4">
+          <h5>Climate Services</h5>
+          <Row>
+          <Col md="auto"><Button type="button" className="btn btn-success-active btn-lg" onClick={() => { location.hash = "/climate-services" }}>
+            <em className="fa fa-chevron-right mr-1"></em> Climate Services</Button></Col>
+          <Col md="auto"><Button type="button" className="btn btn-success btn-lg" onClick={() => { location.hash = "/maps-graphs" }}>
+            <em className="fa fa-chevron-right mr-1"></em> Maps and Graphs</Button></Col>
+          <Col md="auto"><Button type="button" className="btn btn-success btn-lg" onClick={() => { location.hash = "/data-download" }}>
+            <em className="fa fa-chevron-right mr-1"></em> Download Data</Button></Col>
+          </Row>
+          </div>
+        </section>
+
+          <section className="ea-content-full mt-4 pt-4 pb-4 light-bg">
+            <div className="container-fluid">
+
+            <div className="container-fluid ea-tabs">
+            <ul className="nav nav-tabs md-tabs" id="myTabMD" role="tablist">
+              <li className="nav-item waves-effect waves-light">
+                <a className="nav-link active" tab-link="tab-saws" >Products and Services</a>
+              </li>
+              <li className="nav-item waves-effect waves-light">
+                <a className="nav-link" tab-link="tab-about" >About the National Framework for Climate Services</a>
+              </li>
+            </ul>
+            <div className="tab-content card pt-5" id="mymdbTabContentMD">
+              <div className="tab-pane show" id="tab-saws" >
+              <h2 className="mt-3 mb-3">Products and Services</h2>
+              <ServicesData />
+              </div>
+              <div className="tab-pane" id="tab-about" >
+              <div className="row">
+                <div className="col-md-6">
+                    <h2>Vision</h2>
+                    <p>NFCS strives to enable society to better manage the risks and opportunities arising from climate variability and change, especially for those who are most vulnerable to climate related hazards.</p>
+                    <h2>Mission</h2>
+                    <p>The NFCS will mainstream and enhance climate observations and monitoring information, forecasting and prediction and transform these into sector -specific products and applications that can be disseminated widely, and further develop users’ capacity to manage risks of climate variability and change at all levels. This will be done through developing and incorporating science based climate information into planning, policy and practice. To be effective, the NFCS-SA will be user driven, and will address the entire value chain for the production, processing and application of climate services through local, regional and global collaborative efforts. The NFCS-SA will serve as one of enabling tools for South Africa, in the transition towards building a climate resilient country.</p>
+                  </div>
+                  <div className="col-md-6">
+                    <h2>Goals</h2>
+                    <p>The NFCS has five overarching goals, namely:</p>
+                    <ul>
+                      <li>Reducing the vulnerability of society to climate related hazards through better provision of climate information;</li>
+                      <li>Advancing the key national development goals through better provision of climate information;</li>
+                      <li>Mainstreaming the use of climate information in decision-making;</li>
+                      <li>Strengthening the engagement of providers and users of climate services; and</li>
+                      <li>Maximising the utility of existing climate service infrastructure.</li>
+                    </ul>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+
+              
+              
+            </div>
+          </section>
+    </>
+    
+    )
+  }
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(ClimateReport)
\ No newline at end of file
diff --git a/App/JS/Components/Pages/climate-services.jsx b/App/JS/Components/Pages/climate-services.jsx
new file mode 100644
index 0000000..c6f6b36
--- /dev/null
+++ b/App/JS/Components/Pages/climate-services.jsx
@@ -0,0 +1,110 @@
+'use strict'
+
+import React from 'react'
+import { connect } from 'react-redux'
+import { Row, Col, Button, Card, CardBody } from 'mdbreact'
+import ServicesData from '../../../Data/servicesData.jsx'
+import ReportYearData from '../../../Data/2019Data.jsx'
+
+const mapStateToProps = (state, props) => {
+  return {}
+}
+
+const mapDispatchToProps = (dispatch) => {
+  return {
+    updateNav: payload => {
+      dispatch({ type: "NAV", payload })
+    }
+  }
+}
+
+class ClimateServices extends React.Component {
+
+  constructor(props) {
+    super(props);
+  }
+
+  componentDidMount() {
+    
+  }
+
+  render() {
+    this.props.updateNav(location.hash)
+    return (
+      <>
+       <section className="ea-content-full">
+          <div className="container-fluid mt-4">
+          <h5>Climate Services</h5>
+          <Row>
+          <Col md="auto"><Button type="button" className="btn btn-success-active btn-lg" onClick={() => { location.hash = "/climate-services" }}>
+            <em className="fa fa-chevron-right mr-1"></em> Climate Services</Button></Col>
+          <Col md="auto"><Button type="button" className="btn btn-success btn-lg" onClick={() => { location.hash = "/climate-atlas" }}>
+            <em className="fa fa-chevron-right mr-1"></em> Climate Atlas</Button></Col>
+          <Col md="auto"><Button type="button" className="btn btn-success btn-lg" onClick={() => { location.hash = "/maps-graphs" }}>
+            <em className="fa fa-chevron-right mr-1"></em> Maps and Graphs</Button></Col>
+          <Col md="auto"><Button type="button" className="btn btn-success btn-lg" onClick={() => { location.hash = "/data-download" }}>
+            <em className="fa fa-chevron-right mr-1"></em> Download Data</Button></Col>
+          </Row>
+          </div>
+        </section>
+
+          <section className="ea-content-full mt-4 pt-4 pb-4 light-bg">
+            <div className="container-fluid">
+
+            <div className="container-fluid ea-tabs">
+            <ul className="nav nav-tabs md-tabs" id="myTabMD" role="tablist">
+              <li className="nav-item waves-effect waves-light">
+                <a className="nav-link active" tab-link="tab-saws" >Products and Services</a>
+              </li>
+              <li className="nav-item waves-effect waves-light">
+                <a className="nav-link" tab-link="tab-2019" >2019 Climate Reports</a>
+              </li>
+              <li className="nav-item waves-effect waves-light">
+                <a className="nav-link" tab-link="tab-about" >About the National Framework for Climate Services</a>
+              </li>
+            </ul>
+            <div className="tab-content card pt-5" id="mymdbTabContentMD">
+              <div className="tab-pane show" id="tab-saws" >
+              <h2 className="mt-3 mb-3">Products and Services</h2>
+              <ServicesData />
+              </div>
+              <div className="tab-pane" id="tab-about" >
+              <div className="row">
+                <div className="col-md-6">
+                    <h2>Vision</h2>
+                    <p>NFCS strives to enable society to better manage the risks and opportunities arising from climate variability and change, especially for those who are most vulnerable to climate related hazards.</p>
+                    <h2>Mission</h2>
+                    <p>The NFCS will mainstream and enhance climate observations and monitoring information, forecasting and prediction and transform these into sector -specific products and applications that can be disseminated widely, and further develop users’ capacity to manage risks of climate variability and change at all levels. This will be done through developing and incorporating science based climate information into planning, policy and practice. To be effective, the NFCS-SA will be user driven, and will address the entire value chain for the production, processing and application of climate services through local, regional and global collaborative efforts. The NFCS-SA will serve as one of enabling tools for South Africa, in the transition towards building a climate resilient country.</p>
+                  </div>
+                  <div className="col-md-6">
+                    <h2>Goals</h2>
+                    <p>The NFCS has five overarching goals, namely:</p>
+                    <ul>
+                      <li>Reducing the vulnerability of society to climate related hazards through better provision of climate information;</li>
+                      <li>Advancing the key national development goals through better provision of climate information;</li>
+                      <li>Mainstreaming the use of climate information in decision-making;</li>
+                      <li>Strengthening the engagement of providers and users of climate services; and</li>
+                      <li>Maximising the utility of existing climate service infrastructure.</li>
+                    </ul>
+                  </div>
+                </div>
+              </div>
+              <h2 className="mt-3 mb-3">2019 Climate Reports</h2>
+              <ReportYearData />
+              </div>
+              <div className="tab-pane show" id="tab-2019" >
+              
+            </div>
+          </div>
+
+              
+              
+            </div>
+          </section>
+    </>
+    
+    )
+  }
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(ClimateServices)
\ No newline at end of file
diff --git a/App/JS/Components/Pages/contact-ccis.jsx b/App/JS/Components/Pages/contact-ccis.jsx
new file mode 100644
index 0000000..66d3344
--- /dev/null
+++ b/App/JS/Components/Pages/contact-ccis.jsx
@@ -0,0 +1,102 @@
+'use strict'
+
+import React from 'react'
+import { connect } from 'react-redux'
+import { Card, CardBody, CardImage, CardTitle, CardText } from 'mdbreact'
+import Claire from '../../../Images/Other/claire.png'
+import Tsepang from '../../../Images/Other/Tsepang.jpg'
+import Leo from '../../../Images/Other/leo.jpg'
+
+
+const mapStateToProps = (state, props) => {
+  return {}
+}
+
+const mapDispatchToProps = (dispatch) => {
+  return {
+    updateNav: payload => {
+      dispatch({ type: "NAV", payload })
+    }
+  }
+}
+
+class Contact extends React.Component {
+
+  constructor(props) {
+    super(props);
+  }
+
+  componentDidMount() {
+    
+  }
+
+  render() {
+    this.props.updateNav(location.hash)
+    return (
+      <>
+       <section className="ea-content-full">
+          <div className="container-fluid mt-4">
+          <div className="row d-sm-none d-md-none d-lg-none">
+            <div className="col-6"><h5>Actions</h5></div>
+            <div className="col-6">
+              {/* <IconList></IconList> */}
+            </div>
+          </div>
+          <h5>Contact us</h5>
+          </div>
+          </section>
+
+          <section className="ea-content-full mt-4 pt-4 pb-4 light-bg">
+          <div className="container">
+            <h2 style={{marginBottom:50}}>Primary contacts:</h2>
+          <div className="row">
+            <div className="col-md-4">
+              <Card>
+                <CardBody>
+                  <p className="text-center"><img className="pro-pic" src={Tsepang} /></p>
+                  <h4>Tsepang Makholela</h4>
+                  <p className="contact-p">Contact Tsepang for CCIS Project-related discussions.
+                  </p><strong>tmakholela [at] environment.gov.za</strong>
+                </CardBody>
+              </Card>
+
+            </div>
+            <div className="col-md-4">
+              <Card>
+                <CardBody>
+                  <p className="text-center"><img className="pro-pic" src={Claire} /></p>
+                  <h4>Claire Davis-Reddy</h4>
+                  <p className="contact-p">Discuss new data products and ideas with Claire, as well as stakeholder engagement.
+                  </p><strong>claire [at] saeon.ac.za</strong>
+                </CardBody>
+              </Card>
+            </div>
+            <div className="col-md-4">
+              <Card>
+                <CardBody>
+                  <p className="text-center"><img className="pro-pic" src={Leo} /></p>
+                  <h4>Leo Chiloane</h4>
+                  <p className="contact-p">Talk to Leo about data access and contributing your data, as well as data agreements between your organisation and SAEON or DEFF.
+                  </p><strong>leo [at] saeon.ac.za</strong>
+                </CardBody>
+              </Card>
+            </div>
+            </div><div className="row mt-3">
+            <div className="col-md-12">
+              <Card>
+                <CardBody>
+                  <h4>Submit a Ticket</h4>
+                  <p>If you encounter any technical issues, please submit a ticket to our support desk where we will keep you notified as the issue is resolved.
+                  <br /><a href="https://saeon.atlassian.net/servicedesk/customer/portal/7" target="_blank" className="btn btn-primary">Submit Support Ticket</a></p>
+                </CardBody>
+              </Card>
+            </div>
+            </div>
+          </div>
+          </section>
+    </>
+    )
+  }
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(Contact)
\ No newline at end of file
diff --git a/App/JS/Components/Pages/data-download.jsx b/App/JS/Components/Pages/data-download.jsx
new file mode 100644
index 0000000..4d28530
--- /dev/null
+++ b/App/JS/Components/Pages/data-download.jsx
@@ -0,0 +1,208 @@
+'use strict'
+
+import React from 'react'
+import { connect } from 'react-redux'
+import { Row, Col, Button, Card, CardBody } from 'mdbreact'
+import DataWeather from '../../../images/data/weather.jpg'
+import DataSAWS from '../../../images/data/saws.jpg'
+import DataCSIR from '../../../images/data/csir.jpg'
+import DataCSAG from '../../../images/data/csag.jpg'
+import DataAgrohydrological from  '../../../images/data/agrohydrological.jpg'
+import DataDisasters from  '../../../images/data/disasters.jpg'
+import DataAgriculture from  '../../../images/data/agriculture.jpg'
+import DataCoastal from  '../../../images/data/coastal.jpg'
+import DataHealth from  '../../../images/data/health.jpg'
+import DataBiodiversity from  '../../../images/data/biodiversity.jpg'
+import DataSettlements from  '../../../images/data/settlements.jpg'
+import DataWater from  '../../../images/data/water.jpg'
+import DataDemography from  '../../../images/data/demography.jpg'
+import DataEnergy from  '../../../images/data/energy.jpg'
+const mapStateToProps = (state, props) => {
+  return {}
+}
+
+const mapDispatchToProps = (dispatch) => {
+  return {
+    updateNav: payload => {
+      dispatch({ type: "NAV", payload })
+    }
+  }
+}
+
+class DataDownload extends React.Component {
+
+  constructor(props) {
+    super(props);
+  }
+
+  componentDidMount() {
+    
+  }
+
+  render() {
+    this.props.updateNav(location.hash)
+    return (
+      <>
+       <section className="ea-content-full">
+          <div className="container-fluid mt-4">
+          <h5>Download Data</h5>
+          <Row>
+          <Col md="auto"><Button type="button" className="btn btn-success btn-lg" onClick={() => { location.hash = "/climate-services" }}>
+            <em className="fa fa-chevron-right mr-1"></em> Climate Services</Button></Col>
+          <Col md="auto"><Button type="button" className="btn btn-success btn-lg" onClick={() => { location.hash = "/climate-atlas" }}>
+            <em className="fa fa-chevron-right mr-1"></em> Climate Atlas</Button></Col>
+          <Col md="auto"><Button type="button" className="btn btn-success btn-lg" onClick={() => { location.hash = "/maps-graphs" }}>
+            <em className="fa fa-chevron-right mr-1"></em> Maps and Graphs</Button></Col>
+          <Col md="auto"><Button type="button" className="btn btn-success-active btn-lg" onClick={() => { location.hash = "/data-download" }}>
+            <em className="fa fa-chevron-right mr-1"></em> Download Data</Button></Col>
+          </Row>
+          </div>
+          </section>
+
+          <section className="ea-content-full mt-4 pt-4 pb-4 light-bg">
+          <div className="container">
+          <h2 class="mt-5 mb-3">Climate Data:</h2>
+            <div className="row dataDownTable">
+              <div className="col-md-4">
+                <div className="dataDownTableInner h-100">
+                <h5>Open search:</h5>
+                <p className="pt-4 pl-3 pr-3">Enter in the input below to enter an open search:</p>
+                  <form className="input-group pb-3 pl-3 pr-3 pt-3" id="sasdisearch">
+                    <input type="text" className="form-control sasdisearch" placeholder="Search Term" />
+                    <div className="input-group-append">
+                    <button className="btn btn-green" type="submit"><em className="fa fa-search"></em></button>
+                    </div>
+                  </form> 
+                </div>
+              </div>
+              <div className="col-md-4">
+                <div className="dataDownTableInner">
+                <h5>Weather:</h5>
+                <img src={DataWeather} />
+                <a href="http://www.sasdi.net/atlas.aspx?uid=a3625478991a9714c6fc00335f9dd8c1&ro=true&control=hide&noframe=true&tab=Analysis" target="_blank" className="btn btn-success">Go to Data <em className="fa fa-database ml-2"></em></a>
+                </div>
+              </div>
+              <div className="col-md-4">
+                <div className="dataDownTableInner">
+                <h5>Climate Projections from CSAG</h5>
+                <img src={DataCSAG} />
+                <a href="http://www.sasdi.net/search.aspx?guid=3444145e-0213-9a66-ca49-2a20de03e1b9&control=hide&noframe=true&tab=Results" target="_blank" className="btn btn-success">Go to Data <em className="fa fa-database ml-2"></em></a>
+                </div>
+              </div>
+              <div className="col-md-4">
+                <div className="dataDownTableInner">
+                <h5>Climate Projections from SAWS:</h5>
+                <img src={DataSAWS} />
+                <a href="http://www.sasdi.net/search.aspx?guid=4787c3db-12ac-3350-5d75-1b829e1b1504&control=hide&noframe=true&tab=Results" target="_blank" className="btn btn-success">Go to Data <em className="fa fa-database ml-2"></em></a>
+                </div>
+              </div>
+              <div className="col-md-4">
+                <div className="dataDownTableInner">
+                <h5>Climate Projections from CSIR</h5>
+                <img src={DataCSIR} />
+                <a href="http://www.sasdi.net/search.aspx?guid=16625c5d-9112-91bc-e632-8f7408d15f3d&control=hide&noframe=true&tab=Analysis" target="_blank" className="btn btn-success">Go to Data <em className="fa fa-database ml-2"></em></a>
+                </div>
+              </div>
+              <div className="col-md-4">
+                <div className="dataDownTableInner">
+                <h5>Agrohydrological Atlas</h5>
+                <img src={DataAgrohydrological} />
+                <a href="http://www.sasdi.net/search.aspx?guid=5e8a387e-32f7-dac4-1429-133397a9016d&control=hide&noframe=true&tab=Results" target="_blank" className="btn btn-success">Go to Data <em className="fa fa-database ml-2"></em></a>
+                </div>
+              </div>
+
+            </div>
+            <h2 class="mt-5 mb-3">Further Data Collections:</h2>
+            
+          </div>
+          </section>
+          <section className="pt-5 pb-5">
+            <div className="container">
+              <div className="row mb-5">
+                <div className="col-md-3">
+                  <div className="dataDownTableInner">
+                  <h5>Climate Change Projections</h5>
+                  <img src={DataSAWS} />
+                  <a href="http://www.sasdi.net/search.aspx?guid=4787c3db-12ac-3350-5d75-1b829e1b1504&control=hide&noframe=true&tab=Results" target="_blank" className="btn btn-success">Access Data from SAWS <em className="fa fa-database ml-2"></em></a>
+                  </div>
+                </div>
+                <div className="col-md-3">
+                  <div className="dataDownTableInner">
+                  <h5>Disasters</h5>
+                  <img src={DataDisasters} />
+                  <a href="http://www.sasdi.net/atlas.aspx?uid=cd6878477758be76cefe7761a1d0a968&ro=true&lat=-28.468610999999594&lon=24.66916700000036&z=5&control=hide&noframe=true&tab=Analysis" target="_blank" className="btn btn-success">Access Data <em className="fa fa-database ml-2"></em></a>
+                  </div>
+                </div>
+                <div className="col-md-3">
+                  <div className="dataDownTableInner">
+                  <h5>Agriculture and Forestry</h5>
+                  <img src={DataAgriculture} />
+                  <a href="http://www.sasdi.net/atlas.aspx?uid=93d2b76075a3e7b11bd2ce2bb9a6680d&ro=true&control=hide&noframe=true&tab=Analysis" target="_blank" className="btn btn-success">Access Data <em className="fa fa-database ml-2"></em></a>
+                  </div>
+                </div>
+                <div className="col-md-3">
+                  <div className="dataDownTableInner">
+                  <h5>Biodiversity</h5>
+                  <img src={DataBiodiversity} />
+                  <a href="http://www.sasdi.net/search.aspx?guid=4821e616-f786-8e41-fc9a-45ad113b1510&control=hide&noframe=true&tab=Results" target="_blank" className="btn btn-success">Access Data <em className="fa fa-database ml-2"></em></a>
+                  </div>
+                </div>
+              </div>
+              <div className="row mb-5">
+                <div className="col-md-3">
+                  <div className="dataDownTableInner">
+                  <h5>Demography</h5>
+                  <img src={DataDemography} />
+                  <a href="http://www.sasdi.net/atlas.aspx?uid=1ae960710c8a7749e33b9bfcc528c611&ro=true&control=hide&noframe=true&tab=Analysis" target="_blank" className="btn btn-success">Access Data <em className="fa fa-database ml-2"></em></a>
+                  </div>
+                </div>
+                <div className="col-md-3">
+                  <div className="dataDownTableInner">
+                  <h5>Energy</h5>
+                  <img src={DataEnergy} />
+                  <a href="http://www.sasdi.net/atlas.aspx?uid=52e864404875eee9e1e2cf34996e5abf&ro=true&noframe=true&tab=Results" target="_blank" className="btn btn-success">Access Data <em className="fa fa-database ml-2"></em></a>
+                  </div>
+                </div>
+                <div className="col-md-3">
+                  <div className="dataDownTableInner">
+                  <h5>Settlements</h5>
+                  <img src={DataSettlements} />
+                  <a href="https://www.greenbook.co.za/" target="_blank" className="btn btn-success">Access Data <em className="fa fa-database ml-2"></em></a>
+                  </div>
+                </div>
+                <div className="col-md-3">
+                  <div className="dataDownTableInner">
+                  <h5>Water Resources</h5>
+                  <img src={DataWater} />
+                  <a href="http://www.sasdi.net/atlas.aspx?uid=6529763ce9983abf43d4192197d775c3&ro=true&control=hide&noframe=true&tab=Analysis" target="_blank" className="btn btn-success">Access Data <em className="fa fa-database ml-2"></em></a>
+                  </div>
+                </div>
+              </div>
+              <div className="row">
+                <div className="col-md-6">
+                  <div className="dataDownTableInner">
+                  <h5>Human Health</h5>
+                  <img src={DataHealth} className="w-100" />
+                  <a href="http://www.letsrespondtoolkit.org/sectors/human-health/air-quality-priority-areas" target="_blank" className="btn btn-success">Air Quality Priority Areas <em className="fa fa-database ml-2"></em></a>
+                  <a href="http://www.letsrespondtoolkit.org/sectors/human-health/malaria-risk-map" target="_blank" className="btn btn-success">Malaria Risk Map <em className="fa fa-database ml-2"></em></a>
+                  <a href="http://www.sasdi.net/atlas.aspx?uid=f6184c4722433827463b8238cbd1d220&ro=true&control=hide&noframe=true&tab=Results" target="_blank" className="btn btn-success">Environmental and Economic <em className="fa fa-database ml-2"></em></a>
+                  </div>
+                </div>
+                <div className="col-md-6">
+                  <div className="dataDownTableInner">
+                  <h5>Coastal and Marine</h5>
+                  <img src={DataCoastal} className="w-100" />
+                  <a href="https://mapservice.environment.gov.za/Coastal%20Viewer/" target="_blank" className="btn btn-success">Coastal Viewer <em className="fa fa-database ml-2"></em></a>
+                  <a href="http://www.letsrespondtoolkit.org/sectors/coastal-and-marine/marine-benthic-and-coastal-threat-status" target="_blank" className="btn btn-success">Marine Benthic and Coastal Threat Status <em className="fa fa-database ml-2"></em></a>
+                  <a href="http://www.letsrespondtoolkit.org/sectors/coastal-and-marine/coastal-areas-below-5m" target="_blank" className="btn btn-success">Coastal Areas Below 5m <em className="fa fa-database ml-2"></em></a>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </section>
+    </>
+    )
+  }
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(DataDownload)
\ No newline at end of file
diff --git a/App/JS/Components/Pages/doc-conditions.jsx b/App/JS/Components/Pages/doc-conditions.jsx
index 709b0ec..f6367ce 100644
--- a/App/JS/Components/Pages/doc-conditions.jsx
+++ b/App/JS/Components/Pages/doc-conditions.jsx
@@ -31,7 +31,7 @@ class DOCconditions extends React.Component {
     this.props.updateNav(location.hash)
     return (
       <>
-       <section class="ea-content-full">
+       <section className="ea-content-full">
           <div className="container-fluid mt-4">
           <div className="row d-sm-none d-md-none d-lg-none">
             <div className="col-6"><h5>Actions</h5></div>
diff --git a/App/JS/Components/Pages/doc-disclaimer.jsx b/App/JS/Components/Pages/doc-disclaimer.jsx
index c291d26..34442f8 100644
--- a/App/JS/Components/Pages/doc-disclaimer.jsx
+++ b/App/JS/Components/Pages/doc-disclaimer.jsx
@@ -31,7 +31,7 @@ class DOCdisclaimer extends React.Component {
     this.props.updateNav(location.hash)
     return (
       <>
-       <section class="ea-content-full">
+       <section className="ea-content-full">
           <div className="container-fluid mt-4">
           <div className="row d-sm-none d-md-none d-lg-none">
             <div className="col-6"><h5>Actions</h5></div>
diff --git a/App/JS/Components/Pages/doc-privacy.jsx b/App/JS/Components/Pages/doc-privacy.jsx
index 8f73881..5040b60 100644
--- a/App/JS/Components/Pages/doc-privacy.jsx
+++ b/App/JS/Components/Pages/doc-privacy.jsx
@@ -184,7 +184,7 @@ class DOCprivacy extends React.Component {
                 </tr>
               </table>
               <p>Privacy Support<br />If you have an enquiry or concern about our privacy policy, please contact:</p>
-              <table class="table-plain mt-3">
+              <table className="table-plain mt-3">
                 <tr>
                 <td colSpan="2">Contact 1</td>
                 </tr>
diff --git a/App/JS/Components/Pages/finance.jsx b/App/JS/Components/Pages/finance.jsx
new file mode 100644
index 0000000..4ecf3a1
--- /dev/null
+++ b/App/JS/Components/Pages/finance.jsx
@@ -0,0 +1,67 @@
+'use strict'
+
+import React from 'react'
+import { connect } from 'react-redux'
+import { Row, Col, Button } from 'mdbreact'
+import te1 from './../../../Images/Other/t_e_1.gif'
+import te2 from './../../../Images/Other/t_e_2.gif'
+
+const mapStateToProps = (state, props) => {
+  return {}
+}
+
+const mapDispatchToProps = (dispatch) => {
+  return {
+    updateNav: payload => {
+      dispatch({ type: "NAV", payload })
+    }
+  }
+}
+
+class Finance extends React.Component {
+
+  constructor(props) {
+    super(props);
+  }
+
+  componentDidMount() {
+    
+  }
+
+  render() {
+    this.props.updateNav(location.hash)
+    return (
+      <>
+       <section className="ea-content-full">
+          <div className="container-fluid mt-4">
+          <div className="row d-sm-none d-md-none d-lg-none">
+            <div className="col-6"><h5>Actions</h5></div>
+            <div className="col-6">
+              {/* <IconList></IconList> */}
+            </div>
+          </div>
+          <h5>Financing Climate Change</h5>
+          <p>In order for South Africa to implement effective climate action, support is required to fund programmes. The financial support, categorised by type and current status, required by South Africa to implement action is presented below.</p>
+          </div>
+          </section>
+
+          <section className="ea-content-full mt-4 pt-4 pb-4 light-bg">
+          <div className="container pt-3 pb-3">
+            <div className="row align-items-center">
+              <div className="col-md-6">
+                <h5>Support type (US $)</h5>
+                <img src={te1} />
+              </div>
+              <div className="col-md-6">
+                <h5>Support status (US $)</h5>
+                <img src={te2} />
+              </div>
+            </div>
+          </div>
+          </section>
+    </>
+    )
+  }
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(Finance)
\ No newline at end of file
diff --git a/App/JS/Components/Pages/info-about.jsx b/App/JS/Components/Pages/info-about.jsx
index a5c8796..cc9974d 100644
--- a/App/JS/Components/Pages/info-about.jsx
+++ b/App/JS/Components/Pages/info-about.jsx
@@ -33,7 +33,7 @@ class INFOabout extends React.Component {
     this.props.updateNav(location.hash)
     return (
       <>
-       <section class="ea-content-full">
+       <section className="ea-content-full">
           <div className="container-fluid mt-4">
           <div className="row d-sm-none d-md-none d-lg-none">
             <div className="col-6"><h5>Actions</h5></div>
diff --git a/App/JS/Components/Pages/info-documents.jsx b/App/JS/Components/Pages/info-documents.jsx
index 199685d..389fa9f 100644
--- a/App/JS/Components/Pages/info-documents.jsx
+++ b/App/JS/Components/Pages/info-documents.jsx
@@ -10,6 +10,7 @@ import GuidelinesData from '../../../Data/guidelinesData.jsx'
 import SpatialData from '../../../Data/spatialData.jsx'
 import ToolsData from '../../../Data/toolsData.jsx'
 import InternationalData from '../../../Data/internationalData.jsx'
+import ProvincialData from '../../../Data/provincialData.jsx'
 
 const mapStateToProps = (state, props) => {
   return {}
@@ -59,51 +60,60 @@ class INFOabout extends React.Component {
 
          <section className="ea-content-full mt-4 pt-4 pb-4 light-bg">
            <div className="container-fluid ea-tabs">
-            <ul class="nav nav-tabs md-tabs" id="myTabMD" role="tablist">
-              <li class="nav-item waves-effect waves-light">
-                <a class="nav-link active" tab-link="tab-reports" >Reports</a>
+            <ul className="nav nav-tabs md-tabs" id="myTabMD" role="tablist">
+              <li className="nav-item waves-effect waves-light">
+                <a className="nav-link active" tab-link="tab-reports" >Reports</a>
               </li>
-              <li class="nav-item waves-effect waves-light">
-                <a class="nav-link" tab-link="tab-tracking" >Tracking and Evaluation</a>
+              <li className="nav-item waves-effect waves-light">
+                <a className="nav-link" tab-link="tab-tracking" >Tracking and Evaluation</a>
               </li>
-              <li class="nav-item waves-effect waves-light">
-                <a class="nav-link" tab-link="tab-policy" >Policy and Legislation</a>
+              <li className="nav-item waves-effect waves-light">
+                <a className="nav-link" tab-link="tab-policy" >Policy and Legislation</a>
               </li>
-              <li class="nav-item waves-effect waves-light">
-                <a class="nav-link" tab-link="tab-guidelines" >Guidelines</a>
+              <li className="nav-item waves-effect waves-light">
+                <a className="nav-link" tab-link="tab-guidelines" >Guidelines</a>
               </li>
-              <li class="nav-item waves-effect waves-light">
-                <a class="nav-link" tab-link="tab-spatial" >Spatial Planning</a>
+              <li className="nav-item waves-effect waves-light">
+                <a className="nav-link" tab-link="tab-spatial" >Spatial Planning</a>
               </li>
-              <li class="nav-item waves-effect waves-light">
-                <a class="nav-link" tab-link="tab-tools" >Tools</a>
+              <li className="nav-item waves-effect waves-light">
+                <a className="nav-link" tab-link="tab-tools" >Tools</a>
               </li>
-              <li class="nav-item waves-effect waves-light">
-                <a class="nav-link" tab-link="tab-international" >International</a>
+              <li className="nav-item waves-effect waves-light">
+                <a className="nav-link" tab-link="tab-international" >International</a>
+              </li>
+              <li className="nav-item waves-effect waves-light">
+                <a className="nav-link" tab-link="tab-provincial" >Provincial</a>
+              </li>
+              <li className="nav-item waves-effect waves-light">
+                <a className="nav-link" href="http://www.letsrespondtoolkit.org/climate-change-resources/long-term-adaptation-scenarios" target="_blank" >LTAS</a>
               </li>
             </ul>
-            <div class="tab-content card pt-5" id="mymdbTabContentMD">
-              <div class="tab-pane show" id="tab-reports" >
+            <div className="tab-content card pt-5" id="mymdbTabContentMD">
+              <div className="tab-pane show" id="tab-reports" >
                 <DatatablePage />
               </div>
-              <div class="tab-pane" id="tab-tracking">
+              <div className="tab-pane" id="tab-tracking">
                 <TrackingData />
               </div>
-              <div class="tab-pane" id="tab-policy" >
+              <div className="tab-pane" id="tab-policy" >
                 <PolicyLData />
               </div>
-              <div class="tab-pane" id="tab-guidelines">
+              <div className="tab-pane" id="tab-guidelines">
                 <GuidelinesData />
               </div>
-              <div class="tab-pane" id="tab-spatial" >
+              <div className="tab-pane" id="tab-spatial" >
                 <SpatialData />
               </div>
-              <div class="tab-pane" id="tab-tools">
+              <div className="tab-pane" id="tab-tools">
                 <ToolsData />
               </div>
-              <div class="tab-pane" id="tab-international">
+              <div className="tab-pane" id="tab-international">
                 <InternationalData />
               </div>
+              <div className="tab-pane" id="tab-provincial">
+                <ProvincialData />
+              </div>
             </div>
           </div>
           </section>
diff --git a/App/JS/Components/Pages/info-events.jsx b/App/JS/Components/Pages/info-events.jsx
index 65e4b6b..4dfbbc6 100644
--- a/App/JS/Components/Pages/info-events.jsx
+++ b/App/JS/Components/Pages/info-events.jsx
@@ -2,7 +2,7 @@
 
 import React from 'react'
 import { connect } from 'react-redux'
-import { Row, Col, Button } from 'mdbreact'
+import { Row, Col, Button, MDBContainer, MDBCollapse, MDBCard, MDBCardBody, MDBCollapseHeader, MDBIcon } from 'mdbreact'
 import environmental_affairs_logo from '../../../images/DEA/environmental_affairs_logo.png'
 import sa_flag from '../../../images/Other/sa_flag.jpg'
 
@@ -32,7 +32,7 @@ class INFOevents extends React.Component {
     this.props.updateNav(location.hash)
     return (
       <>
-       <section class="ea-content-full">
+       <section className="ea-content-full">
           <div className="container-fluid mt-4">
           <div className="row d-sm-none d-md-none d-lg-none">
             <div className="col-6"><h5>Actions</h5></div>
@@ -77,17 +77,104 @@ class INFOevents extends React.Component {
               </div> */}
             </div>
             <div className="col-8">
-            <table className="ea-table dataTable">
-            <tr><td className="td-title">		</td><td className="td-title">	Province	</td><td className="td-title">	Date	</td><td className="td-title">	Status	</td><td className="td-title">	Venue	</td><td className="td-title">	Documents	</td></tr>
-            <tr><td>	1	</td><td>	Northern Cape	</td><td>	6-7th August 2019	</td><td>	Confirmed	</td><td>	Savoy hotel	</td><td><button onClick={() => { location.hash = "/event-nc6aug2019" }}>link</button></td></tr>
-            <tr><td>	2	</td><td>	KZN	</td><td>	20-21st August 2019	</td><td>	Confirmed	</td><td>	Durban Manor	</td><td> </td></tr>
-            <tr><td>	3	</td><td>	Mpumalanga	</td><td>	29-30th August 2019	</td><td>	Confirmed	</td><td>		</td><td> </td></tr>
-            <tr><td>	4	</td><td>	Limpopo	</td><td>	TBC	</td><td>		</td><td>		</td><td> </td></tr>
-            <tr><td>	5	</td><td>	Gauteng	</td><td>	TBC	</td><td>		</td><td>		</td><td> </td></tr>
-            <tr><td>	6	</td><td>	Western Cape	</td><td>	TBC	</td><td>		</td><td>		</td><td> </td></tr>
-            <tr><td>	7	</td><td>	North West	</td><td>	TBC	</td><td>		</td><td>		</td><td> </td></tr>
-            <tr><td>	8	</td><td>	Eastern Cape	</td><td>	4-5th September 2019	</td><td>	Confirmed	</td><td>		</td><td> </td></tr>
+            <section className="ea-content-full mt-4 pt-4 pb-4 light-bg">
+           <div className="container-fluid ea-tabs">
+            <ul className="nav nav-tabs md-tabs" id="myTabMD" role="tablist">
+              <li className="nav-item waves-effect waves-light">
+                <a className="nav-link active" tab-link="tab-all" >All</a>
+              </li>
+              <li className="nav-item waves-effect waves-light">
+                <a className="nav-link" tab-link="tab-ec" >Eastern Cape</a>
+              </li>
+              <li className="nav-item waves-effect waves-light">
+                <a className="nav-link" tab-link="tab-kzn" >KZN</a>
+              </li>
+              <li className="nav-item waves-effect waves-light">
+                <a className="nav-link" tab-link="tab-nc" >Northern Cape</a>
+              </li>
+            </ul>
+            <div className="tab-content card pt-5" id="mymdbTabContentMD">
+              <div className="tab-pane show" id="tab-all">
+              <table className="ea-table dataTable">
+            <tr><td className="td-title">	Province	</td><td className="td-title">	Date	</td><td className="td-title">	Title	</td><td className="td-title">	Publisher	</td><td className="td-title">	Documents	</td></tr>
+            <tr><td>Northern Cape</td><td>2019-08-06</td><td>Presentation on the Climate Tracking and Evaluation Portal</td><td>Department of Environmental Affairs</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=1CeKhMes7ylAb0NyD-ByoQrp20fKaIH5k">Link</a></td></tr>
+              <tr><td>Northern Cape</td><td>2019-08-06</td><td>Presentation on the National Climate Change Information System</td><td>Department of Environmental Affairs</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=1HQDzgVB7qYA_erv_Xg1tLRXdgAXTKqzt">Link</a></td></tr>
+              <tr><td>Northern Cape</td><td>2019-08-06</td><td>Presentation from the National Climate Change Information System Training Workshop: Northern Cape</td><td>South African Weather Service</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=16AT3C-XBe9iCeiEzJdvcxZfv9ubBLUcJ">Link</a></td></tr>
+              <tr><td>Northern Cape</td><td>2019-08-06</td><td>Presentation on Climate Change Adaptation Materials</td><td>Department of Environmental Affairs</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=1VADubVqA8AnBLwnQUkFX0Goc9nCg_1TW">Link</a></td></tr>
+              <tr><td>Northern Cape</td><td>2019-08-06</td><td>Presentation on Integrated Decision Support Tools by SAEON</td><td>Department of Environmental Affairs</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=1mwvamLMFqkhs1oodp_jrh8roqFaEet8n">Link</a></td></tr>
+              <tr><td>Northern Cape</td><td>2019-08-06</td><td>Presentation on Greenbook: National Climate Change Information Systems Training Workshop Northern Cape</td><td>Council for Scientific and Industrial Research</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=1GtUt6-e0d_PsK-1wyAwmB58zs7BXauV5">Link</a></td></tr>
+              <tr><td>Northern Cape</td><td>2019-08-06</td><td>Presentation on Climate Service</td><td>South African Weather Service</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=1108VihxslFdU2dw5qxbrGQz_cP_otPt4">Link</a></td></tr>
+              <tr><td>Northern Cape</td><td>2019-08-06</td><td>Presentation on Climate Change: an Impact-based Severe Weather Warning System</td><td>South African Weather Service</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=1tOsBngE2e7wzBmuDiSVEGP5KZbJrd3o0">Link</a></td></tr>
+              <tr><td>Northern Cape</td><td>2019-08-06</td><td>Presentation on Climate Change Adaptation Local Government Climate Change Support Programme / Let's Respond Toolkit</td><td>Department of Environmental Affairs</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=1T56BLR_zEDn-JDUbaFwtqoTBQcPHEatv">Link</a></td></tr>
+              <tr><td>Northern Cape</td><td>2019-08-06</td><td>Northern Cape Province Climate Change Reponse</td><td>Norther Cape Department of Environment and Nature Conservation, Northern Cape Province, Private Bag x6102, Kimberley 8301</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=19o75f9DOuuAWNZCH4q9QCOm1EIE9qZZm">Link</a></td></tr>
+              <tr><td>KZN</td><td>2019-08-20</td><td>Presentation on the Tracking and Evaluation Portal</td><td>Department of Environmental Affairs</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=1FHESHadYmr7thMjoJXSt1No0GLpj7KiN">Link</a></td></tr>
+              <tr><td>KZN</td><td>2019-08-20</td><td>Presentation on SAWS Research and Development</td><td>South African Weather Service</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=1jyD0E3isS95t_vWcMuxE-TVd_9vny6F0">Link</a></td></tr>
+              <tr><td>KZN</td><td>2019-08-20</td><td>Presentation on SAWS Impact-based Severe Weather Warning System</td><td>South African Weather Service</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=1KQmMxP6KFHul04spYut4qF66P3MbJLXe">Link</a></td></tr>
+              <tr><td>KZN</td><td>2019-08-20</td><td>Presentation on SAWS Climate Services Department</td><td>South African Weather Service</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=1XiG_ALIvli5bzUNxss7v2ZB59F7EN3RB">Link</a></td></tr>
+              <tr><td>KZN</td><td>2019-08-20</td><td>Presentation on the Integrated Decision Support Tools</td><td>South African Environmental Observation Network</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=16VbInFyOZYVosHRxCP_3b9OHpZFkyPbj">Link</a></td></tr>
+              <tr><td>KZN</td><td>2019-08-20</td><td>Presentation on Climate Change Policy, Planning-Implementation and Reporting (Province of KwaZulu Natal, South Africa))</td><td>KwaZulu-Natal Department of Economic Development, Tourism and Environmental Affairs</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=1fnwaXFQIUZFFA2HaCivDEaY6ukwG3AoY">Link</a></td></tr>
+              <tr><td>KZN</td><td>2019-08-20</td><td>Training presentation on the National Climate Change Information System</td><td>Department of Environmental Affairs</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=1EzmHNoKvag23qVp38ReFHa4ZUpDArHLC">Link</a></td></tr>
+              <tr><td>KZN</td><td>2019-08-20</td><td>Video guide on the Green Book</td><td>Council for Scientific and Industrial Research</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=1baq6319hfacaA3NgEOXUeM3gjyF5-DYw">Link</a></td></tr>
+              <tr><td>KZN</td><td>2019-08-20</td><td>Presentation on Climate Change Adaptation Materials</td><td>Department of Environmental Affairs</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=1xney8NdRmrnmdwTmaqRDd8CecrDNaTyZ">Link</a></td></tr>
+              <tr><td>KZN</td><td>2019-08-20</td><td>KZN NCCIS Training Workshop presentation on Climate Change Adaptation Local Government Climate Change Support Programme / Let's Respond Toolkit</td><td>Department of Environmental Affairs</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=1CN_l486fM5PBedxzldls2CwQtw4Po4Z-">Link</a></td></tr>
+              <tr><td>Eastern Cape</td><td>2019-09-04</td><td>SAWS - Research and Development</td><td>South African Weather Service, Eco Glades block 1b, Eco Park, cnr Olievenhoutbosch and Ribbon Grass Streets, Centurion, South Africa</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=1GtLsd5L0kmKU1UCH2-U98igFDezIrROz">Link</a></td></tr>
+              <tr><td>Eastern Cape</td><td>2019-09-04</td><td>Climate Services Department (SAWS)</td><td>South African Weather Service, Eco Glades block 1b, Eco Park, cnr Olievenhoutbosch and Ribbon Grass Streets, Centurion, South Africa</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=17-QjnPdybkiKAmFaAQqvqx4ZbxzsdtUp">Link</a></td></tr>
+              <tr><td>Eastern Cape</td><td>2019-09-04</td><td>National Climate Change Information System</td><td>South African Environmental Observation Network (SAEON), PO Box 2600, Pretoria, 0001, South Africa</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=1KLNtczV3SPAJL9Oog1oW-RCb6n0Yp0Kw">Link</a></td></tr>
+              <tr><td>Eastern Cape</td><td>2019-09-04</td><td>Climate Change - An Impact-based Severe Weather Warning System (SAWS)</td><td>South African Weather Service, Eco Glades block 1b, Eco Park, cnr Olievenhoutbosch and Ribbon Grass Streets, Centurion, South Africa</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=13jGn98Pg1cnFrx_ZZdacVjJvvGXFuLSA">Link</a></td></tr>
+              <tr><td>Eastern Cape</td><td>2019-09-04</td><td>GreenBook - Adapting Settlements for the Future</td><td>Council for Scientific and Industrial Research, Meiring Naudé Road, Brummeria, Pretoria, South Africa</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=1DHJX1kVEnjRoW1XOEjy0xhjOUIfcTJJH">Link</a></td></tr>
+              <tr><td>Eastern Cape</td><td>2019-09-04</td><td>Eastern Cape Province - Overview of Climate Change Response</td><td>Eastern Cape Department of Economic Development, Environmental Affairs and Tourism, Private Bag X0054, Bhisho, 5605, South Africa</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=14QN9wx1c8i5Q0yUyA92wQ3si885mAo1U">Link</a></td></tr>
+              <tr><td>Eastern Cape</td><td>2019-09-05</td><td>SAEON Integrated Decision Support Tools</td><td>South African Environmental Observation Network (SAEON), PO Box 2600, Pretoria, 0001, South Africa</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=1PXSJf9he0hr9iD9KErWSuYq9ijEyMTEd">Link</a></td></tr>
+              <tr><td>Eastern Cape</td><td>2019-09-05</td><td>Climate Change Adaptation - Local Government Climate Change Support Programme (LGCCSP), Lets Respond Toolkit</td><td>Department of Environment Affairs, Corner Steve Biko (previously Beatrix Street) and Soutpansberg Road, Environment House, 473 Steve Biko, Arcadia, Pretoria, 0083, South Africa;</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=1nR7_9-e9_kBUE5nJMP1tApr0aOVJzKCa">Link</a></td></tr>
             </table>
+              </div>
+              <div className="tab-pane" id="tab-ec">
+              <table className="ea-table dataTable">
+              <tr><td className="td-title">	Province	</td><td className="td-title">	Date	</td><td className="td-title">	Title	</td><td className="td-title">	Publisher	</td><td className="td-title">	Documents	</td></tr>
+              <tr><td>Eastern Cape</td><td>2019-09-04</td><td>SAWS - Research and Development</td><td>South African Weather Service, Eco Glades block 1b, Eco Park, cnr Olievenhoutbosch and Ribbon Grass Streets, Centurion, South Africa</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=1GtLsd5L0kmKU1UCH2-U98igFDezIrROz">Link</a></td></tr>
+              <tr><td>Eastern Cape</td><td>2019-09-04</td><td>Climate Services Department (SAWS)</td><td>South African Weather Service, Eco Glades block 1b, Eco Park, cnr Olievenhoutbosch and Ribbon Grass Streets, Centurion, South Africa</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=17-QjnPdybkiKAmFaAQqvqx4ZbxzsdtUp">Link</a></td></tr>
+              <tr><td>Eastern Cape</td><td>2019-09-04</td><td>National Climate Change Information System</td><td>South African Environmental Observation Network (SAEON), PO Box 2600, Pretoria, 0001, South Africa</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=1KLNtczV3SPAJL9Oog1oW-RCb6n0Yp0Kw">Link</a></td></tr>
+              <tr><td>Eastern Cape</td><td>2019-09-04</td><td>Climate Change - An Impact-based Severe Weather Warning System (SAWS)</td><td>South African Weather Service, Eco Glades block 1b, Eco Park, cnr Olievenhoutbosch and Ribbon Grass Streets, Centurion, South Africa</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=13jGn98Pg1cnFrx_ZZdacVjJvvGXFuLSA">Link</a></td></tr>
+              <tr><td>Eastern Cape</td><td>2019-09-04</td><td>GreenBook - Adapting Settlements for the Future</td><td>Council for Scientific and Industrial Research, Meiring Naudé Road, Brummeria, Pretoria, South Africa</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=1DHJX1kVEnjRoW1XOEjy0xhjOUIfcTJJH">Link</a></td></tr>
+              <tr><td>Eastern Cape</td><td>2019-09-04</td><td>Eastern Cape Province - Overview of Climate Change Response</td><td>Eastern Cape Department of Economic Development, Environmental Affairs and Tourism, Private Bag X0054, Bhisho, 5605, South Africa</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=14QN9wx1c8i5Q0yUyA92wQ3si885mAo1U">Link</a></td></tr>
+              <tr><td>Eastern Cape</td><td>2019-09-05</td><td>SAEON Integrated Decision Support Tools</td><td>South African Environmental Observation Network (SAEON), PO Box 2600, Pretoria, 0001, South Africa</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=1PXSJf9he0hr9iD9KErWSuYq9ijEyMTEd">Link</a></td></tr>
+              <tr><td>Eastern Cape</td><td>2019-09-05</td><td>Climate Change Adaptation - Local Government Climate Change Support Programme (LGCCSP), Lets Respond Toolkit</td><td>Department of Environment Affairs, Corner Steve Biko (previously Beatrix Street) and Soutpansberg Road, Environment House, 473 Steve Biko, Arcadia, Pretoria, 0083, South Africa;</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=1nR7_9-e9_kBUE5nJMP1tApr0aOVJzKCa">Link</a></td></tr>
+            </table>
+              </div>
+              <div className="tab-pane" id="tab-kzn" >
+              <table className="ea-table dataTable">
+            <tr><td className="td-title">	Province	</td><td className="td-title">	Date	</td><td className="td-title">	Title	</td><td className="td-title">	Publisher	</td><td className="td-title">	Documents	</td></tr>
+              <tr><td>KZN</td><td>2019-08-20</td><td>Presentation on the Tracking and Evaluation Portal</td><td>Department of Environmental Affairs</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=1FHESHadYmr7thMjoJXSt1No0GLpj7KiN">Link</a></td></tr>
+              <tr><td>KZN</td><td>2019-08-20</td><td>Presentation on SAWS Research and Development</td><td>South African Weather Service</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=1jyD0E3isS95t_vWcMuxE-TVd_9vny6F0">Link</a></td></tr>
+              <tr><td>KZN</td><td>2019-08-20</td><td>Presentation on SAWS Impact-based Severe Weather Warning System</td><td>South African Weather Service</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=1KQmMxP6KFHul04spYut4qF66P3MbJLXe">Link</a></td></tr>
+              <tr><td>KZN</td><td>2019-08-20</td><td>Presentation on SAWS Climate Services Department</td><td>South African Weather Service</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=1XiG_ALIvli5bzUNxss7v2ZB59F7EN3RB">Link</a></td></tr>
+              <tr><td>KZN</td><td>2019-08-20</td><td>Presentation on the Integrated Decision Support Tools</td><td>South African Environmental Observation Network</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=16VbInFyOZYVosHRxCP_3b9OHpZFkyPbj">Link</a></td></tr>
+              <tr><td>KZN</td><td>2019-08-20</td><td>Presentation on Climate Change Policy, Planning-Implementation and Reporting (Province of KwaZulu Natal, South Africa))</td><td>KwaZulu-Natal Department of Economic Development, Tourism and Environmental Affairs</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=1fnwaXFQIUZFFA2HaCivDEaY6ukwG3AoY">Link</a></td></tr>
+              <tr><td>KZN</td><td>2019-08-20</td><td>Training presentation on the National Climate Change Information System</td><td>Department of Environmental Affairs</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=1EzmHNoKvag23qVp38ReFHa4ZUpDArHLC">Link</a></td></tr>
+              <tr><td>KZN</td><td>2019-08-20</td><td>Video guide on the Green Book</td><td>Council for Scientific and Industrial Research</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=1baq6319hfacaA3NgEOXUeM3gjyF5-DYw">Link</a></td></tr>
+              <tr><td>KZN</td><td>2019-08-20</td><td>Presentation on Climate Change Adaptation Materials</td><td>Department of Environmental Affairs</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=1xney8NdRmrnmdwTmaqRDd8CecrDNaTyZ">Link</a></td></tr>
+              <tr><td>KZN</td><td>2019-08-20</td><td>KZN NCCIS Training Workshop presentation on Climate Change Adaptation Local Government Climate Change Support Programme / Let's Respond Toolkit</td><td>Department of Environmental Affairs</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=1CN_l486fM5PBedxzldls2CwQtw4Po4Z-">Link</a></td></tr>
+            </table>
+              </div>
+              <div className="tab-pane" id="tab-nc">
+              <table className="ea-table dataTable">
+            <tr><td className="td-title">	Province	</td><td className="td-title">	Date	</td><td className="td-title">	Title	</td><td className="td-title">	Publisher	</td><td className="td-title">	Documents	</td></tr>
+            <tr><td>Northern Cape</td><td>2019-08-06</td><td>Presentation on the Climate Tracking and Evaluation Portal</td><td>Department of Environmental Affairs</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=1CeKhMes7ylAb0NyD-ByoQrp20fKaIH5k">Link</a></td></tr>
+              <tr><td>Northern Cape</td><td>2019-08-06</td><td>Presentation on the National Climate Change Information System</td><td>Department of Environmental Affairs</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=1HQDzgVB7qYA_erv_Xg1tLRXdgAXTKqzt">Link</a></td></tr>
+              <tr><td>Northern Cape</td><td>2019-08-06</td><td>Presentation from the National Climate Change Information System Training Workshop: Northern Cape</td><td>South African Weather Service</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=16AT3C-XBe9iCeiEzJdvcxZfv9ubBLUcJ">Link</a></td></tr>
+              <tr><td>Northern Cape</td><td>2019-08-06</td><td>Presentation on Climate Change Adaptation Materials</td><td>Department of Environmental Affairs</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=1VADubVqA8AnBLwnQUkFX0Goc9nCg_1TW">Link</a></td></tr>
+              <tr><td>Northern Cape</td><td>2019-08-06</td><td>Presentation on Integrated Decision Support Tools by SAEON</td><td>Department of Environmental Affairs</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=1mwvamLMFqkhs1oodp_jrh8roqFaEet8n">Link</a></td></tr>
+              <tr><td>Northern Cape</td><td>2019-08-06</td><td>Presentation on Greenbook: National Climate Change Information Systems Training Workshop Northern Cape</td><td>Council for Scientific and Industrial Research</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=1GtUt6-e0d_PsK-1wyAwmB58zs7BXauV5">Link</a></td></tr>
+              <tr><td>Northern Cape</td><td>2019-08-06</td><td>Presentation on Climate Service</td><td>South African Weather Service</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=1108VihxslFdU2dw5qxbrGQz_cP_otPt4">Link</a></td></tr>
+              <tr><td>Northern Cape</td><td>2019-08-06</td><td>Presentation on Climate Change: an Impact-based Severe Weather Warning System</td><td>South African Weather Service</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=1tOsBngE2e7wzBmuDiSVEGP5KZbJrd3o0">Link</a></td></tr>
+              <tr><td>Northern Cape</td><td>2019-08-06</td><td>Presentation on Climate Change Adaptation Local Government Climate Change Support Programme / Let's Respond Toolkit</td><td>Department of Environmental Affairs</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=1T56BLR_zEDn-JDUbaFwtqoTBQcPHEatv">Link</a></td></tr>
+              <tr><td>Northern Cape</td><td>2019-08-06</td><td>Northern Cape Province Climate Change Reponse</td><td>Norther Cape Department of Environment and Nature Conservation, Northern Cape Province, Private Bag x6102, Kimberley 8301</td><td><a target="_blank" className="dataLink" href="https://drive.google.com/open?id=19o75f9DOuuAWNZCH4q9QCOm1EIE9qZZm">Link</a></td></tr>
+            </table>
+              </div>
+              
+            </div>
+          </div>
+          </section>
+            
             </div>
           </div>
           </div>
diff --git a/App/JS/Components/Pages/info-glossary.jsx b/App/JS/Components/Pages/info-glossary.jsx
index 4ba67ed..a8d31e7 100644
--- a/App/JS/Components/Pages/info-glossary.jsx
+++ b/App/JS/Components/Pages/info-glossary.jsx
@@ -33,7 +33,7 @@ class INFOglossary extends React.Component {
     this.props.updateNav(location.hash)
     return (
       <>
-       <section class="ea-content-full">
+       <section className="ea-content-full">
           <div className="container-fluid mt-4">
           <div className="row d-sm-none d-md-none d-lg-none">
             <div className="col-6"><h5>Actions</h5></div>
@@ -56,35 +56,52 @@ class INFOglossary extends React.Component {
           </section>
 
           <section className="ea-content-full mt-4 pt-4 pb-4 light-bg ea-list-p">
+          <p><b>Climate Action (or Response Action)</b> refers to “stepped-up efforts to reduce greenhouse gas emissions and strengthen resilience and adaptive capacity to climate-induced impacts, including: climate-related hazards in all countries; integrating climate change measures into national policies, strategies and planning; and improving education, awareness-raising and human and institutional capacity with respect to climate change mitigation, adaptation, impact reduction and early warning” (SDG Goal 13).</p>
+          <p>The <b>Desired Adaptation Outcomes</b> describe a desired dynamic state that will enable South Africa to be resilient to climate change. The Department of Environmental Affairs has developed desired outcomes with a view to monitoring the country's progress towards their achievement. </p>
           <p><b>Adaptation</b> is a means of responding to the impacts of climate change. It is “the process of adjustment to actual or expected climate and its effects. In human systems, adaptation seeks to moderate harm or exploit beneficial opportunities. In natural systems, human intervention may facilitate adjustment to expected climate and its effects” (Field et al. 2014).It aims to moderate the impacts as well as to take advantage of new opportunities or to cope with the consequences of new conditions. </p>
           <p><b>Adaptive capacity</b> refers to the varying characteristics that determine how a climate event is experienced. It refers to the ability of systems, institutions, humans, and other organisms to adjust to potential damage, to take advantage of opportunities, or to respond to consequences (IPCC, 2014).  The capacity to adapt is dependent on a region’s socio-economic and environmental situation as well as the availability of information and technology. Adaptive capacity can reflect the status of poverty, health, knowledge/education, and governance.</p>
+          <p>A <b>climate anomaly</b>  refers to the difference between the average climate over a period of the last several decades and the projected climate.</p>
           <p>An <b>early warning system (EWS)</b> refers to “the set of capacities needed to generate and disseminate timely and meaningful warning information to enable individuals, communities and organizations threatened by a hazard to prepare and to act appropriately and in sufficient time to reduce the possibility of harm or loss” (UNIDSR, 2007).</p>
           <p>An <b>extreme (weather or climate) event</b>  is the unusual, severe or unseasonal occurrence of a weather or climate variable at the extremes of the historically observed values; the range that has been observed in the past. </p>
           <p id="bm-cc"><b>Climate change</b> refers to a change in the average weather experienced in a particular region or location. The change may occur over periods ranging from decades to millennia. It may affect one or more seasons (e.g. summer, winter or the whole year) and involve changes in one or more aspects of the weather, e.g. rainfall, temperature or winds. Its causes may be natural (e.g. due to periodic changes in the earth’s orbit, volcanoes and solar variability) or attributable to human activities, e.g. increasing emissions of greenhouse gases such as CO2, land use change and/or emissions of aerosols. Commonly, the term ‘climate change’ often refers to changes due to anthropogenic causes.</p>
           <p><b>Climate</b> refers to the average of individual weather conditions in an area, taken over sufficiently long periods of time.</p>
           <p><b>Climate-smart disaster risk reduction (CSDRM)</b> has been borne out the need to integrate disaster risk reduction and climate change adaptation. CSDRM is considered as the initial step to adapting to climate change and variability, providing policymakers with practical measures to allocate resources to reduce current and future risks at all levels (Mitchell et al. 2010; Davis-Reddy & Vincent 2018).</p>
+          <p><b>Climate Change Projection</b> is a statement of a possible (hopefully likely) future state of the climate system dependent on the evolution of a set of key factors over time (e.g. carbon dioxide emissions). </p>
           <p id="bm-cv"><b>Climate variability</b> refers to variations in climate on all spatial and temporal scales beyond that of individual weather events. This variability may be caused by natural internal processes within the climate system. One of the most important (and widely known) examples of natural climate variability is the El Niño-Southern Oscillation (ENSO). Variations may also be caused by external influences which may be due to naturally-occurring phenomena (such as periodic changes in the earth’s orbit around the sun). </p>
           <p><b>A disaster</b> is a serious disruption of the functioning of a community or society due to a physical event resulting in widespread human, material, economic or environmental losses that require immediate emergency response. A disaster is a negative outcome brought about by high vulnerability (or low adaptive capacity) in the face of exposure to an often sudden event. It is for this reason that an event of similar magnitude in one place may translate into a disaster, but in another may not, depending on the capacity of the population to cope.</p>
           <p><b>Disaster risk management (DRM)</b> refers to the  “integrated multisectoral and multidisciplinary administrative, organisational and operational planning processes and capacities aimed at lessening the impacts of natural hazards and related environmental, technological and biological disasters” (Republic of South Africa 2015). Disaster risk management includes all forms of activities to avoid (prevention) or to limit (mitigation and preparedness) the adverse effects of hazards. </p>
           <p><b>Disaster risk reduction (DRR)</b> is defined as the process of “reducing disaster risks through systematic efforts to analyse and manage the causal factors of disasters, including through reduced exposure to hazards, lessened vulnerability of people and property, wise management of land and the environment, and improved preparedness for adverse events” (UNIDSR, 2007). DRR includes all forms of activities to avoid (prevention) or to limit (mitigation and preparedness) the adverse effects of hazards.</p>
+          <p><b>Database</b> refers to a structured set of data that is accessible in various ways.</p>
+          <p><b>Statistical Downscaling</b> refers to the process where large-scale climate features are statistically related to local climate for a region – historical observations are utilised.</p>
+          <p><b>Regional Climate Model</b> is a dynamic climate model (either a limited-area model or variable resolution global model) is nested/nudged within a GCM.</p>
           <p><b>Droughts</b> may refer to “meteorological drought (below average precipitation), hydrological drought (low river flows and water levels in rivers, lakes and groundwater), agricultural drought (low soil moisture), and environmental drought (a combination of the above)” (Stocker et al. 2013). In this report, drought refers to the extended period of unusually low precipitation that produces a shortage of water (CRED 2015).</p>
+          <p>An <b>ensemble of models</b> is used to project different (but equally plausible) climate futures.</p>
           <p><b>Exposure</b> refers to the presence of people, livelihoods, species or ecosystems, environmental functions, services, and resources, infrastructure, or economic, social, or cultural assets in places and settings that could be adversely affected (IPCC, 2014).  </p>
-          <p><b>Extreme temperature</b> refers to both cold waves and heat waves (CRED 2015).</p>
+          <p><b>Extreme temperature</b> refers to both cold waves and heat waves (CRED 2015). In the data presented here, extremes were extracted from the daily temperature database generated by Schulze and Maharaj (2004) for the 51 year period from 1950 to 2000. Extreme temperatures are based on the lowest minimum and highest maximum values for each weather station. </p>
           <p><b>Floods</b> refer to riverine, flash and coastal flood events and in South Africa are the result of tropical cyclones, cut-off lows, and thunderstorms which cause heavy rainfall and high runoff volumes (CRED 2015).</p>
+          <p><b>Global Climate Models or global circulation models (GCMs),</b> refer to complex computer models represent interactions between the different components of the climate system, such as the land surface, the atmosphere and the oceans. GCMs simulate climate under a range of emission scenarios each representing a plausible future.</p>
           <p id="bm-gw"><b>Global warming</b> refers only to the overall warming of the Earth, based on average increases in temperature over the entire land and ocean surface. Climate change is more than simply an increase in global temperatures; it encompasses changes in regional climate characteristics, including temperature, humidity, rainfall, wind, and extreme weather events, which have economic and social dimensions. </p>
+          <p><b>Greenhouse Gas</b> refers to a gas that contributes to the greenhouse effect by absorbing infrared radiation. Examples include carbon dioxide, methane and chlorofluorocarbons.</p>
           <p><b>A hazard</b> refers to the physical parameters (e.g. rainfall or temperature) that may cause property damage, loss of livelihoods and services, economic disruption, or environmental damage.  A hazard can be incremental temperature or precipitation change, which unfolds gradually over a long time, or it can refer to weather-related hazards, such as droughts, floods and heat waves. </p>
           <p><b>Impacts</b>, in the context of this website, refer to the effects of climate change on natural and human systems (IPCC 2012). </p>
+          <p><b>Indicator</b> refers to numbers and scales that track the state or level of some aspect of the climate. Examples of climate change indicators include the global average temperature, greenhouse gas emissions, sea-level rise.</p>
           <p id="bm-ipcc"><b>IPCC</b>The Intergovernmental Panel on Climate Change (IPCC) is the United Nations body for assessing the science related to climate change.</p>
           <p><b>Mitigation</b> refers to the measures taken to reduce the emission of greenhouse gases and to enhance sinks (i.e. ways of reducing) of greenhouse gases. </p>
-          <p><b>Projection</b> is a statement of a possible (hopefully likely) future state of the climate system dependent on the evolution of a set of key factors over time (e.g. carbon dioxide emissions). </p>
+          <p><b>Monitoring and Evaluation (M&E)</b> refers to the process that helps improve current and future management and achieve outcomes. It is a tool to support the understanding and prioritization of actions to assist decision making. M&E is critical in ensuring the long-term success of climate adaptation initiatives, plans and actions.</p>
+          <p><b>Moisture Growing Season</b> refers to the amount of water in the soil for sustained plant growth to take during the primary growing season. The data presented here was determined by adapting a simple water budgeting approach of the FAO (1978), developed originally for agro-ecological zone mapping of Africa.</p>
+          <p><b>Percentile</b> is a measure used in statistics indicating the value below which a given percentage of observations in a group of observations falls. Examples used in climate change science include the 95th percentile, 50th percentile (median), and 25th percentile range of models.</p>
           <p><b>Radiative forcing</b> is a measure of the energy absorbed and retained in the lower atmosphere. </p>
           <p><b>Representative Concentration Pathways</b> (RCPs) are four greenhouse gas concentration trajectories adopted by the IPCC Fifth Assessment Report and describe four possible climate futures. The RCP’s are named according to their 2100 radiative forcing level. There are four pathways - RCP2.6, RCP4.5, RCP6.0 and RCP8.5. </p>
-          <p><b>Resilience</b> is defined as the capacity for a socio-ecological system to (a) absorb stresses and maintain normal functioning in the face of external stress and (b) to adapt in order to be better prepared to future impacts (Folke 2006).  </p>
+          <p><b>Resilience</b> is defined as the capacity for a socio-ecological system to (a) absorb stresses and maintain normal functioning in the face of external stress and (b) to adapt in order to be better prepared for future impacts (Folke 2006).</p>
           <p><b>Risk</b> refers to the likelihood of an adverse impact from an event. Risk is often represented as the probability of occurrence of hazardous events or trends multiplied by the impacts if these events or trends occur. Risk results from the interaction of vulnerability, exposure, and hazard (Field et al. 2014).</p>
           <p><b>Sensitivity</b> is the degree to which a system or species is affected, either adversely or beneficially, by climate variability or change. The effect may be direct (e.g., a change in crop yield in response to a change in the mean, range, or variability of temperature) or indirect (e.g., damages caused by an increase in the frequency of coastal flooding due to sea level rise) (Field et al. 2014).</p>
           <p><b>Storms</b> refer to tropical, extra-tropical and convective storm events as well as coastal storm surges (CRED 2015).</p>
+          <p>A <b>carbon emissions target</b> is the reductions required to keep global temperature increase below 2°C above pre-industrial temperatures.</p>
+          <p><b>Technology Needs Assessment</b> identifies a country's development priorities in order to reduce greenhouse gas emissions and adapt to the impacts of climate.</p>
+          <p>A <b>Temperature Trend</b> is the average rate of increase or decrease of a time-series of data. It is normally determined by simple linear regression. </p>
           <p id="bm-enso">The <b>El Niño-Southern Oscillation</b> (ENSO) is a recurring natural climate phenomenon that is caused by abnormal warming in sea surface temperatures across the Equatorial Pacific is usually associated with high temperatures and below normal rainfall in the southern hemisphere. </p>
           <p><b>Vulnerability</b> is the “propensity or predisposition to be adversely affected. Vulnerability encompasses a variety of concepts and elements including sensitivity or susceptibility to harm and lack of capacity to cope and adapt” (Field et al. 2014).</p>
+          <p><b>Uncertainty</b> does not mean that we have no confidence in our projections of future climate, rather, it implies there is a probability or level of confidence associated with a particular outcome.</p>
           <p><b>Weather</b> describes the set of meteorological phenomena we experience on a daily basis. Weather conditions might be sunny and hot, or cloudy and rainy. We expect changes in weather to occur from day to day. </p>
           <p><b>Wildfires</b> refer to any uncontrolled and non-prescribed burning of plants in a natural setting (CRED 2015). The occurrence of fires is closely linked with high temperatures and dry spells and are generally the result of deliberate or accidental actions of people (Forsyth et al. 2010).</p>
           </section>
diff --git a/App/JS/Components/Pages/maps-graphs.jsx b/App/JS/Components/Pages/maps-graphs.jsx
new file mode 100644
index 0000000..7bd9564
--- /dev/null
+++ b/App/JS/Components/Pages/maps-graphs.jsx
@@ -0,0 +1,61 @@
+'use strict'
+
+import React from 'react'
+import { connect } from 'react-redux'
+import { Row, Col, Button, Card, CardBody,MDBLightbox  } from 'mdbreact'
+import RainfallMaps from '../galleries/gal-rainfall-maps.jsx'
+import RainfallGraphs from '../galleries/gal-rainfall-graphs.jsx'
+const mapStateToProps = (state, props) => {
+  return {}
+}
+
+const mapDispatchToProps = (dispatch) => {
+  return {
+    updateNav: payload => {
+      dispatch({ type: "NAV", payload })
+    }
+  }
+}
+
+class MapsGraphs extends React.Component {
+
+  constructor(props) {
+    super(props);
+  }
+
+
+  render() {
+    this.props.updateNav(location.hash)
+    return (
+      <>
+       <section className="ea-content-full">
+          <div className="container-fluid mt-4">
+          <h5>Maps and Graphs</h5>
+          <Row>
+          <Col md="auto"><Button type="button" className="btn btn-success btn-lg" onClick={() => { location.hash = "/climate-services" }}>
+            <em className="fa fa-chevron-right mr-1"></em> Climate Services</Button></Col>
+          <Col md="auto"><Button type="button" className="btn btn-success btn-lg" onClick={() => { location.hash = "/climate-atlas" }}>
+            <em className="fa fa-chevron-right mr-1"></em> Climate Atlas</Button></Col>
+          <Col md="auto"><Button type="button" className="btn btn-success-active btn-lg" onClick={() => { location.hash = "/maps-graphs" }}>
+            <em className="fa fa-chevron-right mr-1"></em> Maps and Graphs</Button></Col>
+          <Col md="auto"><Button type="button" className="btn btn-success btn-lg" onClick={() => { location.hash = "/data-download" }}>
+            <em className="fa fa-chevron-right mr-1"></em> Download Data</Button></Col>
+          </Row>
+          </div>
+          </section>
+
+          <section className="ea-content-full mt-4 pt-4 pb-4 light-bg">
+          <div className="container-fluid">
+            <h2 className="mt-5 mb-3">Rainfall and Temperature:</h2>
+            <RainfallMaps />
+
+            <h2 className="mt-5 mb-3">Provincial Annual Rainfall:</h2>
+            <RainfallGraphs />
+          </div>
+          </section>
+    </>
+    )
+  }
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(MapsGraphs)
\ No newline at end of file
diff --git a/App/JS/Components/galleries/gal-rainfall-graphs.jsx b/App/JS/Components/galleries/gal-rainfall-graphs.jsx
new file mode 100644
index 0000000..0491566
--- /dev/null
+++ b/App/JS/Components/galleries/gal-rainfall-graphs.jsx
@@ -0,0 +1,128 @@
+'use strict'
+
+import React from "react";
+import { MDBRow, MDBCol, MDBLightbox, MDBContainer, MDBIcon } from "mdbreact";
+import Lightbox from "react-image-lightbox";
+import arEc from "../../../Images/Stats/mapsgraphs/ar-ec.gif";
+import arFs from "../../../Images/Stats/mapsgraphs/ar-fs.gif";
+import arG from "../../../Images/Stats/mapsgraphs/ar-g.gif";
+import arKzn from "../../../Images/Stats/mapsgraphs/ar-kzn.gif";
+import arLim from "../../../Images/Stats/mapsgraphs/ar-lim.gif";
+import arMp from "../../../Images/Stats/mapsgraphs/ar-mp.gif";
+import arNc from "../../../Images/Stats/mapsgraphs/ar-nc.gif";
+import arNw from "../../../Images/Stats/mapsgraphs/ar-nw.gif";
+import arWc from "../../../Images/Stats/mapsgraphs/ar-wc.gif";
+
+import '../../../css/lightbox.css';
+
+
+const images = [
+  {
+    id: 1,
+    src: [arEc],
+    description: 'Eastern Cape'
+  },
+  {
+    id: 2,
+    src: [arFs],
+    description: 'Free State'
+  },
+  {
+    id: 3,
+    src: [arG],
+    description: 'Gauteng'
+  },
+  {
+    id: 4,
+    src: [arKzn],
+    description: 'KZN'
+  },
+  {
+    id: 5,
+    src: [arLim],
+    description: 'Limpopo'
+  },
+  {
+    id: 6,
+    src: [arMp],
+    description: 'Mpumalanga'
+  },
+  {
+    id: 7,
+    src: [arNc],
+    description: 'Northern Cape'
+  },
+  {
+    id: 8,
+    src: [arNw],
+    description: 'North West'
+  },
+  {
+    id: 9,
+    src: [arWc],
+    description: 'Western Cape'
+  }
+];
+
+class RainfallGraphs extends React.Component {
+  constructor(props) {
+    super(props);
+
+    this.state = {
+      photoIndex: 0,
+      isOpen: false
+    };
+  }
+
+  render() {
+    const { photoIndex, isOpen } = this.state;
+    return (
+      <>
+      <MDBRow className="s-gallery">
+         
+         {images.map(p => {
+
+            return (
+              <MDBCol md="2" key={p.id} className="mb-3" >
+              <div md="2" className="s-gallery-item image-dl" onClick={() =>
+                  this.setState({ photoIndex: 0, isOpen: true })
+                }>
+                {/* <div md="2" className="image-dl s-gallery-item "> */}
+                  <img src={p.src} alt={p.description} />
+                  <p className="s-gallery-description">{p.description}</p>
+                </div>
+                </MDBCol>
+            );
+
+            }) }
+            
+
+      </MDBRow>
+
+        {isOpen && (
+          <>
+          <Lightbox
+            mainSrc={images[photoIndex].src}
+            nextSrc={images[(photoIndex + 1) % images.length].src}
+            prevSrc={images[(photoIndex + images.length - 1) % images.length].src}
+            imageTitle={photoIndex + 1 + "/" + images.length}
+            onCloseRequest={() => this.setState({ isOpen: false })}
+            onMovePrevRequest={() =>
+              this.setState({
+                photoIndex: (photoIndex + images.length - 1) % images.length
+              })
+            }
+            onMoveNextRequest={() =>
+              this.setState({
+                photoIndex: (photoIndex + 1) % images.length
+              })
+            }
+          /><a href={images[photoIndex].src} className="s-gall-download" download target="_blank" ><MDBIcon icon="download" /></a>
+          </>
+        )}
+      </>
+    );
+  }
+}
+
+export default RainfallGraphs;
\ No newline at end of file
diff --git a/App/JS/Components/galleries/gal-rainfall-maps copy.jsx b/App/JS/Components/galleries/gal-rainfall-maps copy.jsx
new file mode 100644
index 0000000..1b7acbd
--- /dev/null
+++ b/App/JS/Components/galleries/gal-rainfall-maps copy.jsx	
@@ -0,0 +1,129 @@
+'use strict'
+
+import React from "react";
+import { MDBRow, MDBCol, MDBLightbox, MDBContainer, MDBIcon } from "mdbreact";
+import Lightbox from "react-image-lightbox";
+import mrAnnual from "../../../Images/Stats/mapsgraphs/mr-annual.gif";
+import mrSpring from "../../../Images/Stats/mapsgraphs/mr-spring.gif";
+import mrSummer from "../../../Images/Stats/mapsgraphs/mr-summer.gif";
+import mrWinter from "../../../Images/Stats/mapsgraphs/mr-winter.gif";
+import mtAnnual from "../../../Images/Stats/mapsgraphs/mt-annual.gif";
+import mtAutumn from "../../../Images/Stats/mapsgraphs/mt-autumn.gif";
+import mtSpring from "../../../Images/Stats/mapsgraphs/mt-spring.gif";
+import mtSummer from "../../../Images/Stats/mapsgraphs/mt-summer.gif";
+import mtWinter from "../../../Images/Stats/mapsgraphs/mt-winter.gif";
+
+import '../../../css/lightbox.css';
+
+
+const images = [
+  {
+    id: 1,
+    src: [mrAnnual],
+    description: 'Mean Rainfall Annual'
+  },
+  {
+    id: 2,
+    src: [mrSpring],
+    description: 'Mean Rainfall Spring'
+  },
+  {
+    id: 3,
+    src: [mrSummer],
+    description: 'Mean Rainfall Summer'
+  },
+  {
+    id: 4,
+    src: [mrWinter],
+    description: 'Mean Rainfall Winter'
+  },
+  {
+    id: 5,
+    src: [mtAnnual],
+    description: 'Mean Temperature Annual'
+  },
+  {
+    id: 6,
+    src: [mtAutumn],
+    description: 'Mean Temperature Autumn'
+  },
+  {
+    id: 7,
+    src: [mtSpring],
+    description: 'Mean Temperature Spring'
+  },
+  {
+    id: 8,
+    src: [mtSummer],
+    description: 'Mean Temperature Summer'
+  },
+  {
+    id: 9,
+    src: [mtWinter],
+    description: 'Mean Temperature Winter'
+  }
+];
+
+class RainfallMaps extends React.Component {
+  constructor(props) {
+    super(props);
+
+    this.state = {
+      photoIndex: 0,
+      isOpen: false
+    };
+  }
+
+  render() {
+    const { photoIndex, isOpen } = this.state;
+    return (
+      <>
+      <MDBRow className="s-gallery">
+         
+         {images.map(p => {
+
+            return (
+                <MDBCol md="2" key={p.id}  className="mb-3" >
+                <div md="2" className="s-gallery-item image-dl" onClick={() =>
+                  this.setState({ photoIndex: (p.id - 1), isOpen: true })
+                }>
+                {/* <div md="2" className="image-dl s-gallery-item "> */}
+                  <img src={p.src} alt={p.description} />
+                  <p className="s-gallery-description">{p.description}</p>
+                </div>
+                </MDBCol>
+            );
+
+            }) }
+            
+
+      </MDBRow>
+
+        {isOpen && (
+          <>
+          <Lightbox
+            mainSrc={images[photoIndex].src}
+            nextSrc={images[(photoIndex + 1) % images.length].src}
+            prevSrc={images[(photoIndex + images.length - 1) % images.length].src}
+            imageTitle={photoIndex + 1 + "/" + images.length}
+            onCloseRequest={() => this.setState({ isOpen: false })}
+            onMovePrevRequest={() =>
+              this.setState({
+                photoIndex: (photoIndex + images.length - 1) % images.length
+              })
+            }
+            onMoveNextRequest={() =>
+              this.setState({
+                photoIndex: (photoIndex + 1) % images.length
+              })
+            }
+          />
+          <a href={images[photoIndex].src} className="s-gall-download" download target="_blank" ><MDBIcon icon="download" /></a>
+          </>
+        )}
+      </>
+    );
+  }
+}
+
+export default RainfallMaps;
\ No newline at end of file
diff --git a/App/JS/Components/galleries/gal-rainfall-maps.jsx b/App/JS/Components/galleries/gal-rainfall-maps.jsx
new file mode 100644
index 0000000..936c97c
--- /dev/null
+++ b/App/JS/Components/galleries/gal-rainfall-maps.jsx
@@ -0,0 +1,130 @@
+'use strict'
+
+import React from "react";
+import { MDBRow, MDBCol, MDBLightbox, MDBContainer, MDBIcon } from "mdbreact";
+import Lightbox from "react-image-lightbox";
+import mrAnnual from "../../../Images/Stats/mapsgraphs/mr-annual.gif";
+import mrSpring from "../../../Images/Stats/mapsgraphs/mr-spring.gif";
+import mrSummer from "../../../Images/Stats/mapsgraphs/mr-summer.gif";
+import mrWinter from "../../../Images/Stats/mapsgraphs/mr-winter.gif";
+import mtAnnual from "../../../Images/Stats/mapsgraphs/mt-annual.gif";
+import mtAutumn from "../../../Images/Stats/mapsgraphs/mt-autumn.gif";
+import mtSpring from "../../../Images/Stats/mapsgraphs/mt-spring.gif";
+import mtSummer from "../../../Images/Stats/mapsgraphs/mt-summer.gif";
+import mtWinter from "../../../Images/Stats/mapsgraphs/mt-winter.gif";
+
+import '../../../css/lightbox.css';
+
+
+const images = [
+  {
+    id: 1,
+    src: [mrAnnual],
+    description: 'Mean Rainfall Annual'
+  },
+  {
+    id: 2,
+    src: [mrSpring],
+    description: 'Mean Rainfall Spring'
+  },
+  {
+    id: 3,
+    src: [mrSummer],
+    description: 'Mean Rainfall Summer'
+  },
+  {
+    id: 4,
+    src: [mrWinter],
+    description: 'Mean Rainfall Winter'
+  },
+  {
+    id: 5,
+    src: [mtAnnual],
+    description: 'Mean Temperature Annual'
+  },
+  {
+    id: 6,
+    src: [mtAutumn],
+    description: 'Mean Temperature Autumn'
+  },
+  {
+    id: 7,
+    src: [mtSpring],
+    description: 'Mean Temperature Spring'
+  },
+  {
+    id: 8,
+    src: [mtSummer],
+    description: 'Mean Temperature Summer'
+  },
+  {
+    id: 9,
+    src: [mtWinter],
+    description: 'Mean Temperature Winter'
+  }
+];
+
+class RainfallMaps extends React.Component {
+  constructor(props) {
+    super(props);
+
+    this.state = {
+      photoIndex: 0,
+      isOpen: false
+    };
+  }
+
+  render() {
+    const { photoIndex, isOpen } = this.state;
+    return (
+      <>
+      <MDBRow className="s-gallery">
+         
+         {images.map(p => {
+
+            return (
+                <MDBCol md="2" key={p.id}  className="mb-3" >
+                <div md="2" className="s-gallery-item image-dl" onClick={() =>
+                  this.setState({ photoIndex: (p.id - 1), isOpen: true })
+                }>
+                {/* <div md="2" className="image-dl s-gallery-item "> */}
+                  <img src={p.src} alt={p.description} />
+                  <p className="s-gallery-description">{p.description}</p>
+                </div>
+                </MDBCol>
+            );
+
+            }) }
+            
+
+      </MDBRow>
+
+        {isOpen && (
+          
+          <>
+          <Lightbox
+            mainSrc={images[photoIndex].src}
+            nextSrc={images[(photoIndex + 1) % images.length].src}
+            prevSrc={images[(photoIndex + images.length - 1) % images.length].src}
+            imageTitle={photoIndex + 1 + "/" + images.length}
+            onCloseRequest={() => this.setState({ isOpen: false })}
+            onMovePrevRequest={() =>
+              this.setState({
+                photoIndex: (photoIndex + images.length - 1) % images.length
+              })
+            }
+            onMoveNextRequest={() =>
+              this.setState({
+                photoIndex: (photoIndex + 1) % images.length
+              })
+            }
+          />
+          <a href={images[photoIndex].src} className="s-gall-download" download target="_blank" ><MDBIcon icon="download" /></a>
+          </>
+        )}
+      </>
+    );
+  }
+}
+
+export default RainfallMaps;
\ No newline at end of file
diff --git a/App/JS/Components/layout/tabs-vulnerability.jsx b/App/JS/Components/layout/tabs-vulnerability.jsx
index 9e84131..380fc69 100644
--- a/App/JS/Components/layout/tabs-vulnerability.jsx
+++ b/App/JS/Components/layout/tabs-vulnerability.jsx
@@ -1,12 +1,14 @@
 'use strict'
 
 import React from 'react'
+import { Button } from 'mdbreact'
 import { connect } from 'react-redux'
 import IMGagriculture from '../../../Images/Other/agriculture.jpg'
 import IMGestuary from '../../../Images/Other/estuary.jpg'
 import IMGmalaria from '../../../Images/Other/malaria.gif'
 import IMGbiome from '../../../Images/Other/biome.gif'
 import IMGwater from '../../../Images/Other/water.jpg'
+import PDFcciohisa from '../../../content/pdfs/Climate_change_impacts_on_health_in_South Africa_EOR_DEA.pdf'
 
 const mapStateToProps = (state, props) => {
   return {}
@@ -84,6 +86,8 @@ class TabsVulnerability extends React.Component {
                     <p>South Africa exhibits multiple risks that contribute to the overall burden of disease (i.e. the quadruple burden of disease), which currently puts stress on the health sector. This stress may make the sector as a whole more vulnerable to climate change due to additional stress a changing climate may put on the system.</p>
                     <p>The challenging burden of disease in South Africa may make people more vulnerable to the health impacts from climate change (e.g. through pre-existing conditions). However, the impact of pre-existing conditions on the resultant health impact from climate change in South Africa is not quantified. There is a lack of understanding on the linkages between climate and health in South Africa (e.g. quantitative link between high temperatures and mortality). Thus, the current impact of climate-related diseases is not quantified, nor is the vulnerability of communities to such risks. Without a better understanding of the current health burden, it is not possible to understand how climate-sensitive health risks will change in a changing climate.</p>
                     <p>A quantitative vulnerability and risk assessment for the health sector should be performed; this would help to identify the most important health risks, as well as begin to identify the most vulnerable populations or communities. Adaptation strategies can then be tailored to region or communities based upon their risks and vulnerability. The South African health system is also vulnerable to the health status and disease burden of people from neighbouring countries. For example, a majority of malaria in South Africa is not from local transmission.</p>
+                    <p><a className="btn btn-success btn-lg mb-4" href={PDFcciohisa} target="_blank" >
+                    <em className="fa fa-file-pdf-o mr-1"></em> Climate change impacts on health in South Africa PDF</a></p>
                 </div>
                 </div>
               </div>
diff --git a/App/JS/Components/navigation/Footer.jsx b/App/JS/Components/navigation/Footer.jsx
index 0a6c426..6f5afe4 100644
--- a/App/JS/Components/navigation/Footer.jsx
+++ b/App/JS/Components/navigation/Footer.jsx
@@ -1,6 +1,7 @@
 import React from 'react'
 import { Col, Row, Modal, ModalBody, ModalHeader } from 'mdbreact';
 import { DEAGreen, DEAGreenDark } from '../../config/colours.js'
+import eaLogo from '../../../Images/DEA/environmental_affairs_logo_small.jpg'
 
 import { footerContent } from '../../../data/footerConfig'
 import loader from '../../../images/Other/loader.gif'
@@ -117,26 +118,33 @@ class Footer extends React.Component {
           color: "black"
         }}>
           <br />
-          <div class="row">
-    <div class="col-md-3">
+          <div className="row">
+    <div className="col-md-3">
         <h4><b>Technology</b></h4>
-        <div >DEA NCCIS uses open source, government funded facilities provided by SAEON. The DST and NRF funds the SAEON Open Data Platform (ODP) and associated portals. Developed by SAEON on behalf of DST, DEA, DRDLR, and other stakeholders.</div>
+        <div >DEFF NCCIS uses open source, government funded facilities provided by SAEON. The DST and NRF funds the SAEON Open Data Platform (ODP) and associated portals. Developed by SAEON on behalf of DST, DEFF and DLDLR and other stakeholders.</div>
     </div>
-    <div class="col-md-3">
+    <div className="col-md-2">
         <h4><b>Legal</b></h4>
         <div><a onClick={() => { location.hash = "/doc-disclaimer" }}><b>Disclaimer</b></a></div>
         <div><a onClick={() => { location.hash = "/doc-conditions" }}> <b>Conditions of use</b></a></div>
         <div><a className="text-dark" href="https://docs.google.com/document/d/e/2PACX-1vT8ajcogJEEo0ZC9BGIej_jOH2EV8lMFrwOu8LB4K9pDq7Tki94mUoVxU8hGM-J5EL8V3w5o83_TuEl/pub" target="link"><b>Data Licenses</b></a></div>
         <div><a onClick={() => { location.hash = "/doc-privacy" }}> <b>Privacy policy</b></a></div>
     </div>
-    <div class="col-md-3">
+    <div className="col-md-2">
+        <h4><b>Quick Links</b></h4>
+        <div><a onClick={() => { location.hash = "/about" }}><b>About the CCIS</b></a></div>
+        <div><a onClick={() => { location.hash = "/contact-ccis" }}> <b>Contact details</b></a></div>
+        <div><a onClick={() => { location.hash = "/info-events" }}> <b>News and events</b></a></div>
+        <div><a className="text-dark" href="http://elearning.ccis.saeon.ac.za/" target="_blank"><b>Help and Guidance</b></a></div>
+    </div>
+    <div className="col-md-2">
         <h4><b>SAEON ODP</b></h4>
         <div><a className="text-dark" href="https://docs.google.com/document/d/e/2PACX-1vQ7DWVfot6ZEuX22aciju9MW5PAZJoi6v_lFUFCiwVajRzG91YxjPaCj2NCsUV5WI8hlTdOfBrCxxc1/pub" target="link"><b>Open Data Platform</b></a></div>
         <div><a className="text-dark" href="http://app01.saeon.ac.za/dev/UI_footside/page_contribute.html" target="link"><b>Contribute</b></a></div>
-        <div><a className="text-dark" href="http://app01.saeon.ac.za/dev/UI_footside/page_contact.html" target="link"><b>Contact Us</b></a></div>
+        <div><a className="text-dark" href="https://ulwazi.saeon.ac.za/contact/" target="link"><b>Contact Us</b></a></div>
     </div>
-    <div class="col-md-3">
-        <h4><b>Funding</b></h4><img src="https://ccis.environment.gov.za/df4a473d960cba109f32b0bfc40ad717.jpg" /></div>
+    <div className="col-md-3">
+        <h4><b>Funding</b></h4><img src={eaLogo}/></div>
 </div>
 
             {/* {this.renderSections(footerContent)} */}
diff --git a/App/JS/Components/navigation/Header.jsx b/App/JS/Components/navigation/Header.jsx
index dfbb588..f71e819 100644
--- a/App/JS/Components/navigation/Header.jsx
+++ b/App/JS/Components/navigation/Header.jsx
@@ -36,12 +36,8 @@ class Header extends React.Component {
             <div>
               <h1 style={{ textAlign: "center", letterSpacing: "2px", color: "#2e7d32" }}>
                 <b>NCCIS</b>
-
-                <sub style={{ fontSize: "18px", backgroundColor: "#78e26c", borderRadius: "5px", padding: "2px" }}>
-                  <i>BETA</i>
-                </sub>
-
               </h1>
+
               <p></p>
               <h5 style={{ textAlign: "center", letterSpacing: "2px", marginTop: "-8px", color: "grey" }}>
                 <b>National Climate Change Information System</b>
@@ -82,6 +78,7 @@ class Header extends React.Component {
                   </div>
         </div>
       </div>
+   
       </>
     )
   }
diff --git a/App/JS/Components/navigation/Navbar.jsx b/App/JS/Components/navigation/Navbar.jsx
index 56421f3..213f43c 100644
--- a/App/JS/Components/navigation/Navbar.jsx
+++ b/App/JS/Components/navigation/Navbar.jsx
@@ -14,8 +14,9 @@ import SARVA from '../pages/Tools/SARVA.jsx';
 import { data as NavData } from '../../../data/sideNavData';
 import IconList from '../Iconlist/index.jsx'
 import EASearch from '../search/search.jsx';
+import {siteBaseURL} from '../../../js/config/serviceURLs.js'
 
-
+console.log(siteBaseURL);
 
 const _gf = require('../../globalFunctions')
 
@@ -124,7 +125,7 @@ class Navbar extends React.Component {
                 
                 <Dropdown>
                   <DropdownToggle nav caret>
-                    <b>Climate Information Centre</b>
+                    <b>Climate Information</b>
                   </DropdownToggle>
                   <DropdownMenu>
                   <DropdownItem onClick={() => { location.hash = "cic" }}>
@@ -135,32 +136,72 @@ class Navbar extends React.Component {
                       GHG Emissions Database
                     </DropdownItem>
                     <DropdownItem onClick={() => { location.hash = "cic-trends" }}>
-                      Trends
+                      Observed Climate Trends
                     </DropdownItem>
                     <DropdownItem onClick={() => { location.hash = "cic-projections" }}>
-                      Projections
+                      Climate Change Projections
                     </DropdownItem>
                     <DropdownItem onClick={() => { location.hash = "cic-vulnerability" }}>
-                      Vulnerability
+                      Vulnerability to Climate Change
                     </DropdownItem>
                     <DropdownItem onClick={() => { location.hash = "cic-extreme" }}>
                       Extreme Weather Events and Disasters
                     </DropdownItem>
+                    <DropdownItem onClick={() => { location.hash = "finance" }}>
+                      Financing Climate Change
+                    </DropdownItem>
                   </DropdownMenu>
                 </Dropdown>
               </NavItem>
 
+
               <NavItem>
                 <Dropdown>
                   <DropdownToggle nav caret>
-                    <b>Financing Climate Change</b>
+                    <b>Climate Services</b>
+                  </DropdownToggle>
+                  <DropdownMenu>
+                    <DropdownItem onClick={() => { location.hash = "/ComingSoon" }}>
+                    Climate Services
+                    </DropdownItem>
+                    <DropdownItem onClick={() => { location.hash = "/ComingSoon" }}>
+                    Climate Atlas
+                    </DropdownItem>
+                    <DropdownItem onClick={() => { location.hash = "/ComingSoon" }}>
+                    Maps and Graphs
+                    </DropdownItem>
+                    <DropdownItem onClick={() => { location.hash = "/ComingSoon" }}>
+                    Download Data
+                    </DropdownItem>
+                  </DropdownMenu>
+                  {/* <DropdownMenu>
+                  <DropdownItem onClick={() => { location.hash = "/climate-services" }}>
+                    Climate Services
+                    </DropdownItem>
+                    <DropdownItem onClick={() => { location.hash = "/climate-atlas" }}>
+                    Climate Atlas
+                    </DropdownItem>
+                    <DropdownItem onClick={() => { location.hash = "/maps-graphs" }}>
+                    Maps and Graphs
+                    </DropdownItem>
+                    <DropdownItem onClick={() => { location.hash = "/data-download" }}>
+                    Download Data
+                    </DropdownItem>
+                  </DropdownMenu> */}
+                </Dropdown>
+              </NavItem>
+
+              {/* <NavItem>
+                <Dropdown>
+                  <DropdownToggle nav caret>
+                    <b>Finance Climate Change</b>
                   </DropdownToggle>
                   <DropdownMenu>
 
                     <DropdownItem onClick={() => { location.hash = "ComingSoon" }}>
                     Technology Needs Assessment
                     </DropdownItem>
-                    <DropdownItem onClick={() => { location.hash = "ComingSoon" }}>
+                    <DropdownItem onClick={() => { location.hash = "finance" }}>
                     Financing
                     </DropdownItem>
                     <DropdownItem onClick={() => { location.hash = "ComingSoon" }}>
@@ -168,7 +209,7 @@ class Navbar extends React.Component {
                     </DropdownItem>
                   </DropdownMenu>
                 </Dropdown>
-              </NavItem>
+              </NavItem> */}
 
               {/* Resources */}
               <NavItem>
@@ -180,9 +221,12 @@ class Navbar extends React.Component {
               <NavItem>
                 <Dropdown>
                   <DropdownToggle nav caret>
-                    <b>Resources</b>
+                    <b>Resources and Tools</b>
                   </DropdownToggle>
                   <DropdownMenu>
+                    <DropdownItem onClick={() => { location.hash = "/info-tools" }}>
+                    Tools
+                    </DropdownItem>
                     <DropdownItem onClick={() => { location.hash = "/info-glossary" }}>
                     Glossary
                     </DropdownItem>
@@ -194,10 +238,16 @@ class Navbar extends React.Component {
               </NavItem>
 
               {/* Tools */}
-              <NavItem>
-                <NavLink to="/info-tools">
-                <b>Tools</b>
+              {/* <NavItem>
+                <NavLink to="/data-download">
+                <b>Data</b>
                 </NavLink>
+              </NavItem> */}
+              {/* Carbon Sinks */}
+              <NavItem>
+                <a className="nav-link Ripple-parent" target="_blank" href={siteBaseURL,'/carbon-sinks'}>
+                <b>Carbon Sinks Atlas</b>
+                </a>
               </NavItem>
 
             </NavbarNav>
@@ -206,11 +256,11 @@ class Navbar extends React.Component {
               <NavItem>
                 <EASearch />
               </NavItem>
-              <NavItem>
+              {/* <NavItem>
                 <NavLink to="/about">
                 <b>About</b>
                 </NavLink>
-              </NavItem>
+              </NavItem> */}
               <NavItem>
                 <IconList></IconList>
               </NavItem>
diff --git a/App/JS/Components/navigation/SideNav.jsx b/App/JS/Components/navigation/SideNav.jsx
index 76a3fec..9fff5e6 100644
--- a/App/JS/Components/navigation/SideNav.jsx
+++ b/App/JS/Components/navigation/SideNav.jsx
@@ -94,16 +94,16 @@ class SideNav extends React.Component {
   align="center"
 />
 <hr className="mt-4 mb-4" />
-<ul class="ea-side-nav pl-3 pr-3">
+<ul className="ea-side-nav pl-3 pr-3">
     <li>
 
         <div className="ea-parent">
             <span>Climate Information Centre</span>
             <ul className="ea-child">
-                <li><a onClick={()=> { location.hash = "ComingSoon", this.props.toggleSideNav(false) }}>GHG Emissions Database</a></li>
-                <li><a onClick={()=> { location.hash = "ComingSoon", this.props.toggleSideNav(false) }}>Trends</a></li>
-                <li><a onClick={()=> { location.hash = "ComingSoon", this.props.toggleSideNav(false) }}>Projections</a></li>
-                <li><a onClick={()=> { location.hash = "ComingSoon", this.props.toggleSideNav(false) }}>Impacts</a></li>
+                <li><a onClick={()=> { location.hash = "cic-ghg", this.props.toggleSideNav(false) }}>GHG Emissions Database</a></li>
+                <li><a onClick={()=> { location.hash = "cic-trends", this.props.toggleSideNav(false) }}>Trends</a></li>
+                <li><a onClick={()=> { location.hash = "cic-projections", this.props.toggleSideNav(false) }}>Projections</a></li>
+                <li><a onClick={()=> { location.hash = "cic-vulnerability", this.props.toggleSideNav(false) }}>Impacts</a></li>
             </ul>
         </div>
     </li>
@@ -118,13 +118,13 @@ class SideNav extends React.Component {
         </div>
     </li>
     <li>
-    <a onClick={()=> { location.hash = "ComingSoon", this.props.toggleSideNav(false) }}>Governement Response</a>
+    <a href="https://ccis.environment.gov.za/nccrd/#/" target="_blank" onClick={()=> { this.props.toggleSideNav(false) }}>Governement Response</a>
     </li>
     <li>
         <div className="ea-parent">
             <span>Submit a climate change response project</span>
             <ul className="ea-child">
-                <li><a onClick={()=> { location.hash = "ComingSoon", this.props.toggleSideNav(false) }}>NCCRD (Portal link)</a></li>
+            <li><a href="https://ccis.environment.gov.za/nccrd/#/" target="_blank" onClick={()=> { this.props.toggleSideNav(false) }}>NCCRD (Portal link)</a></li>
             </ul>
         </div>
     </li>
@@ -132,9 +132,9 @@ class SideNav extends React.Component {
         <div className="ea-parent">
             <span>Design a climate change plan</span>
             <ul className="ea-child">
-                <li><a onClick={()=> { location.hash = "ComingSoon", this.props.toggleSideNav(false) }}>Risk and Vulnerability Assessment</a></li>
-                <li><a onClick={()=> { location.hash = "ComingSoon", this.props.toggleSideNav(false) }}>Stakeholder Engagement</a></li>
-                <li><a onClick={()=> { location.hash = "ComingSoon", this.props.toggleSideNav(false) }}>Planning Integration</a></li>
+            <li><a  href="https://ccis.environment.gov.za/nccrd/#/" target="_blank" onClick={()=> { this.props.toggleSideNav(false) }}>Risk and Vulnerability Assessment</a></li>
+                <li><a  href="https://ccis.environment.gov.za/nccrd/#/" target="_blank" onClick={()=> { this.props.toggleSideNav(false) }}>Stakeholder Engagement</a></li>
+                <li><a  href="https://ccis.environment.gov.za/nccrd/#/" target="_blank" onClick={()=> { this.props.toggleSideNav(false) }}>Planning Integration</a></li>
             </ul>
         </div>
     </li>
@@ -142,17 +142,17 @@ class SideNav extends React.Component {
         <div className="ea-parent">
             <span>Evaluate a climate change plan</span>
             <ul className="ea-child">
-                <li><a onClick={()=> { location.hash = "ComingSoon", this.props.toggleSideNav(false) }}>Adaptation | DAO</a></li>
-                <li><a onClick={()=> { location.hash = "ComingSoon", this.props.toggleSideNav(false) }}>Mitigation</a></li>
-                <li><a onClick={()=> { location.hash = "ComingSoon", this.props.toggleSideNav(false) }}>Indicators</a></li>
-                <li><a onClick={()=> { location.hash = "ComingSoon", this.props.toggleSideNav(false) }}>SDGs</a></li>
-                <li><a onClick={()=> { location.hash = "ComingSoon", this.props.toggleSideNav(false) }}>T&E System</a></li>
-                <li><a onClick={()=> { location.hash = "ComingSoon", this.props.toggleSideNav(false) }}>Other Indicators and Policy</a></li>
+            <li><a  href="https://ccis.environment.gov.za/ndao/#/" target="_blank" onClick={()=> { this.props.toggleSideNav(false) }}>Adaptation | DAO</a></li>
+                <li><a  href="https://ccis.environment.gov.za/ndao/#/ame" target="_blank" onClick={()=> { this.props.toggleSideNav(false) }}>Mitigation</a></li>
+                <li><a  href="https://ccis.environment.gov.za/ndao/#/" target="_blank" onClick={()=> { this.props.toggleSideNav(false) }}>Indicators</a></li>
+                <li><a  href="https://ccis.environment.gov.za/ndao/#/" target="_blank" onClick={()=> { this.props.toggleSideNav(false) }}>SDGs</a></li>
+                <li><a onClick={()=> { location.hash = "cic-ghg", this.props.toggleSideNav(false) }}>T&E System</a></li>
+                <li><a onClick={()=> { location.hash = "cic-extreme", this.props.toggleSideNav(false) }}>Other Indicators and Policy</a></li>
             </ul>
         </div>
     </li>
     <li>
-    <a onClick={()=> { location.hash = "ComingSoon", this.props.toggleSideNav(false) }}>Review Report</a>
+    <a  href="https://ccis.environment.gov.za/ndao/#/" target="_blank" onClick={()=> { this.props.toggleSideNav(false) }}>Review Report</a>
     </li>
 </ul>
 <hr className="mt-4" />
diff --git a/App/JS/Components/search/search.jsx b/App/JS/Components/search/search.jsx
index e5343fb..02d3f2b 100644
--- a/App/JS/Components/search/search.jsx
+++ b/App/JS/Components/search/search.jsx
@@ -65,21 +65,25 @@ class EASearch extends React.Component {
   checkkeys(){
     var input = document.getElementById('searchInput');
     var inputcount = input.value.length;
-    if( inputcount > 3 ){
+    if( inputcount > 0 ){
       this.searchTermsList()
     }
+
   }
   hidelist(){
     var hidesearch = document.getElementById('search-list');
     hidesearch.style.display = "none";
   }
+  
   searchTermsList() {
-        var input, filter, ul, li, a, i, txtValue;
+        var input, filter, ul, li, a, i, txtValue, searchnoresults, resultse;
         input = document.getElementById('searchInput');
         filter = input.value.toUpperCase();
         ul = document.getElementById("search-list");
         li = ul.getElementsByTagName('li');
+        searchnoresults = document.getElementById("search-noresults");
         ul.style.display = "block";
+        resultse = " ";
 
         // Loop through all list items, and hide those who don't match the search query
         
@@ -88,9 +92,17 @@ class EASearch extends React.Component {
             txtValue = a.textContent || a.innerText;
             if (txtValue.toUpperCase().indexOf(filter) > -1) {
             li[i].style.display = "block";
+            searchnoresults.style.display = "none";
+            resultse = "somethinge";
             } else {
             li[i].style.display = "none";
+            searchnoresults.style.display = "none";
+            console.log("there's nothing");
+            }
+            if (resultse != "somethinge"){
+              searchnoresults.style.display = "block";
             }
+
         }
     }
 
@@ -101,6 +113,7 @@ class EASearch extends React.Component {
         onKeyUp={() => this.checkkeys()} 
         ></input>
         <ul id="search-list" onMouseLeave={() => this.hidelist()}>
+        <li id="search-noresults" style={{display:'none'}}><a href="https://ccis.environment.gov.za/ndao/#/">No results</a></li>
         <li><a href="https://ccis.environment.gov.za/ndao/#/">Climate Change</a></li>
 <li><a href="https://ccis.environment.gov.za/ndao/#/">Climate Change Plan</a></li>
 <li><a href="https://ccis.environment.gov.za/ndao/#/">Climate Change Project</a></li>
diff --git a/App/JS/Config/serviceURLs.js b/App/JS/Config/serviceURLs.js
index 6c91f04..e90b0d7 100644
--- a/App/JS/Config/serviceURLs.js
+++ b/App/JS/Config/serviceURLs.js
@@ -1,5 +1,6 @@
 let _apiBaseURL = ''
 let _siteBaseURL = ''
+let _sitePlainBaseURL =''
 let _ccrdBaseURL = ''
 let _ccrdSiteBaseURL = ''
 let _ndmcBaseURL = ''
@@ -13,6 +14,7 @@ let _ndaoSiteBaseURL = ''
 if (CONSTANTS.DEV) {
   _apiBaseURL = 'http://app01.saeon.ac.za/ndaotestapi/odata/' //'https://localhost:44301/odata/'
   _siteBaseURL = `${window.location.protocol}//${window.location.hostname}:${window.location.port}/`
+  _sitePlainBaseURL = `http://localhost:8091/`
   _ccrdBaseURL = 'http://app01.saeon.ac.za/nccrdtestapi/odata/' //'http://localhost:62553/odata/'
   _ccrdSiteBaseURL = 'http://app01.saeon.ac.za/nccrdtestsite/#/' //'http://localhost:8085/#/'
   _ndmcBaseURL = 'http://app01.saeon.ac.za/ndmctestapi/odata/' //'https://localhost:44334/odata/'
@@ -28,6 +30,7 @@ else if (CONSTANTS.TEST) {
   _siteBaseURL = 'http://app01.saeon.ac.za/ccistestsite/'
   _ccrdBaseURL = 'http://app01.saeon.ac.za/nccrdtestapi/odata/'
   _ccrdSiteBaseURL = 'http://app01.saeon.ac.za/nccrdtestsite/#/'
+  _sitePlainBaseURL = `${window.location.protocol}//`
   _ndmcBaseURL = 'http://app01.saeon.ac.za/ndmctestapi/odata/'
   _ndmcSiteBaseURL = 'http://app01.saeon.ac.za/ndmctestsite/#/'
   _ndaoSiteBaseURL = 'http://app01.saeon.ac.za/ndaotestsite/#/'
@@ -39,6 +42,7 @@ else if (CONSTANTS.TEST) {
 else if (CONSTANTS.PROD) {
   _apiBaseURL = 'https://ccis.environment.gov.za/ndao/api/odata/';
   _siteBaseURL = 'https://ccis.environment.gov.za';
+  _sitePlainBaseURL = 'https://ccis.environment.gov.za';
   _ccrdBaseURL = 'https://ccis.environment.gov.za/nccrd/api/odata/';
   _ccrdSiteBaseURL = 'https://ccis.environment.gov.za/nccrd/';
   _ndmcBaseURL = 'http://app01.saeon.ac.za/ndmcapi/odata/'
@@ -64,6 +68,7 @@ else if (CONSTANTS.PROD) {
 
 export const apiBaseURL = _apiBaseURL
 export const siteBaseURL = _siteBaseURL
+export const sitePlainBaseURL = _sitePlainBaseURL
 export const ccrdBaseURL = _ccrdBaseURL
 export const ccrdSiteBaseURL = _ccrdSiteBaseURL
 export const ndmcBaseURL = _ndmcBaseURL
diff --git a/App/JS/custom.js b/App/JS/custom.js
index 8fbe40d..ac51f59 100644
--- a/App/JS/custom.js
+++ b/App/JS/custom.js
@@ -8,6 +8,32 @@
             $('#ea-header').removeClass('scrollnav');
         }
     });
+/* Atlas Explorer page */
+function explorer(){
+    
+if ($(".ea-content-full").hasClass("explore-data")) {
+    setTimeout(function(){
+        $('#ea-header').addClass('explorer-scrollnav');
+        $('#app').addClass('full-explorer');
+        }, 4000);
+    }else{
+    $('#ea-header').removeClass('explorer-scrollnav');
+    $('#app').removeClass('full-explorer');
+    };
+};
+/* Image Download */
+
+// $('body').on('click', '.image-dl', function(event){
+//     // var imgsrc = $(this).find('img').attr('src');
+//     var dlButton = event.target;
+//     var dlParent = $(dlButton).closest('*[class~="image-dl"]');
+//     var dlSrc = $(dlParent).find('img').attr('src');
+//     $(dlParent).addClass('isParent');
+//     $(dlButton).addClass('clickedme');
+//     console.log('It is' + dlSrc );
+
+//     this.xhr = $.ajax({		type: "POST",		url: "https://www.w3schools.com/images/myw3schoolsimage.jpg",	}).done(function (data) { 	});
+// });
 
 /* Sidenav Dropdowns */
 
@@ -48,11 +74,90 @@ $('body').on('click', '.ea-tabs .nav-tabs a', function(){
 });
 
 $(document).ready(function() {
-    $("#homemap").attr("src","https://ulwazi.saeon.ac.za/");
+    $("#homemap").attr("src","https://gisportal.saeon.ac.za/portal/apps/webappviewer/index.html?id=2d572dcf9c5f47c484540f8c934e03f4");
     $("body").on("click", ".supportToggle", function(){
-        console.log('taryn')
         $("#supportform").toggleClass('show');
         $("#supportform").fadeToggle(300);
-    })
+    });
+    tableBuild();
+    explorer();
+});
+$(window).on('hashchange', function(){
+
+    setTimeout(function(){
+        tableBuild();
+        explorer();
+        console.log('4');
+      }, 2000);
+
+    
 
 });
+
+
+/* Data Table Filter */
+function tableBuild() {
+
+    if ( $.fn.dataTable.isDataTable( '#servicesTable' ) ) {
+        grid = $('#servicesTable').DataTable();
+    }
+    else {
+        grid = $('#servicesTable').DataTable( {
+            "paging": true,
+            "ordering": true,
+            "info": true
+        } );
+        console.log('is NOT a bdTable');
+        grid.draw();
+        $.fn.dataTable.ext.search.push(
+            function(settings, data, dataIndex) {
+              var dead = $('#gridDisplayDead')[0].checked;
+              var alive = $('#gridDisplayAlive')[0].checked;
+              var all = $('#gridDisplayAll')[0].checked;
+              var condition = String(data[5]); 
+              if (all) {
+                 toggleActive($('#gridDisplayAllLabel'));
+                 return true;
+              } else if (dead) {
+                 toggleActive($('#gridDisplayPublicDeadLabel'));
+                 return ("Public" == condition);
+              } else if (alive) {
+                 toggleActive($('#gridDisplayCommercialLabel'));   
+                 return ("Commercial" == condition);
+              }
+              return false;
+            }
+          );
+          
+        
+    }
+
+
+    
+      // Reload on record filter radio button clicks 
+      $(document).on("click", "#record-filters", function() {
+        grid.draw();
+      });
+      
+      var toggleActive = function(activate)
+      {
+         // de-activate any existing selection
+         $('#record-filters').find('.btn-primary').each(function(index, element) {
+           $(element).removeClass('active');
+         });
+         activate.addClass('active');
+      }
+    
+      
+  
+  };
+
+  /* Search modal */
+  $('body').on('submit', '#sasdisearch', function(e){
+    e.preventDefault();
+    
+    var searchterm = $('.sasdisearch').val();
+    var searchurl = 'http://www.sasdi.net/search.aspx?noframe=true&anytext='
+    //console.log(searchurl + searchterm);
+    window.open(searchurl + searchterm,'_blank');
+})
diff --git a/App/JS/dataTables.js b/App/JS/dataTables.js
new file mode 100644
index 0000000..f127725
--- /dev/null
+++ b/App/JS/dataTables.js
@@ -0,0 +1,166 @@
+/*!
+ DataTables 1.10.12
+ ©2008-2015 SpryMedia Ltd - datatables.net/license
+*/
+(function(h){"function"===typeof define&&define.amd?define(["jquery"],function(D){return h(D,window,document)}):"object"===typeof exports?module.exports=function(D,I){D||(D=window);I||(I="undefined"!==typeof window?require("jquery"):require("jquery")(D));return h(I,D,D.document)}:h(jQuery,window,document)})(function(h,D,I,k){function X(a){var b,c,d={};h.each(a,function(e){if((b=e.match(/^([^A-Z]+?)([A-Z])/))&&-1!=="a aa ai ao as b fn i m o s ".indexOf(b[1]+" "))c=e.replace(b[0],b[2].toLowerCase()),
+d[c]=e,"o"===b[1]&&X(a[e])});a._hungarianMap=d}function K(a,b,c){a._hungarianMap||X(a);var d;h.each(b,function(e){d=a._hungarianMap[e];if(d!==k&&(c||b[d]===k))"o"===d.charAt(0)?(b[d]||(b[d]={}),h.extend(!0,b[d],b[e]),K(a[d],b[d],c)):b[d]=b[e]})}function Da(a){var b=m.defaults.oLanguage,c=a.sZeroRecords;!a.sEmptyTable&&(c&&"No data available in table"===b.sEmptyTable)&&E(a,a,"sZeroRecords","sEmptyTable");!a.sLoadingRecords&&(c&&"Loading..."===b.sLoadingRecords)&&E(a,a,"sZeroRecords","sLoadingRecords");
+a.sInfoThousands&&(a.sThousands=a.sInfoThousands);(a=a.sDecimal)&&db(a)}function eb(a){A(a,"ordering","bSort");A(a,"orderMulti","bSortMulti");A(a,"orderClasses","bSortClasses");A(a,"orderCellsTop","bSortCellsTop");A(a,"order","aaSorting");A(a,"orderFixed","aaSortingFixed");A(a,"paging","bPaginate");A(a,"pagingType","sPaginationType");A(a,"pageLength","iDisplayLength");A(a,"searching","bFilter");"boolean"===typeof a.sScrollX&&(a.sScrollX=a.sScrollX?"100%":"");"boolean"===typeof a.scrollX&&(a.scrollX=
+a.scrollX?"100%":"");if(a=a.aoSearchCols)for(var b=0,c=a.length;b<c;b++)a[b]&&K(m.models.oSearch,a[b])}function fb(a){A(a,"orderable","bSortable");A(a,"orderData","aDataSort");A(a,"orderSequence","asSorting");A(a,"orderDataType","sortDataType");var b=a.aDataSort;b&&!h.isArray(b)&&(a.aDataSort=[b])}function gb(a){if(!m.__browser){var b={};m.__browser=b;var c=h("<div/>").css({position:"fixed",top:0,left:0,height:1,width:1,overflow:"hidden"}).append(h("<div/>").css({position:"absolute",top:1,left:1,
+width:100,overflow:"scroll"}).append(h("<div/>").css({width:"100%",height:10}))).appendTo("body"),d=c.children(),e=d.children();b.barWidth=d[0].offsetWidth-d[0].clientWidth;b.bScrollOversize=100===e[0].offsetWidth&&100!==d[0].clientWidth;b.bScrollbarLeft=1!==Math.round(e.offset().left);b.bBounding=c[0].getBoundingClientRect().width?!0:!1;c.remove()}h.extend(a.oBrowser,m.__browser);a.oScroll.iBarWidth=m.__browser.barWidth}function hb(a,b,c,d,e,f){var g,j=!1;c!==k&&(g=c,j=!0);for(;d!==e;)a.hasOwnProperty(d)&&
+(g=j?b(g,a[d],d,a):a[d],j=!0,d+=f);return g}function Ea(a,b){var c=m.defaults.column,d=a.aoColumns.length,c=h.extend({},m.models.oColumn,c,{nTh:b?b:I.createElement("th"),sTitle:c.sTitle?c.sTitle:b?b.innerHTML:"",aDataSort:c.aDataSort?c.aDataSort:[d],mData:c.mData?c.mData:d,idx:d});a.aoColumns.push(c);c=a.aoPreSearchCols;c[d]=h.extend({},m.models.oSearch,c[d]);ja(a,d,h(b).data())}function ja(a,b,c){var b=a.aoColumns[b],d=a.oClasses,e=h(b.nTh);if(!b.sWidthOrig){b.sWidthOrig=e.attr("width")||null;var f=
+(e.attr("style")||"").match(/width:\s*(\d+[pxem%]+)/);f&&(b.sWidthOrig=f[1])}c!==k&&null!==c&&(fb(c),K(m.defaults.column,c),c.mDataProp!==k&&!c.mData&&(c.mData=c.mDataProp),c.sType&&(b._sManualType=c.sType),c.className&&!c.sClass&&(c.sClass=c.className),h.extend(b,c),E(b,c,"sWidth","sWidthOrig"),c.iDataSort!==k&&(b.aDataSort=[c.iDataSort]),E(b,c,"aDataSort"));var g=b.mData,j=Q(g),i=b.mRender?Q(b.mRender):null,c=function(a){return"string"===typeof a&&-1!==a.indexOf("@")};b._bAttrSrc=h.isPlainObject(g)&&
+(c(g.sort)||c(g.type)||c(g.filter));b._setter=null;b.fnGetData=function(a,b,c){var d=j(a,b,k,c);return i&&b?i(d,b,a,c):d};b.fnSetData=function(a,b,c){return R(g)(a,b,c)};"number"!==typeof g&&(a._rowReadObject=!0);a.oFeatures.bSort||(b.bSortable=!1,e.addClass(d.sSortableNone));a=-1!==h.inArray("asc",b.asSorting);c=-1!==h.inArray("desc",b.asSorting);!b.bSortable||!a&&!c?(b.sSortingClass=d.sSortableNone,b.sSortingClassJUI=""):a&&!c?(b.sSortingClass=d.sSortableAsc,b.sSortingClassJUI=d.sSortJUIAscAllowed):
+!a&&c?(b.sSortingClass=d.sSortableDesc,b.sSortingClassJUI=d.sSortJUIDescAllowed):(b.sSortingClass=d.sSortable,b.sSortingClassJUI=d.sSortJUI)}function Y(a){if(!1!==a.oFeatures.bAutoWidth){var b=a.aoColumns;Fa(a);for(var c=0,d=b.length;c<d;c++)b[c].nTh.style.width=b[c].sWidth}b=a.oScroll;(""!==b.sY||""!==b.sX)&&ka(a);u(a,null,"column-sizing",[a])}function Z(a,b){var c=la(a,"bVisible");return"number"===typeof c[b]?c[b]:null}function $(a,b){var c=la(a,"bVisible"),c=h.inArray(b,c);return-1!==c?c:null}
+function aa(a){var b=0;h.each(a.aoColumns,function(a,d){d.bVisible&&"none"!==h(d.nTh).css("display")&&b++});return b}function la(a,b){var c=[];h.map(a.aoColumns,function(a,e){a[b]&&c.push(e)});return c}function Ga(a){var b=a.aoColumns,c=a.aoData,d=m.ext.type.detect,e,f,g,j,i,h,l,q,t;e=0;for(f=b.length;e<f;e++)if(l=b[e],t=[],!l.sType&&l._sManualType)l.sType=l._sManualType;else if(!l.sType){g=0;for(j=d.length;g<j;g++){i=0;for(h=c.length;i<h;i++){t[i]===k&&(t[i]=B(a,i,e,"type"));q=d[g](t[i],a);if(!q&&
+g!==d.length-1)break;if("html"===q)break}if(q){l.sType=q;break}}l.sType||(l.sType="string")}}function ib(a,b,c,d){var e,f,g,j,i,n,l=a.aoColumns;if(b)for(e=b.length-1;0<=e;e--){n=b[e];var q=n.targets!==k?n.targets:n.aTargets;h.isArray(q)||(q=[q]);f=0;for(g=q.length;f<g;f++)if("number"===typeof q[f]&&0<=q[f]){for(;l.length<=q[f];)Ea(a);d(q[f],n)}else if("number"===typeof q[f]&&0>q[f])d(l.length+q[f],n);else if("string"===typeof q[f]){j=0;for(i=l.length;j<i;j++)("_all"==q[f]||h(l[j].nTh).hasClass(q[f]))&&
+d(j,n)}}if(c){e=0;for(a=c.length;e<a;e++)d(e,c[e])}}function N(a,b,c,d){var e=a.aoData.length,f=h.extend(!0,{},m.models.oRow,{src:c?"dom":"data",idx:e});f._aData=b;a.aoData.push(f);for(var g=a.aoColumns,j=0,i=g.length;j<i;j++)g[j].sType=null;a.aiDisplayMaster.push(e);b=a.rowIdFn(b);b!==k&&(a.aIds[b]=f);(c||!a.oFeatures.bDeferRender)&&Ha(a,e,c,d);return e}function ma(a,b){var c;b instanceof h||(b=h(b));return b.map(function(b,e){c=Ia(a,e);return N(a,c.data,e,c.cells)})}function B(a,b,c,d){var e=a.iDraw,
+f=a.aoColumns[c],g=a.aoData[b]._aData,j=f.sDefaultContent,i=f.fnGetData(g,d,{settings:a,row:b,col:c});if(i===k)return a.iDrawError!=e&&null===j&&(L(a,0,"Requested unknown parameter "+("function"==typeof f.mData?"{function}":"'"+f.mData+"'")+" for row "+b+", column "+c,4),a.iDrawError=e),j;if((i===g||null===i)&&null!==j&&d!==k)i=j;else if("function"===typeof i)return i.call(g);return null===i&&"display"==d?"":i}function jb(a,b,c,d){a.aoColumns[c].fnSetData(a.aoData[b]._aData,d,{settings:a,row:b,col:c})}
+function Ja(a){return h.map(a.match(/(\\.|[^\.])+/g)||[""],function(a){return a.replace(/\\./g,".")})}function Q(a){if(h.isPlainObject(a)){var b={};h.each(a,function(a,c){c&&(b[a]=Q(c))});return function(a,c,f,g){var j=b[c]||b._;return j!==k?j(a,c,f,g):a}}if(null===a)return function(a){return a};if("function"===typeof a)return function(b,c,f,g){return a(b,c,f,g)};if("string"===typeof a&&(-1!==a.indexOf(".")||-1!==a.indexOf("[")||-1!==a.indexOf("("))){var c=function(a,b,f){var g,j;if(""!==f){j=Ja(f);
+for(var i=0,n=j.length;i<n;i++){f=j[i].match(ba);g=j[i].match(U);if(f){j[i]=j[i].replace(ba,"");""!==j[i]&&(a=a[j[i]]);g=[];j.splice(0,i+1);j=j.join(".");if(h.isArray(a)){i=0;for(n=a.length;i<n;i++)g.push(c(a[i],b,j))}a=f[0].substring(1,f[0].length-1);a=""===a?g:g.join(a);break}else if(g){j[i]=j[i].replace(U,"");a=a[j[i]]();continue}if(null===a||a[j[i]]===k)return k;a=a[j[i]]}}return a};return function(b,e){return c(b,e,a)}}return function(b){return b[a]}}function R(a){if(h.isPlainObject(a))return R(a._);
+if(null===a)return function(){};if("function"===typeof a)return function(b,d,e){a(b,"set",d,e)};if("string"===typeof a&&(-1!==a.indexOf(".")||-1!==a.indexOf("[")||-1!==a.indexOf("("))){var b=function(a,d,e){var e=Ja(e),f;f=e[e.length-1];for(var g,j,i=0,n=e.length-1;i<n;i++){g=e[i].match(ba);j=e[i].match(U);if(g){e[i]=e[i].replace(ba,"");a[e[i]]=[];f=e.slice();f.splice(0,i+1);g=f.join(".");if(h.isArray(d)){j=0;for(n=d.length;j<n;j++)f={},b(f,d[j],g),a[e[i]].push(f)}else a[e[i]]=d;return}j&&(e[i]=e[i].replace(U,
+""),a=a[e[i]](d));if(null===a[e[i]]||a[e[i]]===k)a[e[i]]={};a=a[e[i]]}if(f.match(U))a[f.replace(U,"")](d);else a[f.replace(ba,"")]=d};return function(c,d){return b(c,d,a)}}return function(b,d){b[a]=d}}function Ka(a){return G(a.aoData,"_aData")}function na(a){a.aoData.length=0;a.aiDisplayMaster.length=0;a.aiDisplay.length=0;a.aIds={}}function oa(a,b,c){for(var d=-1,e=0,f=a.length;e<f;e++)a[e]==b?d=e:a[e]>b&&a[e]--; -1!=d&&c===k&&a.splice(d,1)}function ca(a,b,c,d){var e=a.aoData[b],f,g=function(c,d){for(;c.childNodes.length;)c.removeChild(c.firstChild);
+c.innerHTML=B(a,b,d,"display")};if("dom"===c||(!c||"auto"===c)&&"dom"===e.src)e._aData=Ia(a,e,d,d===k?k:e._aData).data;else{var j=e.anCells;if(j)if(d!==k)g(j[d],d);else{c=0;for(f=j.length;c<f;c++)g(j[c],c)}}e._aSortData=null;e._aFilterData=null;g=a.aoColumns;if(d!==k)g[d].sType=null;else{c=0;for(f=g.length;c<f;c++)g[c].sType=null;La(a,e)}}function Ia(a,b,c,d){var e=[],f=b.firstChild,g,j,i=0,n,l=a.aoColumns,q=a._rowReadObject,d=d!==k?d:q?{}:[],t=function(a,b){if("string"===typeof a){var c=a.indexOf("@");
+-1!==c&&(c=a.substring(c+1),R(a)(d,b.getAttribute(c)))}},S=function(a){if(c===k||c===i)j=l[i],n=h.trim(a.innerHTML),j&&j._bAttrSrc?(R(j.mData._)(d,n),t(j.mData.sort,a),t(j.mData.type,a),t(j.mData.filter,a)):q?(j._setter||(j._setter=R(j.mData)),j._setter(d,n)):d[i]=n;i++};if(f)for(;f;){g=f.nodeName.toUpperCase();if("TD"==g||"TH"==g)S(f),e.push(f);f=f.nextSibling}else{e=b.anCells;f=0;for(g=e.length;f<g;f++)S(e[f])}if(b=b.firstChild?b:b.nTr)(b=b.getAttribute("id"))&&R(a.rowId)(d,b);return{data:d,cells:e}}
+function Ha(a,b,c,d){var e=a.aoData[b],f=e._aData,g=[],j,i,n,l,q;if(null===e.nTr){j=c||I.createElement("tr");e.nTr=j;e.anCells=g;j._DT_RowIndex=b;La(a,e);l=0;for(q=a.aoColumns.length;l<q;l++){n=a.aoColumns[l];i=c?d[l]:I.createElement(n.sCellType);i._DT_CellIndex={row:b,column:l};g.push(i);if((!c||n.mRender||n.mData!==l)&&(!h.isPlainObject(n.mData)||n.mData._!==l+".display"))i.innerHTML=B(a,b,l,"display");n.sClass&&(i.className+=" "+n.sClass);n.bVisible&&!c?j.appendChild(i):!n.bVisible&&c&&i.parentNode.removeChild(i);
+n.fnCreatedCell&&n.fnCreatedCell.call(a.oInstance,i,B(a,b,l),f,b,l)}u(a,"aoRowCreatedCallback",null,[j,f,b])}e.nTr.setAttribute("role","row")}function La(a,b){var c=b.nTr,d=b._aData;if(c){var e=a.rowIdFn(d);e&&(c.id=e);d.DT_RowClass&&(e=d.DT_RowClass.split(" "),b.__rowc=b.__rowc?pa(b.__rowc.concat(e)):e,h(c).removeClass(b.__rowc.join(" ")).addClass(d.DT_RowClass));d.DT_RowAttr&&h(c).attr(d.DT_RowAttr);d.DT_RowData&&h(c).data(d.DT_RowData)}}function kb(a){var b,c,d,e,f,g=a.nTHead,j=a.nTFoot,i=0===
+h("th, td",g).length,n=a.oClasses,l=a.aoColumns;i&&(e=h("<tr/>").appendTo(g));b=0;for(c=l.length;b<c;b++)f=l[b],d=h(f.nTh).addClass(f.sClass),i&&d.appendTo(e),a.oFeatures.bSort&&(d.addClass(f.sSortingClass),!1!==f.bSortable&&(d.attr("tabindex",a.iTabIndex).attr("aria-controls",a.sTableId),Ma(a,f.nTh,b))),f.sTitle!=d[0].innerHTML&&d.html(f.sTitle),Na(a,"header")(a,d,f,n);i&&da(a.aoHeader,g);h(g).find(">tr").attr("role","row");h(g).find(">tr>th, >tr>td").addClass(n.sHeaderTH);h(j).find(">tr>th, >tr>td").addClass(n.sFooterTH);
+if(null!==j){a=a.aoFooter[0];b=0;for(c=a.length;b<c;b++)f=l[b],f.nTf=a[b].cell,f.sClass&&h(f.nTf).addClass(f.sClass)}}function ea(a,b,c){var d,e,f,g=[],j=[],i=a.aoColumns.length,n;if(b){c===k&&(c=!1);d=0;for(e=b.length;d<e;d++){g[d]=b[d].slice();g[d].nTr=b[d].nTr;for(f=i-1;0<=f;f--)!a.aoColumns[f].bVisible&&!c&&g[d].splice(f,1);j.push([])}d=0;for(e=g.length;d<e;d++){if(a=g[d].nTr)for(;f=a.firstChild;)a.removeChild(f);f=0;for(b=g[d].length;f<b;f++)if(n=i=1,j[d][f]===k){a.appendChild(g[d][f].cell);
+for(j[d][f]=1;g[d+i]!==k&&g[d][f].cell==g[d+i][f].cell;)j[d+i][f]=1,i++;for(;g[d][f+n]!==k&&g[d][f].cell==g[d][f+n].cell;){for(c=0;c<i;c++)j[d+c][f+n]=1;n++}h(g[d][f].cell).attr("rowspan",i).attr("colspan",n)}}}}function O(a){var b=u(a,"aoPreDrawCallback","preDraw",[a]);if(-1!==h.inArray(!1,b))C(a,!1);else{var b=[],c=0,d=a.asStripeClasses,e=d.length,f=a.oLanguage,g=a.iInitDisplayStart,j="ssp"==y(a),i=a.aiDisplay;a.bDrawing=!0;g!==k&&-1!==g&&(a._iDisplayStart=j?g:g>=a.fnRecordsDisplay()?0:g,a.iInitDisplayStart=
+-1);var g=a._iDisplayStart,n=a.fnDisplayEnd();if(a.bDeferLoading)a.bDeferLoading=!1,a.iDraw++,C(a,!1);else if(j){if(!a.bDestroying&&!lb(a))return}else a.iDraw++;if(0!==i.length){f=j?a.aoData.length:n;for(j=j?0:g;j<f;j++){var l=i[j],q=a.aoData[l];null===q.nTr&&Ha(a,l);l=q.nTr;if(0!==e){var t=d[c%e];q._sRowStripe!=t&&(h(l).removeClass(q._sRowStripe).addClass(t),q._sRowStripe=t)}u(a,"aoRowCallback",null,[l,q._aData,c,j]);b.push(l);c++}}else c=f.sZeroRecords,1==a.iDraw&&"ajax"==y(a)?c=f.sLoadingRecords:
+f.sEmptyTable&&0===a.fnRecordsTotal()&&(c=f.sEmptyTable),b[0]=h("<tr/>",{"class":e?d[0]:""}).append(h("<td />",{valign:"top",colSpan:aa(a),"class":a.oClasses.sRowEmpty}).html(c))[0];u(a,"aoHeaderCallback","header",[h(a.nTHead).children("tr")[0],Ka(a),g,n,i]);u(a,"aoFooterCallback","footer",[h(a.nTFoot).children("tr")[0],Ka(a),g,n,i]);d=h(a.nTBody);d.children().detach();d.append(h(b));u(a,"aoDrawCallback","draw",[a]);a.bSorted=!1;a.bFiltered=!1;a.bDrawing=!1}}function T(a,b){var c=a.oFeatures,d=c.bFilter;
+c.bSort&&mb(a);d?fa(a,a.oPreviousSearch):a.aiDisplay=a.aiDisplayMaster.slice();!0!==b&&(a._iDisplayStart=0);a._drawHold=b;O(a);a._drawHold=!1}function nb(a){var b=a.oClasses,c=h(a.nTable),c=h("<div/>").insertBefore(c),d=a.oFeatures,e=h("<div/>",{id:a.sTableId+"_wrapper","class":b.sWrapper+(a.nTFoot?"":" "+b.sNoFooter)});a.nHolding=c[0];a.nTableWrapper=e[0];a.nTableReinsertBefore=a.nTable.nextSibling;for(var f=a.sDom.split(""),g,j,i,n,l,q,t=0;t<f.length;t++){g=null;j=f[t];if("<"==j){i=h("<div/>")[0];
+n=f[t+1];if("'"==n||'"'==n){l="";for(q=2;f[t+q]!=n;)l+=f[t+q],q++;"H"==l?l=b.sJUIHeader:"F"==l&&(l=b.sJUIFooter);-1!=l.indexOf(".")?(n=l.split("."),i.id=n[0].substr(1,n[0].length-1),i.className=n[1]):"#"==l.charAt(0)?i.id=l.substr(1,l.length-1):i.className=l;t+=q}e.append(i);e=h(i)}else if(">"==j)e=e.parent();else if("l"==j&&d.bPaginate&&d.bLengthChange)g=ob(a);else if("f"==j&&d.bFilter)g=pb(a);else if("r"==j&&d.bProcessing)g=qb(a);else if("t"==j)g=rb(a);else if("i"==j&&d.bInfo)g=sb(a);else if("p"==
+j&&d.bPaginate)g=tb(a);else if(0!==m.ext.feature.length){i=m.ext.feature;q=0;for(n=i.length;q<n;q++)if(j==i[q].cFeature){g=i[q].fnInit(a);break}}g&&(i=a.aanFeatures,i[j]||(i[j]=[]),i[j].push(g),e.append(g))}c.replaceWith(e);a.nHolding=null}function da(a,b){var c=h(b).children("tr"),d,e,f,g,j,i,n,l,q,t;a.splice(0,a.length);f=0;for(i=c.length;f<i;f++)a.push([]);f=0;for(i=c.length;f<i;f++){d=c[f];for(e=d.firstChild;e;){if("TD"==e.nodeName.toUpperCase()||"TH"==e.nodeName.toUpperCase()){l=1*e.getAttribute("colspan");
+q=1*e.getAttribute("rowspan");l=!l||0===l||1===l?1:l;q=!q||0===q||1===q?1:q;g=0;for(j=a[f];j[g];)g++;n=g;t=1===l?!0:!1;for(j=0;j<l;j++)for(g=0;g<q;g++)a[f+g][n+j]={cell:e,unique:t},a[f+g].nTr=d}e=e.nextSibling}}}function qa(a,b,c){var d=[];c||(c=a.aoHeader,b&&(c=[],da(c,b)));for(var b=0,e=c.length;b<e;b++)for(var f=0,g=c[b].length;f<g;f++)if(c[b][f].unique&&(!d[f]||!a.bSortCellsTop))d[f]=c[b][f].cell;return d}function ra(a,b,c){u(a,"aoServerParams","serverParams",[b]);if(b&&h.isArray(b)){var d={},
+e=/(.*?)\[\]$/;h.each(b,function(a,b){var c=b.name.match(e);c?(c=c[0],d[c]||(d[c]=[]),d[c].push(b.value)):d[b.name]=b.value});b=d}var f,g=a.ajax,j=a.oInstance,i=function(b){u(a,null,"xhr",[a,b,a.jqXHR]);c(b)};if(h.isPlainObject(g)&&g.data){f=g.data;var n=h.isFunction(f)?f(b,a):f,b=h.isFunction(f)&&n?n:h.extend(!0,b,n);delete g.data}n={data:b,success:function(b){var c=b.error||b.sError;c&&L(a,0,c);a.json=b;i(b)},dataType:"json",cache:!1,type:a.sServerMethod,error:function(b,c){var d=u(a,null,"xhr",
+[a,null,a.jqXHR]);-1===h.inArray(!0,d)&&("parsererror"==c?L(a,0,"Invalid JSON response",1):4===b.readyState&&L(a,0,"Ajax error",7));C(a,!1)}};a.oAjaxData=b;u(a,null,"preXhr",[a,b]);a.fnServerData?a.fnServerData.call(j,a.sAjaxSource,h.map(b,function(a,b){return{name:b,value:a}}),i,a):a.sAjaxSource||"string"===typeof g?a.jqXHR=h.ajax(h.extend(n,{url:g||a.sAjaxSource})):h.isFunction(g)?a.jqXHR=g.call(j,b,i,a):(a.jqXHR=h.ajax(h.extend(n,g)),g.data=f)}function lb(a){return a.bAjaxDataGet?(a.iDraw++,C(a,
+!0),ra(a,ub(a),function(b){vb(a,b)}),!1):!0}function ub(a){var b=a.aoColumns,c=b.length,d=a.oFeatures,e=a.oPreviousSearch,f=a.aoPreSearchCols,g,j=[],i,n,l,q=V(a);g=a._iDisplayStart;i=!1!==d.bPaginate?a._iDisplayLength:-1;var k=function(a,b){j.push({name:a,value:b})};k("sEcho",a.iDraw);k("iColumns",c);k("sColumns",G(b,"sName").join(","));k("iDisplayStart",g);k("iDisplayLength",i);var S={draw:a.iDraw,columns:[],order:[],start:g,length:i,search:{value:e.sSearch,regex:e.bRegex}};for(g=0;g<c;g++)n=b[g],
+l=f[g],i="function"==typeof n.mData?"function":n.mData,S.columns.push({data:i,name:n.sName,searchable:n.bSearchable,orderable:n.bSortable,search:{value:l.sSearch,regex:l.bRegex}}),k("mDataProp_"+g,i),d.bFilter&&(k("sSearch_"+g,l.sSearch),k("bRegex_"+g,l.bRegex),k("bSearchable_"+g,n.bSearchable)),d.bSort&&k("bSortable_"+g,n.bSortable);d.bFilter&&(k("sSearch",e.sSearch),k("bRegex",e.bRegex));d.bSort&&(h.each(q,function(a,b){S.order.push({column:b.col,dir:b.dir});k("iSortCol_"+a,b.col);k("sSortDir_"+
+a,b.dir)}),k("iSortingCols",q.length));b=m.ext.legacy.ajax;return null===b?a.sAjaxSource?j:S:b?j:S}function vb(a,b){var c=sa(a,b),d=b.sEcho!==k?b.sEcho:b.draw,e=b.iTotalRecords!==k?b.iTotalRecords:b.recordsTotal,f=b.iTotalDisplayRecords!==k?b.iTotalDisplayRecords:b.recordsFiltered;if(d){if(1*d<a.iDraw)return;a.iDraw=1*d}na(a);a._iRecordsTotal=parseInt(e,10);a._iRecordsDisplay=parseInt(f,10);d=0;for(e=c.length;d<e;d++)N(a,c[d]);a.aiDisplay=a.aiDisplayMaster.slice();a.bAjaxDataGet=!1;O(a);a._bInitComplete||
+ta(a,b);a.bAjaxDataGet=!0;C(a,!1)}function sa(a,b){var c=h.isPlainObject(a.ajax)&&a.ajax.dataSrc!==k?a.ajax.dataSrc:a.sAjaxDataProp;return"data"===c?b.aaData||b[c]:""!==c?Q(c)(b):b}function pb(a){var b=a.oClasses,c=a.sTableId,d=a.oLanguage,e=a.oPreviousSearch,f=a.aanFeatures,g='<input type="search" class="'+b.sFilterInput+'"/>',j=d.sSearch,j=j.match(/_INPUT_/)?j.replace("_INPUT_",g):j+g,b=h("<div/>",{id:!f.f?c+"_filter":null,"class":b.sFilter}).append(h("<label/>").append(j)),f=function(){var b=!this.value?
+"":this.value;b!=e.sSearch&&(fa(a,{sSearch:b,bRegex:e.bRegex,bSmart:e.bSmart,bCaseInsensitive:e.bCaseInsensitive}),a._iDisplayStart=0,O(a))},g=null!==a.searchDelay?a.searchDelay:"ssp"===y(a)?400:0,i=h("input",b).val(e.sSearch).attr("placeholder",d.sSearchPlaceholder).bind("keyup.DT search.DT input.DT paste.DT cut.DT",g?Oa(f,g):f).bind("keypress.DT",function(a){if(13==a.keyCode)return!1}).attr("aria-controls",c);h(a.nTable).on("search.dt.DT",function(b,c){if(a===c)try{i[0]!==I.activeElement&&i.val(e.sSearch)}catch(d){}});
+return b[0]}function fa(a,b,c){var d=a.oPreviousSearch,e=a.aoPreSearchCols,f=function(a){d.sSearch=a.sSearch;d.bRegex=a.bRegex;d.bSmart=a.bSmart;d.bCaseInsensitive=a.bCaseInsensitive};Ga(a);if("ssp"!=y(a)){wb(a,b.sSearch,c,b.bEscapeRegex!==k?!b.bEscapeRegex:b.bRegex,b.bSmart,b.bCaseInsensitive);f(b);for(b=0;b<e.length;b++)xb(a,e[b].sSearch,b,e[b].bEscapeRegex!==k?!e[b].bEscapeRegex:e[b].bRegex,e[b].bSmart,e[b].bCaseInsensitive);yb(a)}else f(b);a.bFiltered=!0;u(a,null,"search",[a])}function yb(a){for(var b=
+m.ext.search,c=a.aiDisplay,d,e,f=0,g=b.length;f<g;f++){for(var j=[],i=0,n=c.length;i<n;i++)e=c[i],d=a.aoData[e],b[f](a,d._aFilterData,e,d._aData,i)&&j.push(e);c.length=0;h.merge(c,j)}}function xb(a,b,c,d,e,f){if(""!==b)for(var g=a.aiDisplay,d=Pa(b,d,e,f),e=g.length-1;0<=e;e--)b=a.aoData[g[e]]._aFilterData[c],d.test(b)||g.splice(e,1)}function wb(a,b,c,d,e,f){var d=Pa(b,d,e,f),e=a.oPreviousSearch.sSearch,f=a.aiDisplayMaster,g;0!==m.ext.search.length&&(c=!0);g=zb(a);if(0>=b.length)a.aiDisplay=f.slice();
+else{if(g||c||e.length>b.length||0!==b.indexOf(e)||a.bSorted)a.aiDisplay=f.slice();b=a.aiDisplay;for(c=b.length-1;0<=c;c--)d.test(a.aoData[b[c]]._sFilterRow)||b.splice(c,1)}}function Pa(a,b,c,d){a=b?a:Qa(a);c&&(a="^(?=.*?"+h.map(a.match(/"[^"]+"|[^ ]+/g)||[""],function(a){if('"'===a.charAt(0))var b=a.match(/^"(.*)"$/),a=b?b[1]:a;return a.replace('"',"")}).join(")(?=.*?")+").*$");return RegExp(a,d?"i":"")}function zb(a){var b=a.aoColumns,c,d,e,f,g,j,i,h,l=m.ext.type.search;c=!1;d=0;for(f=a.aoData.length;d<
+f;d++)if(h=a.aoData[d],!h._aFilterData){j=[];e=0;for(g=b.length;e<g;e++)c=b[e],c.bSearchable?(i=B(a,d,e,"filter"),l[c.sType]&&(i=l[c.sType](i)),null===i&&(i=""),"string"!==typeof i&&i.toString&&(i=i.toString())):i="",i.indexOf&&-1!==i.indexOf("&")&&(ua.innerHTML=i,i=Zb?ua.textContent:ua.innerText),i.replace&&(i=i.replace(/[\r\n]/g,"")),j.push(i);h._aFilterData=j;h._sFilterRow=j.join("  ");c=!0}return c}function Ab(a){return{search:a.sSearch,smart:a.bSmart,regex:a.bRegex,caseInsensitive:a.bCaseInsensitive}}
+function Bb(a){return{sSearch:a.search,bSmart:a.smart,bRegex:a.regex,bCaseInsensitive:a.caseInsensitive}}function sb(a){var b=a.sTableId,c=a.aanFeatures.i,d=h("<div/>",{"class":a.oClasses.sInfo,id:!c?b+"_info":null});c||(a.aoDrawCallback.push({fn:Cb,sName:"information"}),d.attr("role","status").attr("aria-live","polite"),h(a.nTable).attr("aria-describedby",b+"_info"));return d[0]}function Cb(a){var b=a.aanFeatures.i;if(0!==b.length){var c=a.oLanguage,d=a._iDisplayStart+1,e=a.fnDisplayEnd(),f=a.fnRecordsTotal(),
+g=a.fnRecordsDisplay(),j=g?c.sInfo:c.sInfoEmpty;g!==f&&(j+=" "+c.sInfoFiltered);j+=c.sInfoPostFix;j=Db(a,j);c=c.fnInfoCallback;null!==c&&(j=c.call(a.oInstance,a,d,e,f,g,j));h(b).html(j)}}function Db(a,b){var c=a.fnFormatNumber,d=a._iDisplayStart+1,e=a._iDisplayLength,f=a.fnRecordsDisplay(),g=-1===e;return b.replace(/_START_/g,c.call(a,d)).replace(/_END_/g,c.call(a,a.fnDisplayEnd())).replace(/_MAX_/g,c.call(a,a.fnRecordsTotal())).replace(/_TOTAL_/g,c.call(a,f)).replace(/_PAGE_/g,c.call(a,g?1:Math.ceil(d/
+e))).replace(/_PAGES_/g,c.call(a,g?1:Math.ceil(f/e)))}function ga(a){var b,c,d=a.iInitDisplayStart,e=a.aoColumns,f;c=a.oFeatures;var g=a.bDeferLoading;if(a.bInitialised){nb(a);kb(a);ea(a,a.aoHeader);ea(a,a.aoFooter);C(a,!0);c.bAutoWidth&&Fa(a);b=0;for(c=e.length;b<c;b++)f=e[b],f.sWidth&&(f.nTh.style.width=x(f.sWidth));u(a,null,"preInit",[a]);T(a);e=y(a);if("ssp"!=e||g)"ajax"==e?ra(a,[],function(c){var f=sa(a,c);for(b=0;b<f.length;b++)N(a,f[b]);a.iInitDisplayStart=d;T(a);C(a,!1);ta(a,c)},a):(C(a,!1),
+ta(a))}else setTimeout(function(){ga(a)},200)}function ta(a,b){a._bInitComplete=!0;(b||a.oInit.aaData)&&Y(a);u(a,null,"plugin-init",[a,b]);u(a,"aoInitComplete","init",[a,b])}function Ra(a,b){var c=parseInt(b,10);a._iDisplayLength=c;Sa(a);u(a,null,"length",[a,c])}function ob(a){for(var b=a.oClasses,c=a.sTableId,d=a.aLengthMenu,e=h.isArray(d[0]),f=e?d[0]:d,d=e?d[1]:d,e=h("<select/>",{name:c+"_length","aria-controls":c,"class":b.sLengthSelect}),g=0,j=f.length;g<j;g++)e[0][g]=new Option(d[g],f[g]);var i=
+h("<div><label/></div>").addClass(b.sLength);a.aanFeatures.l||(i[0].id=c+"_length");i.children().append(a.oLanguage.sLengthMenu.replace("_MENU_",e[0].outerHTML));h("select",i).val(a._iDisplayLength).bind("change.DT",function(){Ra(a,h(this).val());O(a)});h(a.nTable).bind("length.dt.DT",function(b,c,d){a===c&&h("select",i).val(d)});return i[0]}function tb(a){var b=a.sPaginationType,c=m.ext.pager[b],d="function"===typeof c,e=function(a){O(a)},b=h("<div/>").addClass(a.oClasses.sPaging+b)[0],f=a.aanFeatures;
+d||c.fnInit(a,b,e);f.p||(b.id=a.sTableId+"_paginate",a.aoDrawCallback.push({fn:function(a){if(d){var b=a._iDisplayStart,i=a._iDisplayLength,h=a.fnRecordsDisplay(),l=-1===i,b=l?0:Math.ceil(b/i),i=l?1:Math.ceil(h/i),h=c(b,i),k,l=0;for(k=f.p.length;l<k;l++)Na(a,"pageButton")(a,f.p[l],l,h,b,i)}else c.fnUpdate(a,e)},sName:"pagination"}));return b}function Ta(a,b,c){var d=a._iDisplayStart,e=a._iDisplayLength,f=a.fnRecordsDisplay();0===f||-1===e?d=0:"number"===typeof b?(d=b*e,d>f&&(d=0)):"first"==b?d=0:
+"previous"==b?(d=0<=e?d-e:0,0>d&&(d=0)):"next"==b?d+e<f&&(d+=e):"last"==b?d=Math.floor((f-1)/e)*e:L(a,0,"Unknown paging action: "+b,5);b=a._iDisplayStart!==d;a._iDisplayStart=d;b&&(u(a,null,"page",[a]),c&&O(a));return b}function qb(a){return h("<div/>",{id:!a.aanFeatures.r?a.sTableId+"_processing":null,"class":a.oClasses.sProcessing}).html(a.oLanguage.sProcessing).insertBefore(a.nTable)[0]}function C(a,b){a.oFeatures.bProcessing&&h(a.aanFeatures.r).css("display",b?"block":"none");u(a,null,"processing",
+[a,b])}function rb(a){var b=h(a.nTable);b.attr("role","grid");var c=a.oScroll;if(""===c.sX&&""===c.sY)return a.nTable;var d=c.sX,e=c.sY,f=a.oClasses,g=b.children("caption"),j=g.length?g[0]._captionSide:null,i=h(b[0].cloneNode(!1)),n=h(b[0].cloneNode(!1)),l=b.children("tfoot");l.length||(l=null);i=h("<div/>",{"class":f.sScrollWrapper}).append(h("<div/>",{"class":f.sScrollHead}).css({overflow:"hidden",position:"relative",border:0,width:d?!d?null:x(d):"100%"}).append(h("<div/>",{"class":f.sScrollHeadInner}).css({"box-sizing":"content-box",
+width:c.sXInner||"100%"}).append(i.removeAttr("id").css("margin-left",0).append("top"===j?g:null).append(b.children("thead"))))).append(h("<div/>",{"class":f.sScrollBody}).css({position:"relative",overflow:"auto",width:!d?null:x(d)}).append(b));l&&i.append(h("<div/>",{"class":f.sScrollFoot}).css({overflow:"hidden",border:0,width:d?!d?null:x(d):"100%"}).append(h("<div/>",{"class":f.sScrollFootInner}).append(n.removeAttr("id").css("margin-left",0).append("bottom"===j?g:null).append(b.children("tfoot")))));
+var b=i.children(),k=b[0],f=b[1],t=l?b[2]:null;if(d)h(f).on("scroll.DT",function(){var a=this.scrollLeft;k.scrollLeft=a;l&&(t.scrollLeft=a)});h(f).css(e&&c.bCollapse?"max-height":"height",e);a.nScrollHead=k;a.nScrollBody=f;a.nScrollFoot=t;a.aoDrawCallback.push({fn:ka,sName:"scrolling"});return i[0]}function ka(a){var b=a.oScroll,c=b.sX,d=b.sXInner,e=b.sY,b=b.iBarWidth,f=h(a.nScrollHead),g=f[0].style,j=f.children("div"),i=j[0].style,n=j.children("table"),j=a.nScrollBody,l=h(j),q=j.style,t=h(a.nScrollFoot).children("div"),
+m=t.children("table"),o=h(a.nTHead),F=h(a.nTable),p=F[0],r=p.style,u=a.nTFoot?h(a.nTFoot):null,Eb=a.oBrowser,Ua=Eb.bScrollOversize,s=G(a.aoColumns,"nTh"),P,v,w,y,z=[],A=[],B=[],C=[],D,E=function(a){a=a.style;a.paddingTop="0";a.paddingBottom="0";a.borderTopWidth="0";a.borderBottomWidth="0";a.height=0};v=j.scrollHeight>j.clientHeight;if(a.scrollBarVis!==v&&a.scrollBarVis!==k)a.scrollBarVis=v,Y(a);else{a.scrollBarVis=v;F.children("thead, tfoot").remove();u&&(w=u.clone().prependTo(F),P=u.find("tr"),w=
+w.find("tr"));y=o.clone().prependTo(F);o=o.find("tr");v=y.find("tr");y.find("th, td").removeAttr("tabindex");c||(q.width="100%",f[0].style.width="100%");h.each(qa(a,y),function(b,c){D=Z(a,b);c.style.width=a.aoColumns[D].sWidth});u&&J(function(a){a.style.width=""},w);f=F.outerWidth();if(""===c){r.width="100%";if(Ua&&(F.find("tbody").height()>j.offsetHeight||"scroll"==l.css("overflow-y")))r.width=x(F.outerWidth()-b);f=F.outerWidth()}else""!==d&&(r.width=x(d),f=F.outerWidth());J(E,v);J(function(a){B.push(a.innerHTML);
+z.push(x(h(a).css("width")))},v);J(function(a,b){if(h.inArray(a,s)!==-1)a.style.width=z[b]},o);h(v).height(0);u&&(J(E,w),J(function(a){C.push(a.innerHTML);A.push(x(h(a).css("width")))},w),J(function(a,b){a.style.width=A[b]},P),h(w).height(0));J(function(a,b){a.innerHTML='<div class="dataTables_sizing" style="height:0;overflow:hidden;">'+B[b]+"</div>";a.style.width=z[b]},v);u&&J(function(a,b){a.innerHTML='<div class="dataTables_sizing" style="height:0;overflow:hidden;">'+C[b]+"</div>";a.style.width=
+A[b]},w);if(F.outerWidth()<f){P=j.scrollHeight>j.offsetHeight||"scroll"==l.css("overflow-y")?f+b:f;if(Ua&&(j.scrollHeight>j.offsetHeight||"scroll"==l.css("overflow-y")))r.width=x(P-b);(""===c||""!==d)&&L(a,1,"Possible column misalignment",6)}else P="100%";q.width=x(P);g.width=x(P);u&&(a.nScrollFoot.style.width=x(P));!e&&Ua&&(q.height=x(p.offsetHeight+b));c=F.outerWidth();n[0].style.width=x(c);i.width=x(c);d=F.height()>j.clientHeight||"scroll"==l.css("overflow-y");e="padding"+(Eb.bScrollbarLeft?"Left":
+"Right");i[e]=d?b+"px":"0px";u&&(m[0].style.width=x(c),t[0].style.width=x(c),t[0].style[e]=d?b+"px":"0px");F.children("colgroup").insertBefore(F.children("thead"));l.scroll();if((a.bSorted||a.bFiltered)&&!a._drawHold)j.scrollTop=0}}function J(a,b,c){for(var d=0,e=0,f=b.length,g,j;e<f;){g=b[e].firstChild;for(j=c?c[e].firstChild:null;g;)1===g.nodeType&&(c?a(g,j,d):a(g,d),d++),g=g.nextSibling,j=c?j.nextSibling:null;e++}}function Fa(a){var b=a.nTable,c=a.aoColumns,d=a.oScroll,e=d.sY,f=d.sX,g=d.sXInner,
+j=c.length,i=la(a,"bVisible"),n=h("th",a.nTHead),l=b.getAttribute("width"),k=b.parentNode,t=!1,m,o,p=a.oBrowser,d=p.bScrollOversize;(m=b.style.width)&&-1!==m.indexOf("%")&&(l=m);for(m=0;m<i.length;m++)o=c[i[m]],null!==o.sWidth&&(o.sWidth=Fb(o.sWidthOrig,k),t=!0);if(d||!t&&!f&&!e&&j==aa(a)&&j==n.length)for(m=0;m<j;m++)i=Z(a,m),null!==i&&(c[i].sWidth=x(n.eq(m).width()));else{j=h(b).clone().css("visibility","hidden").removeAttr("id");j.find("tbody tr").remove();var r=h("<tr/>").appendTo(j.find("tbody"));
+j.find("thead, tfoot").remove();j.append(h(a.nTHead).clone()).append(h(a.nTFoot).clone());j.find("tfoot th, tfoot td").css("width","");n=qa(a,j.find("thead")[0]);for(m=0;m<i.length;m++)o=c[i[m]],n[m].style.width=null!==o.sWidthOrig&&""!==o.sWidthOrig?x(o.sWidthOrig):"",o.sWidthOrig&&f&&h(n[m]).append(h("<div/>").css({width:o.sWidthOrig,margin:0,padding:0,border:0,height:1}));if(a.aoData.length)for(m=0;m<i.length;m++)t=i[m],o=c[t],h(Gb(a,t)).clone(!1).append(o.sContentPadding).appendTo(r);h("[name]",
+j).removeAttr("name");o=h("<div/>").css(f||e?{position:"absolute",top:0,left:0,height:1,right:0,overflow:"hidden"}:{}).append(j).appendTo(k);f&&g?j.width(g):f?(j.css("width","auto"),j.removeAttr("width"),j.width()<k.clientWidth&&l&&j.width(k.clientWidth)):e?j.width(k.clientWidth):l&&j.width(l);for(m=e=0;m<i.length;m++)k=h(n[m]),g=k.outerWidth()-k.width(),k=p.bBounding?Math.ceil(n[m].getBoundingClientRect().width):k.outerWidth(),e+=k,c[i[m]].sWidth=x(k-g);b.style.width=x(e);o.remove()}l&&(b.style.width=
+x(l));if((l||f)&&!a._reszEvt)b=function(){h(D).bind("resize.DT-"+a.sInstance,Oa(function(){Y(a)}))},d?setTimeout(b,1E3):b(),a._reszEvt=!0}function Fb(a,b){if(!a)return 0;var c=h("<div/>").css("width",x(a)).appendTo(b||I.body),d=c[0].offsetWidth;c.remove();return d}function Gb(a,b){var c=Hb(a,b);if(0>c)return null;var d=a.aoData[c];return!d.nTr?h("<td/>").html(B(a,c,b,"display"))[0]:d.anCells[b]}function Hb(a,b){for(var c,d=-1,e=-1,f=0,g=a.aoData.length;f<g;f++)c=B(a,f,b,"display")+"",c=c.replace($b,
+""),c=c.replace(/&nbsp;/g," "),c.length>d&&(d=c.length,e=f);return e}function x(a){return null===a?"0px":"number"==typeof a?0>a?"0px":a+"px":a.match(/\d$/)?a+"px":a}function V(a){var b,c,d=[],e=a.aoColumns,f,g,j,i;b=a.aaSortingFixed;c=h.isPlainObject(b);var n=[];f=function(a){a.length&&!h.isArray(a[0])?n.push(a):h.merge(n,a)};h.isArray(b)&&f(b);c&&b.pre&&f(b.pre);f(a.aaSorting);c&&b.post&&f(b.post);for(a=0;a<n.length;a++){i=n[a][0];f=e[i].aDataSort;b=0;for(c=f.length;b<c;b++)g=f[b],j=e[g].sType||
+"string",n[a]._idx===k&&(n[a]._idx=h.inArray(n[a][1],e[g].asSorting)),d.push({src:i,col:g,dir:n[a][1],index:n[a]._idx,type:j,formatter:m.ext.type.order[j+"-pre"]})}return d}function mb(a){var b,c,d=[],e=m.ext.type.order,f=a.aoData,g=0,j,i=a.aiDisplayMaster,h;Ga(a);h=V(a);b=0;for(c=h.length;b<c;b++)j=h[b],j.formatter&&g++,Ib(a,j.col);if("ssp"!=y(a)&&0!==h.length){b=0;for(c=i.length;b<c;b++)d[i[b]]=b;g===h.length?i.sort(function(a,b){var c,e,g,j,i=h.length,k=f[a]._aSortData,m=f[b]._aSortData;for(g=
+0;g<i;g++)if(j=h[g],c=k[j.col],e=m[j.col],c=c<e?-1:c>e?1:0,0!==c)return"asc"===j.dir?c:-c;c=d[a];e=d[b];return c<e?-1:c>e?1:0}):i.sort(function(a,b){var c,g,j,i,k=h.length,m=f[a]._aSortData,p=f[b]._aSortData;for(j=0;j<k;j++)if(i=h[j],c=m[i.col],g=p[i.col],i=e[i.type+"-"+i.dir]||e["string-"+i.dir],c=i(c,g),0!==c)return c;c=d[a];g=d[b];return c<g?-1:c>g?1:0})}a.bSorted=!0}function Jb(a){for(var b,c,d=a.aoColumns,e=V(a),a=a.oLanguage.oAria,f=0,g=d.length;f<g;f++){c=d[f];var j=c.asSorting;b=c.sTitle.replace(/<.*?>/g,
+"");var i=c.nTh;i.removeAttribute("aria-sort");c.bSortable&&(0<e.length&&e[0].col==f?(i.setAttribute("aria-sort","asc"==e[0].dir?"ascending":"descending"),c=j[e[0].index+1]||j[0]):c=j[0],b+="asc"===c?a.sSortAscending:a.sSortDescending);i.setAttribute("aria-label",b)}}function Va(a,b,c,d){var e=a.aaSorting,f=a.aoColumns[b].asSorting,g=function(a,b){var c=a._idx;c===k&&(c=h.inArray(a[1],f));return c+1<f.length?c+1:b?null:0};"number"===typeof e[0]&&(e=a.aaSorting=[e]);c&&a.oFeatures.bSortMulti?(c=h.inArray(b,
+G(e,"0")),-1!==c?(b=g(e[c],!0),null===b&&1===e.length&&(b=0),null===b?e.splice(c,1):(e[c][1]=f[b],e[c]._idx=b)):(e.push([b,f[0],0]),e[e.length-1]._idx=0)):e.length&&e[0][0]==b?(b=g(e[0]),e.length=1,e[0][1]=f[b],e[0]._idx=b):(e.length=0,e.push([b,f[0]]),e[0]._idx=0);T(a);"function"==typeof d&&d(a)}function Ma(a,b,c,d){var e=a.aoColumns[c];Wa(b,{},function(b){!1!==e.bSortable&&(a.oFeatures.bProcessing?(C(a,!0),setTimeout(function(){Va(a,c,b.shiftKey,d);"ssp"!==y(a)&&C(a,!1)},0)):Va(a,c,b.shiftKey,d))})}
+function va(a){var b=a.aLastSort,c=a.oClasses.sSortColumn,d=V(a),e=a.oFeatures,f,g;if(e.bSort&&e.bSortClasses){e=0;for(f=b.length;e<f;e++)g=b[e].src,h(G(a.aoData,"anCells",g)).removeClass(c+(2>e?e+1:3));e=0;for(f=d.length;e<f;e++)g=d[e].src,h(G(a.aoData,"anCells",g)).addClass(c+(2>e?e+1:3))}a.aLastSort=d}function Ib(a,b){var c=a.aoColumns[b],d=m.ext.order[c.sSortDataType],e;d&&(e=d.call(a.oInstance,a,b,$(a,b)));for(var f,g=m.ext.type.order[c.sType+"-pre"],j=0,i=a.aoData.length;j<i;j++)if(c=a.aoData[j],
+c._aSortData||(c._aSortData=[]),!c._aSortData[b]||d)f=d?e[j]:B(a,j,b,"sort"),c._aSortData[b]=g?g(f):f}function wa(a){if(a.oFeatures.bStateSave&&!a.bDestroying){var b={time:+new Date,start:a._iDisplayStart,length:a._iDisplayLength,order:h.extend(!0,[],a.aaSorting),search:Ab(a.oPreviousSearch),columns:h.map(a.aoColumns,function(b,d){return{visible:b.bVisible,search:Ab(a.aoPreSearchCols[d])}})};u(a,"aoStateSaveParams","stateSaveParams",[a,b]);a.oSavedState=b;a.fnStateSaveCallback.call(a.oInstance,a,
+b)}}function Kb(a){var b,c,d=a.aoColumns;if(a.oFeatures.bStateSave){var e=a.fnStateLoadCallback.call(a.oInstance,a);if(e&&e.time&&(b=u(a,"aoStateLoadParams","stateLoadParams",[a,e]),-1===h.inArray(!1,b)&&(b=a.iStateDuration,!(0<b&&e.time<+new Date-1E3*b)&&d.length===e.columns.length))){a.oLoadedState=h.extend(!0,{},e);e.start!==k&&(a._iDisplayStart=e.start,a.iInitDisplayStart=e.start);e.length!==k&&(a._iDisplayLength=e.length);e.order!==k&&(a.aaSorting=[],h.each(e.order,function(b,c){a.aaSorting.push(c[0]>=
+d.length?[0,c[1]]:c)}));e.search!==k&&h.extend(a.oPreviousSearch,Bb(e.search));b=0;for(c=e.columns.length;b<c;b++){var f=e.columns[b];f.visible!==k&&(d[b].bVisible=f.visible);f.search!==k&&h.extend(a.aoPreSearchCols[b],Bb(f.search))}u(a,"aoStateLoaded","stateLoaded",[a,e])}}}function xa(a){var b=m.settings,a=h.inArray(a,G(b,"nTable"));return-1!==a?b[a]:null}function L(a,b,c,d){c="DataTables warning: "+(a?"table id="+a.sTableId+" - ":"")+c;d&&(c+=". For more information about this error, please see http://datatables.net/tn/"+
+d);if(b)D.console&&console.log&&console.log(c);else if(b=m.ext,b=b.sErrMode||b.errMode,a&&u(a,null,"error",[a,d,c]),"alert"==b)alert(c);else{if("throw"==b)throw Error(c);"function"==typeof b&&b(a,d,c)}}function E(a,b,c,d){h.isArray(c)?h.each(c,function(c,d){h.isArray(d)?E(a,b,d[0],d[1]):E(a,b,d)}):(d===k&&(d=c),b[c]!==k&&(a[d]=b[c]))}function Lb(a,b,c){var d,e;for(e in b)b.hasOwnProperty(e)&&(d=b[e],h.isPlainObject(d)?(h.isPlainObject(a[e])||(a[e]={}),h.extend(!0,a[e],d)):a[e]=c&&"data"!==e&&"aaData"!==
+e&&h.isArray(d)?d.slice():d);return a}function Wa(a,b,c){h(a).bind("click.DT",b,function(b){a.blur();c(b)}).bind("keypress.DT",b,function(a){13===a.which&&(a.preventDefault(),c(a))}).bind("selectstart.DT",function(){return!1})}function z(a,b,c,d){c&&a[b].push({fn:c,sName:d})}function u(a,b,c,d){var e=[];b&&(e=h.map(a[b].slice().reverse(),function(b){return b.fn.apply(a.oInstance,d)}));null!==c&&(b=h.Event(c+".dt"),h(a.nTable).trigger(b,d),e.push(b.result));return e}function Sa(a){var b=a._iDisplayStart,
+c=a.fnDisplayEnd(),d=a._iDisplayLength;b>=c&&(b=c-d);b-=b%d;if(-1===d||0>b)b=0;a._iDisplayStart=b}function Na(a,b){var c=a.renderer,d=m.ext.renderer[b];return h.isPlainObject(c)&&c[b]?d[c[b]]||d._:"string"===typeof c?d[c]||d._:d._}function y(a){return a.oFeatures.bServerSide?"ssp":a.ajax||a.sAjaxSource?"ajax":"dom"}function ya(a,b){var c=[],c=Mb.numbers_length,d=Math.floor(c/2);b<=c?c=W(0,b):a<=d?(c=W(0,c-2),c.push("ellipsis"),c.push(b-1)):(a>=b-1-d?c=W(b-(c-2),b):(c=W(a-d+2,a+d-1),c.push("ellipsis"),
+c.push(b-1)),c.splice(0,0,"ellipsis"),c.splice(0,0,0));c.DT_el="span";return c}function db(a){h.each({num:function(b){return za(b,a)},"num-fmt":function(b){return za(b,a,Xa)},"html-num":function(b){return za(b,a,Aa)},"html-num-fmt":function(b){return za(b,a,Aa,Xa)}},function(b,c){v.type.order[b+a+"-pre"]=c;b.match(/^html\-/)&&(v.type.search[b+a]=v.type.search.html)})}function Nb(a){return function(){var b=[xa(this[m.ext.iApiIndex])].concat(Array.prototype.slice.call(arguments));return m.ext.internal[a].apply(this,
+b)}}var m=function(a){this.$=function(a,b){return this.api(!0).$(a,b)};this._=function(a,b){return this.api(!0).rows(a,b).data()};this.api=function(a){return a?new r(xa(this[v.iApiIndex])):new r(this)};this.fnAddData=function(a,b){var c=this.api(!0),d=h.isArray(a)&&(h.isArray(a[0])||h.isPlainObject(a[0]))?c.rows.add(a):c.row.add(a);(b===k||b)&&c.draw();return d.flatten().toArray()};this.fnAdjustColumnSizing=function(a){var b=this.api(!0).columns.adjust(),c=b.settings()[0],d=c.oScroll;a===k||a?b.draw(!1):
+(""!==d.sX||""!==d.sY)&&ka(c)};this.fnClearTable=function(a){var b=this.api(!0).clear();(a===k||a)&&b.draw()};this.fnClose=function(a){this.api(!0).row(a).child.hide()};this.fnDeleteRow=function(a,b,c){var d=this.api(!0),a=d.rows(a),e=a.settings()[0],h=e.aoData[a[0][0]];a.remove();b&&b.call(this,e,h);(c===k||c)&&d.draw();return h};this.fnDestroy=function(a){this.api(!0).destroy(a)};this.fnDraw=function(a){this.api(!0).draw(a)};this.fnFilter=function(a,b,c,d,e,h){e=this.api(!0);null===b||b===k?e.search(a,
+c,d,h):e.column(b).search(a,c,d,h);e.draw()};this.fnGetData=function(a,b){var c=this.api(!0);if(a!==k){var d=a.nodeName?a.nodeName.toLowerCase():"";return b!==k||"td"==d||"th"==d?c.cell(a,b).data():c.row(a).data()||null}return c.data().toArray()};this.fnGetNodes=function(a){var b=this.api(!0);return a!==k?b.row(a).node():b.rows().nodes().flatten().toArray()};this.fnGetPosition=function(a){var b=this.api(!0),c=a.nodeName.toUpperCase();return"TR"==c?b.row(a).index():"TD"==c||"TH"==c?(a=b.cell(a).index(),
+[a.row,a.columnVisible,a.column]):null};this.fnIsOpen=function(a){return this.api(!0).row(a).child.isShown()};this.fnOpen=function(a,b,c){return this.api(!0).row(a).child(b,c).show().child()[0]};this.fnPageChange=function(a,b){var c=this.api(!0).page(a);(b===k||b)&&c.draw(!1)};this.fnSetColumnVis=function(a,b,c){a=this.api(!0).column(a).visible(b);(c===k||c)&&a.columns.adjust().draw()};this.fnSettings=function(){return xa(this[v.iApiIndex])};this.fnSort=function(a){this.api(!0).order(a).draw()};this.fnSortListener=
+function(a,b,c){this.api(!0).order.listener(a,b,c)};this.fnUpdate=function(a,b,c,d,e){var h=this.api(!0);c===k||null===c?h.row(b).data(a):h.cell(b,c).data(a);(e===k||e)&&h.columns.adjust();(d===k||d)&&h.draw();return 0};this.fnVersionCheck=v.fnVersionCheck;var b=this,c=a===k,d=this.length;c&&(a={});this.oApi=this.internal=v.internal;for(var e in m.ext.internal)e&&(this[e]=Nb(e));this.each(function(){var e={},e=1<d?Lb(e,a,!0):a,g=0,j,i=this.getAttribute("id"),n=!1,l=m.defaults,q=h(this);if("table"!=
+this.nodeName.toLowerCase())L(null,0,"Non-table node initialisation ("+this.nodeName+")",2);else{eb(l);fb(l.column);K(l,l,!0);K(l.column,l.column,!0);K(l,h.extend(e,q.data()));var t=m.settings,g=0;for(j=t.length;g<j;g++){var p=t[g];if(p.nTable==this||p.nTHead.parentNode==this||p.nTFoot&&p.nTFoot.parentNode==this){g=e.bRetrieve!==k?e.bRetrieve:l.bRetrieve;if(c||g)return p.oInstance;if(e.bDestroy!==k?e.bDestroy:l.bDestroy){p.oInstance.fnDestroy();break}else{L(p,0,"Cannot reinitialise DataTable",3);
+return}}if(p.sTableId==this.id){t.splice(g,1);break}}if(null===i||""===i)this.id=i="DataTables_Table_"+m.ext._unique++;var o=h.extend(!0,{},m.models.oSettings,{sDestroyWidth:q[0].style.width,sInstance:i,sTableId:i});o.nTable=this;o.oApi=b.internal;o.oInit=e;t.push(o);o.oInstance=1===b.length?b:q.dataTable();eb(e);e.oLanguage&&Da(e.oLanguage);e.aLengthMenu&&!e.iDisplayLength&&(e.iDisplayLength=h.isArray(e.aLengthMenu[0])?e.aLengthMenu[0][0]:e.aLengthMenu[0]);e=Lb(h.extend(!0,{},l),e);E(o.oFeatures,
+e,"bPaginate bLengthChange bFilter bSort bSortMulti bInfo bProcessing bAutoWidth bSortClasses bServerSide bDeferRender".split(" "));E(o,e,["asStripeClasses","ajax","fnServerData","fnFormatNumber","sServerMethod","aaSorting","aaSortingFixed","aLengthMenu","sPaginationType","sAjaxSource","sAjaxDataProp","iStateDuration","sDom","bSortCellsTop","iTabIndex","fnStateLoadCallback","fnStateSaveCallback","renderer","searchDelay","rowId",["iCookieDuration","iStateDuration"],["oSearch","oPreviousSearch"],["aoSearchCols",
+"aoPreSearchCols"],["iDisplayLength","_iDisplayLength"],["bJQueryUI","bJUI"]]);E(o.oScroll,e,[["sScrollX","sX"],["sScrollXInner","sXInner"],["sScrollY","sY"],["bScrollCollapse","bCollapse"]]);E(o.oLanguage,e,"fnInfoCallback");z(o,"aoDrawCallback",e.fnDrawCallback,"user");z(o,"aoServerParams",e.fnServerParams,"user");z(o,"aoStateSaveParams",e.fnStateSaveParams,"user");z(o,"aoStateLoadParams",e.fnStateLoadParams,"user");z(o,"aoStateLoaded",e.fnStateLoaded,"user");z(o,"aoRowCallback",e.fnRowCallback,
+"user");z(o,"aoRowCreatedCallback",e.fnCreatedRow,"user");z(o,"aoHeaderCallback",e.fnHeaderCallback,"user");z(o,"aoFooterCallback",e.fnFooterCallback,"user");z(o,"aoInitComplete",e.fnInitComplete,"user");z(o,"aoPreDrawCallback",e.fnPreDrawCallback,"user");o.rowIdFn=Q(e.rowId);gb(o);i=o.oClasses;e.bJQueryUI?(h.extend(i,m.ext.oJUIClasses,e.oClasses),e.sDom===l.sDom&&"lfrtip"===l.sDom&&(o.sDom='<"H"lfr>t<"F"ip>'),o.renderer)?h.isPlainObject(o.renderer)&&!o.renderer.header&&(o.renderer.header="jqueryui"):
+o.renderer="jqueryui":h.extend(i,m.ext.classes,e.oClasses);q.addClass(i.sTable);o.iInitDisplayStart===k&&(o.iInitDisplayStart=e.iDisplayStart,o._iDisplayStart=e.iDisplayStart);null!==e.iDeferLoading&&(o.bDeferLoading=!0,g=h.isArray(e.iDeferLoading),o._iRecordsDisplay=g?e.iDeferLoading[0]:e.iDeferLoading,o._iRecordsTotal=g?e.iDeferLoading[1]:e.iDeferLoading);var r=o.oLanguage;h.extend(!0,r,e.oLanguage);""!==r.sUrl&&(h.ajax({dataType:"json",url:r.sUrl,success:function(a){Da(a);K(l.oLanguage,a);h.extend(true,
+r,a);ga(o)},error:function(){ga(o)}}),n=!0);null===e.asStripeClasses&&(o.asStripeClasses=[i.sStripeOdd,i.sStripeEven]);var g=o.asStripeClasses,v=q.children("tbody").find("tr").eq(0);-1!==h.inArray(!0,h.map(g,function(a){return v.hasClass(a)}))&&(h("tbody tr",this).removeClass(g.join(" ")),o.asDestroyStripes=g.slice());t=[];g=this.getElementsByTagName("thead");0!==g.length&&(da(o.aoHeader,g[0]),t=qa(o));if(null===e.aoColumns){p=[];g=0;for(j=t.length;g<j;g++)p.push(null)}else p=e.aoColumns;g=0;for(j=
+p.length;g<j;g++)Ea(o,t?t[g]:null);ib(o,e.aoColumnDefs,p,function(a,b){ja(o,a,b)});if(v.length){var s=function(a,b){return a.getAttribute("data-"+b)!==null?b:null};h(v[0]).children("th, td").each(function(a,b){var c=o.aoColumns[a];if(c.mData===a){var d=s(b,"sort")||s(b,"order"),e=s(b,"filter")||s(b,"search");if(d!==null||e!==null){c.mData={_:a+".display",sort:d!==null?a+".@data-"+d:k,type:d!==null?a+".@data-"+d:k,filter:e!==null?a+".@data-"+e:k};ja(o,a)}}})}var w=o.oFeatures;e.bStateSave&&(w.bStateSave=
+!0,Kb(o,e),z(o,"aoDrawCallback",wa,"state_save"));if(e.aaSorting===k){t=o.aaSorting;g=0;for(j=t.length;g<j;g++)t[g][1]=o.aoColumns[g].asSorting[0]}va(o);w.bSort&&z(o,"aoDrawCallback",function(){if(o.bSorted){var a=V(o),b={};h.each(a,function(a,c){b[c.src]=c.dir});u(o,null,"order",[o,a,b]);Jb(o)}});z(o,"aoDrawCallback",function(){(o.bSorted||y(o)==="ssp"||w.bDeferRender)&&va(o)},"sc");g=q.children("caption").each(function(){this._captionSide=q.css("caption-side")});j=q.children("thead");0===j.length&&
+(j=h("<thead/>").appendTo(this));o.nTHead=j[0];j=q.children("tbody");0===j.length&&(j=h("<tbody/>").appendTo(this));o.nTBody=j[0];j=q.children("tfoot");if(0===j.length&&0<g.length&&(""!==o.oScroll.sX||""!==o.oScroll.sY))j=h("<tfoot/>").appendTo(this);0===j.length||0===j.children().length?q.addClass(i.sNoFooter):0<j.length&&(o.nTFoot=j[0],da(o.aoFooter,o.nTFoot));if(e.aaData)for(g=0;g<e.aaData.length;g++)N(o,e.aaData[g]);else(o.bDeferLoading||"dom"==y(o))&&ma(o,h(o.nTBody).children("tr"));o.aiDisplay=
+o.aiDisplayMaster.slice();o.bInitialised=!0;!1===n&&ga(o)}});b=null;return this},v,r,p,s,Ya={},Ob=/[\r\n]/g,Aa=/<.*?>/g,ac=/^[\w\+\-]/,bc=/[\w\+\-]$/,cc=RegExp("(\\/|\\.|\\*|\\+|\\?|\\||\\(|\\)|\\[|\\]|\\{|\\}|\\\\|\\$|\\^|\\-)","g"),Xa=/[',$£€¥%\u2009\u202F\u20BD\u20a9\u20BArfk]/gi,M=function(a){return!a||!0===a||"-"===a?!0:!1},Pb=function(a){var b=parseInt(a,10);return!isNaN(b)&&isFinite(a)?b:null},Qb=function(a,b){Ya[b]||(Ya[b]=RegExp(Qa(b),"g"));return"string"===typeof a&&"."!==b?a.replace(/\./g,
+"").replace(Ya[b],"."):a},Za=function(a,b,c){var d="string"===typeof a;if(M(a))return!0;b&&d&&(a=Qb(a,b));c&&d&&(a=a.replace(Xa,""));return!isNaN(parseFloat(a))&&isFinite(a)},Rb=function(a,b,c){return M(a)?!0:!(M(a)||"string"===typeof a)?null:Za(a.replace(Aa,""),b,c)?!0:null},G=function(a,b,c){var d=[],e=0,f=a.length;if(c!==k)for(;e<f;e++)a[e]&&a[e][b]&&d.push(a[e][b][c]);else for(;e<f;e++)a[e]&&d.push(a[e][b]);return d},ha=function(a,b,c,d){var e=[],f=0,g=b.length;if(d!==k)for(;f<g;f++)a[b[f]][c]&&
+e.push(a[b[f]][c][d]);else for(;f<g;f++)e.push(a[b[f]][c]);return e},W=function(a,b){var c=[],d;b===k?(b=0,d=a):(d=b,b=a);for(var e=b;e<d;e++)c.push(e);return c},Sb=function(a){for(var b=[],c=0,d=a.length;c<d;c++)a[c]&&b.push(a[c]);return b},pa=function(a){var b=[],c,d,e=a.length,f,g=0;d=0;a:for(;d<e;d++){c=a[d];for(f=0;f<g;f++)if(b[f]===c)continue a;b.push(c);g++}return b};m.util={throttle:function(a,b){var c=b!==k?b:200,d,e;return function(){var b=this,g=+new Date,h=arguments;d&&g<d+c?(clearTimeout(e),
+e=setTimeout(function(){d=k;a.apply(b,h)},c)):(d=g,a.apply(b,h))}},escapeRegex:function(a){return a.replace(cc,"\\$1")}};var A=function(a,b,c){a[b]!==k&&(a[c]=a[b])},ba=/\[.*?\]$/,U=/\(\)$/,Qa=m.util.escapeRegex,ua=h("<div>")[0],Zb=ua.textContent!==k,$b=/<.*?>/g,Oa=m.util.throttle,Tb=[],w=Array.prototype,dc=function(a){var b,c,d=m.settings,e=h.map(d,function(a){return a.nTable});if(a){if(a.nTable&&a.oApi)return[a];if(a.nodeName&&"table"===a.nodeName.toLowerCase())return b=h.inArray(a,e),-1!==b?[d[b]]:
+null;if(a&&"function"===typeof a.settings)return a.settings().toArray();"string"===typeof a?c=h(a):a instanceof h&&(c=a)}else return[];if(c)return c.map(function(){b=h.inArray(this,e);return-1!==b?d[b]:null}).toArray()};r=function(a,b){if(!(this instanceof r))return new r(a,b);var c=[],d=function(a){(a=dc(a))&&(c=c.concat(a))};if(h.isArray(a))for(var e=0,f=a.length;e<f;e++)d(a[e]);else d(a);this.context=pa(c);b&&h.merge(this,b);this.selector={rows:null,cols:null,opts:null};r.extend(this,this,Tb)};
+m.Api=r;h.extend(r.prototype,{any:function(){return 0!==this.count()},concat:w.concat,context:[],count:function(){return this.flatten().length},each:function(a){for(var b=0,c=this.length;b<c;b++)a.call(this,this[b],b,this);return this},eq:function(a){var b=this.context;return b.length>a?new r(b[a],this[a]):null},filter:function(a){var b=[];if(w.filter)b=w.filter.call(this,a,this);else for(var c=0,d=this.length;c<d;c++)a.call(this,this[c],c,this)&&b.push(this[c]);return new r(this.context,b)},flatten:function(){var a=
+[];return new r(this.context,a.concat.apply(a,this.toArray()))},join:w.join,indexOf:w.indexOf||function(a,b){for(var c=b||0,d=this.length;c<d;c++)if(this[c]===a)return c;return-1},iterator:function(a,b,c,d){var e=[],f,g,h,i,n,l=this.context,m,t,p=this.selector;"string"===typeof a&&(d=c,c=b,b=a,a=!1);g=0;for(h=l.length;g<h;g++){var o=new r(l[g]);if("table"===b)f=c.call(o,l[g],g),f!==k&&e.push(f);else if("columns"===b||"rows"===b)f=c.call(o,l[g],this[g],g),f!==k&&e.push(f);else if("column"===b||"column-rows"===
+b||"row"===b||"cell"===b){t=this[g];"column-rows"===b&&(m=Ba(l[g],p.opts));i=0;for(n=t.length;i<n;i++)f=t[i],f="cell"===b?c.call(o,l[g],f.row,f.column,g,i):c.call(o,l[g],f,g,i,m),f!==k&&e.push(f)}}return e.length||d?(a=new r(l,a?e.concat.apply([],e):e),b=a.selector,b.rows=p.rows,b.cols=p.cols,b.opts=p.opts,a):this},lastIndexOf:w.lastIndexOf||function(a,b){return this.indexOf.apply(this.toArray.reverse(),arguments)},length:0,map:function(a){var b=[];if(w.map)b=w.map.call(this,a,this);else for(var c=
+0,d=this.length;c<d;c++)b.push(a.call(this,this[c],c));return new r(this.context,b)},pluck:function(a){return this.map(function(b){return b[a]})},pop:w.pop,push:w.push,reduce:w.reduce||function(a,b){return hb(this,a,b,0,this.length,1)},reduceRight:w.reduceRight||function(a,b){return hb(this,a,b,this.length-1,-1,-1)},reverse:w.reverse,selector:null,shift:w.shift,sort:w.sort,splice:w.splice,toArray:function(){return w.slice.call(this)},to$:function(){return h(this)},toJQuery:function(){return h(this)},
+unique:function(){return new r(this.context,pa(this))},unshift:w.unshift});r.extend=function(a,b,c){if(c.length&&b&&(b instanceof r||b.__dt_wrapper)){var d,e,f,g=function(a,b,c){return function(){var d=b.apply(a,arguments);r.extend(d,d,c.methodExt);return d}};d=0;for(e=c.length;d<e;d++)f=c[d],b[f.name]="function"===typeof f.val?g(a,f.val,f):h.isPlainObject(f.val)?{}:f.val,b[f.name].__dt_wrapper=!0,r.extend(a,b[f.name],f.propExt)}};r.register=p=function(a,b){if(h.isArray(a))for(var c=0,d=a.length;c<
+d;c++)r.register(a[c],b);else for(var e=a.split("."),f=Tb,g,j,c=0,d=e.length;c<d;c++){g=(j=-1!==e[c].indexOf("()"))?e[c].replace("()",""):e[c];var i;a:{i=0;for(var n=f.length;i<n;i++)if(f[i].name===g){i=f[i];break a}i=null}i||(i={name:g,val:{},methodExt:[],propExt:[]},f.push(i));c===d-1?i.val=b:f=j?i.methodExt:i.propExt}};r.registerPlural=s=function(a,b,c){r.register(a,c);r.register(b,function(){var a=c.apply(this,arguments);return a===this?this:a instanceof r?a.length?h.isArray(a[0])?new r(a.context,
+a[0]):a[0]:k:a})};p("tables()",function(a){var b;if(a){b=r;var c=this.context;if("number"===typeof a)a=[c[a]];else var d=h.map(c,function(a){return a.nTable}),a=h(d).filter(a).map(function(){var a=h.inArray(this,d);return c[a]}).toArray();b=new b(a)}else b=this;return b});p("table()",function(a){var a=this.tables(a),b=a.context;return b.length?new r(b[0]):a});s("tables().nodes()","table().node()",function(){return this.iterator("table",function(a){return a.nTable},1)});s("tables().body()","table().body()",
+function(){return this.iterator("table",function(a){return a.nTBody},1)});s("tables().header()","table().header()",function(){return this.iterator("table",function(a){return a.nTHead},1)});s("tables().footer()","table().footer()",function(){return this.iterator("table",function(a){return a.nTFoot},1)});s("tables().containers()","table().container()",function(){return this.iterator("table",function(a){return a.nTableWrapper},1)});p("draw()",function(a){return this.iterator("table",function(b){"page"===
+a?O(b):("string"===typeof a&&(a="full-hold"===a?!1:!0),T(b,!1===a))})});p("page()",function(a){return a===k?this.page.info().page:this.iterator("table",function(b){Ta(b,a)})});p("page.info()",function(){if(0===this.context.length)return k;var a=this.context[0],b=a._iDisplayStart,c=a.oFeatures.bPaginate?a._iDisplayLength:-1,d=a.fnRecordsDisplay(),e=-1===c;return{page:e?0:Math.floor(b/c),pages:e?1:Math.ceil(d/c),start:b,end:a.fnDisplayEnd(),length:c,recordsTotal:a.fnRecordsTotal(),recordsDisplay:d,
+serverSide:"ssp"===y(a)}});p("page.len()",function(a){return a===k?0!==this.context.length?this.context[0]._iDisplayLength:k:this.iterator("table",function(b){Ra(b,a)})});var Ub=function(a,b,c){if(c){var d=new r(a);d.one("draw",function(){c(d.ajax.json())})}if("ssp"==y(a))T(a,b);else{C(a,!0);var e=a.jqXHR;e&&4!==e.readyState&&e.abort();ra(a,[],function(c){na(a);for(var c=sa(a,c),d=0,e=c.length;d<e;d++)N(a,c[d]);T(a,b);C(a,!1)})}};p("ajax.json()",function(){var a=this.context;if(0<a.length)return a[0].json});
+p("ajax.params()",function(){var a=this.context;if(0<a.length)return a[0].oAjaxData});p("ajax.reload()",function(a,b){return this.iterator("table",function(c){Ub(c,!1===b,a)})});p("ajax.url()",function(a){var b=this.context;if(a===k){if(0===b.length)return k;b=b[0];return b.ajax?h.isPlainObject(b.ajax)?b.ajax.url:b.ajax:b.sAjaxSource}return this.iterator("table",function(b){h.isPlainObject(b.ajax)?b.ajax.url=a:b.ajax=a})});p("ajax.url().load()",function(a,b){return this.iterator("table",function(c){Ub(c,
+!1===b,a)})});var $a=function(a,b,c,d,e){var f=[],g,j,i,n,l,m;i=typeof b;if(!b||"string"===i||"function"===i||b.length===k)b=[b];i=0;for(n=b.length;i<n;i++){j=b[i]&&b[i].split?b[i].split(","):[b[i]];l=0;for(m=j.length;l<m;l++)(g=c("string"===typeof j[l]?h.trim(j[l]):j[l]))&&g.length&&(f=f.concat(g))}a=v.selector[a];if(a.length){i=0;for(n=a.length;i<n;i++)f=a[i](d,e,f)}return pa(f)},ab=function(a){a||(a={});a.filter&&a.search===k&&(a.search=a.filter);return h.extend({search:"none",order:"current",
+page:"all"},a)},bb=function(a){for(var b=0,c=a.length;b<c;b++)if(0<a[b].length)return a[0]=a[b],a[0].length=1,a.length=1,a.context=[a.context[b]],a;a.length=0;return a},Ba=function(a,b){var c,d,e,f=[],g=a.aiDisplay;c=a.aiDisplayMaster;var j=b.search;d=b.order;e=b.page;if("ssp"==y(a))return"removed"===j?[]:W(0,c.length);if("current"==e){c=a._iDisplayStart;for(d=a.fnDisplayEnd();c<d;c++)f.push(g[c])}else if("current"==d||"applied"==d)f="none"==j?c.slice():"applied"==j?g.slice():h.map(c,function(a){return-1===
+h.inArray(a,g)?a:null});else if("index"==d||"original"==d){c=0;for(d=a.aoData.length;c<d;c++)"none"==j?f.push(c):(e=h.inArray(c,g),(-1===e&&"removed"==j||0<=e&&"applied"==j)&&f.push(c))}return f};p("rows()",function(a,b){a===k?a="":h.isPlainObject(a)&&(b=a,a="");var b=ab(b),c=this.iterator("table",function(c){var e=b;return $a("row",a,function(a){var b=Pb(a);if(b!==null&&!e)return[b];var j=Ba(c,e);if(b!==null&&h.inArray(b,j)!==-1)return[b];if(!a)return j;if(typeof a==="function")return h.map(j,function(b){var e=
+c.aoData[b];return a(b,e._aData,e.nTr)?b:null});b=Sb(ha(c.aoData,j,"nTr"));if(a.nodeName){if(a._DT_RowIndex!==k)return[a._DT_RowIndex];if(a._DT_CellIndex)return[a._DT_CellIndex.row];b=h(a).closest("*[data-dt-row]");return b.length?[b.data("dt-row")]:[]}if(typeof a==="string"&&a.charAt(0)==="#"){j=c.aIds[a.replace(/^#/,"")];if(j!==k)return[j.idx]}return h(b).filter(a).map(function(){return this._DT_RowIndex}).toArray()},c,e)},1);c.selector.rows=a;c.selector.opts=b;return c});p("rows().nodes()",function(){return this.iterator("row",
+function(a,b){return a.aoData[b].nTr||k},1)});p("rows().data()",function(){return this.iterator(!0,"rows",function(a,b){return ha(a.aoData,b,"_aData")},1)});s("rows().cache()","row().cache()",function(a){return this.iterator("row",function(b,c){var d=b.aoData[c];return"search"===a?d._aFilterData:d._aSortData},1)});s("rows().invalidate()","row().invalidate()",function(a){return this.iterator("row",function(b,c){ca(b,c,a)})});s("rows().indexes()","row().index()",function(){return this.iterator("row",
+function(a,b){return b},1)});s("rows().ids()","row().id()",function(a){for(var b=[],c=this.context,d=0,e=c.length;d<e;d++)for(var f=0,g=this[d].length;f<g;f++){var h=c[d].rowIdFn(c[d].aoData[this[d][f]]._aData);b.push((!0===a?"#":"")+h)}return new r(c,b)});s("rows().remove()","row().remove()",function(){var a=this;this.iterator("row",function(b,c,d){var e=b.aoData,f=e[c],g,h,i,n,l;e.splice(c,1);g=0;for(h=e.length;g<h;g++)if(i=e[g],l=i.anCells,null!==i.nTr&&(i.nTr._DT_RowIndex=g),null!==l){i=0;for(n=
+l.length;i<n;i++)l[i]._DT_CellIndex.row=g}oa(b.aiDisplayMaster,c);oa(b.aiDisplay,c);oa(a[d],c,!1);Sa(b);c=b.rowIdFn(f._aData);c!==k&&delete b.aIds[c]});this.iterator("table",function(a){for(var c=0,d=a.aoData.length;c<d;c++)a.aoData[c].idx=c});return this});p("rows.add()",function(a){var b=this.iterator("table",function(b){var c,f,g,h=[];f=0;for(g=a.length;f<g;f++)c=a[f],c.nodeName&&"TR"===c.nodeName.toUpperCase()?h.push(ma(b,c)[0]):h.push(N(b,c));return h},1),c=this.rows(-1);c.pop();h.merge(c,b);
+return c});p("row()",function(a,b){return bb(this.rows(a,b))});p("row().data()",function(a){var b=this.context;if(a===k)return b.length&&this.length?b[0].aoData[this[0]]._aData:k;b[0].aoData[this[0]]._aData=a;ca(b[0],this[0],"data");return this});p("row().node()",function(){var a=this.context;return a.length&&this.length?a[0].aoData[this[0]].nTr||null:null});p("row.add()",function(a){a instanceof h&&a.length&&(a=a[0]);var b=this.iterator("table",function(b){return a.nodeName&&"TR"===a.nodeName.toUpperCase()?
+ma(b,a)[0]:N(b,a)});return this.row(b[0])});var cb=function(a,b){var c=a.context;if(c.length&&(c=c[0].aoData[b!==k?b:a[0]])&&c._details)c._details.remove(),c._detailsShow=k,c._details=k},Vb=function(a,b){var c=a.context;if(c.length&&a.length){var d=c[0].aoData[a[0]];if(d._details){(d._detailsShow=b)?d._details.insertAfter(d.nTr):d._details.detach();var e=c[0],f=new r(e),g=e.aoData;f.off("draw.dt.DT_details column-visibility.dt.DT_details destroy.dt.DT_details");0<G(g,"_details").length&&(f.on("draw.dt.DT_details",
+function(a,b){e===b&&f.rows({page:"current"}).eq(0).each(function(a){a=g[a];a._detailsShow&&a._details.insertAfter(a.nTr)})}),f.on("column-visibility.dt.DT_details",function(a,b){if(e===b)for(var c,d=aa(b),f=0,h=g.length;f<h;f++)c=g[f],c._details&&c._details.children("td[colspan]").attr("colspan",d)}),f.on("destroy.dt.DT_details",function(a,b){if(e===b)for(var c=0,d=g.length;c<d;c++)g[c]._details&&cb(f,c)}))}}};p("row().child()",function(a,b){var c=this.context;if(a===k)return c.length&&this.length?
+c[0].aoData[this[0]]._details:k;if(!0===a)this.child.show();else if(!1===a)cb(this);else if(c.length&&this.length){var d=c[0],c=c[0].aoData[this[0]],e=[],f=function(a,b){if(h.isArray(a)||a instanceof h)for(var c=0,k=a.length;c<k;c++)f(a[c],b);else a.nodeName&&"tr"===a.nodeName.toLowerCase()?e.push(a):(c=h("<tr><td/></tr>").addClass(b),h("td",c).addClass(b).html(a)[0].colSpan=aa(d),e.push(c[0]))};f(a,b);c._details&&c._details.remove();c._details=h(e);c._detailsShow&&c._details.insertAfter(c.nTr)}return this});
+p(["row().child.show()","row().child().show()"],function(){Vb(this,!0);return this});p(["row().child.hide()","row().child().hide()"],function(){Vb(this,!1);return this});p(["row().child.remove()","row().child().remove()"],function(){cb(this);return this});p("row().child.isShown()",function(){var a=this.context;return a.length&&this.length?a[0].aoData[this[0]]._detailsShow||!1:!1});var ec=/^(.+):(name|visIdx|visible)$/,Wb=function(a,b,c,d,e){for(var c=[],d=0,f=e.length;d<f;d++)c.push(B(a,e[d],b));
+return c};p("columns()",function(a,b){a===k?a="":h.isPlainObject(a)&&(b=a,a="");var b=ab(b),c=this.iterator("table",function(c){var e=a,f=b,g=c.aoColumns,j=G(g,"sName"),i=G(g,"nTh");return $a("column",e,function(a){var b=Pb(a);if(a==="")return W(g.length);if(b!==null)return[b>=0?b:g.length+b];if(typeof a==="function"){var e=Ba(c,f);return h.map(g,function(b,f){return a(f,Wb(c,f,0,0,e),i[f])?f:null})}var k=typeof a==="string"?a.match(ec):"";if(k)switch(k[2]){case "visIdx":case "visible":b=parseInt(k[1],
+10);if(b<0){var m=h.map(g,function(a,b){return a.bVisible?b:null});return[m[m.length+b]]}return[Z(c,b)];case "name":return h.map(j,function(a,b){return a===k[1]?b:null});default:return[]}if(a.nodeName&&a._DT_CellIndex)return[a._DT_CellIndex.column];b=h(i).filter(a).map(function(){return h.inArray(this,i)}).toArray();if(b.length||!a.nodeName)return b;b=h(a).closest("*[data-dt-column]");return b.length?[b.data("dt-column")]:[]},c,f)},1);c.selector.cols=a;c.selector.opts=b;return c});s("columns().header()",
+"column().header()",function(){return this.iterator("column",function(a,b){return a.aoColumns[b].nTh},1)});s("columns().footer()","column().footer()",function(){return this.iterator("column",function(a,b){return a.aoColumns[b].nTf},1)});s("columns().data()","column().data()",function(){return this.iterator("column-rows",Wb,1)});s("columns().dataSrc()","column().dataSrc()",function(){return this.iterator("column",function(a,b){return a.aoColumns[b].mData},1)});s("columns().cache()","column().cache()",
+function(a){return this.iterator("column-rows",function(b,c,d,e,f){return ha(b.aoData,f,"search"===a?"_aFilterData":"_aSortData",c)},1)});s("columns().nodes()","column().nodes()",function(){return this.iterator("column-rows",function(a,b,c,d,e){return ha(a.aoData,e,"anCells",b)},1)});s("columns().visible()","column().visible()",function(a,b){var c=this.iterator("column",function(b,c){if(a===k)return b.aoColumns[c].bVisible;var f=b.aoColumns,g=f[c],j=b.aoData,i,n,l;if(a!==k&&g.bVisible!==a){if(a){var m=
+h.inArray(!0,G(f,"bVisible"),c+1);i=0;for(n=j.length;i<n;i++)l=j[i].nTr,f=j[i].anCells,l&&l.insertBefore(f[c],f[m]||null)}else h(G(b.aoData,"anCells",c)).detach();g.bVisible=a;ea(b,b.aoHeader);ea(b,b.aoFooter);wa(b)}});a!==k&&(this.iterator("column",function(c,e){u(c,null,"column-visibility",[c,e,a,b])}),(b===k||b)&&this.columns.adjust());return c});s("columns().indexes()","column().index()",function(a){return this.iterator("column",function(b,c){return"visible"===a?$(b,c):c},1)});p("columns.adjust()",
+function(){return this.iterator("table",function(a){Y(a)},1)});p("column.index()",function(a,b){if(0!==this.context.length){var c=this.context[0];if("fromVisible"===a||"toData"===a)return Z(c,b);if("fromData"===a||"toVisible"===a)return $(c,b)}});p("column()",function(a,b){return bb(this.columns(a,b))});p("cells()",function(a,b,c){h.isPlainObject(a)&&(a.row===k?(c=a,a=null):(c=b,b=null));h.isPlainObject(b)&&(c=b,b=null);if(null===b||b===k)return this.iterator("table",function(b){var d=a,e=ab(c),f=
+b.aoData,g=Ba(b,e),j=Sb(ha(f,g,"anCells")),i=h([].concat.apply([],j)),l,n=b.aoColumns.length,m,p,r,u,v,s;return $a("cell",d,function(a){var c=typeof a==="function";if(a===null||a===k||c){m=[];p=0;for(r=g.length;p<r;p++){l=g[p];for(u=0;u<n;u++){v={row:l,column:u};if(c){s=f[l];a(v,B(b,l,u),s.anCells?s.anCells[u]:null)&&m.push(v)}else m.push(v)}}return m}if(h.isPlainObject(a))return[a];c=i.filter(a).map(function(a,b){return{row:b._DT_CellIndex.row,column:b._DT_CellIndex.column}}).toArray();if(c.length||
+!a.nodeName)return c;s=h(a).closest("*[data-dt-row]");return s.length?[{row:s.data("dt-row"),column:s.data("dt-column")}]:[]},b,e)});var d=this.columns(b,c),e=this.rows(a,c),f,g,j,i,n,l=this.iterator("table",function(a,b){f=[];g=0;for(j=e[b].length;g<j;g++){i=0;for(n=d[b].length;i<n;i++)f.push({row:e[b][g],column:d[b][i]})}return f},1);h.extend(l.selector,{cols:b,rows:a,opts:c});return l});s("cells().nodes()","cell().node()",function(){return this.iterator("cell",function(a,b,c){return(a=a.aoData[b])&&
+a.anCells?a.anCells[c]:k},1)});p("cells().data()",function(){return this.iterator("cell",function(a,b,c){return B(a,b,c)},1)});s("cells().cache()","cell().cache()",function(a){a="search"===a?"_aFilterData":"_aSortData";return this.iterator("cell",function(b,c,d){return b.aoData[c][a][d]},1)});s("cells().render()","cell().render()",function(a){return this.iterator("cell",function(b,c,d){return B(b,c,d,a)},1)});s("cells().indexes()","cell().index()",function(){return this.iterator("cell",function(a,
+b,c){return{row:b,column:c,columnVisible:$(a,c)}},1)});s("cells().invalidate()","cell().invalidate()",function(a){return this.iterator("cell",function(b,c,d){ca(b,c,a,d)})});p("cell()",function(a,b,c){return bb(this.cells(a,b,c))});p("cell().data()",function(a){var b=this.context,c=this[0];if(a===k)return b.length&&c.length?B(b[0],c[0].row,c[0].column):k;jb(b[0],c[0].row,c[0].column,a);ca(b[0],c[0].row,"data",c[0].column);return this});p("order()",function(a,b){var c=this.context;if(a===k)return 0!==
+c.length?c[0].aaSorting:k;"number"===typeof a?a=[[a,b]]:a.length&&!h.isArray(a[0])&&(a=Array.prototype.slice.call(arguments));return this.iterator("table",function(b){b.aaSorting=a.slice()})});p("order.listener()",function(a,b,c){return this.iterator("table",function(d){Ma(d,a,b,c)})});p("order.fixed()",function(a){if(!a){var b=this.context,b=b.length?b[0].aaSortingFixed:k;return h.isArray(b)?{pre:b}:b}return this.iterator("table",function(b){b.aaSortingFixed=h.extend(!0,{},a)})});p(["columns().order()",
+"column().order()"],function(a){var b=this;return this.iterator("table",function(c,d){var e=[];h.each(b[d],function(b,c){e.push([c,a])});c.aaSorting=e})});p("search()",function(a,b,c,d){var e=this.context;return a===k?0!==e.length?e[0].oPreviousSearch.sSearch:k:this.iterator("table",function(e){e.oFeatures.bFilter&&fa(e,h.extend({},e.oPreviousSearch,{sSearch:a+"",bRegex:null===b?!1:b,bSmart:null===c?!0:c,bCaseInsensitive:null===d?!0:d}),1)})});s("columns().search()","column().search()",function(a,
+b,c,d){return this.iterator("column",function(e,f){var g=e.aoPreSearchCols;if(a===k)return g[f].sSearch;e.oFeatures.bFilter&&(h.extend(g[f],{sSearch:a+"",bRegex:null===b?!1:b,bSmart:null===c?!0:c,bCaseInsensitive:null===d?!0:d}),fa(e,e.oPreviousSearch,1))})});p("state()",function(){return this.context.length?this.context[0].oSavedState:null});p("state.clear()",function(){return this.iterator("table",function(a){a.fnStateSaveCallback.call(a.oInstance,a,{})})});p("state.loaded()",function(){return this.context.length?
+this.context[0].oLoadedState:null});p("state.save()",function(){return this.iterator("table",function(a){wa(a)})});m.versionCheck=m.fnVersionCheck=function(a){for(var b=m.version.split("."),a=a.split("."),c,d,e=0,f=a.length;e<f;e++)if(c=parseInt(b[e],10)||0,d=parseInt(a[e],10)||0,c!==d)return c>d;return!0};m.isDataTable=m.fnIsDataTable=function(a){var b=h(a).get(0),c=!1;h.each(m.settings,function(a,e){var f=e.nScrollHead?h("table",e.nScrollHead)[0]:null,g=e.nScrollFoot?h("table",e.nScrollFoot)[0]:
+null;if(e.nTable===b||f===b||g===b)c=!0});return c};m.tables=m.fnTables=function(a){var b=!1;h.isPlainObject(a)&&(b=a.api,a=a.visible);var c=h.map(m.settings,function(b){if(!a||a&&h(b.nTable).is(":visible"))return b.nTable});return b?new r(c):c};m.camelToHungarian=K;p("$()",function(a,b){var c=this.rows(b).nodes(),c=h(c);return h([].concat(c.filter(a).toArray(),c.find(a).toArray()))});h.each(["on","one","off"],function(a,b){p(b+"()",function(){var a=Array.prototype.slice.call(arguments);a[0].match(/\.dt\b/)||
+(a[0]+=".dt");var d=h(this.tables().nodes());d[b].apply(d,a);return this})});p("clear()",function(){return this.iterator("table",function(a){na(a)})});p("settings()",function(){return new r(this.context,this.context)});p("init()",function(){var a=this.context;return a.length?a[0].oInit:null});p("data()",function(){return this.iterator("table",function(a){return G(a.aoData,"_aData")}).flatten()});p("destroy()",function(a){a=a||!1;return this.iterator("table",function(b){var c=b.nTableWrapper.parentNode,
+d=b.oClasses,e=b.nTable,f=b.nTBody,g=b.nTHead,j=b.nTFoot,i=h(e),f=h(f),k=h(b.nTableWrapper),l=h.map(b.aoData,function(a){return a.nTr}),p;b.bDestroying=!0;u(b,"aoDestroyCallback","destroy",[b]);a||(new r(b)).columns().visible(!0);k.unbind(".DT").find(":not(tbody *)").unbind(".DT");h(D).unbind(".DT-"+b.sInstance);e!=g.parentNode&&(i.children("thead").detach(),i.append(g));j&&e!=j.parentNode&&(i.children("tfoot").detach(),i.append(j));b.aaSorting=[];b.aaSortingFixed=[];va(b);h(l).removeClass(b.asStripeClasses.join(" "));
+h("th, td",g).removeClass(d.sSortable+" "+d.sSortableAsc+" "+d.sSortableDesc+" "+d.sSortableNone);b.bJUI&&(h("th span."+d.sSortIcon+", td span."+d.sSortIcon,g).detach(),h("th, td",g).each(function(){var a=h("div."+d.sSortJUIWrapper,this);h(this).append(a.contents());a.detach()}));f.children().detach();f.append(l);g=a?"remove":"detach";i[g]();k[g]();!a&&c&&(c.insertBefore(e,b.nTableReinsertBefore),i.css("width",b.sDestroyWidth).removeClass(d.sTable),(p=b.asDestroyStripes.length)&&f.children().each(function(a){h(this).addClass(b.asDestroyStripes[a%
+p])}));c=h.inArray(b,m.settings);-1!==c&&m.settings.splice(c,1)})});h.each(["column","row","cell"],function(a,b){p(b+"s().every()",function(a){var d=this.selector.opts,e=this;return this.iterator(b,function(f,g,h,i,n){a.call(e[b](g,"cell"===b?h:d,"cell"===b?d:k),g,h,i,n)})})});p("i18n()",function(a,b,c){var d=this.context[0],a=Q(a)(d.oLanguage);a===k&&(a=b);c!==k&&h.isPlainObject(a)&&(a=a[c]!==k?a[c]:a._);return a.replace("%d",c)});m.version="1.10.12";m.settings=[];m.models={};m.models.oSearch={bCaseInsensitive:!0,
+sSearch:"",bRegex:!1,bSmart:!0};m.models.oRow={nTr:null,anCells:null,_aData:[],_aSortData:null,_aFilterData:null,_sFilterRow:null,_sRowStripe:"",src:null,idx:-1};m.models.oColumn={idx:null,aDataSort:null,asSorting:null,bSearchable:null,bSortable:null,bVisible:null,_sManualType:null,_bAttrSrc:!1,fnCreatedCell:null,fnGetData:null,fnSetData:null,mData:null,mRender:null,nTh:null,nTf:null,sClass:null,sContentPadding:null,sDefaultContent:null,sName:null,sSortDataType:"std",sSortingClass:null,sSortingClassJUI:null,
+sTitle:null,sType:null,sWidth:null,sWidthOrig:null};m.defaults={aaData:null,aaSorting:[[0,"asc"]],aaSortingFixed:[],ajax:null,aLengthMenu:[10,25,50,100],aoColumns:null,aoColumnDefs:null,aoSearchCols:[],asStripeClasses:null,bAutoWidth:!0,bDeferRender:!1,bDestroy:!1,bFilter:!0,bInfo:!0,bJQueryUI:!1,bLengthChange:!0,bPaginate:!0,bProcessing:!1,bRetrieve:!1,bScrollCollapse:!1,bServerSide:!1,bSort:!0,bSortMulti:!0,bSortCellsTop:!1,bSortClasses:!0,bStateSave:!1,fnCreatedRow:null,fnDrawCallback:null,fnFooterCallback:null,
+fnFormatNumber:function(a){return a.toString().replace(/\B(?=(\d{3})+(?!\d))/g,this.oLanguage.sThousands)},fnHeaderCallback:null,fnInfoCallback:null,fnInitComplete:null,fnPreDrawCallback:null,fnRowCallback:null,fnServerData:null,fnServerParams:null,fnStateLoadCallback:function(a){try{return JSON.parse((-1===a.iStateDuration?sessionStorage:localStorage).getItem("DataTables_"+a.sInstance+"_"+location.pathname))}catch(b){}},fnStateLoadParams:null,fnStateLoaded:null,fnStateSaveCallback:function(a,b){try{(-1===
+a.iStateDuration?sessionStorage:localStorage).setItem("DataTables_"+a.sInstance+"_"+location.pathname,JSON.stringify(b))}catch(c){}},fnStateSaveParams:null,iStateDuration:7200,iDeferLoading:null,iDisplayLength:10,iDisplayStart:0,iTabIndex:0,oClasses:{},oLanguage:{oAria:{sSortAscending:": activate to sort column ascending",sSortDescending:": activate to sort column descending"},oPaginate:{sFirst:"First",sLast:"Last",sNext:"Next",sPrevious:"Previous"},sEmptyTable:"No data available in table",sInfo:"Showing _START_ to _END_ of _TOTAL_ entries",
+sInfoEmpty:"Showing 0 to 0 of 0 entries",sInfoFiltered:"(filtered from _MAX_ total entries)",sInfoPostFix:"",sDecimal:"",sThousands:",",sLengthMenu:"Show _MENU_ entries",sLoadingRecords:"Loading...",sProcessing:"Processing...",sSearch:"Search:",sSearchPlaceholder:"",sUrl:"",sZeroRecords:"No matching records found"},oSearch:h.extend({},m.models.oSearch),sAjaxDataProp:"data",sAjaxSource:null,sDom:"lfrtip",searchDelay:null,sPaginationType:"simple_numbers",sScrollX:"",sScrollXInner:"",sScrollY:"",sServerMethod:"GET",
+renderer:null,rowId:"DT_RowId"};X(m.defaults);m.defaults.column={aDataSort:null,iDataSort:-1,asSorting:["asc","desc"],bSearchable:!0,bSortable:!0,bVisible:!0,fnCreatedCell:null,mData:null,mRender:null,sCellType:"td",sClass:"",sContentPadding:"",sDefaultContent:null,sName:"",sSortDataType:"std",sTitle:null,sType:null,sWidth:null};X(m.defaults.column);m.models.oSettings={oFeatures:{bAutoWidth:null,bDeferRender:null,bFilter:null,bInfo:null,bLengthChange:null,bPaginate:null,bProcessing:null,bServerSide:null,
+bSort:null,bSortMulti:null,bSortClasses:null,bStateSave:null},oScroll:{bCollapse:null,iBarWidth:0,sX:null,sXInner:null,sY:null},oLanguage:{fnInfoCallback:null},oBrowser:{bScrollOversize:!1,bScrollbarLeft:!1,bBounding:!1,barWidth:0},ajax:null,aanFeatures:[],aoData:[],aiDisplay:[],aiDisplayMaster:[],aIds:{},aoColumns:[],aoHeader:[],aoFooter:[],oPreviousSearch:{},aoPreSearchCols:[],aaSorting:null,aaSortingFixed:[],asStripeClasses:null,asDestroyStripes:[],sDestroyWidth:0,aoRowCallback:[],aoHeaderCallback:[],
+aoFooterCallback:[],aoDrawCallback:[],aoRowCreatedCallback:[],aoPreDrawCallback:[],aoInitComplete:[],aoStateSaveParams:[],aoStateLoadParams:[],aoStateLoaded:[],sTableId:"",nTable:null,nTHead:null,nTFoot:null,nTBody:null,nTableWrapper:null,bDeferLoading:!1,bInitialised:!1,aoOpenRows:[],sDom:null,searchDelay:null,sPaginationType:"two_button",iStateDuration:0,aoStateSave:[],aoStateLoad:[],oSavedState:null,oLoadedState:null,sAjaxSource:null,sAjaxDataProp:null,bAjaxDataGet:!0,jqXHR:null,json:k,oAjaxData:k,
+fnServerData:null,aoServerParams:[],sServerMethod:null,fnFormatNumber:null,aLengthMenu:null,iDraw:0,bDrawing:!1,iDrawError:-1,_iDisplayLength:10,_iDisplayStart:0,_iRecordsTotal:0,_iRecordsDisplay:0,bJUI:null,oClasses:{},bFiltered:!1,bSorted:!1,bSortCellsTop:null,oInit:null,aoDestroyCallback:[],fnRecordsTotal:function(){return"ssp"==y(this)?1*this._iRecordsTotal:this.aiDisplayMaster.length},fnRecordsDisplay:function(){return"ssp"==y(this)?1*this._iRecordsDisplay:this.aiDisplay.length},fnDisplayEnd:function(){var a=
+this._iDisplayLength,b=this._iDisplayStart,c=b+a,d=this.aiDisplay.length,e=this.oFeatures,f=e.bPaginate;return e.bServerSide?!1===f||-1===a?b+d:Math.min(b+a,this._iRecordsDisplay):!f||c>d||-1===a?d:c},oInstance:null,sInstance:null,iTabIndex:0,nScrollHead:null,nScrollFoot:null,aLastSort:[],oPlugins:{},rowIdFn:null,rowId:null};m.ext=v={buttons:{},classes:{},builder:"-source-",errMode:"alert",feature:[],search:[],selector:{cell:[],column:[],row:[]},internal:{},legacy:{ajax:null},pager:{},renderer:{pageButton:{},
+header:{}},order:{},type:{detect:[],search:{},order:{}},_unique:0,fnVersionCheck:m.fnVersionCheck,iApiIndex:0,oJUIClasses:{},sVersion:m.version};h.extend(v,{afnFiltering:v.search,aTypes:v.type.detect,ofnSearch:v.type.search,oSort:v.type.order,afnSortData:v.order,aoFeatures:v.feature,oApi:v.internal,oStdClasses:v.classes,oPagination:v.pager});h.extend(m.ext.classes,{sTable:"dataTable",sNoFooter:"no-footer",sPageButton:"paginate_button",sPageButtonActive:"current",sPageButtonDisabled:"disabled",sStripeOdd:"odd",
+sStripeEven:"even",sRowEmpty:"dataTables_empty",sWrapper:"dataTables_wrapper",sFilter:"dataTables_filter",sInfo:"dataTables_info",sPaging:"dataTables_paginate paging_",sLength:"dataTables_length",sProcessing:"dataTables_processing",sSortAsc:"sorting_asc",sSortDesc:"sorting_desc",sSortable:"sorting",sSortableAsc:"sorting_asc_disabled",sSortableDesc:"sorting_desc_disabled",sSortableNone:"sorting_disabled",sSortColumn:"sorting_",sFilterInput:"",sLengthSelect:"",sScrollWrapper:"dataTables_scroll",sScrollHead:"dataTables_scrollHead",
+sScrollHeadInner:"dataTables_scrollHeadInner",sScrollBody:"dataTables_scrollBody",sScrollFoot:"dataTables_scrollFoot",sScrollFootInner:"dataTables_scrollFootInner",sHeaderTH:"",sFooterTH:"",sSortJUIAsc:"",sSortJUIDesc:"",sSortJUI:"",sSortJUIAscAllowed:"",sSortJUIDescAllowed:"",sSortJUIWrapper:"",sSortIcon:"",sJUIHeader:"",sJUIFooter:""});var Ca="",Ca="",H=Ca+"ui-state-default",ia=Ca+"css_right ui-icon ui-icon-",Xb=Ca+"fg-toolbar ui-toolbar ui-widget-header ui-helper-clearfix";h.extend(m.ext.oJUIClasses,
+m.ext.classes,{sPageButton:"fg-button ui-button "+H,sPageButtonActive:"ui-state-disabled",sPageButtonDisabled:"ui-state-disabled",sPaging:"dataTables_paginate fg-buttonset ui-buttonset fg-buttonset-multi ui-buttonset-multi paging_",sSortAsc:H+" sorting_asc",sSortDesc:H+" sorting_desc",sSortable:H+" sorting",sSortableAsc:H+" sorting_asc_disabled",sSortableDesc:H+" sorting_desc_disabled",sSortableNone:H+" sorting_disabled",sSortJUIAsc:ia+"triangle-1-n",sSortJUIDesc:ia+"triangle-1-s",sSortJUI:ia+"carat-2-n-s",
+sSortJUIAscAllowed:ia+"carat-1-n",sSortJUIDescAllowed:ia+"carat-1-s",sSortJUIWrapper:"DataTables_sort_wrapper",sSortIcon:"DataTables_sort_icon",sScrollHead:"dataTables_scrollHead "+H,sScrollFoot:"dataTables_scrollFoot "+H,sHeaderTH:H,sFooterTH:H,sJUIHeader:Xb+" ui-corner-tl ui-corner-tr",sJUIFooter:Xb+" ui-corner-bl ui-corner-br"});var Mb=m.ext.pager;h.extend(Mb,{simple:function(){return["previous","next"]},full:function(){return["first","previous","next","last"]},numbers:function(a,b){return[ya(a,
+b)]},simple_numbers:function(a,b){return["previous",ya(a,b),"next"]},full_numbers:function(a,b){return["first","previous",ya(a,b),"next","last"]},_numbers:ya,numbers_length:7});h.extend(!0,m.ext.renderer,{pageButton:{_:function(a,b,c,d,e,f){var g=a.oClasses,j=a.oLanguage.oPaginate,i=a.oLanguage.oAria.paginate||{},k,l,m=0,p=function(b,d){var o,r,u,s,v=function(b){Ta(a,b.data.action,true)};o=0;for(r=d.length;o<r;o++){s=d[o];if(h.isArray(s)){u=h("<"+(s.DT_el||"div")+"/>").appendTo(b);p(u,s)}else{k=null;
+l="";switch(s){case "ellipsis":b.append('<span class="ellipsis">&#x2026;</span>');break;case "first":k=j.sFirst;l=s+(e>0?"":" "+g.sPageButtonDisabled);break;case "previous":k=j.sPrevious;l=s+(e>0?"":" "+g.sPageButtonDisabled);break;case "next":k=j.sNext;l=s+(e<f-1?"":" "+g.sPageButtonDisabled);break;case "last":k=j.sLast;l=s+(e<f-1?"":" "+g.sPageButtonDisabled);break;default:k=s+1;l=e===s?g.sPageButtonActive:""}if(k!==null){u=h("<a>",{"class":g.sPageButton+" "+l,"aria-controls":a.sTableId,"aria-label":i[s],
+"data-dt-idx":m,tabindex:a.iTabIndex,id:c===0&&typeof s==="string"?a.sTableId+"_"+s:null}).html(k).appendTo(b);Wa(u,{action:s},v);m++}}}},r;try{r=h(b).find(I.activeElement).data("dt-idx")}catch(o){}p(h(b).empty(),d);r&&h(b).find("[data-dt-idx="+r+"]").focus()}}});h.extend(m.ext.type.detect,[function(a,b){var c=b.oLanguage.sDecimal;return Za(a,c)?"num"+c:null},function(a){if(a&&!(a instanceof Date)&&(!ac.test(a)||!bc.test(a)))return null;var b=Date.parse(a);return null!==b&&!isNaN(b)||M(a)?"date":
+null},function(a,b){var c=b.oLanguage.sDecimal;return Za(a,c,!0)?"num-fmt"+c:null},function(a,b){var c=b.oLanguage.sDecimal;return Rb(a,c)?"html-num"+c:null},function(a,b){var c=b.oLanguage.sDecimal;return Rb(a,c,!0)?"html-num-fmt"+c:null},function(a){return M(a)||"string"===typeof a&&-1!==a.indexOf("<")?"html":null}]);h.extend(m.ext.type.search,{html:function(a){return M(a)?a:"string"===typeof a?a.replace(Ob," ").replace(Aa,""):""},string:function(a){return M(a)?a:"string"===typeof a?a.replace(Ob,
+" "):a}});var za=function(a,b,c,d){if(0!==a&&(!a||"-"===a))return-Infinity;b&&(a=Qb(a,b));a.replace&&(c&&(a=a.replace(c,"")),d&&(a=a.replace(d,"")));return 1*a};h.extend(v.type.order,{"date-pre":function(a){return Date.parse(a)||0},"html-pre":function(a){return M(a)?"":a.replace?a.replace(/<.*?>/g,"").toLowerCase():a+""},"string-pre":function(a){return M(a)?"":"string"===typeof a?a.toLowerCase():!a.toString?"":a.toString()},"string-asc":function(a,b){return a<b?-1:a>b?1:0},"string-desc":function(a,
+b){return a<b?1:a>b?-1:0}});db("");h.extend(!0,m.ext.renderer,{header:{_:function(a,b,c,d){h(a.nTable).on("order.dt.DT",function(e,f,g,h){if(a===f){e=c.idx;b.removeClass(c.sSortingClass+" "+d.sSortAsc+" "+d.sSortDesc).addClass(h[e]=="asc"?d.sSortAsc:h[e]=="desc"?d.sSortDesc:c.sSortingClass)}})},jqueryui:function(a,b,c,d){h("<div/>").addClass(d.sSortJUIWrapper).append(b.contents()).append(h("<span/>").addClass(d.sSortIcon+" "+c.sSortingClassJUI)).appendTo(b);h(a.nTable).on("order.dt.DT",function(e,
+f,g,h){if(a===f){e=c.idx;b.removeClass(d.sSortAsc+" "+d.sSortDesc).addClass(h[e]=="asc"?d.sSortAsc:h[e]=="desc"?d.sSortDesc:c.sSortingClass);b.find("span."+d.sSortIcon).removeClass(d.sSortJUIAsc+" "+d.sSortJUIDesc+" "+d.sSortJUI+" "+d.sSortJUIAscAllowed+" "+d.sSortJUIDescAllowed).addClass(h[e]=="asc"?d.sSortJUIAsc:h[e]=="desc"?d.sSortJUIDesc:c.sSortingClassJUI)}})}}});var Yb=function(a){return"string"===typeof a?a.replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;"):a};m.render={number:function(a,
+b,c,d,e){return{display:function(f){if("number"!==typeof f&&"string"!==typeof f)return f;var g=0>f?"-":"",h=parseFloat(f);if(isNaN(h))return Yb(f);f=Math.abs(h);h=parseInt(f,10);f=c?b+(f-h).toFixed(c).substring(2):"";return g+(d||"")+h.toString().replace(/\B(?=(\d{3})+(?!\d))/g,a)+f+(e||"")}}},text:function(){return{display:Yb}}};h.extend(m.ext.internal,{_fnExternApiFunc:Nb,_fnBuildAjax:ra,_fnAjaxUpdate:lb,_fnAjaxParameters:ub,_fnAjaxUpdateDraw:vb,_fnAjaxDataSrc:sa,_fnAddColumn:Ea,_fnColumnOptions:ja,
+_fnAdjustColumnSizing:Y,_fnVisibleToColumnIndex:Z,_fnColumnIndexToVisible:$,_fnVisbleColumns:aa,_fnGetColumns:la,_fnColumnTypes:Ga,_fnApplyColumnDefs:ib,_fnHungarianMap:X,_fnCamelToHungarian:K,_fnLanguageCompat:Da,_fnBrowserDetect:gb,_fnAddData:N,_fnAddTr:ma,_fnNodeToDataIndex:function(a,b){return b._DT_RowIndex!==k?b._DT_RowIndex:null},_fnNodeToColumnIndex:function(a,b,c){return h.inArray(c,a.aoData[b].anCells)},_fnGetCellData:B,_fnSetCellData:jb,_fnSplitObjNotation:Ja,_fnGetObjectDataFn:Q,_fnSetObjectDataFn:R,
+_fnGetDataMaster:Ka,_fnClearTable:na,_fnDeleteIndex:oa,_fnInvalidate:ca,_fnGetRowElements:Ia,_fnCreateTr:Ha,_fnBuildHead:kb,_fnDrawHead:ea,_fnDraw:O,_fnReDraw:T,_fnAddOptionsHtml:nb,_fnDetectHeader:da,_fnGetUniqueThs:qa,_fnFeatureHtmlFilter:pb,_fnFilterComplete:fa,_fnFilterCustom:yb,_fnFilterColumn:xb,_fnFilter:wb,_fnFilterCreateSearch:Pa,_fnEscapeRegex:Qa,_fnFilterData:zb,_fnFeatureHtmlInfo:sb,_fnUpdateInfo:Cb,_fnInfoMacros:Db,_fnInitialise:ga,_fnInitComplete:ta,_fnLengthChange:Ra,_fnFeatureHtmlLength:ob,
+_fnFeatureHtmlPaginate:tb,_fnPageChange:Ta,_fnFeatureHtmlProcessing:qb,_fnProcessingDisplay:C,_fnFeatureHtmlTable:rb,_fnScrollDraw:ka,_fnApplyToChildren:J,_fnCalculateColumnWidths:Fa,_fnThrottle:Oa,_fnConvertToWidth:Fb,_fnGetWidestNode:Gb,_fnGetMaxLenString:Hb,_fnStringToCss:x,_fnSortFlatten:V,_fnSort:mb,_fnSortAria:Jb,_fnSortListener:Va,_fnSortAttachListener:Ma,_fnSortingClasses:va,_fnSortData:Ib,_fnSaveState:wa,_fnLoadState:Kb,_fnSettingsFromNode:xa,_fnLog:L,_fnMap:E,_fnBindAction:Wa,_fnCallbackReg:z,
+_fnCallbackFire:u,_fnLengthOverflow:Sa,_fnRenderer:Na,_fnDataSource:y,_fnRowAttributes:La,_fnCalculateEnd:function(){}});h.fn.dataTable=m;m.$=h;h.fn.dataTableSettings=m.settings;h.fn.dataTableExt=m.ext;h.fn.DataTable=function(a){return h(this).dataTable(a).api()};h.each(m,function(a,b){h.fn.DataTable[a]=b});return h.fn.dataTable});
diff --git a/App/content/pdfs/AdaptationStrategiesforLimpopoProvince.pdf b/App/content/pdfs/AdaptationStrategiesforLimpopoProvince.pdf
new file mode 100644
index 0000000..4d579fe
Binary files /dev/null and b/App/content/pdfs/AdaptationStrategiesforLimpopoProvince.pdf differ
diff --git a/App/content/pdfs/AdaptationStrategiesforMpumalangaProvince.pdf b/App/content/pdfs/AdaptationStrategiesforMpumalangaProvince.pdf
new file mode 100644
index 0000000..99b99fb
Binary files /dev/null and b/App/content/pdfs/AdaptationStrategiesforMpumalangaProvince.pdf differ
diff --git a/App/content/pdfs/AdaptationStrategiesforNorthWestProvince.pdf b/App/content/pdfs/AdaptationStrategiesforNorthWestProvince.pdf
new file mode 100644
index 0000000..cb7cc8f
Binary files /dev/null and b/App/content/pdfs/AdaptationStrategiesforNorthWestProvince.pdf differ
diff --git a/App/content/pdfs/AnnualStateoftheClimate2019.pdf b/App/content/pdfs/AnnualStateoftheClimate2019.pdf
new file mode 100644
index 0000000..6895773
Binary files /dev/null and b/App/content/pdfs/AnnualStateoftheClimate2019.pdf differ
diff --git a/App/content/pdfs/ClimateChangeModelProjectionfortheFreeStateProvince.pdf b/App/content/pdfs/ClimateChangeModelProjectionfortheFreeStateProvince.pdf
new file mode 100644
index 0000000..2ab5f51
Binary files /dev/null and b/App/content/pdfs/ClimateChangeModelProjectionfortheFreeStateProvince.pdf differ
diff --git a/App/content/pdfs/ClimateChangeModelProjectionsFortheNorthernCapeProvince.pdf b/App/content/pdfs/ClimateChangeModelProjectionsFortheNorthernCapeProvince.pdf
new file mode 100644
index 0000000..f31165e
Binary files /dev/null and b/App/content/pdfs/ClimateChangeModelProjectionsFortheNorthernCapeProvince.pdf differ
diff --git a/App/content/pdfs/ClimateChangeStatusQuofortheFreeStateProvince.pdf b/App/content/pdfs/ClimateChangeStatusQuofortheFreeStateProvince.pdf
new file mode 100644
index 0000000..d122ab9
Binary files /dev/null and b/App/content/pdfs/ClimateChangeStatusQuofortheFreeStateProvince.pdf differ
diff --git a/App/content/pdfs/ClimateChangeStatusQuofortheNorthernCapeProvince.pdf b/App/content/pdfs/ClimateChangeStatusQuofortheNorthernCapeProvince.pdf
new file mode 100644
index 0000000..db51a5e
Binary files /dev/null and b/App/content/pdfs/ClimateChangeStatusQuofortheNorthernCapeProvince.pdf differ
diff --git a/App/content/pdfs/Climate_change_impacts_on_health_in_South Africa_EOR_DEA.pdf b/App/content/pdfs/Climate_change_impacts_on_health_in_South Africa_EOR_DEA.pdf
new file mode 100644
index 0000000..ae971de
Binary files /dev/null and b/App/content/pdfs/Climate_change_impacts_on_health_in_South Africa_EOR_DEA.pdf differ
diff --git a/App/content/pdfs/KZNDraftClimateChangeActionPlan.pdf b/App/content/pdfs/KZNDraftClimateChangeActionPlan.pdf
new file mode 100644
index 0000000..28b8688
Binary files /dev/null and b/App/content/pdfs/KZNDraftClimateChangeActionPlan.pdf differ
diff --git a/App/content/pdfs/NCCRD_Training_Manual_V1.pdf b/App/content/pdfs/NCCRD_Training_Manual_V1.pdf
new file mode 100644
index 0000000..f784a53
Binary files /dev/null and b/App/content/pdfs/NCCRD_Training_Manual_V1.pdf differ
diff --git a/App/content/pdfs/NDAO_Training_Manual_V1.pdf b/App/content/pdfs/NDAO_Training_Manual_V1.pdf
new file mode 100644
index 0000000..8ccc320
Binary files /dev/null and b/App/content/pdfs/NDAO_Training_Manual_V1.pdf differ
diff --git a/App/content/pdfs/VulnerabilityAssessmentforFreeStateProvince.pdf b/App/content/pdfs/VulnerabilityAssessmentforFreeStateProvince.pdf
new file mode 100644
index 0000000..c81af6c
Binary files /dev/null and b/App/content/pdfs/VulnerabilityAssessmentforFreeStateProvince.pdf differ
diff --git a/App/content/pdfs/VulnerabilityAssessmentforMpumalangaProvince.pdf b/App/content/pdfs/VulnerabilityAssessmentforMpumalangaProvince.pdf
new file mode 100644
index 0000000..4962402
Binary files /dev/null and b/App/content/pdfs/VulnerabilityAssessmentforMpumalangaProvince.pdf differ
diff --git a/App/content/pdfs/VulnerabilityAssessmentforNorthWestProvince.pdf b/App/content/pdfs/VulnerabilityAssessmentforNorthWestProvince.pdf
new file mode 100644
index 0000000..99425fb
Binary files /dev/null and b/App/content/pdfs/VulnerabilityAssessmentforNorthWestProvince.pdf differ
diff --git a/App/content/pdfs/VulnerabilityAssessmentforNorthernCapeProvince.pdf b/App/content/pdfs/VulnerabilityAssessmentforNorthernCapeProvince.pdf
new file mode 100644
index 0000000..c1cc9ec
Binary files /dev/null and b/App/content/pdfs/VulnerabilityAssessmentforNorthernCapeProvince.pdf differ
diff --git a/App/content/pdfs/WMOExtremeClimateIndicesreport2019FIN.pdf b/App/content/pdfs/WMOExtremeClimateIndicesreport2019FIN.pdf
new file mode 100644
index 0000000..7be2139
Binary files /dev/null and b/App/content/pdfs/WMOExtremeClimateIndicesreport2019FIN.pdf differ
diff --git a/App/css/custom.css b/App/css/custom.css
index 837f715..a3fb2f4 100644
--- a/App/css/custom.css
+++ b/App/css/custom.css
@@ -2,7 +2,14 @@ button:hover{
     cursor: pointer;
 }
 .round-edge,.btn{
-    border-radius: 10px;
+    border-radius: 2px;
+}
+.credit-bg{
+    border-radius: 5px;
+    background-color: #f5f5f5;
+    padding: 17px;
+    font-size: 13px;
+    line-height: 16px;
 }
 .green-bg{
     background-color: #719062;
@@ -25,7 +32,7 @@ button:hover{
 }
 .border-light-radius{
     border: 1px solid gainsboro;
-    border-radius: 10px;
+    border-radius: 5px;
     padding: 10px;
 }
 .bg-danger,.bg-primary{
@@ -33,7 +40,7 @@ button:hover{
 }
 .ea-list-p p{
     border: 1px solid gainsboro;
-    border-radius: 10px;
+    border-radius: 5px;
     padding: 10px;
     margin-bottom:15px;
 }
@@ -56,6 +63,7 @@ h5{
     padding-left: 42px;
     padding-right: 22px;
     position: relative;
+    border-radius:5px;
 }
 .text-link{
     text-decoration: underline;
@@ -101,21 +109,94 @@ img{
 table.dataTable thead .sorting:before, table.dataTable thead .sorting_asc:before, table.dataTable thead .sorting_desc:before, table.dataTable thead .sorting_asc_disabled:before, table.dataTable thead .sorting_desc_disabled:before, table.dataTable thead .sorting:after, table.dataTable thead .sorting_asc:after, table.dataTable thead .sorting_desc:after, table.dataTable thead .sorting_asc_disabled:after, table.dataTable thead .sorting_desc_disabled:after {
     font-family: 'FontAwesome';
 }
-#ea-header,.ea-parent span:after{
+#ea-header,.ea-parent span:after,.s-gallery-item *,.s-gallery-item{
     -webkit-transition: all 0.7s ease-out;
     -moz-transition: all 0.7s ease-out;
     -o-transition: all 0.7s ease-out;
     transition: all 0.7s ease-out;
 }
-
+/* Filter Table*/
+.filterTable{
+    position: relative;
+    top: 0;
+}
+#servicesTable td{
+    word-break: break-word;
+}
+.filterTable #servicesTable_length select{
+    margin-left: 10px;
+    border: 1px solid #dee2e6;
+    padding: 10px;
+}
+.filterTable #servicesTable_filter input{
+    border: 1px solid #dee2e6;
+    padding: 0 6px;
+}
+.filterTable #servicesTable_length label,
+.filterTable #servicesTable_filter label{
+    line-height: 39px;
+}
+.filterTable #record-filters label{
+    margin-bottom: 0;
+    line-height: 45px;
+    margin-right: 10px;
+}
+.filterTable #record-filters .btn-primary{
+    background-color: #f9f9f9!important;
+    color: #000;
+    margin: 0;
+    line-height: inherit;
+}
+.filterTable #record-filters .btn-primary:hover,
+.filterTable #record-filters .btn-primary.active{
+    background-color: #719062!important;
+    color:#fff;
+}
+@media (min-width: 768px){
+    .filterTable #record-filters{
+        position: absolute;
+        z-index: 1;
+    }
+    .filterTable #servicesTable_length{
+        float:right;
+        min-width: 150px;
+        margin-left: 20px;
+    }
+    .filterTable #servicesTable_length select{
+        display: block!important;
+        float: right;
+    }
+    .navbar-expand-md .navbar-nav .dropdown-menu.show {
+        transform: translate3d(0px, 45px, 0px)!important;
+    }
+    #ea-header.scrollnav,#ea-header.explorer-scrollnav{
+        margin-top:-100px;
+    }
+    .full-explorer,.full-explorer iframe{
+        overflow: hidden;
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        top: 50px;
+        height:100%!important;
+        z-index:1;
+    }
+    .full-explorer #ea-body{
+        padding-top:0;
+    }
+    .full-explorer .CSA-footer{
+        display:none;
+    }
+}
 /* tabs */
 .tab-child{
     display: none;
     padding-top: 20px;
 }
 .ea-tabs .tab-parent:first-child{
-    border-top-left-radius: 10px;
-    border-top-right-radius: 10px;
+    border-top-left-radius: 5px;
+    border-top-right-radius: 5px;
 }
 .ea-tabs .tab-parent{
     border: 1px solid gainsboro;
@@ -144,23 +225,29 @@ table.dataTable thead .sorting:before, table.dataTable thead .sorting_asc:before
     background-color: #719062;
     color: #fff;
 }
+.md-tabs .nav-link{
+    background-color: #7e9c70;
+    border-radius: 0.25rem;
+    margin-left: 10px;
+}
 .tab-content>.tab-pane.show {
     display: block;
 }
 .dataTables_length .select-wrapper {
     margin-top: 7px;
 }
-.dataTable button{
+.dataTable button,.dataTable .dataLink{
     background: #719062;
     border: 1px solid #719062;
     color: #fff;
-    border-radius: 10px;
+    word-break: normal;
+    border-radius: 5px;
     padding: 5px 15px;
     box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12);
     font-size: 0.81rem;
     transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
 }
-.dataTable button:hover{
+.dataTable button:hover,.dataTable .dataLink:hover{
     background: #004101;
     border: 1px solid #004101;;
 }
@@ -175,14 +262,17 @@ table.dataTable thead .sorting:before, table.dataTable thead .sorting_asc:before
 
 @media (min-width: 768px){
     #ea-body {
-        padding-top: 148px;
+        padding-top: 150px;
     }
     .ea-content{
-        padding: 0 20px;
+        padding: 0px 20px;
     }
     .ea-content-full{
         padding: 0 35px;
     }
+    .contact-p{
+        min-height:120px;
+    }
 }
 /* Body END*/
 /* header */
@@ -319,12 +409,46 @@ table.dataTable thead .sorting:before, table.dataTable thead .sorting_asc:before
     z-index: 1;
 }
 /* map iframe END */
+/* Data Download List START */
+.dataDownTable img{
+    display:block;
+    width:100%;
+}
+.dataDownTableInner {
+    box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12);
+    background: #fff;
+    text-align:center;
+}
+.dataDownTableInner h5{
+    border-bottom:1px solid gainsboro;
+    margin: 0;
+    padding: 25px 0;
+    font-weight: 300;
+    text-transform: uppercase;
+    font-size: 15px;
+    text-align: center;
+}
+.dataDownTableInner .btn-success {
+    display: block;
+    border-radius: 0;
+    margin: 0;
+}
+.dataDownTable .col-md-4{
+    padding-bottom:30px;
+}
+#sasdisearch button{
+    margin:0;
+}
+.sasdisearch{
+    height: 48px;
+}
+/* Data Download List END */
 /* overwrites */
-.btn-success {
+.btn-success, .btn-green{
     background-color: #719062!important;
     border-color: #719062!important;
 }
-.btn-success:hover {
+.btn-success:hover, .btn-green:hover {
     background-color: #004101!important;
     border-color: #004101!important;
 }
@@ -370,4 +494,53 @@ table.dataTable thead .sorting:before, table.dataTable thead .sorting_asc:before
     max-width: 550px;
     margin: 1.75rem auto;
 }
-}
\ No newline at end of file
+}
+/* Support for nav on small desktops */
+@media screen and (max-width: 1590px) and (min-width: 769px){
+    .navbar-expand-md .navbar-nav .nav-link {
+        padding-right: 15px;
+        font-size: 14px;
+        padding-top: 11px;
+    }
+    .ea-links li {
+        margin-top: 9px;
+    }
+    .ea-links a {
+        font-size: 14px;
+    }
+    .nav-item input {
+        margin-top: 0px;
+        max-width: 150px;
+    }
+}
+/* Gallery - Climate Services */
+.s-gallery-item img{
+    
+}
+.s-gallery-item{
+    box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12);
+    background:#fff;
+}
+.s-gallery-item:hover{
+    cursor: pointer;
+    background:#f9f9f9;
+}
+.s-gallery-item:hover img{
+    opacity: 0.5;
+}
+.s-gallery-description{
+    font-weight: bold;
+    text-align:center;
+    border-top: 1px solid #dee2e6;
+    padding: 10px 5px;
+}
+.s-gallery-item:hover{
+    cursor: pointer;
+}
+/* Contact page */
+.pro-pic{
+    width:150px;
+    height:150px;
+    border-radius:50%;
+    margin:20px auto;
+}
diff --git a/App/css/lightbox.css b/App/css/lightbox.css
new file mode 100644
index 0000000..1e4c46e
--- /dev/null
+++ b/App/css/lightbox.css
@@ -0,0 +1,414 @@
+.s-gall-download{
+  position: fixed;
+  z-index: 9999;
+  color: #fff;
+  top: 15px;
+  right: 150px;
+}
+@-webkit-keyframes closeWindow {
+    0% {
+    opacity: 1;
+    }
+    100% {
+    opacity: 0;
+    }
+    }
+    
+    @keyframes closeWindow {
+    0% {
+    opacity: 1;
+    }
+    100% {
+    opacity: 0;
+    }
+    }
+    
+    .ril__outer {
+    background-color: rgba(0, 0, 0, 0.85);
+    outline: none;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    z-index: 1000;
+    width: 100%;
+    height: 100%;
+    -ms-content-zooming: none;
+    -ms-user-select: none;
+    -ms-touch-select: none;
+    -ms-touch-action: none;
+    touch-action: none;
+    }
+    
+    .ril__outerClosing {
+    opacity: 0;
+    }
+    
+    .ril__inner {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    }
+    
+    .ril__image,
+    .ril__imagePrev,
+    .ril__imageNext {
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    margin: auto;
+    max-width: none;
+    -ms-content-zooming: none;
+    -ms-user-select: none;
+    -ms-touch-select: none;
+    -ms-touch-action: none;
+    touch-action: none;
+    }
+    
+    .ril__imageDiscourager {
+    background-repeat: no-repeat;
+    background-position: center;
+    background-size: contain;
+    }
+    
+    .ril__navButtons {
+    border: none;
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    width: 20px;
+    height: 34px;
+    padding: 40px 30px;
+    margin: auto;
+    cursor: pointer;
+    opacity: 0.7;
+    }
+    .ril__navButtons:hover {
+    opacity: 1;
+    }
+    .ril__navButtons:active {
+    opacity: 0.7;
+    }
+    
+    .ril__navButtonPrev {
+    left: 0;
+    background: rgba(0, 0, 0, 0.2)
+    url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZlcnNpb249IjEuMSIgd2lkdGg9IjIwIiBoZWlnaHQ9IjM0Ij48cGF0aCBkPSJtIDE5LDMgLTIsLTIgLTE2LDE2IDE2LDE2IDEsLTEgLTE1LC0xNSAxNSwtMTUgeiIgZmlsbD0iI0ZGRiIvPjwvc3ZnPg==')
+    no-repeat center;
+    }
+    
+    .ril__navButtonNext {
+    right: 0;
+    background: rgba(0, 0, 0, 0.2)
+    url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZlcnNpb249IjEuMSIgd2lkdGg9IjIwIiBoZWlnaHQ9IjM0Ij48cGF0aCBkPSJtIDEsMyAyLC0yIDE2LDE2IC0xNiwxNiAtMSwtMSAxNSwtMTUgLTE1LC0xNSB6IiBmaWxsPSIjRkZGIi8+PC9zdmc+')
+    no-repeat center;
+    }
+    
+    .ril__downloadBlocker {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-image: url('data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7');
+    background-size: cover;
+    }
+    
+    .ril__caption,
+    .ril__toolbar {
+    background-color: rgba(0, 0, 0, 0.5);
+    position: absolute;
+    left: 0;
+    right: 0;
+    display: -webkit-box;
+    display: -ms-flexbox;
+    display: flex;
+    -webkit-box-pack: justify;
+    -ms-flex-pack: justify;
+    justify-content: space-between;
+    }
+    
+    .ril__caption {
+    bottom: 0;
+    max-height: 150px;
+    overflow: auto;
+    }
+    
+    .ril__captionContent {
+    padding: 10px 20px;
+    color: #fff;
+    }
+    
+    .ril__toolbar {
+    top: 0;
+    height: 50px;
+    }
+    
+    .ril__toolbarSide {
+    height: 50px;
+    margin: 0;
+    }
+    
+    .ril__toolbarLeftSide {
+    padding-left: 20px;
+    padding-right: 0;
+    -webkit-box-flex: 0;
+    -ms-flex: 0 1 auto;
+    flex: 0 1 auto;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    }
+    
+    .ril__toolbarRightSide {
+    padding-left: 0;
+    padding-right: 20px;
+    -webkit-box-flex: 0;
+    -ms-flex: 0 0 auto;
+    flex: 0 0 auto;
+    }
+    
+    .ril__toolbarItem {
+    display: inline-block;
+    line-height: 50px;
+    padding: 0;
+    color: #fff;
+    font-size: 120%;
+    max-width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    }
+    
+    .ril__toolbarItemChild {
+    vertical-align: middle;
+    }
+    
+    .ril__builtinButton {
+    width: 40px;
+    height: 35px;
+    cursor: pointer;
+    border: none;
+    opacity: 0.7;
+    }
+    .ril__builtinButton:hover {
+    opacity: 1;
+    }
+    .ril__builtinButton:active {
+    outline: none;
+    }
+    
+    .ril__builtinButtonDisabled {
+    cursor: default;
+    opacity: 0.5;
+    }
+    .ril__builtinButtonDisabled:hover {
+    opacity: 0.5;
+    }
+    
+    .ril__closeButton {
+    background:
+    url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZlcnNpb249IjEuMSIgd2lkdGg9IjIwIiBoZWlnaHQ9IjIwIj48cGF0aCBkPSJtIDEsMyAxLjI1LC0xLjI1IDcuNSw3LjUgNy41LC03LjUgMS4yNSwxLjI1IC03LjUsNy41IDcuNSw3LjUgLTEuMjUsMS4yNSAtNy41LC03LjUgLTcuNSw3LjUgLTEuMjUsLTEuMjUgNy41LC03LjUgLTcuNSwtNy41IHoiIGZpbGw9IiNGRkYiLz48L3N2Zz4=')
+    no-repeat center;
+    }
+    
+    .ril__zoomInButton {
+    background:
+    url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyMCIgaGVpZ2h0PSIyMCI+PGcgc3Ryb2tlPSIjZmZmIiBzdHJva2Utd2lkdGg9IjIiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCI+PHBhdGggZD0iTTEgMTlsNi02Ii8+PHBhdGggZD0iTTkgOGg2Ii8+PHBhdGggZD0iTTEyIDV2NiIvPjwvZz48Y2lyY2xlIGN4PSIxMiIgY3k9IjgiIHI9IjciIGZpbGw9Im5vbmUiIHN0cm9rZT0iI2ZmZiIgc3Ryb2tlLXdpZHRoPSIyIi8+PC9zdmc+')
+    no-repeat center;
+    }
+    
+    .ril__zoomOutButton {
+    background:
+    url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyMCIgaGVpZ2h0PSIyMCI+PGcgc3Ryb2tlPSIjZmZmIiBzdHJva2Utd2lkdGg9IjIiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCI+PHBhdGggZD0iTTEgMTlsNi02Ii8+PHBhdGggZD0iTTkgOGg2Ii8+PC9nPjxjaXJjbGUgY3g9IjEyIiBjeT0iOCIgcj0iNyIgZmlsbD0ibm9uZSIgc3Ryb2tlPSIjZmZmIiBzdHJva2Utd2lkdGg9IjIiLz48L3N2Zz4=')
+    no-repeat center;
+    }
+    
+    .ril__outerAnimating {
+    -webkit-animation-name: closeWindow;
+    animation-name: closeWindow;
+    }
+    
+    @-webkit-keyframes pointFade {
+    0%,
+    19.999%,
+    100% {
+    opacity: 0;
+    }
+    20% {
+    opacity: 1;
+    }
+    }
+    
+    @keyframes pointFade {
+    0%,
+    19.999%,
+    100% {
+    opacity: 0;
+    }
+    20% {
+    opacity: 1;
+    }
+    }
+    
+    .ril__loadingCircle {
+    width: 60px;
+    height: 60px;
+    position: relative;
+    }
+    
+    .ril__loadingCirclePoint {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    left: 0;
+    top: 0;
+    }
+    .ril__loadingCirclePoint::before {
+    content: '';
+    display: block;
+    margin: 0 auto;
+    width: 11%;
+    height: 30%;
+    background-color: #fff;
+    border-radius: 30%;
+    -webkit-animation: pointFade 800ms infinite ease-in-out both;
+    animation: pointFade 800ms infinite ease-in-out both;
+    }
+    .ril__loadingCirclePoint:nth-of-type(1) {
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+    }
+    .ril__loadingCirclePoint:nth-of-type(7) {
+    -webkit-transform: rotate(180deg);
+    transform: rotate(180deg);
+    }
+    .ril__loadingCirclePoint:nth-of-type(1)::before,
+    .ril__loadingCirclePoint:nth-of-type(7)::before {
+    -webkit-animation-delay: -800ms;
+    animation-delay: -800ms;
+    }
+    .ril__loadingCirclePoint:nth-of-type(2) {
+    -webkit-transform: rotate(30deg);
+    transform: rotate(30deg);
+    }
+    .ril__loadingCirclePoint:nth-of-type(8) {
+    -webkit-transform: rotate(210deg);
+    transform: rotate(210deg);
+    }
+    .ril__loadingCirclePoint:nth-of-type(2)::before,
+    .ril__loadingCirclePoint:nth-of-type(8)::before {
+    -webkit-animation-delay: -666ms;
+    animation-delay: -666ms;
+    }
+    .ril__loadingCirclePoint:nth-of-type(3) {
+    -webkit-transform: rotate(60deg);
+    transform: rotate(60deg);
+    }
+    .ril__loadingCirclePoint:nth-of-type(9) {
+    -webkit-transform: rotate(240deg);
+    transform: rotate(240deg);
+    }
+    .ril__loadingCirclePoint:nth-of-type(3)::before,
+    .ril__loadingCirclePoint:nth-of-type(9)::before {
+    -webkit-animation-delay: -533ms;
+    animation-delay: -533ms;
+    }
+    .ril__loadingCirclePoint:nth-of-type(4) {
+    -webkit-transform: rotate(90deg);
+    transform: rotate(90deg);
+    }
+    .ril__loadingCirclePoint:nth-of-type(10) {
+    -webkit-transform: rotate(270deg);
+    transform: rotate(270deg);
+    }
+    .ril__loadingCirclePoint:nth-of-type(4)::before,
+    .ril__loadingCirclePoint:nth-of-type(10)::before {
+    -webkit-animation-delay: -400ms;
+    animation-delay: -400ms;
+    }
+    .ril__loadingCirclePoint:nth-of-type(5) {
+    -webkit-transform: rotate(120deg);
+    transform: rotate(120deg);
+    }
+    .ril__loadingCirclePoint:nth-of-type(11) {
+    -webkit-transform: rotate(300deg);
+    transform: rotate(300deg);
+    }
+    .ril__loadingCirclePoint:nth-of-type(5)::before,
+    .ril__loadingCirclePoint:nth-of-type(11)::before {
+    -webkit-animation-delay: -266ms;
+    animation-delay: -266ms;
+    }
+    .ril__loadingCirclePoint:nth-of-type(6) {
+    -webkit-transform: rotate(150deg);
+    transform: rotate(150deg);
+    }
+    .ril__loadingCirclePoint:nth-of-type(12) {
+    -webkit-transform: rotate(330deg);
+    transform: rotate(330deg);
+    }
+    .ril__loadingCirclePoint:nth-of-type(6)::before,
+    .ril__loadingCirclePoint:nth-of-type(12)::before {
+    -webkit-animation-delay: -133ms;
+    animation-delay: -133ms;
+    }
+    .ril__loadingCirclePoint:nth-of-type(7) {
+    -webkit-transform: rotate(180deg);
+    transform: rotate(180deg);
+    }
+    .ril__loadingCirclePoint:nth-of-type(13) {
+    -webkit-transform: rotate(360deg);
+    transform: rotate(360deg);
+    }
+    .ril__loadingCirclePoint:nth-of-type(7)::before,
+    .ril__loadingCirclePoint:nth-of-type(13)::before {
+    -webkit-animation-delay: 0ms;
+    animation-delay: 0ms;
+    }
+    
+    .ril__loadingContainer {
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    }
+    .ril__imagePrev .ril__loadingContainer,
+    .ril__imageNext .ril__loadingContainer {
+    display: none;
+    }
+    
+    .ril__errorContainer {
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    display: -webkit-box;
+    display: -ms-flexbox;
+    display: flex;
+    -webkit-box-align: center;
+    -ms-flex-align: center;
+    align-items: center;
+    -webkit-box-pack: center;
+    -ms-flex-pack: center;
+    justify-content: center;
+    color: #fff;
+    }
+    .ril__imagePrev .ril__errorContainer,
+    .ril__imageNext .ril__errorContainer {
+    display: none;
+    }
+    
+    .ril__loadingContainer__icon {
+      color: #fff;
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      -webkit-transform: translateX(-50%) translateY(-50%);
+      transform: translateX(-50%) translateY(-50%);
+    }
\ No newline at end of file
diff --git a/App/index.ejs b/App/index.ejs
index 2755ad3..73850ef 100644
--- a/App/index.ejs
+++ b/App/index.ejs
@@ -3,18 +3,20 @@
 
 <head>
     <!-- Global site tag (gtag.js) - Google Analytics -->
-  <script async src="https://www.googletagmanager.com/gtag/js?id=UA-145174772-1"></script>
+  <!-- <script async src="https://www.googletagmanager.com/gtag/js?id=UA-145174772-1"></script>
   <script>
     window.dataLayer = window.dataLayer || [];
     function gtag(){dataLayer.push(arguments);}
     gtag('js', new Date());
 
     gtag('config', 'UA-145174772-1');
-  </script>
+  </script> -->
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>NCCIS - National Climate Change Information System</title>
   <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
+  <!-- <script src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script> -->
+  <script type="text/javascript" src="https://cdn.datatables.net/1.10.12/js/jquery.dataTables.min.js"></script>
   <link rel="icon" href="#">
 </head>
 
diff --git a/package-lock.json b/package-lock.json
index 2d3461e..336b470 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -867,17 +867,17 @@
       }
     },
     "@babel/runtime": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.5.5.tgz",
-      "integrity": "sha512-28QvEGyQyNkB0/m2B4FU7IEZGK2NUrcMtT6BZEFALTguLk+AUT6ofsHtPk5QyjAdUkpMJ+/Em+quwz4HOt30AQ==",
+      "version": "7.9.2",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz",
+      "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==",
       "requires": {
-        "regenerator-runtime": "^0.13.2"
+        "regenerator-runtime": "^0.13.4"
       },
       "dependencies": {
         "regenerator-runtime": {
-          "version": "0.13.3",
-          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz",
-          "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw=="
+          "version": "0.13.5",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz",
+          "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA=="
         }
       }
     },
@@ -945,6 +945,11 @@
         }
       }
     },
+    "@date-io/moment": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/@date-io/moment/-/moment-1.3.5.tgz",
+      "integrity": "sha512-b0JQb10Lie07iW2/9uKCQSrXif262d6zfYBstCLLJUk0JVA+7o/yLDg5p2+GkjgJbmodjHozIXs4Bi34RRhL8Q=="
+    },
     "@emotion/babel-utils": {
       "version": "0.6.9",
       "resolved": "https://registry.npmjs.org/@emotion/babel-utils/-/babel-utils-0.6.9.tgz",
@@ -1009,6 +1014,11 @@
       "integrity": "sha512-dEv1n+IFtlvLQ8/FsTOtBCC1aNT4B5abE8ODF5wk2tpWnjvgGNRMvHCeJGbVHjFfer4h8MH2w9c2/6eoJHclMg==",
       "dev": true
     },
+    "@fortawesome/fontawesome-free": {
+      "version": "5.8.2",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.8.2.tgz",
+      "integrity": "sha512-E4fDUF4fbu9AxKpaQQqCN3XBnNzb/5e0Gvd9OaQsYkK574LVI57v/EqqPfIm/mC7jYbxaPNrhvT5AF+Yzwyizg=="
+    },
     "@material-ui/core": {
       "version": "3.9.3",
       "resolved": "https://registry.npmjs.org/@material-ui/core/-/core-3.9.3.tgz",
@@ -1044,9 +1054,9 @@
       },
       "dependencies": {
         "hoist-non-react-statics": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz",
-          "integrity": "sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA==",
+          "version": "3.3.2",
+          "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
+          "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
           "requires": {
             "react-is": "^16.7.0"
           }
@@ -1070,14 +1080,6 @@
             "react-lifecycles-compat": "^3.0.4"
           },
           "dependencies": {
-            "dom-helpers": {
-              "version": "3.4.0",
-              "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.4.0.tgz",
-              "integrity": "sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==",
-              "requires": {
-                "@babel/runtime": "^7.1.2"
-              }
-            },
             "prop-types": {
               "version": "15.7.2",
               "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
@@ -1111,24 +1113,6 @@
         "warning": "^4.0.1"
       },
       "dependencies": {
-        "@babel/runtime": {
-          "version": "7.4.2",
-          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.2.tgz",
-          "integrity": "sha512-7Bl2rALb7HpvXFL7TETNzKSAeBVCPHELzc0C//9FCxN8nsiueWSJBqaF+2oIJScyILStASR/Cx5WMkXGYTiJFA==",
-          "requires": {
-            "regenerator-runtime": "^0.13.2"
-          }
-        },
-        "deepmerge": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-3.2.0.tgz",
-          "integrity": "sha512-6+LuZGU7QCNUnAJyX8cIrlzoEgggTM6B7mm+znKOX4t5ltluT9KLjN6g61ECMS0LTsLW7yDpNoxhix5FZcrIow=="
-        },
-        "regenerator-runtime": {
-          "version": "0.13.2",
-          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz",
-          "integrity": "sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA=="
-        },
         "warning": {
           "version": "4.0.3",
           "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
@@ -1147,21 +1131,6 @@
         "@babel/runtime": "^7.2.0",
         "prop-types": "^15.6.0",
         "react-is": "^16.6.3"
-      },
-      "dependencies": {
-        "@babel/runtime": {
-          "version": "7.4.2",
-          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.2.tgz",
-          "integrity": "sha512-7Bl2rALb7HpvXFL7TETNzKSAeBVCPHELzc0C//9FCxN8nsiueWSJBqaF+2oIJScyILStASR/Cx5WMkXGYTiJFA==",
-          "requires": {
-            "regenerator-runtime": "^0.13.2"
-          }
-        },
-        "regenerator-runtime": {
-          "version": "0.13.2",
-          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz",
-          "integrity": "sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA=="
-        }
       }
     },
     "@mrmlnc/readdir-enhanced": {
@@ -1251,26 +1220,23 @@
       "dev": true
     },
     "@types/jss": {
-      "version": "9.5.6",
-      "resolved": "https://registry.npmjs.org/@types/jss/-/jss-9.5.6.tgz",
-      "integrity": "sha512-7TWmR5y1jYG4ka4wTZt65RR0kw4WgALFUWktQIWbLnDd6/z/0SQZ/4+UeH0rhdp+HEdIfmzPBH0VwE/4Z9Evzw==",
+      "version": "9.5.8",
+      "resolved": "https://registry.npmjs.org/@types/jss/-/jss-9.5.8.tgz",
+      "integrity": "sha512-bBbHvjhm42UKki+wZpR89j73ykSXg99/bhuKuYYePtpma3ZAnmeGnl0WxXiZhPGsIfzKwCUkpPC0jlrVMBfRxA==",
       "requires": {
         "csstype": "^2.0.0",
         "indefinite-observable": "^1.0.1"
       }
     },
     "@types/prop-types": {
-      "version": "15.5.5",
-      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.5.5.tgz",
-      "integrity": "sha512-mOrlCEdwX3seT3n0AXNt4KNPAZZxcsABUHwBgFXOt+nvFUXkxCAO6UBJHPrDxWEa2KDMil86355fjo8jbZ+K0Q==",
-      "requires": {
-        "@types/react": "*"
-      }
+      "version": "15.7.3",
+      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.3.tgz",
+      "integrity": "sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw=="
     },
     "@types/react": {
-      "version": "16.4.14",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-16.4.14.tgz",
-      "integrity": "sha512-Gh8irag2dbZ2K6vPn+S8+LNrULuG3zlCgJjVUrvuiUK7waw9d9CFk2A/tZFyGhcMDUyO7tznbx1ZasqlAGjHxA==",
+      "version": "16.9.25",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.25.tgz",
+      "integrity": "sha512-Dlj2V72cfYLPNscIG3/SMUOzhzj7GK3bpSrfefwt2YT9GLynvLCCZjbhyF6VsT0q0+aRACRX03TDJGb7cA0cqg==",
       "requires": {
         "@types/prop-types": "*",
         "csstype": "^2.2.0"
@@ -1285,9 +1251,9 @@
       }
     },
     "@types/react-transition-group": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-2.0.14.tgz",
-      "integrity": "sha512-pa7qB0/mkhwWMBFoXhX8BcntK8G4eQl4sIfSrJCxnivTYRQWjOWf2ClR9bWdm0EUFBDHzMbKYS+QYfDtBzkY4w==",
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-2.9.2.tgz",
+      "integrity": "sha512-5Fv2DQNO+GpdPZcxp2x/OQG/H19A01WlmpjVD9cKvVFmoVLOZ9LvBgSWG6pSXIU4og5fgbvGPaCV5+VGkWAEHA==",
       "requires": {
         "@types/react": "*"
       }
@@ -2157,7 +2123,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
       "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "assign-symbols": {
       "version": "1.0.0",
@@ -3661,6 +3628,11 @@
       "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.1.3.tgz",
       "integrity": "sha512-rDFIzgXcof0jDyjNosjv4Sno77X4KuPeFxG2XZZv1/Kc8DRVGVADdoQyyOVDwPqL36DDmtCQbrpMCqvpPLJQ0w=="
     },
+    "bootstrap-css-only": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/bootstrap-css-only/-/bootstrap-css-only-4.3.1.tgz",
+      "integrity": "sha512-xPQNmTR6skX7boM3Q/K2vWDL8RFhfHm5PbTcn/vd7nZtkzg9tc6ScNreIIsMaP9QLUxeqvUx+OGnDaiK4KBRiQ=="
+    },
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -4482,9 +4454,9 @@
       }
     },
     "clsx": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.0.4.tgz",
-      "integrity": "sha512-1mQ557MIZTrL/140j+JVdRM6e31/OA4vTYxXgqIIZlndyfjHpyawKZia1Im05Vp9BWmImkcNrNtFYQMyFcgJDg=="
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.1.0.tgz",
+      "integrity": "sha512-3avwM37fSK5oP6M5rQ9CNe99lwxhXDOeSWVPAOYF6OazUTgZCMb0yWlJpmdD74REy1gkEaFiub2ULv4fq9GUhA=="
     },
     "co": {
       "version": "4.6.0",
@@ -4574,6 +4546,7 @@
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
       "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
       "dev": true,
+      "optional": true,
       "requires": {
         "delayed-stream": "~1.0.0"
       }
@@ -5036,9 +5009,9 @@
       }
     },
     "csstype": {
-      "version": "2.5.7",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.5.7.tgz",
-      "integrity": "sha512-Nt5VDyOTIIV4/nRFswoCKps1R5CD1hkiyjBE9/thNaNZILLEviVw9yWQw15+O+CpNjQKB/uvdcxFFOrSflY3Yw=="
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.9.tgz",
+      "integrity": "sha512-xz39Sb4+OaTsULgUERcCk+TJj8ylkL4aSVDQiX/ksxbELSqwkgt4d4RD7fovIdgJGSuNYqwZEiVjYY5l0ask+Q=="
     },
     "cyclist": {
       "version": "0.2.2",
@@ -5245,7 +5218,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "depd": {
       "version": "1.1.2",
@@ -5373,9 +5347,12 @@
       }
     },
     "dom-helpers": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.3.1.tgz",
-      "integrity": "sha512-2Sm+JaYn74OiTM2wHvxJOo3roiq/h25Yi69Fqk269cNUwIXsCvATB6CRSFC9Am/20G2b28hGv/+7NiWydIrPvg=="
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.4.0.tgz",
+      "integrity": "sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==",
+      "requires": {
+        "@babel/runtime": "^7.1.2"
+      }
     },
     "dom-matches": {
       "version": "2.0.0",
@@ -5889,7 +5866,8 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
       "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "fast-deep-equal": {
       "version": "1.1.0",
@@ -6508,7 +6486,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -6529,12 +6508,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -6549,17 +6530,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -6676,7 +6660,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -6688,6 +6673,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -6702,6 +6688,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -6709,12 +6696,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -6733,6 +6722,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -6813,7 +6803,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -6825,6 +6816,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -6910,7 +6902,8 @@
         "safe-buffer": {
           "version": "5.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -6946,6 +6939,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -6965,6 +6959,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -7008,12 +7003,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -7975,9 +7972,9 @@
       "dev": true
     },
     "hyphenate-style-name": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.0.2.tgz",
-      "integrity": "sha1-MRYKNpMK2vH8BMYHT360FGXU7Es="
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.0.3.tgz",
+      "integrity": "sha512-EcuixamT82oplpoJ2XU4pDtKGWQ7b00CD9f1ug9IaQ3p1bkHMiKCZ9ut9QDI6qsa6cpUuB+A/I+zLtdNK4n2DQ=="
     },
     "iconv-lite": {
       "version": "0.4.19",
@@ -8075,18 +8072,11 @@
       "dev": true
     },
     "indefinite-observable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/indefinite-observable/-/indefinite-observable-1.0.1.tgz",
-      "integrity": "sha1-CZFUI8yNb36xy3iCrRNGM8mm7cM=",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/indefinite-observable/-/indefinite-observable-1.0.2.tgz",
+      "integrity": "sha512-Mps0898zEduHyPhb7UCgNmfzlqNZknVmaFz5qzr0mm04YQ5FGLhAyK/dJ+NaRxGyR6juQXIxh5Ev0xx+qq0nYA==",
       "requires": {
-        "symbol-observable": "1.0.4"
-      },
-      "dependencies": {
-        "symbol-observable": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.4.tgz",
-          "integrity": "sha1-Kb9hXUqnEhvdiYsi1LP5vE4qoD0="
-        }
+        "symbol-observable": "1.2.0"
       }
     },
     "indent-string": {
@@ -9287,30 +9277,22 @@
         "tslib": "^1.9.3"
       },
       "dependencies": {
-        "dom-helpers": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.4.0.tgz",
-          "integrity": "sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==",
-          "requires": {
-            "@babel/runtime": "^7.1.2"
-          }
-        },
-        "react-event-listener": {
-          "version": "0.6.6",
-          "resolved": "https://registry.npmjs.org/react-event-listener/-/react-event-listener-0.6.6.tgz",
-          "integrity": "sha512-+hCNqfy7o9wvO6UgjqFmBzARJS7qrNoda0VqzvOuioEpoEXKutiKuv92dSz6kP7rYLmyHPyYNLesi5t/aH1gfw==",
+        "loose-envify": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+          "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
           "requires": {
-            "@babel/runtime": "^7.2.0",
-            "prop-types": "^15.6.0",
-            "warning": "^4.0.1"
+            "js-tokens": "^3.0.0 || ^4.0.0"
           }
         },
-        "react-text-mask": {
-          "version": "5.4.3",
-          "resolved": "https://registry.npmjs.org/react-text-mask/-/react-text-mask-5.4.3.tgz",
-          "integrity": "sha1-mR77QpnjDC5sLEbRP2FxaUY+DS0=",
+        "prop-types": {
+          "version": "15.7.2",
+          "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
+          "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
           "requires": {
-            "prop-types": "^15.5.6"
+            "loose-envify": "^1.4.0",
+            "object-assign": "^4.1.1",
+            "react-is": "^16.8.1"
           }
         },
         "react-transition-group": {
@@ -9322,34 +9304,6 @@
             "loose-envify": "^1.4.0",
             "prop-types": "^15.6.2",
             "react-lifecycles-compat": "^3.0.4"
-          },
-          "dependencies": {
-            "loose-envify": {
-              "version": "1.4.0",
-              "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-              "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-              "requires": {
-                "js-tokens": "^3.0.0 || ^4.0.0"
-              }
-            },
-            "prop-types": {
-              "version": "15.7.2",
-              "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
-              "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
-              "requires": {
-                "loose-envify": "^1.4.0",
-                "object-assign": "^4.1.1",
-                "react-is": "^16.8.1"
-              }
-            }
-          }
-        },
-        "warning": {
-          "version": "4.0.3",
-          "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
-          "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
-          "requires": {
-            "loose-envify": "^1.0.0"
           }
         }
       }
@@ -9377,8 +9331,8 @@
       }
     },
     "mdbreact": {
-      "version": "git+https://oauth2:TrvzhasQo5h8aod8YSLE@git.mdbootstrap.com/mdb/react/re-pro.git#a9f2d49e92dc9e4c8e2fac9acec9eafc0f04a211",
-      "from": "git+https://oauth2:TrvzhasQo5h8aod8YSLE@git.mdbootstrap.com/mdb/react/re-pro.git",
+      "version": "git+https://oauth2:TrvzhasQo5h8aod8YSLE@git.mdbootstrap.com/mdb/react/re-pro.git#0ba3800c8ac0835dbc9d910f1df99996c6598fa7",
+      "from": "git+https://oauth2:TrvzhasQo5h8aod8YSLE@git.mdbootstrap.com/mdb/react/re-pro.git#4.17.0",
       "requires": {
         "@date-io/moment": "1.3.5",
         "@fortawesome/fontawesome-free": "5.8.2",
@@ -9399,21 +9353,6 @@
         "react-transition-group": "4.0.1"
       },
       "dependencies": {
-        "@date-io/moment": {
-          "version": "1.3.5",
-          "resolved": "https://registry.npmjs.org/@date-io/moment/-/moment-1.3.5.tgz",
-          "integrity": "sha512-b0JQb10Lie07iW2/9uKCQSrXif262d6zfYBstCLLJUk0JVA+7o/yLDg5p2+GkjgJbmodjHozIXs4Bi34RRhL8Q=="
-        },
-        "@fortawesome/fontawesome-free": {
-          "version": "5.8.2",
-          "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.8.2.tgz",
-          "integrity": "sha512-E4fDUF4fbu9AxKpaQQqCN3XBnNzb/5e0Gvd9OaQsYkK574LVI57v/EqqPfIm/mC7jYbxaPNrhvT5AF+Yzwyizg=="
-        },
-        "bootstrap-css-only": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/bootstrap-css-only/-/bootstrap-css-only-4.3.1.tgz",
-          "integrity": "sha512-xPQNmTR6skX7boM3Q/K2vWDL8RFhfHm5PbTcn/vd7nZtkzg9tc6ScNreIIsMaP9QLUxeqvUx+OGnDaiK4KBRiQ=="
-        },
         "classnames": {
           "version": "2.2.6",
           "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz",
@@ -9426,106 +9365,6 @@
           "requires": {
             "performance-now": "^2.1.0"
           }
-        },
-        "react": {
-          "version": "16.8.5",
-          "resolved": "https://registry.npmjs.org/react/-/react-16.8.5.tgz",
-          "integrity": "sha512-daCb9TD6FZGvJ3sg8da1tRAtIuw29PbKZW++NN4wqkbEvxL+bZpaaYb4xuftW/SpXmgacf1skXl/ddX6CdOlDw==",
-          "requires": {
-            "loose-envify": "^1.1.0",
-            "object-assign": "^4.1.1",
-            "scheduler": "^0.13.5"
-          }
-        },
-        "react-chartjs-2": {
-          "version": "2.7.6",
-          "resolved": "https://registry.npmjs.org/react-chartjs-2/-/react-chartjs-2-2.7.6.tgz",
-          "integrity": "sha512-xDr0jhgt/o26atftXxTVsepz+QYZI2GNKBYpxtLvYgwffLUm18a9n562reUJAHvuwKsy2v+qMlK5HyjFtSW0mg==",
-          "requires": {
-            "lodash": "^4.17.4",
-            "prop-types": "^15.5.8"
-          }
-        },
-        "react-dom": {
-          "version": "16.8.5",
-          "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.8.5.tgz",
-          "integrity": "sha512-VIEIvZLpFafsfu4kgmftP5L8j7P1f0YThfVTrANMhZUFMDOsA6e0kfR6wxw/8xxKs4NB59TZYbxNdPCDW34x4w==",
-          "requires": {
-            "loose-envify": "^1.1.0",
-            "object-assign": "^4.1.1",
-            "scheduler": "^0.13.5"
-          }
-        },
-        "react-popper": {
-          "version": "1.3.3",
-          "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-1.3.3.tgz",
-          "integrity": "sha512-ynMZBPkXONPc5K4P5yFWgZx5JGAUIP3pGGLNs58cfAPgK67olx7fmLp+AdpZ0+GoQ+ieFDa/z4cdV6u7sioH6w==",
-          "requires": {
-            "@babel/runtime": "^7.1.2",
-            "create-react-context": "<=0.2.2",
-            "popper.js": "^1.14.4",
-            "prop-types": "^15.6.1",
-            "typed-styles": "^0.0.7",
-            "warning": "^4.0.2"
-          }
-        },
-        "react-toastify": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/react-toastify/-/react-toastify-5.1.0.tgz",
-          "integrity": "sha512-0kVAAE7VO609EeXLVaFHDTc6Bnd/OUAb7rrRAwMsHeaThKEhH+WEQEPftTjuA4rP59K0QhCnWu4Ds2hXAcFxaw==",
-          "requires": {
-            "@babel/runtime": "^7.4.2",
-            "classnames": "^2.2.6",
-            "prop-types": "^15.7.2",
-            "react-transition-group": "^2.6.1"
-          },
-          "dependencies": {
-            "dom-helpers": {
-              "version": "3.4.0",
-              "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.4.0.tgz",
-              "integrity": "sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==",
-              "requires": {
-                "@babel/runtime": "^7.1.2"
-              }
-            },
-            "loose-envify": {
-              "version": "1.4.0",
-              "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-              "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-              "requires": {
-                "js-tokens": "^3.0.0 || ^4.0.0"
-              }
-            },
-            "prop-types": {
-              "version": "15.7.2",
-              "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
-              "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
-              "requires": {
-                "loose-envify": "^1.4.0",
-                "object-assign": "^4.1.1",
-                "react-is": "^16.8.1"
-              }
-            },
-            "react-transition-group": {
-              "version": "2.9.0",
-              "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.9.0.tgz",
-              "integrity": "sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg==",
-              "requires": {
-                "dom-helpers": "^3.4.0",
-                "loose-envify": "^1.4.0",
-                "prop-types": "^15.6.2",
-                "react-lifecycles-compat": "^3.0.4"
-              }
-            }
-          }
-        },
-        "warning": {
-          "version": "4.0.3",
-          "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
-          "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
-          "requires": {
-            "loose-envify": "^1.0.0"
-          }
         }
       }
     },
@@ -10796,9 +10635,9 @@
       }
     },
     "popper.js": {
-      "version": "1.14.4",
-      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.14.4.tgz",
-      "integrity": "sha1-juwdj/AqWjoVLdQ0FKFce3n9abY="
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
+      "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ=="
     },
     "portfinder": {
       "version": "1.0.20",
@@ -12221,6 +12060,15 @@
         "prop-types": "^15.6.0"
       }
     },
+    "react-chartjs-2": {
+      "version": "2.7.6",
+      "resolved": "https://registry.npmjs.org/react-chartjs-2/-/react-chartjs-2-2.7.6.tgz",
+      "integrity": "sha512-xDr0jhgt/o26atftXxTVsepz+QYZI2GNKBYpxtLvYgwffLUm18a9n562reUJAHvuwKsy2v+qMlK5HyjFtSW0mg==",
+      "requires": {
+        "lodash": "^4.17.4",
+        "prop-types": "^15.5.8"
+      }
+    },
     "react-csv": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/react-csv/-/react-csv-1.1.1.tgz",
@@ -12243,32 +12091,19 @@
       "integrity": "sha512-xXUbDAZkU08aAkjtUvldqbvI04ogv+a1XdHxvYuHPYKIVk/42BIOD0zSKTHAWV4+gDy3yGm283z2072rA2gdtw=="
     },
     "react-event-listener": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/react-event-listener/-/react-event-listener-0.6.4.tgz",
-      "integrity": "sha512-t7VSjIuUFmN+GeyKb+wm025YLeojVB85kJL6sSs0wEBJddfmKBEQz+CNBZ2zBLKVWkPy/fZXM6U5yvojjYBVYQ==",
+      "version": "0.6.6",
+      "resolved": "https://registry.npmjs.org/react-event-listener/-/react-event-listener-0.6.6.tgz",
+      "integrity": "sha512-+hCNqfy7o9wvO6UgjqFmBzARJS7qrNoda0VqzvOuioEpoEXKutiKuv92dSz6kP7rYLmyHPyYNLesi5t/aH1gfw==",
       "requires": {
-        "@babel/runtime": "7.0.0",
+        "@babel/runtime": "^7.2.0",
         "prop-types": "^15.6.0",
         "warning": "^4.0.1"
       },
       "dependencies": {
-        "@babel/runtime": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.0.0.tgz",
-          "integrity": "sha512-7hGhzlcmg01CvH1EHdSPVXYX1aJ8KCEyz6I9xYIi/asDtzBPMyMhVibhM/K6g/5qnKBwjZtp10bNZIEFTRW1MA==",
-          "requires": {
-            "regenerator-runtime": "^0.12.0"
-          }
-        },
-        "regenerator-runtime": {
-          "version": "0.12.1",
-          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz",
-          "integrity": "sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg=="
-        },
         "warning": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.2.tgz",
-          "integrity": "sha512-wbTp09q/9C+jJn4KKJfJfoS6VleK/Dti0yqWSm6KMvJ4MRCXFQNapHuJXutJIrWV0Cf4AhTdeIe4qdKHR1+Hug==",
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
+          "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
           "requires": {
             "loose-envify": "^1.0.0"
           }
@@ -12286,9 +12121,9 @@
       "integrity": "sha512-H17qmv+ti/AM7h6pZgIni8t2KkOwIcp6T6pHV0hSnr9Xml2CZ7TpQ+Otw9pW8a3pSi6oF11G0duDX5dzbsae9g=="
     },
     "react-ga": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/react-ga/-/react-ga-2.6.0.tgz",
-      "integrity": "sha512-GWHBWZDFjDGMkIk1LzroIn0mNTygKw3adXuqvGvheFZvlbpqMPbHsQsTdQBIxRRdXGQM/Zq+dQLRPKbwIHMTaw=="
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/react-ga/-/react-ga-2.7.0.tgz",
+      "integrity": "sha512-AjC7UOZMvygrWTc2hKxTDvlMXEtbmA0IgJjmkhgmQQ3RkXrWR11xEagLGFGaNyaPnmg24oaIiaNPnEoftUhfXA=="
     },
     "react-hot-loader": {
       "version": "4.3.5",
@@ -12375,6 +12210,29 @@
       "resolved": "https://registry.npmjs.org/react-odata/-/react-odata-10.1.0.tgz",
       "integrity": "sha1-+kBLlvfo6JZbgZh6xAiKWynIP5s="
     },
+    "react-popper": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-1.3.3.tgz",
+      "integrity": "sha512-ynMZBPkXONPc5K4P5yFWgZx5JGAUIP3pGGLNs58cfAPgK67olx7fmLp+AdpZ0+GoQ+ieFDa/z4cdV6u7sioH6w==",
+      "requires": {
+        "@babel/runtime": "^7.1.2",
+        "create-react-context": "<=0.2.2",
+        "popper.js": "^1.14.4",
+        "prop-types": "^15.6.1",
+        "typed-styles": "^0.0.7",
+        "warning": "^4.0.2"
+      },
+      "dependencies": {
+        "warning": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
+          "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
+          "requires": {
+            "loose-envify": "^1.0.0"
+          }
+        }
+      }
+    },
     "react-redux": {
       "version": "5.0.7",
       "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-5.0.7.tgz",
@@ -12493,6 +12351,14 @@
         "classnames": "^2.2.5"
       }
     },
+    "react-text-mask": {
+      "version": "5.4.3",
+      "resolved": "https://registry.npmjs.org/react-text-mask/-/react-text-mask-5.4.3.tgz",
+      "integrity": "sha1-mR77QpnjDC5sLEbRP2FxaUY+DS0=",
+      "requires": {
+        "prop-types": "^15.5.6"
+      }
+    },
     "react-textarea-autosize": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/react-textarea-autosize/-/react-textarea-autosize-6.1.0.tgz",
@@ -12501,6 +12367,53 @@
         "prop-types": "^15.6.0"
       }
     },
+    "react-toastify": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/react-toastify/-/react-toastify-5.1.0.tgz",
+      "integrity": "sha512-0kVAAE7VO609EeXLVaFHDTc6Bnd/OUAb7rrRAwMsHeaThKEhH+WEQEPftTjuA4rP59K0QhCnWu4Ds2hXAcFxaw==",
+      "requires": {
+        "@babel/runtime": "^7.4.2",
+        "classnames": "^2.2.6",
+        "prop-types": "^15.7.2",
+        "react-transition-group": "^2.6.1"
+      },
+      "dependencies": {
+        "classnames": {
+          "version": "2.2.6",
+          "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz",
+          "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q=="
+        },
+        "loose-envify": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+          "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+          "requires": {
+            "js-tokens": "^3.0.0 || ^4.0.0"
+          }
+        },
+        "prop-types": {
+          "version": "15.7.2",
+          "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
+          "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
+          "requires": {
+            "loose-envify": "^1.4.0",
+            "object-assign": "^4.1.1",
+            "react-is": "^16.8.1"
+          }
+        },
+        "react-transition-group": {
+          "version": "2.9.0",
+          "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.9.0.tgz",
+          "integrity": "sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg==",
+          "requires": {
+            "dom-helpers": "^3.4.0",
+            "loose-envify": "^1.4.0",
+            "prop-types": "^15.6.2",
+            "react-lifecycles-compat": "^3.0.4"
+          }
+        }
+      }
+    },
     "react-tooltip": {
       "version": "3.6.1",
       "resolved": "https://registry.npmjs.org/react-tooltip/-/react-tooltip-3.6.1.tgz",
@@ -12623,31 +12536,16 @@
       }
     },
     "recompose": {
-      "version": "0.28.2",
-      "resolved": "https://registry.npmjs.org/recompose/-/recompose-0.28.2.tgz",
-      "integrity": "sha512-baVNKQBQAAAuLRnv6Cb/6/j59a1BVj6c6Pags1KXVyRB0yPfQVUZtuAUnqHDBXoR8iXPrLGWE4RNtCQ/AaRP3g==",
+      "version": "0.30.0",
+      "resolved": "https://registry.npmjs.org/recompose/-/recompose-0.30.0.tgz",
+      "integrity": "sha512-ZTrzzUDa9AqUIhRk4KmVFihH0rapdCSMFXjhHbNrjAWxBuUD/guYlyysMnuHjlZC/KRiOKRtB4jf96yYSkKE8w==",
       "requires": {
-        "@babel/runtime": "7.0.0-beta.56",
+        "@babel/runtime": "^7.0.0",
         "change-emitter": "^0.1.2",
         "fbjs": "^0.8.1",
         "hoist-non-react-statics": "^2.3.1",
         "react-lifecycles-compat": "^3.0.2",
         "symbol-observable": "^1.0.4"
-      },
-      "dependencies": {
-        "@babel/runtime": {
-          "version": "7.0.0-beta.56",
-          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.0.0-beta.56.tgz",
-          "integrity": "sha512-vP9XV2VP013UEyZdU9eWClCsm6rQPUYHVNCfmpcv5uKviW7mKmUZq71Y5cr5dYsFKfnGDxSo8h6plUGR60lwHg==",
-          "requires": {
-            "regenerator-runtime": "^0.12.0"
-          }
-        },
-        "regenerator-runtime": {
-          "version": "0.12.1",
-          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz",
-          "integrity": "sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg=="
-        }
       }
     },
     "reduce-css-calc": {
diff --git a/package.json b/package.json
index 3126b8e..6aa5648 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "date-fns": "^1.30.1",
     "font-awesome": "^4.7.0",
     "luxon": "^1.12.0",
-    "mdbreact": "git+https://oauth2:TrvzhasQo5h8aod8YSLE@git.mdbootstrap.com/mdb/react/re-pro.git",
+    "mdbreact": "git+https://oauth2:TrvzhasQo5h8aod8YSLE@git.mdbootstrap.com/mdb/react/re-pro.git#4.17.0",
     "moment": "^2.24.0",
     "odata-query": "^5.4.3",
     "oidc-client": "^1.5.2",
@@ -30,7 +30,7 @@
     "react-error-overlay": "^4.0.1",
     "react-favicon": "0.0.14",
     "react-fetch-component": "^6.1.0",
-    "react-ga": "^2.6.0",
+    "react-ga": "^2.7.0",
     "react-odata": "^10.1.0",
     "react-redux": "^5.0.7",
     "react-router": "^4.3.1",