diff --git a/client/main.html b/client/main.html
index d019f87..38131f7 100644
--- a/client/main.html
+++ b/client/main.html
@@ -1,5 +1,6 @@
 <head>
-  <title>CZ3003App</title>
+  <title>CMS Singapore - CACAD</title>
+  <link rel="icon" href="/images/icon.png">
   <link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
 </head>
 
@@ -67,10 +68,10 @@
                         {{#if isInRole 'Admin'}}
                         <li class="sublist"><a href="/category/0/0">NEW</a></li>
                         {{/if}}
-                    </ul>
+                    </ul> 
                 </li>
                 <li>
-                    <a href="#">REPORTS</a>
+                    <a href="#">INCIDENTS</a>
                     <ul type="disc">
                         <li class="sublist"><a href="/reports/view">VIEW</a></li>
                         {{#if isInRole 'Admin, Operator'}}
diff --git a/imports/ui/map.jsx b/imports/ui/map.jsx
index ef257ed..8a7abee 100644
--- a/imports/ui/map.jsx
+++ b/imports/ui/map.jsx
@@ -161,13 +161,14 @@ class GoogleMap extends React.Component {
     DengueControlDiv.index = 1;
     TrafficControlDiv.index = 1;
     GasControlDiv.index = 1;
-    mapi.controls[google.maps.ControlPosition.TOP_CENTER].push(PSIControlDiv);
-    mapi.controls[google.maps.ControlPosition.TOP_CENTER].push(WeatherControlDiv);
-    mapi.controls[google.maps.ControlPosition.TOP_CENTER].push(ShelterControlDiv);
-    mapi.controls[google.maps.ControlPosition.TOP_CENTER].push(FireControlDiv);
-    mapi.controls[google.maps.ControlPosition.TOP_CENTER].push(DengueControlDiv);
-    mapi.controls[google.maps.ControlPosition.TOP_CENTER].push(TrafficControlDiv);
-    mapi.controls[google.maps.ControlPosition.TOP_CENTER].push(GasControlDiv);
+    
+    mapi.controls[google.maps.ControlPosition.RIGHT_CENTER].push(PSIControlDiv);
+    mapi.controls[google.maps.ControlPosition.RIGHT_CENTER].push(WeatherControlDiv);
+    mapi.controls[google.maps.ControlPosition.RIGHT_CENTER].push(ShelterControlDiv);
+    mapi.controls[google.maps.ControlPosition.RIGHT_CENTER].push(DengueControlDiv);
+    mapi.controls[google.maps.ControlPosition.RIGHT_CENTER].push(TrafficControlDiv);
+    mapi.controls[google.maps.ControlPosition.RIGHT_CENTER].push(FireControlDiv);
+    mapi.controls[google.maps.ControlPosition.RIGHT_CENTER].push(GasControlDiv);
     this.setState({
           ready : true
         })
@@ -182,9 +183,9 @@ class GoogleMap extends React.Component {
         controlUI.style.borderRadius = '3px';
         controlUI.style.boxShadow = '0 2px 6px rgba(0,0,0,.3)';
         controlUI.style.cursor = 'pointer';
-        controlUI.style.marginBottom = '22px';
+        controlUI.style.marginBottom = '3px';
         controlUI.style.textAlign = 'center';
-        controlUI.title = 'Click to show PSI Markers';
+        controlUI.title = 'Click to show markers';
         controlDiv.appendChild(controlUI);
 
         // Set CSS for the control interior.
@@ -311,63 +312,17 @@ class GoogleMap extends React.Component {
                 '<td>:</td>'+
                 '<td class="mapContent">' + markerlist[i][4] + '</td>' +
               '</tr>' +
-              '<tr>' +
-                '<td>1-hr NO2 concentration</td>'+
-                '<td>:</td>'+
-                '<td class="mapContent">' + markerlist[i][5] + '</td>' +
-              '</tr>' +
-              '<tr>' +
-                '<td>24-hrs PM10 concentration</td>'+
-                '<td>:</td>'+
-                '<td class="mapContent">' + markerlist[i][6] + '</td>' +
-              '</tr>' +
               '<tr>' +
                 '<td>24-hrs PM2.5 concentration</td>'+
                 '<td>:</td>'+
                 '<td class="mapContent">' + markerlist[i][7] + '</td>' +
               '</tr>' +
-              '<tr>' +
-                '<td>24-hrs SO2 concentration</td>'+
-                '<td>:</td>'+
-                '<td class="mapContent">' + markerlist[i][8] + '</td>' +
-              '</tr>' +
-              '<tr>' +
-                '<td>8-hrs CO concentration</td>'+
-                '<td>:</td>'+
-                '<td class="mapContent">' + markerlist[i][9] + '</td>' +
-              '</tr>' +
-              '<tr>' +
-                '<td>8-hrs O3 concentration</td>'+
-                '<td>:</td>'+
-                '<td class="mapContent">' + markerlist[i][10] + '</td>' +
-              '</tr>' +
-              '<tr>' +
-                '<td>CO sub-index</td>'+
-                '<td>:</td>'+
-                '<td class="mapContent">' + markerlist[i][11] + '</td>' +
-              '</tr>' +
-              '<tr>' +
-                '<td>O3 sub-index</td>'+
-                '<td>:</td>'+
-                '<td class="mapContent">' + markerlist[i][12] + '</td>' +
-              '</tr>' +
-              '<tr>' +
-                '<td>PM10 sub-index</td>'+
-                '<td>:</td>'+
-                '<td class="mapContent">' + markerlist[i][13] + '</td>' +
-              '</tr>' +
               '<tr>' +
                 '<td>PM2.5 sub-index</td>'+
                 '<td>:</td>'+
                 '<td class="mapContent">' + markerlist[i][14] + '</td>' +
               '</tr>' +
-              '<tr>' +
-                '<td>SO2 sub-index</td>'+
-                '<td>:</td>'+
-                '<td class="mapContent">' + markerlist[i][15] + '</td>' +
-              '</tr>' +
             '</table>'+
-
             '</div>'+
             '</div>';
       //detail of each marker
@@ -412,7 +367,7 @@ renderShelterMarkers() {
     }
       var arrayofMarkers = []
     var icon = {
-        url: 'images/logo.png',
+        url: 'images/shelter.png',
         scaledSize: new google.maps.Size(30,30),
         origin: new google.maps.Point(0,0),
         anchor: new google.maps.Point(0,0)}
diff --git a/imports/ui/reports_edit.jsx b/imports/ui/reports_edit.jsx
index 088ea47..7cee4b4 100644
--- a/imports/ui/reports_edit.jsx
+++ b/imports/ui/reports_edit.jsx
@@ -176,7 +176,7 @@ development of incidents! &lt;website link&gt;</div>"
 
     if(Roles.userIsInRole(Meteor.userId(), ['Admin', 'Operator'])) {
         return (<div>
-      <h2>Report Page</h2> 
+      <h2>Incident Page</h2> 
       <form name="reportCase" onSubmit={this.handleSubmit.bind(this)}>
         <fieldset id="reportCaseFieldSet">
             <table width="100%" border="0">
@@ -312,7 +312,7 @@ development of incidents! &lt;website link&gt;</div>"
       </form>
           {this.state.ready ? this.renderReportItem() : null}
           <br/>
-          <Link to =  "/reports/view" activeClassName="active">← Back to list of reports</Link>
+          <Link to =  "/reports/view" activeClassName="active">← Back to list of incidents</Link>
       </div>
     )
     }
diff --git a/public/images/icon.png b/public/images/icon.png
new file mode 100644
index 0000000..2ef0fb3
Binary files /dev/null and b/public/images/icon.png differ
diff --git a/server/main.js b/server/main.js
index 4cc4d2a..14d402b 100644
--- a/server/main.js
+++ b/server/main.js
@@ -9,7 +9,16 @@ Meteor.setInterval(function() {
     console.log("INSIDE INTERVAL")
     incidentTypes = ["Fire", "Gas Leak"]
     counter = {"Fire":{"Active":0, "Handled":0, "Resolved":0}, "Gas Leak":{"Active":0, "Handled":0, "Resolved":0}}
-    email = "<div><h2 style='color:#056571;'>Summary</h2><table style='width:700px; font-family:roboto, sans-serif; color:#414141;'><tr><th style='text-align: left; background-color: #056571; font-weight:bold; color:#ffffff;' width='20%'>Category</th><th  style='text-align: left; background-color: #056571; font-weight:bold; color:#ffffff; 'width='50%'>Active</th><th style='text-align: left; background-color: #056571; font-weight:bold; color:#ffffff;' width='15%'>Handled</th><th style='text-align: left; background-color: #056571; font-weight:bold; color:#ffffff;' width='15%'>Resolved</th></tr>"
+    email = "<p>Dear Mr Prime Minister, <br/><br/><br/>"+
+            "The following is the latest development on the current incidents in Singapore.<br/><br/></p>"+
+            "<div>"+
+            "<h2 style='color:#056571;'>Summary</h2>"+
+            "<table style='width:700px; font-family:roboto, sans-serif; color:#414141;'>"+
+            "<tr>"+
+            "<th style='text-align: left; background-color: #056571; font-weight:bold; color:#ffffff;' width='20%'>Category</th>"+
+            "<th style='text-align: left; background-color: #056571; font-weight:bold; color:#ffffff; 'width='15%'>Active</th>"+
+            "<th style='text-align: left; background-color: #056571; font-weight:bold; color:#ffffff;' width='15%'>Handled</th>"+
+            "<th style='text-align: left; background-color: #056571; font-weight:bold; color:#ffffff;' width='15%'>Resolved</th></tr>"
     incidents = "<div>"
     for(i = 0;i<incidentTypes.length;++i) {
         var reports =Meteor.call('reports.getByType', incidentTypes[i])
@@ -30,10 +39,14 @@ Meteor.setInterval(function() {
     email = email + "</div>"
     incidents = incidents + "</div>"
 
+    incidents = incidents + "<br/><p>We hope the information we provided could help you monitor the status of incidents and therefore make informed decisions accordingly.<br/></p>"+
+            "<p>That is the end of our half-hourly report summary.</p>"+
+            "<p>Should you need further information for any purposes, you may navigate to our website, cacadcmssingapore.scalingo.io<br/></p>"+
+            "<p>Thank you very much.<br/><br/>Best regards,<br/>CMS Singapore"
     // console.log(incidents)
 
     // Meteor.call('sendEmail', "dbakti1605@gmail.com", "PM Update", email + incidents);
-    // Meteor.call('sendEmail', "jm.joshua.martin@gmail.com", "PM Update", incidents);
+    // Meteor.call('sendEmail', "jm.joshua.martin@gmail.com", "PM Update", email + incidents);
 }, 5000);
 function GetMinuteDiff(a, b) {
     var diff = a - b;
