diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/static/ndf/js/meta_info.js b/gnowsys-ndf/gnowsys_ndf/ndf/static/ndf/js/meta_info.js
new file mode 100644
index 0000000000..a97adc2ec5
--- /dev/null
+++ b/gnowsys-ndf/gnowsys_ndf/ndf/static/ndf/js/meta_info.js
@@ -0,0 +1,24 @@
+var header_logo_dataURL;
+function toDataUrl(url, callback) {
+    var xhr = new XMLHttpRequest();
+    xhr.onload = function() {
+        var reader = new FileReader();
+        reader.onloadend = function() {
+            callback(reader.result);
+        }
+        reader.readAsDataURL(xhr.response);
+    };
+    xhr.open('GET', url);
+    xhr.responseType = 'blob';
+    xhr.send();
+}
+
+toDataUrl('/static/ndf/images/Clix-logo.png', function(myBase64) {
+    header_logo_dataURL = myBase64; // myBase64 is the base64 string
+});
+
+
+function get_current_datetime_val(){
+    var date = new Date();
+    return date.toDateString() + " " + date.toLocaleTimeString()
+}
diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/admin_course_analytics.html b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/admin_course_analytics.html
new file mode 100644
index 0000000000..81f370a577
--- /dev/null
+++ b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/admin_course_analytics.html
@@ -0,0 +1,237 @@
+{% load i18n %}
+{% load multiply from simple_filters %}
+{% load get_group_object check_is_gstaff get_profile_full_name from ndf_tags %}
+
+<style type="text/css">
+  .reveal-modal{
+    color: black !important;
+  }
+
+  .rating-stars {
+    background-image:url("/static/ndf/images/stars.png");
+    height: 17px;
+    display: none;
+  }
+
+</style>
+<script src="/static/ndf/bower_components/d3/d3.js"></script>
+<script src="/static/ndf/bower_components/html2canvas/build/html2canvas.js"></script>
+<script src="/static/ndf/bower_components/DataTables/media/js/jquery.dataTables.js"></script>
+<script src="/static/ndf/bower_components/DataTables/media/js/jquery.dataTables.min.js"></script>
+<script src="/static/ndf/bower_components/datatables-rowsgroup/dataTables.rowsGroup.js"></script>
+<script src="/static/ndf/bower_components/datatables.net-buttons/js/dataTables.buttons.js"></script>
+<script src="/static/ndf/bower_components/datatables.net-buttons/js/dataTables.buttons.min.js"></script>
+<script src="/static/ndf/bower_components/datatables.net-buttons/js/buttons.html5.js"></script>
+<script src="/static/ndf/bower_components/datatables.net-buttons/js/buttons.print.min.js"></script>
+<link href="/static/ndf/bower_components/datatables.net-buttons-dt/css/buttons.dataTables.min.css" rel="stylesheet" type="text/css" />
+<link href="/static/ndf/bower_components/DataTables/media/css/jquery.dataTables.css" rel="stylesheet" type="text/css" />
+<script src="/static/ndf/bower_components/pdfmake/build/pdfmake.min.js"></script>
+<script src="/static/ndf/bower_components/pdfmake/build/vfs_fonts.js"></script>
+<script src="/static/ndf/bower_components/jszip/dist/jszip.min.js"></script>
+
+{% get_profile_full_name request.user as req_user_full_name %}
+<div class="user-analytics-data" id="grp-analytics">
+<div class="pre-analytics-msg-div text-center hide">
+   {% trans "Your analytics is loading. Please wait." %} 
+</div>
+  
+  <div class="group-analytics ">
+    <div class="small-12 columns course-students-data">
+      <div class="small-12 medium-10 columns students-table-legends">
+        Points table for students <br/>
+        <span class=" badge_ex green">&nbsp;</span>
+        <span>Gallery uploads</span>
+        <span class=" badge_ex">&nbsp;</span>
+        <span>Note Making</span>
+        <span class=" badge_ex red">&nbsp;</span>
+        <span>Quiz Performance</span>
+        <span class=" badge_ex yellow">&nbsp;</span>
+        <span>Interactions</span><br/>
+        <small>* Click on the student's name to view detailed analytics.</small>
+      </div>
+    </div>
+    <div class="small-12 columns students-tabular-data text-center">
+      <div class="small-12 columns table-container">
+      </div>
+    </div>
+  </div>
+  <div id="userAnalyticsModal" class="reveal-modal reveal-modal-overlay" data-options="close_on_background_click:false;close_on_esc:false;" data-reveal aria-hidden="true" role="dialog">
+    <label id="userAnalyticsModalLabel"></label>
+    <div class="userAnalyticsData"></div>
+    <a class="close-reveal-modal" aria-label="Close">Close [&#215;]</a>
+  </div>
+</div>
+
+<script type="text/javascript">
+      // Admin analytics view
+      $(document).ready(function() {
+          var datetime_val = get_current_datetime_val()
+          $(".pre-analytics-msg-div").removeClass("hide")
+          data = {{response_dict|safe}}
+          column_headers = data["column_headers"];
+          students_data_set = data["students_data_set"];
+          max_data = data['max_points_dict']
+          file_max_points = max_data['file_max_points']
+          notes_max_points = max_data['notes_max_points']
+          quiz_max_points =  max_data['quiz_max_points']
+          interactions_max_points = max_data['interactions_max_points']
+          dataTable_columns_set = [];
+
+          var students_points_table = '<table cellpadding="0" cellspacing="0" border="0" class="display" id="students-points-table-tbody">' + '</table>';
+          $(".table-container").html(students_points_table)
+          // Prepare title & data headers used in dataTable
+          $.each(column_headers, function(index, v) {
+            d = {};
+            d["data"] = v[0];
+            d["title"] = v[1];
+            dataTable_columns_set.push(d);
+          });
+          // Set defintion dataTable
+          sce_dt_var = $("#students-points-table-tbody").dataTable({
+            "data": students_data_set,
+            "columns": dataTable_columns_set,
+            "dom": 'Bfrtip',
+            "buttons": [
+              'pageLength', 
+                {
+                    extend: 'csvHtml5',
+                    title: function(){
+                      return "{{group_name|slugify}}" 
+                    } 
+                },
+                {
+                    extend: 'pdfHtml5',
+                    header : true,
+                    footer: true,
+
+                    customize: function ( doc ) {
+                        doc.pageMargins = [30,80, 40, 60];
+                        doc.content[1].table.widths = [ '25%', '15%', '15%', '15%', '15%', '15%'];
+                        doc['footer'] = (function() {
+                            return {
+                                columns: [
+                                    'Report generated by: {{req_user_full_name}}\n{{site.GSTUDIO_DOC_FOOTER_TEXT}}' ,
+                                    { text: datetime_val, alignment: 'right' }
+
+                                ],
+                                margin: [10, 0],
+                                height: 100
+                            }
+                        });
+                        doc['header'] = (function() {
+                            return {
+                                margin: 10,
+                                columns: [
+                                    {
+                                        image: header_logo_dataURL,
+                                        width: 120,
+                                        margin: [30, 20, 0, 0],
+                                    }]
+                            }
+                        });
+
+                        // doc['content'] = (function(page, pages) {
+                        //     return {
+                        //         margin: 10,
+                        //     }
+                        // });
+
+                        doc.styles.title = {
+                          margin: [ 20, 0, 0, 5 ],
+                          color: '#6e3254',
+                          fontSize: '22',
+                          fontWeight: 'bold',
+                          alignment: 'center'
+                        }
+                    },
+                    title: function(){
+                      return "{{group_name|slugify}}" 
+                    } 
+
+                }
+            ],
+
+            "autoWidth": false,
+            "columnDefs": [
+             {"className": "dt-center", "targets": "_all"},
+
+                  { width: '10%', targets: 0 },
+                  { width: '10%', targets: 1 },
+                  { width: '20%', targets: 2 },
+                  { width: '20%', targets: 3 },
+                  { width: '20%', targets: 4 },
+                  { width: '20%', targets: 5 }
+               ],
+            "createdRow": function ( row, data, index ) {
+              user_id = data["user_id"];
+              $(row).attr("data-id", user_id);
+
+              $(row).attr("data-points-dict", JSON.stringify(data));
+
+              $(row).addClass("fetch-analytics")
+              $(row).find("td:nth-child(1)").addClass("user_name_analytics")
+              $(row).find("td:nth-child(3)").html(generate_points_bar(data['files_points'], "Files",data['users_points'],file_max_points));
+              $(row).find("td:nth-child(4)").html(generate_points_bar(data['notes_points'], "Notes",data['users_points'],notes_max_points));
+              $(row).find("td:nth-child(5)").html(generate_points_bar(data['quiz_points'], "Quiz",data['users_points'],quiz_max_points));
+              $(row).find("td:nth-child(6)").html(generate_points_bar(data['interactions_points'], "Interactions",data['users_points'],interactions_max_points));
+
+            }
+          });
+          $(".group-analytics").removeClass("hide")
+          $(".pre-analytics-msg-div").addClass("hide")
+      })
+
+      // Admin analytics view. Score-points in horizontal bars of enrolled students
+      function generate_points_bar(data_for_bars, bar_name, total_user_points, max){
+        if(data_for_bars && total_user_points){
+          var outer_div = document.createElement("div");
+          outer_div.className = "progress small-12 large-12"
+          var span_ele = document.createElement("span");
+          span_ele.className = "meter";
+          span_ele.style.width = (data_for_bars/parseInt(max, 10))* 100 + "%"
+          if (bar_name == "Interactions"){
+            bg_color_val = "#ffe694"
+          }
+          else if(bar_name == "Files"){
+            bg_color_val = "#b5d8a6"
+          }
+          else if(bar_name == "Notes"){
+            bg_color_val = "#9ec4fa"
+          }
+          else if(bar_name == "Quiz"){
+            bg_color_val = "#fa623f"
+          }
+
+          span_ele.style.backgroundColor = bg_color_val
+          var inner_span_ele = document.createElement("span")
+          inner_span_ele.className = "pull-left merter-val"
+          inner_span_ele.innerHTML = data_for_bars
+          $(span_ele).append(inner_span_ele)
+          $(outer_div).append(span_ele)
+          return outer_div.outerHTML;
+        }
+        else{
+          return "NA"
+        }
+      }
+
+      $(document).on('click','.fetch-analytics',function(){
+          var user_id = $(this).attr("data-id");
+          var dataPointsDict = $(this).attr('data-points-dict');
+          // $(this).addClass("hide")
+          // $(".pre-analytics-msg-div").removeClass("hide")
+          $.ajax({
+              url: "{% url 'course_analytics' group_id 'user_id' %}".replace("user_id", user_id),
+              type: "GET",
+              dataType: "html",
+              data: {'data_points_dict': dataPointsDict},
+              success: function(data){
+                $(".userAnalyticsData").html(data)
+                $("#userAnalyticsModal").foundation('reveal', 'open');
+                // $(".pre-analytics-msg-div").addClass("hide")
+              },
+          });//end of ajax
+      })
+
+
+</script>
\ No newline at end of file
diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/course_about.html b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/course_about.html
index 0a46399aca..6c6ff7f756 100755
--- a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/course_about.html
+++ b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/course_about.html
@@ -221,14 +221,8 @@ <h5>Subject</h5>
           </div>
         </div>
       </div>
-      <br/>
-
-     
-      
-      <br/>
-
-      
-        {# </div> #}
+      <br/><br/>
+      {# </div> #}
     </div>
   
 {% endif %}
@@ -255,358 +249,8 @@ <h5>Created On</h5>
       {# </div> #}
   </div>
 {# </div> #}
+<br/><br/>
 
-<br/>
-<br/>
-
-
-
-
-
-
-{% if show_analytics_notifications %}
-{% check_is_gstaff group_id request.user as gstaff_access %}
-  <div class="course-overview-container">
-    <div class="collapse course-overview">
-      {# <div class="columns small-12 medium-12"> #}
-        {% comment %}
-        <div class="ongoing-session">
-          <h5>ONGOING SESSION </h5>
-          <h3>Taking Screenshots of the work and doing something</h3>
-          <button class="tiny button"><i class="fa fa-sign-in"></i>&nbsp;Enter Session</button>
-        </div>
-        {% endcomment %}
-        <div class="notifications-analytics-tabs">
-          <ul class="tabs" data-tab role="tablist">
-            <li class="tab-title active" ><a href="#course-notification" role="tab" tabindex="0" aria-selected="true" aria-controls="panel2-1"> <i class="fa fa-bell" aria-hidden="true"></i> Notifications</a></li>
-
-            {% if request.user.is_authenticated and not gstaff_access %}
-            {# {% if request.user.is_authenticated and not gstaff_access and request.user.id in group_obj.author_set %} #}
-              <li class="tab-title" title="Click here to refresh">
-                <a role="tab" href="#analytics-content" class="fetch-analytics" tabindex="1" aria-selected="false" aria-controls="panel2-2" data-id={{request.user.id}}> <i class="fa fa-line-chart" aria-hidden="true"></i> Progress Report</a>
-              </li>
-              <input type="hidden" class="is_admin" value="False" />
-            {% elif gstaff_access or request.user.id in group_object.group_admin %}
-              <input type="hidden" class="is_admin" value="True" />
-              <li class="tab-title" ><a role="tab" href="#analytics-content" tabindex="1" aria-selected="false" class="fetch-group-analytics" aria-controls="panel2-2" data-id={{request.user.id}}> <i class="fa fa-line-chart" aria-hidden="true"></i> Group Analytics</a></li>
-            {% endif %}
-
-          </ul>
-          <div class="tabs-content">
-            <section role="tabpanel" aria-hidden="true" class="content active" id="course-notification">
-            </section>
-            <section role="tabpanel" aria-hidden="false" class="content active" id="analytics-content">
-              {% if gstaff_access %}
-                <div class="group-analytics hide">
-                  <div class="row course-students-data">
-                    <div class="small-12 medium-3 columns">
-                      Points table for students
-                    </div>
-                    <div class="small-12 medium-10 columns students-table-legends">
-                      <span class=" badge_ex green">&nbsp;</span>
-                      <span>Gallery uploads</span>
-                      <span class=" badge_ex">&nbsp;</span>
-                      <span>Note Making</span>
-                      <span class=" badge_ex red">&nbsp;</span>
-                      <span>Quiz Performance</span>
-                      <span class=" badge_ex yellow">&nbsp;</span>
-                      <span>Interactions</span>
-                    </div>
-                  </div>
-                  <small>* Click on the student's name to view detailed analytics.</small>
-                  <div class="row students-tabular-data">
-                    <div class="small-12 columns table-container">
-                    </div>
-                  </div>
-                </div>
-                <div id="userAnalyticsModal" class="reveal-modal reveal-modal-overlay" data-options="close_on_background_click:false;close_on_esc:false;" data-reveal aria-hidden="true" role="dialog">
-                  <label id="userAnalyticsModalLabel"></label>
-                  <div class="userAnalyticsData"></div>
-                  <a class="close-reveal-modal" aria-label="Close">Close [&#215;]</a>
-                </div>
-              {% endif %}
-
-            </section>
-          </div>
-        </div>
-      {# </div> #}
-    </div>
-  </div>
-  <script type="text/javascript">
-      // Student analytics view
-      $(document).on('click','.fetch-analytics',function(){
-          var user_id = $(this).attr("data-id");
-          var dataPointsDict = $(this).attr('data-points-dict');
-          // $(this).addClass("hide")
-          $(".pre-analytics-msg-div").removeClass("hide")
-          $.ajax({
-              url: "{% url 'course_analytics' group_id 'user_id' %}".replace("user_id", user_id),
-              type: "GET",
-              dataType: "html",
-              data: {'data_points_dict': dataPointsDict},
-              global: false,
-              success: function(data){
-                  if($(".is_admin").val() == "True"){
-                    $(".userAnalyticsData").html(data)
-                    $("#userAnalyticsModal").foundation('reveal', 'open');
-                  }
-                  else{
-                    $("#analytics-content").html(data)
-                  }
-                  $(".pre-analytics-msg-div").addClass("hide")
-              },
-          });//end of ajax
-      })
-
-      // Admin analytics view
-      $(document).on('click','.fetch-group-analytics',function(){
-        if($(".admin_analytics_fetched").val() == "False"){
-          // $(".fetch-group-analytics").addClass("hide")
-          $(".pre-analytics-msg-div").removeClass("hide")
-          $.ajax({
-              url: "{% url 'course_analytics_admin' group_id %}",
-
-              type: "GET",
-
-              dataType: "html",
-              global: false,
-              success: function(data){
-                $(".admin_analytics_fetched").attr('value', "True");
-                data = JSON.parse(data)
-                column_headers = data["column_headers"];
-                students_data_set = data["students_data_set"];
-                max_data = data['max_points_dict']
-                file_max_points = max_data['file_max_points']
-                notes_max_points = max_data['notes_max_points']
-                quiz_max_points =  max_data['quiz_max_points']
-                interactions_max_points = max_data['interactions_max_points']
-                dataTable_columns_set = [];
-
-                var students_points_table = '<table cellpadding="0" cellspacing="0" border="0" class="display" id="students-points-table-tbody">' + '</table>';
-                $(".table-container").html(students_points_table)
-                // Prepare title & data headers used in dataTable
-                $.each(column_headers, function(index, v) {
-                  d = {};
-                  d["data"] = v[0];
-                  d["title"] = v[1];
-                  dataTable_columns_set.push(d);
-                });
-                // Set defintion dataTable
-                sce_dt_var = $("#students-points-table-tbody").dataTable({
-                  "data": students_data_set,
-                  "columns": dataTable_columns_set,
-                  "autoWidth": false,
-                  "columnDefs": [
-                        { width: '10%', targets: 0 },
-                        { width: '10%', targets: 1 },
-                        { width: '20%', targets: 2 },
-                        { width: '20%', targets: 3 },
-                        { width: '20%', targets: 4 },
-                        { width: '20%', targets: 5 }
-                     ],
-                  "createdRow": function ( row, data, index ) {
-                    user_id = data["user_id"];
-                    $(row).attr("data-id", user_id);
-
-                    $(row).attr("data-points-dict", JSON.stringify(data));
-
-                    $(row).addClass("fetch-analytics")
-                    $(row).find("td:nth-child(3)").html(generate_points_bar(data['files_points'], "Files",data['users_points'],file_max_points));
-                    $(row).find("td:nth-child(4)").html(generate_points_bar(data['notes_points'], "Notes",data['users_points'],notes_max_points));
-                    $(row).find("td:nth-child(5)").html(generate_points_bar(data['quiz_points'], "Quiz",data['users_points'],quiz_max_points));
-                    $(row).find("td:nth-child(6)").html(generate_points_bar(data['interactions_points'], "Interactions",data['users_points'],interactions_max_points));
-
-                  }
-                });
-                $(".group-analytics").removeClass("hide")
-                $(".pre-analytics-msg-div").addClass("hide")
-              },
-          });//end of ajax
-        }
-      })
-
-      // Admin analytics view. Score-points in horizontal bars of enrolled students
-      function generate_points_bar(data_for_bars, bar_name, total_user_points, max){
-        if(data_for_bars && total_user_points){
-          var outer_div = document.createElement("div");
-          outer_div.className = "progress small-12 large-12"
-          var span_ele = document.createElement("span");
-          span_ele.className = "meter";
-          span_ele.style.width = (data_for_bars/parseInt(max, 10))* 100 + "%"
-          if (bar_name == "Interactions"){
-            bg_color_val = "#ffe694"
-          }
-          else if(bar_name == "Files"){
-            bg_color_val = "#b5d8a6"
-          }
-          else if(bar_name == "Notes"){
-            bg_color_val = "#9ec4fa"
-          }
-          else if(bar_name == "Quiz"){
-            bg_color_val = "#fa623f"
-          }
-
-          span_ele.style.backgroundColor = bg_color_val
-          var inner_span_ele = document.createElement("span")
-          inner_span_ele.className = "pull-left merter-val"
-          inner_span_ele.innerHTML = data_for_bars
-          $(span_ele).append(inner_span_ele)
-          $(outer_div).append(span_ele)
-          return outer_div.outerHTML;
-        }
-        else{
-          return "NA"
-        }
-      }
-
-      // pi chart for score points
-      function generateGraph(data){
-        var dataSet = []
-          $.each(data,function(i,v){
-            dataSet.push({'legendLabel':i,'magnitude':v})
-          })
-
-        var canvasWidth = 600, //width
-          canvasHeight = 300,   //height
-          outerRadius = 100,   //radius
-          color = d3.scale.category20(); //builtin range of colors
-
-        // var dataSet = [
-        //   {"legendLabel":"One", "magnitude":20},
-        //   {"legendLabel":"Two", "magnitude":40},
-        //   {"legendLabel":"Three", "magnitude":50},
-        //   {"legendLabel":"Four", "magnitude":16},
-        //   {"legendLabel":"Five", "magnitude":50},
-        //   {"legendLabel":"Six", "magnitude":8},
-        //   {"legendLabel":"Six", "magnitude":8},
-        //   {"legendLabel":"Seven", "magnitude":30}];
-
-        var vis = d3.select(".course-points-breakup")
-          .append("svg:svg") //create the SVG element inside the <body>
-            .data([dataSet]) //associate our data with the document
-            .attr("width", canvasWidth) //set the width of the canvas
-            .attr("height", canvasHeight) //set the height of the canvas
-            .append("svg:g") //make a group to hold our pie chart
-              // .attr("transform", "translate(" + 1.5*outerRadius + "," + 1.5*outerRadius + ")") // relocate center of pie to 'outerRadius,outerRadius'
-              .attr("transform", "translate(" + 200 + "," + 100 + ")") // relocate center of pie to 'outerRadius,outerRadius'
-
-        // This will create <path> elements for us using arc data...
-        var arc = d3.svg.arc()
-          .outerRadius(outerRadius);
-
-        var pie = d3.layout.pie() //this will create arc data for us given a list of values
-          .value(function(d) { return d.magnitude; }) // Binding each value to the pie
-          .sort( function(d) { return null; } );
-
-        // Select all <g> elements with class slice (there aren't any yet)
-        var arcs = vis.selectAll("g.slice")
-          // Associate the generated pie data (an array of arcs, each having startAngle,
-          // endAngle and value properties)
-          .data(pie)
-          // This will create <g> elements for every "extra" data element that should be associated
-          // with a selection. The result is creating a <g> for every object in the data array
-          .enter()
-          // Create a group to hold each slice (we will have a <path> and a <text>
-          // element associated with each slice)
-          .append("svg:g")
-          .attr("class", "slice");    //allow us to style things in the slices (like text)
-
-        arcs.append("svg:path")
-          //set the color for each slice to be chosen from the color function defined above
-          .attr("fill", function(d, i) { return color(i); } )
-          //this creates the actual SVG path using the associated data (pie) with the arc drawing function
-          .attr("d", arc);
-
-        // Add a legendLabel to each arc slice...
-        arcs.append("svg:text")
-          .attr("transform", function(d) { //set the label's origin to the center of the arc
-            //we have to make sure to set these before calling arc.centroid
-            d.outerRadius = outerRadius + 50; // Set Outer Coordinate
-            d.innerRadius = outerRadius + 45; // Set Inner Coordinate
-            return "translate(" + arc.centroid(d) + ")";
-          })
-          .attr("text-anchor", "middle") //center the text on it's origin
-          .style("fill", "Purple")
-          .style("font", "15px Arial")
-          .text(function(d, i) { return dataSet[i].legendLabel + "(" + dataSet[i].magnitude + ")"; }); //get the label from our original data array
-
-        // Add a magnitude value to the larger arcs, translated to the arc centroid and rotated.
-        var quant = arcs.filter(function(d) { return d.endAngle - d.startAngle > .2; })
-            .append('g')
-          var temp = quant.append("svg:text")
-              .style("fill", "White")
-              .style("font", "15px Arial")
-              .text(function(d) { return d.data.magnitude; })
-
-          quant.attr("dy", ".35em")
-          .attr("text-anchor", "middle")
-          //.attr("transform", function(d) { return "translate(" + arc.centroid(d) + ")rotate(" + angle(d) + ")"; })
-          .attr("transform", function(d) { //set the label's origin to the center of the arc
-            //we have to make sure to set these before calling arc.centroid
-            d.outerRadius = outerRadius; // Set Outer Coordinate
-            d.innerRadius = outerRadius/2; // Set Inner Coordinate
-            return "translate(" + arc.centroid(d) + ")rotate(" + angle(d) + ")";
-          })
-
-        // Computes the angle of an arc, converting from radians to degrees.
-        function angle(d) {
-          var a = (d.startAngle + d.endAngle) * 90 / Math.PI - 90;
-          return a > 90 ? a - 180 : a;
-        }
-        // Converts from degrees to radians.
-        Math.radians = function(degrees) {
-          return degrees * Math.PI / 180;
-        };
-
-        // Converts from radians to degrees.
-        Math.degrees = function(radians) {
-          return radians * 180 / Math.PI;
-        };
-      }
-
-      // Global variables to manage notifications ajax call
-      var count = 0;
-      var morecount = 0;
-      var counter = 1;
-
-      // Scroll event for Notifications div
-      $("#course-notification").scroll(function(){
-          if (count == 0) {
-              loaddata();
-              count = count+1;
-          }
-      })
-
-      // Fetch notifications ajax call with function
-      function loaddata() {
-        $.ajax({
-            url: "{% url 'page_scroll' groupid 'counter' %}".replace("counter", counter),
-            type: "GET",
-            data:{'links': false},
-            datatype: "json",
-            global: false,
-            beforeSend: function(){
-                $("#course-notification").append("<label class='loading_lbl'>Loading...</label>");
-            },
-            success:function(data){
-                if(String(data)) {
-                    $(".loading_lbl").remove()
-                    $("#course-notification").append(data);
-                    counter = counter+1;
-                }
-
-                else{
-                    if(morecount ==0) {
-                        $("#course-notification").append("<h6>  No more data to show </h6>");
-                        morecount = morecount+1;
-                        counter = 2;
-                    }
-                }
-            }
-        });
-      }
-  </script>
-{% endif %}
 <script type="text/javascript">
 
     // ready function
diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/lms.html b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/lms.html
index a984888493..7d19685cd1 100644
--- a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/lms.html
+++ b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/lms.html
@@ -11,6 +11,7 @@
 
 {% block head %}
   <script src="/static/ndf/bower_components/jquery-backstretch/jquery.backstretch.min.js"></script>
+  <script src="/static/ndf/js/meta_info.js"></script>
 {% endblock head %}
 
 {% block body_content %}
@@ -63,18 +64,23 @@
       </a>
     </li>
     {% if request.user.is_authenticated %}
-    <li>
-      <a {% if is_gstaff %} href="{% url 'course_analytics_admin' group_name %}" {% else %} href="{% url 'progress_report' group_name request.user.pk %}" {% endif %}{% if title == 'progress_report' %} class="selected" {% endif %} tabindex="6" title="See how you have done, how many comments have you received." > <i class="fa fa-line-chart"></i> 
-                {% if 'Group' in group_object_member_of_names_list %}
-                  {% trans "Stats" %}{% else %}{% trans "Progress Report" %}
-                {% endif %}
-      </a>
-    </li>
-       {% endif %}
+      <li>
+        <a {% if is_gstaff %} href="{% url 'course_analytics_admin' group_name %}" {% else %} href="{% url 'course_analytics' group_id request.user.pk %}" {% endif %}{% if title == 'course_analytics' %} class="selected" {% endif %} tabindex="6" title="See how you have done, how many comments have you received." > <i class="fa fa-line-chart"></i> 
+            {% if 'Group' in group_object_member_of_names_list %}
+              {% trans "Stats" %}{% else %}
+              {% if is_gstaff %}
+                {% trans "Group Progress" %}
+              {% else %}
+                {% trans "Progress" %}
+              {% endif %}
+            {% endif %}
+        </a>
+      </li>
+     {% endif %}
      {% if 'Group'  in group_object_member_of_names_list and "base_unit" not in group_object_member_of_names_list and "announced_unit" not in group_object_member_of_names_list %}
-    <li>
-      <a href="{% url 'curriculum_list' groupid  %}" tabindex="6"> <i class="fa fa-sitemap ">  </i> {% trans "Topic Map" %}</a>
-    </li>
+      <li>
+        <a href="{% url 'curriculum_list' groupid  %}" tabindex="6"> <i class="fa fa-sitemap ">  </i> {% trans "Topic Map" %}</a>
+      </li>
     {% endif %}
     {% comment %}
     <li>
@@ -204,7 +210,6 @@ <h3>{% trans "Delete Unit:" %} {% firstof group_object.altnames group_object.nam
 
 
   <div class="small-12 columns group_sections_content">
-
    <div id="group_overview">
       {% if title == "about" %}
         {% include "ndf/course_about.html" %}
@@ -216,10 +221,14 @@ <h3>{% trans "Delete Unit:" %} {% firstof group_object.altnames group_object.nam
           {% include "ndf/gnotebook.html" %}
         {% endif %}
     </div>
-    <div id="progress_report">
-       {% if title == 'progress_report' %}
+    <div id="course_analytics">
+       {% if title == 'course_analytics' %}
+       {% if is_gstaff %}
+          {% include "ndf/admin_course_analytics.html" %}
+        {% else %}
           {% include "ndf/user_course_analytics.html" %}
         {% endif %}
+        {% endif %}
     </div>
     <div id="group_course_content">
        {% if title == 'course content' %}
diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/lms_dashboard.html b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/lms_dashboard.html
index d001c73f9c..be59fac67b 100644
--- a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/lms_dashboard.html
+++ b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/lms_dashboard.html
@@ -5,6 +5,10 @@
 
 {# lms_dashboard.html lms My Desk screen #}
 {% block title %} My Desk {% endblock%}
+{% block head %}
+  <script src="/static/ndf/js/meta_info.js"></script>
+{% endblock %}
+
 {% block body_content %}
 {% load ndf_tags %}
 {% get_gstudio_workspace_instance as is_workspace_instance %}
@@ -216,7 +220,6 @@ <h3 >Joined Workspaces and Enrolled Courses </h3>
       <label id="performaceReportModalLabel"></label>
       <div class="performaceReportModalData"></div>
       <a class="close-reveal-modal" aria-label="Close" style="font-size: inherit">Close [&#215;]</a>
-
     </div>
 
 
@@ -224,7 +227,6 @@ <h3 >Joined Workspaces and Enrolled Courses </h3>
 
     function show_my_performance(this_obj){
       data_unit_id  = $(this_obj).attr("data-node-id");
-      $.blockUI();
       $.ajax({
         url: "{% url 'course_analytics' group_id request.user.id %}",
         type: "GET",
@@ -232,9 +234,7 @@ <h3 >Joined Workspaces and Enrolled Courses </h3>
         data: {
           "data_unit_id":data_unit_id
         },
-        global: false,
         success: function(data){
-          $.unblockUI();
           $('.performaceReportModalData').html(data);
           $('#performaceReportModal').foundation('reveal', 'open');
         },
@@ -302,6 +302,5 @@ <h3 >Joined Workspaces and Enrolled Courses </h3>
       }
     });
 
- 
 </script>
 {% endblock  %}
diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/user_course_analytics.html b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/user_course_analytics.html
index ff8a4a6e3c..374e6fd0b6 100644
--- a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/user_course_analytics.html
+++ b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/user_course_analytics.html
@@ -1,6 +1,7 @@
 {% load i18n %}
 {% load multiply from simple_filters %}
-{% load get_group_object from ndf_tags %}
+{% load get_group_object check_is_gstaff get_site_variables from ndf_tags %}
+{% get_site_variables as site %}
 
 <style type="text/css">
   .reveal-modal{
@@ -18,279 +19,255 @@
 <script src="/static/ndf/bower_components/pdfmake/build/pdfmake.min.js"></script>
 <script src="/static/ndf/bower_components/html2canvas/build/html2canvas.js"></script>
 <script src="/static/ndf/bower_components/pdfmake/build/vfs_fonts.js"></script>
-
-<a class=" download-progress-report" style="padding-left: 38px"><i class="fi-archive"></i> Download </a><br/>
-<div class="user-analytics-data" id="user-pr-report">
-<div class="pre-analytics-msg-div text-center hide">
-   {% trans "Your analytics is loading. Please wait." %} 
-</div>
-<div class="row">
-  <h4 class="text-center"><u><b>PROGRESS REPORT</b></u></h4>
-  <div class="small-6 columns">
-    <h3 class="inner left-space"> {{ group_name }} </h3><br/>
-    <h3 class="inner left-space"> User:  <h3 class="inner left-space"> {{username}} </h3></h3>
+{% check_is_gstaff group_id request.user as gstaff_access %}
+<a class=" download-progress-report-{{group_id|slugify}}-{{request.user.pk}}" style="padding-left: 38px"><i class="fi-archive"></i> Download </a><br/>
+<div class="user-analytics-data" id="user-pr-report-{{group_id|slugify}}-{{request.user.pk}}">
+  <div class="pre-analytics-msg-div text-center hide">
+     {% trans "Your analytics is loading. Please wait." %} 
   </div>
-  <div class="small-6 columns">
-    <h4 class="inner">Total points gained:  <h3 class="course-metric-count users_points inner left-space">{{users_points}}</h3></h4>
-  </div>
-</div><hr/>
-<div class="course-overview-container">
-  <div class="row collapse course-overview">
-    <div class="columns small-12 medium-6">
-      <div class="course-status">
-        {% comment %}
-        <h4>{% trans "Course status" %}</h4>
-        {% endcomment %}
-        <div class="row">
+
+  <div class="row">
+    <h4 class="text-center"><u><b>PROGRESS REPORT</b></u></h4>
+    <div class="small-6 columns">
+      <h3 class="inner left-space"> {% firstof group_obj.altnames group_obj.name%} </h3><br/>
+      <h3 class="inner left-space"> User:  <h3 class="inner left-space"> {{username}} </h3></h3>
+    </div>
+    <div class="small-6 columns">
+      <h4 class="inner">Total points gained:  <h3 class="course-metric-count users_points inner left-space">{{users_points}}</h3></h4>
+    </div>
+  </div><hr/>
+  <div class="row course-overview-container">
+    <div class="collapse course-overview">
+      <div class="columns small-12 medium-6">
+        <div class="course-status">
+          {% comment %}
+          <h4>{% trans "Course status" %}</h4>
+          {% endcomment %}
           <div class="small-12 columns">
-            <span class="course-metric-heading">{{level1_lbl}}</span>
-            <h4 class="module_progress_stmt">{{level1_progress_stmt}}</h4>
-            <div class="progress success round">
-              <div class="module_progress_meter meter" style="width:{{level1_progress_meter}}%"></div>
+            <div class="small-12 columns">
+              <span class="course-metric-heading">{{level1_lbl}}</span>
+              <h4 class="module_progress_stmt">{{level1_progress_stmt}}</h4>
+              <div class="progress success round">
+                <div class="module_progress_meter meter" style="width:{{level1_progress_meter}}%"></div>
+              </div>
             </div>
           </div>
-        </div>
-        <div class="row">
           <div class="small-12 columns">
-            <span class="course-metric-heading">{{level2_lbl}}</span>
-            <h4 class='units_progress_stmt'>{{level2_progress_stmt}}</h4>
-            <div class="progress success round">
-              <div class="unit_progress_meter meter" style="width:{{level2_progress_meter}}%"></div>
-            </div>
+            <div class="small-12 columns">
+              <span class="course-metric-heading">{{level2_lbl}}</span>
+              <h4 class='units_progress_stmt'>{{level2_progress_stmt}}</h4>
+              <div class="progress success round">
+                <div class="unit_progress_meter meter" style="width:{{level2_progress_meter}}%"></div>
+              </div>
 
+            </div>
           </div>
         </div>
       </div>
-    </div>
-    <div class="columns small-12 medium-6 points-data">
-      <div class="course-points-breakup">
+      <div class="columns small-12 medium-6 points-data">
+        <div class="course-points-breakup">
+        </div>
       </div>
     </div>
-  </div>
-  <div class="analytics-panels">
-  {% with group_obj.member_of_names_list as group_member_of_name %}
-  <!-- Assessment/Quiz Performance and Inetractions -->
-  <div class="row">
-    <div class="columns small-12 medium-6">
-      <div class="course-quiz-perf course-section">
-        <span class="course-section-heading inner">Assessment Performance  </span>
-          {% if "announced_unit" in group_member_of_name %}
-          <a class="fetch-assessment-analytics inner left-space" data-user-id={{user_id}}>Refresh</a>
-          <span class="course-section-icon">
-            <i class="fa fa-question-circle"></i>
-          </span>
-        </span>
-        {% endif %}
-        <!-- Total Questions and Correct Answers -->
-        <div class="row">
-          <div class="columns small-12 medium-6">
-            <span class="course-metric-heading">{% trans "Total Questions" %}</span>
-            <span class="course-metric-count total_quizitems">{{total_quizitems}}</span>
-          </div>
-          <div class="columns small-12 medium-6">
-            <span class="course-metric-heading">Correct Answers</span>
-            <span class="course-metric-count correct-count correct_attempted_quizitems">{{correct_attempted_quizitems}}</span>
-          </div>
-        </div>
+    <div class="analytics-panels">
+      {% with group_obj.member_of_names_list as group_member_of_name %}
+      <!-- Assessment/Quiz Performance and Inetractions -->
+      <div class="small-12 columns">
+        <div class="columns small-12 medium-6">
+          <div class="course-quiz-perf course-section">
+            <span class="course-section-heading inner">Assessment Performance  </span>
+            {% if "announced_unit" in group_member_of_name %}
+              <a class="fetch-assessment-analytics inner left-space" data-user-id={{user_id}}>Refresh</a>
+              <span class="course-section-icon">
+                <i class="fa fa-question-circle"></i>
+              </span>
+            {% endif %}
+
+            <!-- Total Questions and Correct Answers -->
+            <div class="small-12 columns">
+              <div class="columns small-12 medium-6">
+                <span class="course-metric-heading">{% trans "Total Questions" %}</span>
+                <span class="course-metric-count total_quizitems">{{total_quizitems}}</span>
+              </div>
+              <div class="columns small-12 medium-6">
+                <span class="course-metric-heading">Correct Answers</span>
+                <span class="course-metric-count correct-count correct_attempted_quizitems">{{correct_attempted_quizitems}}</span>
+              </div>
+            </div>
 
-        <!-- Attempted Questions and Incorrect Answers -->
-        <div class="row">
-          <div class="columns small-12 medium-6">
-            <span class="course-metric-heading">Attempted</span>
-            <span class="course-metric-count attempted_quizitems">{{attempted_quizitems}}</span>
-          </div>
+            <!-- Attempted Questions and Incorrect Answers -->
+            <div class="small-12 columns">
+              <div class="columns small-12 medium-6">
+                <span class="course-metric-heading">Attempted</span>
+                <span class="course-metric-count attempted_quizitems">{{attempted_quizitems}}</span>
+              </div>
 
-          <div class="columns small-12 medium-6">
-            <span class="course-metric-heading">{% trans "Incorrect answers" %}</span>
-            <span class="course-metric-count incorrect-count incorrect_attempted_quizitems">{{incorrect_attempted_quizitems}}</span>
-          </div>
-        </div>
+              <div class="columns small-12 medium-6">
+                <span class="course-metric-heading">{% trans "Incorrect answers" %}</span>
+                <span class="course-metric-count incorrect-count incorrect_attempted_quizitems">{{incorrect_attempted_quizitems}}</span>
+              </div>
+            </div>
 
-        {% if "announced_unit" in group_member_of_name %}
-        <div class="row">
-          <div class="columns small-12 medium-6">
-            <span class="course-metric-heading">{% trans "Not Attempted" %}</span>
-            <span class="course-metric-count unattempted_quizitems">{{unattempted_quizitems}}</span>
-          </div>
-        </div>
-        {% endif %}
-      </div>
-    </div>
-    <div class="columns small-12 medium-6">
-      <div class="course-interactions course-section">
-        <span class="course-section-heading">{% trans "Interactions" %}
-        <span class="course-section-icon">
-          <i class="fa fa-comments"></i>
-        </span>
-        </span>
-        <div class="row">
-          <div class="columns small-12 medium-6">
-            <span class="course-metric-heading">{% trans "Comments By me" %}</span>
-            <span class="course-metric-count total_cmnts_by_user">{{total_cmnts_by_user}}</span>
-          </div>
-          {% comment %}
-          <div class="columns small-12 medium-6">
-            <span class="course-metric-heading">Avg Rating for my comments</span>
-            <span class="course-metric-count">
-              <div class="row avg_rating_for_my_cmnts">
-                <div class="columns small-6 medium-6 rating-stars"></div>
-                <div class="columns small-6 medium-6 rating_lbl left"></div>
+            {% if "announced_unit" in group_member_of_name %}
+            <div class="row">
+              <div class="columns small-12 medium-6">
+                <span class="course-metric-heading">{% trans "Not Attempted" %}</span>
+                <span class="course-metric-count unattempted_quizitems">{{unattempted_quizitems}}</span>
               </div>
-            </span>
+            </div>
+            {% endif %}
           </div>
-          {% endcomment %}
         </div>
-        <div class="row">
-          <div class="columns small-12 medium-6">
-            <span class="course-metric-heading">{% trans "Comments for me" %}</span>
-            <span class="course-metric-count cmnts_rcvd_by_user">{{cmnts_rcvd_by_user}}</span>
-          </div>
-          {% comment %}
-          <div class="columns small-12 medium-6">
-            <span class="course-metric-heading">Avg Ratings to others</span>
-            <span class="course-metric-count">
-              <div class="row avg_rating_to_othr_cmnts_by_me">
-                <div class="columns small-6 medium-6 rating-stars"></div>
-                <div class="columns small-6 medium-6 rating_lbl left"></div>
-              </div>
-
+        <div class="columns small-12 medium-6">
+          <div class="course-interactions course-section">
+            <span class="course-section-heading">{% trans "Interactions" %}
+            <span class="course-section-icon">
+              <i class="fa fa-comments"></i>
+            </span>
             </span>
+            <div class="row">
+              <div class="columns small-12 medium-6">
+                <span class="course-metric-heading">{% trans "Comments By me" %}</span>
+                <span class="course-metric-count total_cmnts_by_user">{{total_cmnts_by_user}}</span>
+              </div>
+              {% comment %}
+              <div class="columns small-12 medium-6">
+                <span class="course-metric-heading">Avg Rating for my comments</span>
+                <span class="course-metric-count">
+                  <div class="row avg_rating_for_my_cmnts">
+                    <div class="columns small-6 medium-6 rating-stars"></div>
+                    <div class="columns small-6 medium-6 rating_lbl left"></div>
+                  </div>
+                </span>
+              </div>
+              {% endcomment %}
+            </div>
+            <div class="row">
+              <div class="columns small-12 medium-6">
+                <span class="course-metric-heading">{% trans "Comments for me" %}</span>
+                <span class="course-metric-count cmnts_rcvd_by_user">{{cmnts_rcvd_by_user}}</span>
+              </div>
+              {% comment %}
+              <div class="columns small-12 medium-6">
+                <span class="course-metric-heading">Avg Ratings to others</span>
+                <span class="course-metric-count">
+                  <div class="row avg_rating_to_othr_cmnts_by_me">
+                    <div class="columns small-6 medium-6 rating-stars"></div>
+                    <div class="columns small-6 medium-6 rating_lbl left"></div>
+                  </div>
+
+                </span>
+              </div>
+              {% endcomment %}
+            </div>
           </div>
-          {% endcomment %}
         </div>
       </div>
-    </div>
-  </div>
-  {% endwith %}
+      {% endwith %}
 
-  <!-- Gallery and Notes -->
-  <div class="row">
-    <div class="columns small-12 medium-6">
-
-      <div class="course-gallery-uploads course-section">
-        <span class="course-section-heading">{% trans "Gallery uploads" %}
-          <span class="course-section-icon">
-            <i class="fa fa-file-image-o"></i>
-          </span>
-        </span>
-        <div class="row">
-          <div class="columns small-12 medium-4">
-            <span class="course-metric-heading">{% trans "Files Uploaded" %}</span>
-            <span class="course-metric-count user_files">{{user_files}}</span>
-          </div>
-          <div class="columns small-12 medium-4">
-            <span class="course-metric-heading">{% trans "Visits gained" %}</span>
-            <span class="course-metric-count other_viewing_my_files">{{other_viewing_my_files}}</span>
-          </div>
-          <div class="columns small-12 medium-4">
-            <span class="course-metric-heading">{% trans "Comments recieved" %}</span>
-            <span class="course-metric-count cmts_on_user_files">{{cmts_on_user_files}}</span>
-          </div>
-        </div>
-        <div class="row">
-          <div class="columns small-12 medium-4">
-            <span class="course-metric-heading">{% trans "Visits on Other Files" %}</span>
-            <span class="course-metric-count total_files_viewed_by_user">{{total_files_viewed_by_user}}</span>
-          </div>
-          <div class="columns small-12 medium-4">
-            <span class="course-metric-heading">{% trans "Comments on other files" %}</span>
-            <span class="course-metric-count commented_on_others_files">{{commented_on_others_files}}</span>
-          </div>
-          <div class="columns small-12 medium-4">
-            <span class="course-metric-heading">{% trans "Comments by unique users" %}</span>
-            <span class="course-metric-count unique_users_commented_on_user_files">{{unique_users_commented_on_user_files}}</span>
-          </div>
-        </div>
-        <div class="row">
-          <div class="columns small-12">
-            <span class="course-metric-heading">{% trans "Avg. Rating Awarded" %}</span>
-            <span class="course-metric-count">
-              <div class="row total_rating_rcvd_on_files">
-                <div class="columns small-6 medium-6 rating-stars" style="width:{{total_rating_rcvd_on_files|multiply:16}}px; {% if total_rating_rcvd_on_files > 0 %}display:block !important;{% endif %}"></div>
-                <div class="columns small-6 medium-6 rating_lbl left">{{total_rating_rcvd_on_files}}</div>
-              </div>
+      <!-- Gallery and Notes -->
+      <div class="small-12 columns">
+        <div class="columns small-12 medium-6">
+
+          <div class="course-gallery-uploads course-section">
+            <span class="course-section-heading">{% trans "Gallery uploads" %}
+              <span class="course-section-icon">
+                <i class="fa fa-file-image-o"></i>
+              </span>
             </span>
+            <div class="row">
+              <div class="columns small-12 medium-4">
+                <span class="course-metric-heading">{% trans "Files Uploaded" %}</span>
+                <span class="course-metric-count user_files">{{user_files}}</span>
+              </div>
+              <div class="columns small-12 medium-4">
+                <span class="course-metric-heading">{% trans "Visits gained" %}</span>
+                <span class="course-metric-count other_viewing_my_files">{{other_viewing_my_files}}</span>
+              </div>
+              <div class="columns small-12 medium-4">
+                <span class="course-metric-heading">{% trans "Comments recieved" %}</span>
+                <span class="course-metric-count cmts_on_user_files">{{cmts_on_user_files}}</span>
+              </div>
+            </div>
+            <div class="row">
+              <div class="columns small-12 medium-4">
+                <span class="course-metric-heading">{% trans "Visits on Other Files" %}</span>
+                <span class="course-metric-count total_files_viewed_by_user">{{total_files_viewed_by_user}}</span>
+              </div>
+              <div class="columns small-12 medium-4">
+                <span class="course-metric-heading">{% trans "Comments on other files" %}</span>
+                <span class="course-metric-count commented_on_others_files">{{commented_on_others_files}}</span>
+              </div>
+              <div class="columns small-12 medium-4">
+                <span class="course-metric-heading">{% trans "Comments by unique users" %}</span>
+                <span class="course-metric-count unique_users_commented_on_user_files">{{unique_users_commented_on_user_files}}</span>
+              </div>
+            </div>
+            <div class="row">
+              <div class="columns small-12">
+                <span class="course-metric-heading">{% trans "Avg. Rating Awarded" %}</span>
+                <span class="course-metric-count">
+                  <div class="row total_rating_rcvd_on_files">
+                    <div class="columns small-6 medium-6 rating-stars" style="width:{{total_rating_rcvd_on_files|multiply:16}}px; {% if total_rating_rcvd_on_files > 0 %}display:block !important;{% endif %}"></div>
+                    <div class="columns small-6 medium-6 rating_lbl left">{{total_rating_rcvd_on_files}}</div>
+                  </div>
+                </span>
+              </div>
+            </div>
           </div>
         </div>
-      </div>
-    </div>
-    <div class="columns small-12 medium-6">
-
-      <div class="course-notes course-section">
-        <span class="course-section-heading">{% trans "Note Making" %}
-        <span class="course-section-icon">
-          <i class="fi-clipboard-pencil"></i>
-        </span>
-        </span>
-        <div class="row">
-          <div class="columns small-12 medium-4">
-            <span class="course-metric-heading">{% trans "Notes Written" %}</span>
-            <span class="course-metric-count user_notes">{{user_notes}}</span>
-          </div>
-          <div class="columns small-12 medium-4">
-            <span class="course-metric-heading">{% trans "Views Gained" %}</span>
-            <span class="course-metric-count others_reading_my_notes">{{others_reading_my_notes}}</span>
-          </div>
-          <div class="columns small-12 medium-4">
-            <span class="course-metric-heading">{% trans "Comments recieved" %}</span>
-            <span class="course-metric-count cmts_on_user_notes">{{cmts_on_user_notes}}</span>
-          </div>
-        </div>
-        <div class="row">
-          <div class="columns small-12 medium-4">
-            <span class="course-metric-heading">{% trans "Visits on Other Notes" %}</span>
-            <span class="course-metric-count total_notes_read_by_user">{{total_notes_read_by_user}}</span>
-          </div>
-          <div class="columns small-12 medium-4">
-            <span class="course-metric-heading">{% trans "Comments on other notes" %}</span>
-            <span class="course-metric-count commented_on_others_notes">{{commented_on_others_notes}}</span>
-          </div>
-        </div>
-        <div class="row">
-          <div class="columns small-12">
-            <span class="course-metric-heading">{% trans "Avg. Rating Awarded" %}</span>
-            <span class="course-metric-count">
-              <div class="row total_rating_rcvd_on_notes">
-                <div class="columns small-6 medium-6 rating-stars" style="width:{{total_rating_rcvd_on_notes|multiply:16}}px;{% if total_rating_rcvd_on_notes > 0 %}display:block !important;{% endif %}"></div>
-                <div class="columns small-6 medium-6 rating_lbl left">{{total_rating_rcvd_on_notes}}</div>
-              </div>
+        <div class="columns small-12 medium-6">
+
+          <div class="course-notes course-section">
+            <span class="course-section-heading">{% trans "Note Making" %}
+            <span class="course-section-icon">
+              <i class="fi-clipboard-pencil"></i>
+            </span>
             </span>
+            <div class="row">
+              <div class="columns small-12 medium-4">
+                <span class="course-metric-heading">{% trans "Notes Written" %}</span>
+                <span class="course-metric-count user_notes">{{user_notes}}</span>
+              </div>
+              <div class="columns small-12 medium-4">
+                <span class="course-metric-heading">{% trans "Views Gained" %}</span>
+                <span class="course-metric-count others_reading_my_notes">{{others_reading_my_notes}}</span>
+              </div>
+              <div class="columns small-12 medium-4">
+                <span class="course-metric-heading">{% trans "Comments recieved" %}</span>
+                <span class="course-metric-count cmts_on_user_notes">{{cmts_on_user_notes}}</span>
+              </div>
+            </div>
+            <div class="row">
+              <div class="columns small-12 medium-4">
+                <span class="course-metric-heading">{% trans "Visits on Other Notes" %}</span>
+                <span class="course-metric-count total_notes_read_by_user">{{total_notes_read_by_user}}</span>
+              </div>
+              <div class="columns small-12 medium-4">
+                <span class="course-metric-heading">{% trans "Comments on other notes" %}</span>
+                <span class="course-metric-count commented_on_others_notes">{{commented_on_others_notes}}</span>
+              </div>
+            </div>
+            <div class="row">
+              <div class="columns small-12">
+                <span class="course-metric-heading">{% trans "Avg. Rating Awarded" %}</span>
+                <span class="course-metric-count">
+                  <div class="row total_rating_rcvd_on_notes">
+                    <div class="columns small-6 medium-6 rating-stars" style="width:{{total_rating_rcvd_on_notes|multiply:16}}px;{% if total_rating_rcvd_on_notes > 0 %}display:block !important;{% endif %}"></div>
+                    <div class="columns small-6 medium-6 rating_lbl left">{{total_rating_rcvd_on_notes}}</div>
+                  </div>
+                </span>
+              </div>
+            </div>
           </div>
-        </div>
+        </div>  
       </div>
     </div>  
   </div>
-  </div>  
-  {% comment %}
-  <div class="course-warning course-section">
-      <h5>WAITING FOR YOUR FEEDBACK</h5>
-      <div><i class="fa fa-sign-in"></i><a>3 New notes added</a></div>
-      <div><i class="fa fa-file-image-o"></i><a>36 New files uploaded in the gallery</a></div>
-      <div></div>
-  </div>
-  {% endcomment %}
-</div>
 </div>
 
 
 <script type="text/javascript">
-
-
-$(document).on('click',".download-progress-report",function(){
-  html2canvas(document.getElementById('user-pr-report'), {
-        onrendered: function (canvas) {
-            var data = canvas.toDataURL();
-            var docDefinition = {
-                content: [{
-                    image: data,
-                    width: 500,
-                }]
-            };
-            pdfMake.createPdf(docDefinition).download("{{group_name|slugify}}-{{username}}.pdf");
-        }
-  });
-})
-
     // pi chart for score points
     function generateGraph(data){
         var dataSet = []
@@ -430,7 +407,6 @@ <h5>WAITING FOR YOUR FEEDBACK</h5>
         dataType: "json",
 
         success: function(data){
-          console.log(data)
           $(".correct_attempted_quizitems").html(data['correct_attempted_quizitems'])
           $(".unattempted_quizitems").html(data['unattempted_quizitems'])
           // $(".visited_quizitems").html(data['visited_quizitems'])
@@ -443,4 +419,44 @@ <h5>WAITING FOR YOUR FEEDBACK</h5>
 
     })
 
+    $(document).on('click',".download-progress-report-{{group_id|slugify}}-{{request.user.pk}}",function(){
+      var datetime_val = get_current_datetime_val()
+      html2canvas(document.getElementById('user-pr-report-{{group_id|slugify}}-{{request.user.pk}}'), {
+            onrendered: function (canvas) {
+                var data = canvas.toDataURL();
+                var docDefinition = {
+                    pageMargins: [ 30, 30, 30, 30 ],
+                    content: [{
+                        image: data,
+                        width: 400,
+                        margin: [30, 30, 0, 0],
+                    }],
+
+                header: {
+                        margin: 10,
+                        columns: [
+                            {
+                                image: header_logo_dataURL,
+                                width: 120,
+                                margin: [30, 20, 0, 0],
+                            },
+                        ]
+                },
+
+                footer: function() {
+                    return { 
+                        columns: [ 
+                            "{{site.GSTUDIO_DOC_FOOTER_TEXT}}", 
+                            { text: datetime_val, alignment: 'right' }
+                        ],
+                        margin: [10, 0]
+                    };
+                },
+
+                };
+                pdfMake.createPdf(docDefinition).download("{% firstof group_obj.altnames|slugify group_obj.name|slugify %}-{{username}}.pdf");
+            }
+      });
+    })
+
 </script>
\ No newline at end of file
diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/templatetags/ndf_tags.py b/gnowsys-ndf/gnowsys_ndf/ndf/templatetags/ndf_tags.py
index f9d8ed8aaa..1b31cde265 100644
--- a/gnowsys-ndf/gnowsys_ndf/ndf/templatetags/ndf_tags.py
+++ b/gnowsys-ndf/gnowsys_ndf/ndf/templatetags/ndf_tags.py
@@ -134,6 +134,7 @@ def get_site_variables():
 	site_var['BUDDY_LOGIN'] = GSTUDIO_BUDDY_LOGIN
 	site_var['INSTITUTE_ID'] = GSTUDIO_INSTITUTE_ID
 	site_var['HEADER_LANGUAGES'] = HEADER_LANGUAGES
+	site_var['GSTUDIO_DOC_FOOTER_TEXT'] = GSTUDIO_DOC_FOOTER_TEXT
 
 	cache.set('site_var', site_var, 60 * 30)
 
@@ -4224,3 +4225,17 @@ def get_header_lang(lang):
         if lang in each_lang:
             return each_lang[1]
     return lang
+
+
+@get_execution_time
+@register.assignment_tag
+def get_profile_full_name(user_obj):
+	auth_obj = Author.get_author_by_userid(user_obj.pk)
+	list_of_attr = ['first_name', 'last_name']
+	auth_attr = auth_obj.get_attributes_from_names_list(list_of_attr)
+	if auth_attr.values():
+		full_name = ' '.join("%s" % val for (key,val) in auth_attr.iteritems())
+		full_name += " (Username: " + user_obj.username + ", ID: " + str(user_obj.pk) + ")"
+	else:
+		full_name = "Username: " + user_obj.username  + ", ID: " + str(user_obj.pk)
+	return full_name
\ No newline at end of file
diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/course.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/course.py
index f7f6d69d4d..37f399e403 100644
--- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/course.py
+++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/course.py
@@ -54,7 +54,6 @@
                         url(r'^/course_analytics/(?P<user_id>[\w-]+)$', 'course_analytics', name='course_analytics'),
                         url(r'^build_progress_bar/(?P<node_id>[\w-]+)$', 'build_progress_bar', name='build_progress_bar'),
                         url(r'^/course_analytics_admin/$', 'course_analytics_admin', name='course_analytics_admin'),
-                        url(r'^/progress_report/(?P<user_id>[\w-]+)$', 'progress_report', name='progress_report'),
                         url(r'^/get_resource_completion_status/$', 'get_resource_completion_status', name='get_resource_completion_status'),
                         url(r'^/manage_users/$', 'manage_users', name='manage_users'),
                         #Asset URLS
diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/views/ajax_views.py b/gnowsys-ndf/gnowsys_ndf/ndf/views/ajax_views.py
index b9f97eb079..08cbfc071d 100644
--- a/gnowsys-ndf/gnowsys_ndf/ndf/views/ajax_views.py
+++ b/gnowsys-ndf/gnowsys_ndf/ndf/views/ajax_views.py
@@ -6769,7 +6769,7 @@ def add_asset(request,group_id):
   if node_obj:
     context_variables.update({'asset_obj': node_obj,'topic_nodes':topic_nodes})
     context_variables.update({'edit': True})
-  context_variables.update({'group_obj': group_obj,'title':title,'topic_nodes':topic_nodes})
+  context_variables.update({'group_obj': group_obj, 'group_name': group_obj.name, 'title':title,'topic_nodes':topic_nodes})
   return render_to_response("ndf/add_asset.html",RequestContext(request,
     context_variables))
 
diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/views/gcourse.py b/gnowsys-ndf/gnowsys_ndf/ndf/views/gcourse.py
index 4e101f33f6..65dcd7b598 100644
--- a/gnowsys-ndf/gnowsys_ndf/ndf/views/gcourse.py
+++ b/gnowsys-ndf/gnowsys_ndf/ndf/views/gcourse.py
@@ -2372,365 +2372,6 @@ def course_notebook(request, group_id, node_id=None, tab="my-notes"):
                                 context_instance = RequestContext(request)
     )
 
-@login_required
-@get_execution_time
-def progress_report(request, group_id, user_id, render_template=False, get_result_dict=False, **kwargs):
-    # set get_result_dict=True to get only raw data in dict format,
-    # without being redirected to template. So that this method can
-    # use to get dict result data in shell or for any command.
-    # this will omit data from request.
-    # if request and not get_result_dict:
-    #     cache_key = u'course_analytics' + unicode(group_id) + "_" + unicode(user_id)
-    #     cache_result = cache.get(cache_key)
-    #     if cache_result:
-    #         return render_to_response("ndf/user_course_analytics.html",
-    #                                 cache_result,
-    #                                 context_instance = RequestContext(request)
-    #                             )
-
-    group_obj = get_group_name_id(group_id, get_obj=True)
-    #forbid_private_group(request, group_obj)
-    group_id = group_obj._id
-    group_name = group_obj.name
-
-    analytics_data = {'user_id': user_id}
-    data_points_dict = {}
-    assessment_and_quiz_data = kwargs.get('assessment_and_quiz_data', False)
-
-    template = 'ndf/gcourse_event_group.html'
-    if 'base_unit' in group_obj.member_of_names_list:
-        template = 'ndf/gevent_base.html'
-
-    if 'announced_unit' in group_obj.member_of_names_list or 'Group' in group_obj.member_of_names_list and 'base_unit' not in group_obj.member_of_names_list:
-        template = 'ndf/lms.html'
-
-    if 'Author' in group_obj.member_of_names_list:
-            template = 'ndf/lms.html'
-            show_analytics_notifications = False
-
-    thread_node = None
-    banner_pic_obj,old_profile_pics = _get_current_and_old_display_pics(group_obj)
-    
-
-    allow_to_join = get_group_join_status(group_obj)
-    context_variables = {
-            'group_id': group_id, 'groupid': group_id, 'group_name':group_name,
-            'group_obj': group_obj, 'title': 'progress_report', 'allow_to_join': allow_to_join,
-            'old_profile_pics':old_profile_pics, "prof_pic_obj": banner_pic_obj,
-            }
-    context_variables.update({
-                'correct_attempted_quizitems' : 0,
-                'unattempted_quizitems': 0,
-                'visited_quizitems': 0,
-                'notapplicable_quizitems': 0,
-                'incorrect_attempted_quizitems': 0,
-                'attempted_quizitems': 0,
-                'admin_analytics': False
-            })
-
-
-    if request.user.is_authenticated():
-        user_id = request.user.id
-
-    try:
-        # user_obj = User.objects.get(pk=int(user_id))
-        author_obj = node_collection.one({ '_type': u'Author', 'created_by': int(user_id) })
-    except Exception, e:
-        print e
-        return analytics_data
-
-    if request:
-        # let's keep all get calls from request in this block.
-        # so that we can use this method for api calls
-        if not get_result_dict:
-            data_points_dict = request.GET.get('data_points_dict', {})
-
-        unit_id = request.GET.get("data_unit_id",'')
-        if unit_id:
-            group_id = ObjectId(unit_id)
-
-    group_obj   = get_group_name_id(group_id, get_obj=True)
-    group_id    = group_obj._id
-    group_name  = group_obj.name
-    group_obj_member_of_names_list = group_obj.member_of_names_list
-
-    if data_points_dict and not isinstance(data_points_dict, dict):
-        data_points_dict = json.loads(data_points_dict)
-        context_variables['correct_attempted_quizitems'] = (data_points_dict['quiz_points'] / GSTUDIO_QUIZ_CORRECT_POINTS)
-        context_variables['user_notes'] = (data_points_dict['notes_points'] / GSTUDIO_NOTE_CREATE_POINTS)
-        context_variables['user_files'] = (data_points_dict['files_points'] / GSTUDIO_FILE_UPLOAD_POINTS)
-        context_variables['total_cmnts_by_user'] = (data_points_dict['interactions_points'] / GSTUDIO_COMMENT_POINTS)
-        context_variables['users_points'] = data_points_dict['users_points']
-
-    counter_obj = Counter.get_counter_obj(user_id, ObjectId(group_id))
-    analytics_instance = AnalyticsMethods(author_obj.created_by, author_obj.name, group_id)
-
-    context_variables['total_quizitems'] = 0
-
-    if "CourseEventGroup" in group_obj_member_of_names_list:
-        # Modules Section
-        all_modules= analytics_instance.get_total_modules_count()
-        # TO IMPROVE
-        completed_modules = analytics_instance.get_completed_modules_count()
-        # Units Section
-        all_units = analytics_instance.get_total_units_count()
-        # print "\n Total Units =  ", all_units, "\n\n"
-        completed_units = analytics_instance.get_completed_units_count()
-        # print "\n Completed Units =  ", completed_units, "\n\n"
-        context_variables['level1_lbl'] = "Module Completion"
-        context_variables['level2_lbl'] = "Unit Completion"
-        context_variables['level1_progress_stmt'] = str(completed_modules) + " out of " + str(all_modules) + " Modules completed"
-        context_variables['level2_progress_stmt'] = str(completed_units) + " out of " + str(all_units) + " Units completed"
-        if completed_modules and all_modules:
-            context_variables['level1_progress_meter'] = (completed_modules/float(all_modules))*100
-        else:
-            context_variables['level1_progress_meter'] = 0
-
-        if completed_units and all_units:
-            context_variables['level2_progress_meter'] = (completed_units/float(all_units))*100
-        else:
-            context_variables['level2_progress_meter'] = 0
-
-        # Depricated on 27Apr2017 - katkamrachana
-        context_variables['total_quizitems'] = analytics_instance.get_total_quizitems_count()
-        # New implementation of using AT: 'total_assessment_items'
-        # print "\n Total QuizItemEvents === ", context_variables['total_quizitems'], "\n\n"
-        # context_variables['attempted_quizitems'] = counter_obj.no_questions_attempted
-        context_variables['attempted_quizitems'] = counter_obj['quiz']['attempted']
-        # print "\n Attempted QuizItemEvents === ", context_variables['attempted_quizitems'], "\n\n"
-        if 'correct_attempted_quizitems' not in context_variables:
-            # context_variables['correct_attempted_quizitems'] = counter_obj.no_correct_answers
-            context_variables['correct_attempted_quizitems'] = counter_obj['quiz']['correct']
-        # print "\n Correct Attempted QuizItemEvents === ", context_variables['correct_attempted_quizitems'], "\n\n"
-        # context_variables['incorrect_attempted_quizitems'] = counter_obj.no_incorrect_answers
-        context_variables['incorrect_attempted_quizitems'] = counter_obj['quiz']['incorrect']
-        # print "\n InCorrect Attempted QuizItemEvents === ", context_variables['incorrect_attempted_quizitems'], "\n\n"
-
-    # Resources Section
-    # context_variables['total_res'] = analytics_instance.get_total_resources_count()
-    # print "\n Total Resources === ", total_res, "\n\n"
-    # context_variables['completed_res'] = analytics_instance.get_completed_resources_count()
-    # print "\n Completed Resources === ", completed_res, "\n\n"
-
-    context_variables['username'] = author_obj.name
-    # QuizItem Section
-
-
-    if "announced_unit" in group_obj_member_of_names_list or "Group" in group_obj_member_of_names_list:
-        visited_nodes = []
-        if counter_obj:
-            visited_nodes = counter_obj['visited_nodes'].keys()
-        unit_structure = get_unit_hierarchy(group_obj)
-        all_lessons = len(unit_structure)
-        all_activities = 0
-        completed_activities = 0
-        completed_lessons = 0
-        for each_lesson_dict in unit_structure:
-            lesson_act_ids = []
-            for each_lesson_key, each_lesson_val in each_lesson_dict.iteritems():
-                if each_lesson_key == 'id':
-                    lesson_id = each_lesson_dict[each_lesson_key]
-
-                if each_lesson_key == 'activities':
-                    all_activities = all_activities + len(each_lesson_dict[each_lesson_key])
-                    for each_act_dict in each_lesson_dict[each_lesson_key]:
-                        for each_act_key, each_act_val in each_act_dict.iteritems():
-                            if each_act_key == 'id':
-                                act_id = each_act_dict[each_act_key]
-                                lesson_act_ids.append(act_id)
-                                if act_id in visited_nodes:
-                                    completed_activities = completed_activities + 1
-            if all(each_act_id in visited_nodes for each_act_id in lesson_act_ids):
-                completed_lessons = completed_lessons + 1
-
-        context_variables['level1_lbl'] = "Lesson Visited"
-        context_variables['level2_lbl'] = "Activity Visited"
-
-        context_variables['level1_progress_stmt'] = str(completed_lessons) + " out of " + str(all_lessons) + " Lessons Visited"
-        context_variables['level2_progress_stmt'] = str(completed_activities) + " out of " + str(all_activities) + " Activities Visited"
-        if completed_lessons and all_lessons:
-            context_variables['level1_progress_meter'] = (completed_lessons/float(all_lessons))*100
-        else:
-            context_variables['level1_progress_meter'] = 0
-        if completed_activities and all_activities:
-            context_variables['level2_progress_meter'] = (completed_activities/float(all_activities))*100
-        else:
-            context_variables['level2_progress_meter'] = 0
-        # print "\n an: ", context_variables
-        # Resources Section
-        # context_variables['total_res'] = analytics_instance.get_total_resources_count()
-        # print "\n Total Resources === ", total_res, "\n\n"
-        # context_variables['completed_res'] = analytics_instance.get_completed_resources_count()
-        # print "\n Completed Resources === ", completed_res, "\n\n"
-
-        # following code will override (gstudio quiz) counters:
-        if assessment_and_quiz_data:
-            context_variables.update({
-                'correct_attempted_assessments': 0,
-                'unattempted_assessments': 0,
-                'visited_assessments': 0,
-                'notapplicable_assessments': 0,
-                'incorrect_attempted_assessments': 0,
-                'attempted_assessments': 0,
-                'total_assessment_items': 0
-                })
-
-        items_count_cur = group_obj.get_attribute("total_assessment_items")
-        if items_count_cur.count():
-            if assessment_and_quiz_data:
-                context_variables['total_assessment_items'] = items_count_cur[0].object_value
-            else:
-                context_variables['total_quizitems'] = items_count_cur[0].object_value
-
-        # total_quiz_points = 0  # not used anywhere
-        # assessment_list_cur = group_obj.get_attribute("assessment_list")
-        # if assessment_list_cur.count():
-        #     assessment_list_cur = assessment_list_cur[0]
-        '''
-        context_variables['correct_attempted_quizitems'] = 0
-        context_variables['unattempted_quizitems'] = 0
-        context_variables['visited_quizitems'] = 0
-        context_variables['notapplicable_quizitems'] = 0
-        context_variables['incorrect_quizitems'] = 0
-        context_variables['attempted_quizitems'] = 0
-        '''
-        try:
-            assessment_data_list = counter_obj['assessment']
-            for each_dict in assessment_data_list:
-                if assessment_and_quiz_data:
-                    context_variables['correct_attempted_assessments'] += each_dict['correct']
-                    # context_variables['unattempted_assessments'] += each_dict['unattempted']
-                    # context_variables['visited_assessments'] += each_dict['visited']
-                    context_variables['notapplicable_assessments'] += each_dict['notapplicable']
-                    context_variables['incorrect_attempted_assessments'] += each_dict['incorrect']
-                    context_variables['attempted_assessments'] += each_dict['attempted']
-                else:
-                    context_variables['correct_attempted_quizitems'] += each_dict['correct']
-                    # context_variables['unattempted_quizitems'] += each_dict['unattempted']
-                    # context_variables['visited_quizitems'] += each_dict['visited']
-                    context_variables['notapplicable_quizitems'] += each_dict['notapplicable']
-                    context_variables['incorrect_attempted_quizitems'] += each_dict['incorrect']
-                    context_variables['attempted_quizitems'] += each_dict['attempted']
-            if assessment_and_quiz_data:
-                context_variables['unattempted_assessments'] = context_variables['total_assessment_items'] - context_variables['attempted_assessments']
-            else:
-                context_variables['unattempted_quizitems'] = context_variables['total_quizitems'] - context_variables['attempted_quizitems']
-        except Exception as assessment_analytics_err:
-            print "\nIn User analytics. Ignore if KeyError. Error: {0}".format(assessment_analytics_err)
-            pass
-
-    # Notes Section
-    # context_variables['total_notes'] = analytics_instance.get_total_notes_count()
-    # print "\n Total Notes === ", total_notes, "\n\n"
-    if 'user_notes' not in context_variables:
-        # context_variables['user_notes'] = counter_obj.no_notes_written
-        context_variables['user_notes'] = counter_obj['page']['blog']['created']
-    # print "\n User Notes === ", user_notes, "\n\n"
-
-    # Files Section
-    # context_variables['total_files'] = analytics_instance.get_total_files_count()
-    # print "\n Total Files === ", total_files, "\n\n"
-    if 'user_files' not in context_variables:
-        # context_variables['user_files'] = counter_obj.no_files_created
-        context_variables['user_files'] = counter_obj['file']['created']
-    # print "\n User's Files === ", user_files, "\n\n"
-
-    # Comments
-    if 'total_cmnts_by_user' not in context_variables:
-        # context_variables['total_cmnts_by_user'] = counter_obj.no_comments_by_user
-        context_variables['total_cmnts_by_user'] = counter_obj['total_comments_by_user']
-    # print "\n Total Comments By User === ", total_cmnts_by_user, "\n\n"
-
-    # Comments on Notes Section
-    # context_variables['cmts_on_user_notes'] = counter_obj.no_comments_received_on_notes
-    context_variables['cmts_on_user_notes'] = counter_obj['page']['blog']['comments_gained']
-    # print "\n Total Comments On User Notes === ", cmts_on_user_notes, "\n\n"
-    # context_variables['unique_users_commented_on_user_notes'] = len(counter_obj.comments_by_others_on_notes.keys())
-    # print "\n Total Unique Users - Commented on User Notes === ", unique_users_commented_on_user_notes, "\n\n"
-
-
-    # Comments on Files Section
-    # context_variables['cmts_on_user_files'] = counter_obj.no_comments_received_on_files
-    context_variables['cmts_on_user_files'] = counter_obj['file']['comments_gained']
-    # print "\n Total Comments User Files === ", cmts_on_user_files, "\n\n"
-    # context_variables['unique_users_commented_on_user_files'] = len(counter_obj.comments_by_others_on_files.keys())
-
-    context_variables['unique_users_commented_on_user_files'] = len(counter_obj['file']['comments_by_others_on_res'].keys())
-
-    # print "\n Total Unique Users Commented on User Files === ", unique_users_commented_on_user_files, "\n\n"
-
-    # BY User
-    # TO IMPROVE
-    # context_variables['total_notes_read_by_user'] = counter_obj.no_others_notes_visited
-    context_variables['total_notes_read_by_user'] = counter_obj['page']['blog']['visits_on_others_res']
-    # print "\n Total Notes read by User === ", total_notes_read_by_user, "\n\n"
-
-    # TO IMPROVE
-    # context_variables['total_files_viewed_by_user'] = counter_obj.no_others_files_visited
-    context_variables['total_files_viewed_by_user'] = counter_obj['file']['visits_on_others_res']
-    # print "\n Total Files viewed by User === ", total_files_viewed_by_user, "\n\n"
-
-    # TO IMPROVE
-    # context_variables['other_viewing_my_files'] = counter_obj.no_visits_gained_on_files
-    context_variables['other_viewing_my_files'] = counter_obj['file']['visits_gained']
-    # print "\n Total Users viewing My FILES === ", other_viewing_my_files, "\n\n"
-
-    # TO IMPROVE
-    # context_variables['others_reading_my_notes'] = counter_obj.no_views_gained_on_notes
-    context_variables['others_reading_my_notes'] = counter_obj['page']['blog']['visits_gained']
-    # print "\n Total Users reading My NOTES === ", others_reading_my_notes, "\n\n"
-
-    # context_variables['commented_on_others_notes'] = counter_obj.no_comments_on_others_notes
-    context_variables['commented_on_others_notes'] = counter_obj['page']['blog']['commented_on_others_res']
-    # print "\n Total Notes on which User Commented === ", commented_on_others_notes, "\n\n"
-
-    # context_variables['commented_on_others_files'] = counter_obj.no_comments_on_others_files
-    context_variables['commented_on_others_files'] = counter_obj['file']['commented_on_others_res']
-    # print "\n Total Notes on which User Commented === ", commented_on_others_notes, "\n\n"
-
-    # all_cmts = analytics_instance.get_avg_rating_on_my_comments()
-    # context_variables['total_rating_rcvd_on_notes'] = counter_obj.avg_rating_received_on_notes
-    context_variables['total_rating_rcvd_on_notes'] = counter_obj['page']['blog']['avg_rating_gained']
-    # print "\n\n context_variables['total_rating_rcvd_on_notes'] === ",context_variables['total_rating_rcvd_on_notes']
-    # context_variables['total_rating_rcvd_on_files'] = counter_obj.avg_rating_received_on_files
-    context_variables['total_rating_rcvd_on_files'] = counter_obj['file']['avg_rating_gained']
-    # print "\n\n context_variables['total_rating_rcvd_on_files'] === ",context_variables['total_rating_rcvd_on_files']
-    # cmts_on_user_notes = counter_obj.no_comments_received_on_notes
-    cmts_on_user_notes = counter_obj['page']['blog']['comments_gained']
-    # cmts_on_user_files = counter_obj.no_comments_received_on_files
-    cmts_on_user_files = counter_obj['file']['comments_gained']
-    context_variables['cmnts_rcvd_by_user'] = 0
-    if 'cmts_on_user_notes' in context_variables and 'cmts_on_user_files' in context_variables:
-        context_variables['cmnts_rcvd_by_user'] = context_variables['cmts_on_user_notes'] + context_variables['cmts_on_user_files']
-
-
-    if "users_points" not in context_variables:
-        # context_variables['users_points'] = counter_obj.course_score
-        context_variables['users_points'] = counter_obj['group_points']
-
-    # context_variables['users_points_breakup'] = analytics_instance.get_users_points(True)
-    context_variables['users_points_breakup'] = counter_obj.get_all_user_points_dict()
-    context_variables['group_obj'] = group_obj
-    del analytics_instance
-    # print context_variables
-
-    if get_result_dict:
-        return context_variables
-
-    # cache.set(cache_key, context_variables, 60*10)
-    context_variables['group_member_of'] = group_obj.member_of_names_list
-    if group_obj.altnames:
-        context_variables['group_name'] = group_obj.altnames
-    else:
-        context_variables['group_name'] = group_obj.name
-    
-
-    return render_to_response(template,
-                                context_variables,
-                                context_instance = RequestContext(request)
-    )
-
-
 @get_execution_time
 def course_raw_material(request, group_id, node_id=None,page_no=1):
     from gnowsys_ndf.settings import GSTUDIO_NO_OF_OBJS_PP
@@ -3213,7 +2854,6 @@ def course_analytics(request, group_id, user_id, render_template=False, get_resu
     # - By setting this to True, result dict will have counter object as a value for key, `counter_obj`
     # 
     # `assessment_and_quiz_data`
-
     analytics_data = {'user_id': user_id}
     analytics_data.update({
                 'correct_attempted_quizitems' : 0,
@@ -3222,6 +2862,7 @@ def course_analytics(request, group_id, user_id, render_template=False, get_resu
                 'notapplicable_quizitems': 0,
                 'incorrect_attempted_quizitems': 0,
                 'attempted_quizitems': 0,
+                'admin_view': False
             })
     data_points_dict = {}
     assessment_and_quiz_data = kwargs.get('assessment_and_quiz_data', False)
@@ -3230,9 +2871,10 @@ def course_analytics(request, group_id, user_id, render_template=False, get_resu
         # user_obj = User.objects.get(pk=int(user_id))
         author_obj = node_collection.one({ '_type': u'Author', 'created_by': int(user_id) })
     except Exception, e:
-        print e
         return analytics_data
 
+    template = "ndf/lms.html"
+
     if request:
         # let's keep all get calls from request in this block.
         # so that we can use this method for api calls
@@ -3241,7 +2883,13 @@ def course_analytics(request, group_id, user_id, render_template=False, get_resu
 
         unit_id = request.GET.get("data_unit_id",'')
         if unit_id:
+            # This marks request from My-Desk
             group_id = ObjectId(unit_id)
+            template = "ndf/user_course_analytics.html"
+
+    gstaff_access = check_is_gstaff(group_id, request.user)
+    if gstaff_access:
+        template = "ndf/user_course_analytics.html"
 
     group_obj   = get_group_name_id(group_id, get_obj=True)
     group_id    = group_obj._id
@@ -3495,7 +3143,6 @@ def course_analytics(request, group_id, user_id, render_template=False, get_resu
     if 'cmts_on_user_notes' in analytics_data and 'cmts_on_user_files' in analytics_data:
         analytics_data['cmnts_rcvd_by_user'] = analytics_data['cmts_on_user_notes'] + analytics_data['cmts_on_user_files']
 
-
     if "users_points" not in analytics_data:
         # analytics_data['users_points'] = counter_obj.course_score
         analytics_data['users_points'] = counter_obj['group_points']
@@ -3513,21 +3160,22 @@ def course_analytics(request, group_id, user_id, render_template=False, get_resu
 
     # cache.set(cache_key, analytics_data, 60*10)
     analytics_data['group_member_of'] = group_obj.member_of_names_list
-    if group_obj.altnames:
-        analytics_data['group_name'] = group_obj.altnames
-    else:
-        analytics_data['group_name'] = group_obj.name
-    return render_to_response("ndf/user_course_analytics.html",
+    analytics_data['group_name'] = group_obj.name
+    analytics_data['group_id'] = group_obj._id
+    analytics_data['groupid'] = group_obj._id
+    analytics_data['title'] = "course_analytics"
+    return render_to_response(template,
                                 analytics_data,
                                 context_instance = RequestContext(request)
     )
 
     # return HttpResponse(json.dumps(analytics_data))
+
 @login_required
 @get_execution_time
 def course_analytics_admin(request, group_id):
 
-    cache_key = u'course_analytics_admin' + unicode(group_id)
+    cache_key = u'course_analytics_admin' + unicode(slugify(group_id))
     cache_result = cache.get(cache_key)
     # if cache_result:
     #     return HttpResponse(cache_result)
@@ -3537,7 +3185,6 @@ def course_analytics_admin(request, group_id):
     group_obj   = get_group_name_id(group_id, get_obj=True)
     group_id    = group_obj._id
     group_name  = group_obj.name
-
     thread_node = None
     banner_pic_obj,old_profile_pics = _get_current_and_old_display_pics(group_obj)
     
@@ -3545,8 +3192,9 @@ def course_analytics_admin(request, group_id):
     allow_to_join = get_group_join_status(group_obj)
     context_variables = {
             'group_id': group_id, 'groupid': group_id, 'group_name':group_name,
-            'group_obj': group_obj, 'title': 'progress_report', 'allow_to_join': allow_to_join,
-            'old_profile_pics':old_profile_pics, "prof_pic_obj": banner_pic_obj, "admin_analytics":  True
+            'group_obj': group_obj, 'title': 'course_analytics', 'allow_to_join': allow_to_join,
+            'old_profile_pics':old_profile_pics, "prof_pic_obj": banner_pic_obj, "admin_analytics":  True,
+            'admin_view': True
             }
 
 
@@ -3630,281 +3278,17 @@ def course_analytics_admin(request, group_id):
     response_dict['max_points_dict'] = max_points_dict
     context_variables["response_dict"] = json.dumps(response_dict)
     cache.set(cache_key, response_dict, 60*10)
+    # print "\n admin_analytics_data_list === ",admin_analytics_data_list
     return render_to_response("ndf/lms.html",
                                 context_variables,
                                 context_instance = RequestContext(request)
     )
 
 
-    # print "\n admin_analytics_data_list === ",admin_analytics_data_list
-    return HttpResponse(response_dict)
-
-'''
-@login_required
-@get_execution_time
-def course_analytics_admin(request, group_id):
-
-    cache_key = u'course_analytics_admin' + unicode(group_id)
-    cache_result = cache.get(cache_key)
-    if cache_result:
-        return HttpResponse(cache_result)
-
-    # from gnowsys_ndf.ndf.views.analytics_methods import AnalyticsMethods
-    # from gnowsys_ndf.settings import GSTUDIO_FILE_UPLOAD_POINTS, GSTUDIO_COMMENT_POINTS, GSTUDIO_NOTE_CREATE_POINTS, GSTUDIO_QUIZ_CORRECT_POINTS
-
-    group_obj = get_group_name_id(group_id, get_obj=True)
-    admin_analytics_data_list = []
-    admin_analytics_data_append = admin_analytics_data_list.append
-    FILES_MAX_POINT_VAL = NOTES_MAX_POINT_VAL = QUIZ_MAX_POINT_VAL = INTERACTIONS_MAX_POINT_VAL = 0
-
-    all_group_authors = node_collection.find({'_type': u'Author', 'created_by': {'$in': group_obj.author_set}})
-    # print group_obj.author_set
-
-    auth_counters = counter_collection.find({'user_id': {'$in': group_obj.author_set}, 'group_id': ObjectId(group_id) })
-
-    for each_author_obj in all_group_authors:
-        admin_analytics_data = {}
-
-        try:
-            user_counter_obj = Counter(auth_counters.clone().where('this.user_id == '+str(each_author_obj.created_by)+' && this.group_id ==  "'+str(group_id)+'"')[0])
-        except Exception, e:
-            user_counter_obj = Counter.get_counter_obj(each_author_obj.created_by, ObjectId(group_id))
-            print e
-
-        # try:
-        #     user_obj = User.objects.get(pk=int(each_author_obj))
-        # except Exception, e:
-        #     continue
-
-        # analytics_instance = AnalyticsMethods(request, user_obj.id,user_obj.username, group_id)
-        # username = user_obj.username
-        # user_id = user_obj.id
-        # users_points = analytics_instance.get_users_points()
-        admin_analytics_data['username']    = each_author_obj.name
-        admin_analytics_data['user_id']     = each_author_obj.created_by
-        admin_analytics_data['users_points']= user_counter_obj['group_points']
-
-        # admin_analytics_data["files_points"] = user_counter_obj['file']['created'] * GSTUDIO_FILE_UPLOAD_POINTS
-        admin_analytics_data["files_points"] = user_counter_obj.get_file_points()
-        if FILES_MAX_POINT_VAL < admin_analytics_data["files_points"]:
-            FILES_MAX_POINT_VAL = admin_analytics_data["files_points"]
-
-        # admin_analytics_data['notes_points'] = user_counter_obj['page']['blog']['created'] * GSTUDIO_NOTE_CREATE_POINTS
-        admin_analytics_data['notes_points'] = user_counter_obj.get_page_points(page_type='blog')
-        if NOTES_MAX_POINT_VAL < admin_analytics_data['notes_points']:
-            NOTES_MAX_POINT_VAL = admin_analytics_data['notes_points']
-
-
-        if "announced_unit" in group_obj.member_of_names_list:
-            admin_analytics_data['quiz_points'] = user_counter_obj.get_assessment_points()
-            if QUIZ_MAX_POINT_VAL < admin_analytics_data['quiz_points']:
-                QUIZ_MAX_POINT_VAL = admin_analytics_data['quiz_points']
-        else:
-            # admin_analytics_data['quiz_points'] = user_counter_obj['quiz']['correct'] * GSTUDIO_QUIZ_CORRECT_POINTS
-            admin_analytics_data['quiz_points'] = user_counter_obj.get_quiz_points()
-            if QUIZ_MAX_POINT_VAL < admin_analytics_data['quiz_points']:
-                QUIZ_MAX_POINT_VAL = admin_analytics_data['quiz_points']
-
-        # admin_analytics_data['interactions_points'] = user_counter_obj['total_comments_by_user'] * GSTUDIO_COMMENT_POINTS
-        admin_analytics_data['interactions_points'] = user_counter_obj.get_interaction_points()
-        if INTERACTIONS_MAX_POINT_VAL < admin_analytics_data['interactions_points']:
-            INTERACTIONS_MAX_POINT_VAL = admin_analytics_data['interactions_points']
-
-        # del analytics_instance
-        admin_analytics_data_append(admin_analytics_data)
-
-    max_points_dict = {'file_max_points': FILES_MAX_POINT_VAL,'notes_max_points': NOTES_MAX_POINT_VAL,
-    'quiz_max_points': QUIZ_MAX_POINT_VAL, 'interactions_max_points': INTERACTIONS_MAX_POINT_VAL}
-
-    column_headers = [
-        ("username", "Name"),
-        # ("user_id", "user_id"),
-        ("users_points", "Total Points"),
-        ("files_points", "Files"),
-        ("notes_points", "Notes"),
-        ("quiz_points", "Quiz"),
-        ("interactions_points", "Interactions"),
-    ]
-    response_dict = {}
-    response_dict["column_headers"] = column_headers
-    response_dict["success"] = True
-    response_dict["students_data_set"] = admin_analytics_data_list
-    response_dict['max_points_dict'] = max_points_dict
-
-    response_dict = json.dumps(response_dict)
-    cache.set(cache_key, response_dict, 60*10)
-
-    # print "\n admin_analytics_data_list === ",admin_analytics_data_list
-    return HttpResponse(response_dict)
-
-@login_required
-@get_execution_time
-def course_analytics_admin(request, group_id):
-    cache_key = u'course_analytics_admin' + unicode(group_id)
-    cache_result = cache.get(cache_key)
-    if cache_result:
-        return HttpResponse(cache_result)
-    # try:
-    #     group_id = ObjectId(group_id)
-    # except:
-    #     group_name, group_id = get_group_name_id(group_id)
-    # t1 = time.time()
-
-    # response_dict = {}
-    # group_obj = node_collection.one({'_id': ObjectId(group_id)})
-    # FILES_MAX_POINT_VAL = NOTES_MAX_POINT_VAL = QUIZ_MAX_POINT_VAL = INTERACTIONS_MAX_POINT_VAL = 0
-
-    # admin_analytics_list = []
-    # if group_obj.author_set:
-    #     for each_author in group_obj.author_set:
-    #         user_obj = User.objects.get(pk=int(each_author))
-    #         admin_analytics_data = {}
-    #         analytics_instance = AnalyticsMethods(request, user_obj.id,user_obj.username, group_id)
-    #         # username = user_obj.username
-    #         # user_id = user_obj.id
-    #         # users_points = analytics_instance.get_users_points()
-    #         admin_analytics_data['username'] = user_obj.username
-    #         admin_analytics_data['user_id'] = user_obj.id
-    #         users_points_breakup = analytics_instance.get_users_points(True)
-    #         admin_analytics_data['users_points'] = users_points_breakup['Total']
-
-    #         admin_analytics_data["files_points"] = users_points_breakup['Files']
-    #         if FILES_MAX_POINT_VAL < users_points_breakup['Files']:
-    #             FILES_MAX_POINT_VAL = users_points_breakup['Files']
-    #         admin_analytics_data['notes_points'] = users_points_breakup['Notes']
-    #         if NOTES_MAX_POINT_VAL < users_points_breakup['Notes']:
-    #             NOTES_MAX_POINT_VAL = users_points_breakup['Notes']
-    #         admin_analytics_data['quiz_points'] = users_points_breakup['Quiz']
-    #         if QUIZ_MAX_POINT_VAL < users_points_breakup['Quiz']:
-    #             QUIZ_MAX_POINT_VAL = users_points_breakup['Quiz']
-    #         admin_analytics_data['interactions_points'] = users_points_breakup['Interactions']
-    #         if INTERACTIONS_MAX_POINT_VAL < users_points_breakup['Interactions']:
-    #             INTERACTIONS_MAX_POINT_VAL = users_points_breakup['Interactions']
-    #         del analytics_instance
-    #         admin_analytics_list.append(admin_analytics_data)
-    # # print "\n\nadmin_analytics_list ",admin_analytics_list
-
-    # column_headers = [
-    #     ("username", "Name"),
-    #     # ("user_id", "user_id"),
-    #     ("users_points", "Total Points"),
-    #     ("files_points", "Files"),
-    #     ("notes_points", "Notes"),
-    #     ("quiz_points", "Quiz"),
-    #     ("interactions_points", "Interactions"),
-    # ]
-    # max_points_dict = {'file_max_points': FILES_MAX_POINT_VAL,'notes_max_points': NOTES_MAX_POINT_VAL,
-    # 'quiz_max_points': QUIZ_MAX_POINT_VAL,'interactions_max_points': INTERACTIONS_MAX_POINT_VAL}
-
-    # response_dict["column_headers"] = column_headers
-    # response_dict["success"] = True
-    # response_dict["students_data_set"] = admin_analytics_list
-    # response_dict['max_points_dict'] = max_points_dict
-
-    # response_dict = json.dumps(response_dict)
-    # cache.set(cache_key, response_dict, 60*10)
-
-
-    # import time
-    # t1 = time.time()
-    from gnowsys_ndf.ndf.views.analytics_methods import AnalyticsMethods
-    from gnowsys_ndf.settings import GSTUDIO_FILE_UPLOAD_POINTS, GSTUDIO_COMMENT_POINTS, GSTUDIO_NOTE_CREATE_POINTS, GSTUDIO_QUIZ_CORRECT_POINTS
-
-    gst_page = node_collection.one({'_type': 'GSystemType', 'name': u'Page'})
-    page_gst_id = page_gst_id
-
-    gst_blog = node_collection.one({'_type': "GSystemType", 'name': "Blog page"})
-    gst_blog_id = gst_blog._id
-
-    gst_file = node_collection.one({'_type': 'GSystemType', 'name': u'File'})
-    gst_file_id = file_gst_id
-
-    gst_reply = node_collection.one({'_type': "GSystemType", 'name': "Reply"})
-    gst_reply_id = gst_reply._id
-
-    group_obj = node_collection.one({'_id': ObjectId(group_id)})
-    author_set = group_obj.author_set
-    all_res_cur = node_collection.find({'_type': 'GSystem', 'group_set': {'$in': [group_obj._id]}, '$or': [{'member_of': {'$in': [gst_file_id, gst_reply_id]}}, {'member_of': page_gst_id, 'type_of': gst_blog_id}], 'created_by': {'$in': author_set} })
-
-
-    gst_dict = {page_gst_id: 0, gst_file_id: 0, gst_reply_id: 0}
-
-    ud = { auth_id: gst_dict.copy() for auth_id in author_set}
-
-    for each in all_res_cur:
-        ud[each.created_by][each.member_of[0]] += 1
-
-    # final dict
-    fd = {}
-
-    gst_name_id_dict = {page_gst_id: 'notes_points', gst_file_id: 'files_points', gst_reply_id: 'interactions_points'}
-    gst_name_point_dict = {page_gst_id: GSTUDIO_NOTE_CREATE_POINTS, gst_file_id: GSTUDIO_FILE_UPLOAD_POINTS, gst_reply_id: GSTUDIO_COMMENT_POINTS}
-
-    admin_analytics_data_list = []
-    admin_analytics_data_append = admin_analytics_data_list.append
-    notes_points_list = [0]
-    notes_points_append = notes_points_list.append
-    files_points_list = [0]
-    files_points_append = files_points_list.append
-    interactions_points_list = [0]
-    interactions_points_append = interactions_points_list.append
-    quize_points_list = [0]
-    quize_points_append = quize_points_list.append
-
-    author_cur = node_collection.find({'_type': u'Author', 'created_by': {'$in': group_obj.author_set} }, {'_id': 0, 'created_by': 1, 'name': 1})
-    user_id_name_dict = {u['created_by']: u['name'] for u in author_cur}
-
-    for uid, gsts in ud.iteritems():
-        fd[uid] = {gst_name_id_dict[g]: gsts[g]*gst_name_point_dict[g] for g in gsts}
-        ua_dict = fd[uid]
-        analytics_instance = AnalyticsMethods(uid, user_id_name_dict[uid], group_id)
-        correct_attempted_quizitems = analytics_instance.get_evaluated_quizitems_count(True,False)
-        ua_dict['quiz_points'] = correct_attempted_quizitems * GSTUDIO_QUIZ_CORRECT_POINTS
-
-        # appends:
-        notes_points_append(ua_dict['notes_points'])
-        files_points_append(ua_dict['files_points'])
-        interactions_points_append(ua_dict['interactions_points'])
-        quize_points_append(ua_dict['quiz_points'])
-
-        ua_dict['users_points'] = sum(ua_dict.values())
-        ua_dict['user_id'] = uid
-        ua_dict['username'] = user_id_name_dict[uid]
-        admin_analytics_data_append(ua_dict)
-
-    max_points_dict = {'file_max_points': max(files_points_list),'notes_max_points': max(notes_points_list),
-        'quiz_max_points': max(quize_points_list),'interactions_max_points': max(interactions_points_list)}
-
-    column_headers = [
-        ("username", "Name"),
-        # ("user_id", "user_id"),
-        ("users_points", "Total Points"),
-        ("files_points", "Files"),
-        ("notes_points", "Notes"),
-        ("quiz_points", "Quiz"),
-        ("interactions_points", "Interactions"),
-    ]
-    response_dict = {}
-    response_dict["column_headers"] = column_headers
-    response_dict["success"] = True
-    response_dict["students_data_set"] = admin_analytics_data_list
-    response_dict['max_points_dict'] = max_points_dict
-
-    response_dict = json.dumps(response_dict)
-    cache.set(cache_key, response_dict, 60*10)
-
-    # print time.time() - t1
-    # print response_dict
-    # print "\n admin_analytics_list === ",admin_analytics_list
-    return HttpResponse(response_dict)
-
-'''
-
-
 @login_required
 @get_execution_time
 def build_progress_bar(request, group_id, node_id):
-    cache_key = u'build_progress_bar_' + unicode(group_id) + "_" + unicode(node_id) + "_" + unicode(request.user.id)
+    cache_key = u'build_progress_bar_' + unicode(slugify(group_id)) + "_" + unicode(node_id) + "_" + unicode(request.user.id)
     cache_result = cache.get(cache_key)
     if cache_result:
         return HttpResponse(cache_result)
@@ -3952,8 +3336,6 @@ def manage_users(request, group_id):
                                 context_instance = RequestContext(request)
     )
 
-
-
 @get_execution_time
 def assets(request, group_id, asset_id=None,page_no=1):
     try:
@@ -3978,7 +3360,7 @@ def assets(request, group_id, asset_id=None,page_no=1):
             'group_id': group_id, 'groupid': group_id,
             'title':'asset_detail','asset_obj':asset_obj,
             'asset_nodes':asset_nodes,'asset_content_list':asset_content_list,
-            'group_obj':group_obj
+            'group_obj':group_obj, 'group_name':group_obj.name
         }
         if 'announced_unit' in group_obj.member_of_names_list or 'Group' in group_obj.member_of_names_list and 'base_unit' not in group_obj.member_of_names_list :
                  
@@ -4001,7 +3383,7 @@ def assets(request, group_id, asset_id=None,page_no=1):
         'group_set': {'$all': [ObjectId(group_id)]}}).sort('last_update', -1)
     assets_page_info = paginator.Paginator(asset_nodes, page_no, GSTUDIO_NO_OF_OBJS_PP)
     context_variables = {
-            'group_id': group_id, 'groupid': group_id,
+            'group_id': group_id, 'groupid': group_id, 'group_name':group_obj.name, 
             'asset_nodes': asset_nodes,'title':'asset_list',
             'group_obj':group_obj,'assets_page_info':assets_page_info
         }
diff --git a/gnowsys-ndf/gnowsys_ndf/settings.py b/gnowsys-ndf/gnowsys_ndf/settings.py
index 881617e100..6759b6c200 100755
--- a/gnowsys-ndf/gnowsys_ndf/settings.py
+++ b/gnowsys-ndf/gnowsys_ndf/settings.py
@@ -787,6 +787,7 @@
 
 GSTUDIO_PROGRAM_EVENT_MOD_GROUP_ALTNAMES = ['Screening House', 'Selection House']
 
+GSTUDIO_DOC_FOOTER_TEXT = "gStudio, Gnowledge Lab"
 
 GSTUDIO_HELP_TIP = {
    "name":"Title of the object",