diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 710e960f..811ac2eb 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -15,6 +15,7 @@ import { HttpClientModule, HttpClient } from '@angular/common/http';
 import { TranslateModule, TranslateLoader } from '@ngx-translate/core';
 import { TranslateHttpLoader } from "@ngx-translate/http-loader";
 import { i18nData } from './assets/i18n-en';
+import { AppConfigModule } from '../shared/app-config/app-config.module';
 import { TranslationModule } from '../shared/translation/translation.module';
 import { MomentModule } from 'angular2-moment';
 import { WindowRef } from '../shared/window';
@@ -65,9 +66,8 @@ import { EventsListPage } from '../pages/events/list/list.page';
 import { EventsPreviewPage } from '../pages/events/download/events-preview.page';
 import { EventsViewPage } from '../pages/events/view/events-view.page';
 import { ForgetPasswordPage } from '../pages/forget-password/forget-password';
-import { GalleryPage } from '../pages/gallery/gallery';
+import { GalleryPage } from '../pages/gallery/gallery.page';
 import { ItemsPopupPage } from '../pages/assessments/popup/items-popup.page';
-import { LeaderboardSettingsPage } from '../pages/settings/leaderboard/leaderboard-settings.page';
 import { LevelsListPage } from '../pages/levels/list/list';
 import { LoginPage } from '../pages/login/login';
 import { MagicLinkPage } from '../pages/magic-link/magic-link';
@@ -79,7 +79,7 @@ import { ResetPasswordPage } from '../pages/reset-password/reset-password';
 import { SettingsPage } from '../pages/settings/settings.page';
 import { SidenavPage } from '../pages/sidenav/sidenav';
 import { TabsPage } from '../pages/tabs/tabs.page';
-import { TeamPage } from '../pages/team/team';
+import { TeamPage } from '../pages/team/team.page';
 import { TermsConditionsPage } from '../pages/registration/terms-conditions/terms-conditions.page';
 import { TestPage } from '../pages/tabs/test.page';
 import { TutorialPage } from '../pages/settings/tutorial/tutorial.page';
@@ -117,7 +117,6 @@ export function createTranslateLoader(http: HttpClient) {
     ForgetPasswordPage,
     GalleryPage,
     ItemsPopupPage,
-    LeaderboardSettingsPage,
     LevelComponent,
     LevelsListPage,
     LoadingMarkerComponent,
@@ -150,6 +149,7 @@ export function createTranslateLoader(http: HttpClient) {
     EscapeHtmlPipe,
   ],
   imports: [
+    AppConfigModule,
     BrowserModule,
     CacheModule,
     FormsModule,
@@ -230,7 +230,6 @@ export function createTranslateLoader(http: HttpClient) {
     ForgetPasswordPage,
     ItemsPopupPage,
     GalleryPage,
-    LeaderboardSettingsPage,
     LevelComponent,
     LevelsListPage,
     LoadingMarkerComponent,
diff --git a/src/pages/activities-classic/list/activities-classic-list.page.ts b/src/pages/activities-classic/list/activities-classic-list.page.ts
index 633a5f7f..d01caf09 100644
--- a/src/pages/activities-classic/list/activities-classic-list.page.ts
+++ b/src/pages/activities-classic/list/activities-classic-list.page.ts
@@ -1,3 +1,6 @@
+/**
+ * @TODO: I believe we can delete this now
+ */
 import { Component } from '@angular/core';
 import { NavController, ToastController, LoadingController } from 'ionic-angular';
 
@@ -10,7 +13,7 @@ declare var _: any;
   templateUrl: './list.html'
 })
 export class ActivitiesClassicListPage {
-  public activities: Array<any> = [];
+  activities: Array<any> = [];
 
   constructor(
     public navCtrl: NavController,
@@ -38,7 +41,7 @@ export class ActivitiesClassicListPage {
   /**
    * normalise activities
    */
-  public normaliseActivities(activities): Array<any> {
+   normaliseActivities(activities): Array<any> {
     let result = [];
 
     activities.forEach((act, index) => {
@@ -78,7 +81,7 @@ export class ActivitiesClassicListPage {
       });
   }
 
-  public doRefresh(refresher) {
+  doRefresh(refresher) {
     this._pullData(this.activities, () => {
       if (refresher) {
         refresher.complete();
@@ -103,19 +106,19 @@ export class ActivitiesClassicListPage {
     });
   }
 
-  public hasReservation(activity) {
+  hasReservation(activity) {
     return false;
   }
 
-  public viewTicket(activity) {
+  viewTicket(activity) {
 
   }
 
-  public book(activity) {
+  book(activity) {
 
   }
 
-  public gotoActivity(activity) {
+  gotoActivity(activity) {
     console.log(activity);
     this.navCtrl.push(ActivitiesViewPage, {activity});
   }
diff --git a/src/pages/activities/list/popup.ts b/src/pages/activities/list/popup.ts
index c461f689..44a0e7f4 100644
--- a/src/pages/activities/list/popup.ts
+++ b/src/pages/activities/list/popup.ts
@@ -13,7 +13,6 @@ import { loadingMessages, errMessages } from '../../../app/messages';
   templateUrl: 'popup.html'
 })
 export class ActivityListPopupPage {
-
   achievementData: any = null;
   achievementName: string;
   achievementsLoadingErr: any = errMessages.General.loading.load;
diff --git a/src/pages/assessments/assessments.html b/src/pages/assessments/assessments.html
index 02d56f6b..bb0fe09f 100644
--- a/src/pages/assessments/assessments.html
+++ b/src/pages/assessments/assessments.html
@@ -1,7 +1,6 @@
 <ion-header>
   <ion-navbar>
     <ion-title></ion-title>
-
     <ion-buttons end>
       <button ion-button (click)="clickSubmit()" class="btn-submit" *ngIf="allowSubmit">
         {{ 'GENERAL.SUBMIT' | translate }}
@@ -9,18 +8,15 @@
     </ion-buttons>
   </ion-navbar>
 </ion-header>
-<ion-content class="assessments-list">
-
+<ion-content>
   <div *ngFor="let assessmentGroup of assessmentGroups; let i = index">
     <div *ngFor="let assessment of assessmentGroup; let j = index">
-
       <ion-card *ngIf="assessment.description" class="no-box-shadow">
         <ion-card-content>
-          <h2 class="text-center">{{ assessment.name }}</h2>
-          <div [innerHTML]="assessment.description"></div>
+          <h2 class="text-center assessment-title">{{ assessment.name }}</h2>
+          <p [innerHTML]="assessment.description" class="assessment-description"></p>
         </ion-card-content>
       </ion-card>
-
       <questionGroup
         *ngFor="let group of assessment.AssessmentGroup; let q = index"
         [group]="group"
diff --git a/src/pages/assessments/assessments.page.ts b/src/pages/assessments/assessments.page.ts
index 229bf3dc..2f05ad34 100644
--- a/src/pages/assessments/assessments.page.ts
+++ b/src/pages/assessments/assessments.page.ts
@@ -5,7 +5,6 @@ import { Observable } from 'rxjs/Observable';
 //services
 import { AssessmentService } from '../../services/assessment.service';
 import { CacheService } from '../../shared/cache/cache.service';
-import { CharacterService } from '../../services/character.service';
 import { GameService } from '../../services/game.service';
 import { SubmissionService } from '../../services/submission.service';
 import { TranslationService } from '../../shared/translation/translation.service';
@@ -52,7 +51,6 @@ export class AssessmentsPage {
     public alertCtrl: AlertController,
     public assessmentService: AssessmentService,
     public cacheService: CacheService,
-    public characterService: CharacterService,
     public events: Events,
     public gameService: GameService,
     public loadingCtrl: LoadingController,
@@ -74,10 +72,7 @@ export class AssessmentsPage {
       this.loadQuestions()
       .then(() => {
         loader.dismiss();
-      }, err => {
-        console.log('log::', err);
-      })
-      .catch((err) => {
+      }).catch(err => {
         console.log(err);
         loader.dismiss();
       });
@@ -97,125 +92,102 @@ export class AssessmentsPage {
    * @description mapping assessments and submissions
    * @param {Object} submissions submissions
    * @param {Object} assessments assessments
+   * @returns {Array} objects of compiled assessment + submissions
    */
-  mapSubmissionsToAssessment(submissions, assessments) {
-    _.forEach(assessments, (group, i) => {
-      _.forEach(group, (assessment, j) => {
-
-        // normalise
-        assessments[i][j] = assessment = this.assessmentService.normalise(assessment);
-
-        _.forEach(assessment.AssessmentGroup, (assessmentGroup, k) => {
-          _.forEach(assessmentGroup.questions, (question, l) => {
-            // Inject empty answer fields
-            // We will know thare are no submission when it is null
-            assessments[i][j].AssessmentGroup[k].questions[l].answer = null;
-            assessments[i][j].AssessmentGroup[k].questions[l].reviewerAnswer = null;
+  mapSubmissionsToAssessment(submissions, assessmentsBatch) {
+    let result = [];
+
+    _.forEach(assessmentsBatch, (batch, i) => {
+
+      let assessmentResult = [];
+      _.forEach(batch, (assessment, j) => {
+        // normalised
+        let normalised = this.assessmentService.normalise(assessment);
+
+        // groups
+        let assessmentGroupResult = [];
+        _.forEach(normalised.AssessmentGroup, assessmentGroup => {
+          // questions
+          let questionsResult = [];
+          let submissionResult : any = {};
+          _.forEach(assessmentGroup.questions, question => {
+            // force answers as null by default (for checkings)
+            let questionResult : any = {
+              answer: null,
+              reviewerAnswer: null
+            };
 
             // find submission
             _.forEach(submissions, (submission) => {
               // attach existing submission to assessment group it belongs to
-              let group = this.assessmentGroups[i][j].AssessmentGroup[k];
-              if (group.assessment_id === submission.assessment_id) {
-                this.assessmentGroups[i][j].AssessmentGroup[k].submission = submission;
+              if (assessmentGroup.assessment_id === submission.assessment_id) {
+                submissionResult = submission;
               }
 
               // find user answer
               _.forEach(submission.answer, (answer) => {
-                if (answer.assessment_question_id === question.id) {
-                  assessments[i][j].AssessmentGroup[k].questions[l].answer = answer;
+                if (answer.assessment_question_id === question.question_id) {
+                  questionResult.answer = answer;
                 }
               });
 
               // find reviewer feedback
               _.forEach(submission.review, (reviewerAnswer) => {
-                if (reviewerAnswer.assessment_question_id === question.id) {
-                  assessments[i][j].AssessmentGroup[k].questions[l].reviewerAnswer = reviewerAnswer;
+                if (reviewerAnswer.assessment_question_id === question.question_id) {
+                  questionResult.reviewerAnswer = reviewerAnswer;
                 }
               });
             });
 
-          });
-
-          // Summarise basic answer information
-          // get total number of questions
-          assessments[i][j].AssessmentGroup[k].totalRequiredQuestions = 0;
-          _.forEach(assessmentGroup.questions, (q) => {
-            if (q.required) {
-              assessments[i][j].AssessmentGroup[k].totalRequiredQuestions += 1;
+            // set assessmentGroup as accessible (submitter has no permission to view)
+            if (this.isAccessibleBySubmitter(question, submissionResult.status)) {
+              assessmentGroup.accessible = true;
+              questionsResult.push(Object.assign(question, questionResult));
             }
           });
 
-          // get total number of answered questions
-          assessments[i][j].AssessmentGroup[k].answeredQuestions = 0;
-          _.forEach(assessmentGroup.questions, (q) => {
-            if (q.required && q.answer && q.answer !== null) {
-              assessments[i][j].AssessmentGroup[k].answeredQuestions += 1;
-            }
-          });
+          let summaries = this.assessmentService.getSummaries(questionsResult);
+          if (assessmentGroup.accessible) {
+            assessmentGroupResult.push(Object.assign(assessmentGroup, {
+              questions: questionsResult,
+              submission: submissionResult,
+              totalRequiredQuestions: summaries.totalRequiredQuestions,
+              answeredQuestions: summaries.answeredQuestions,
+              reviewerFeedback: summaries.reviewerFeedback,
+              status: this.assessmentService.getStatus(questionsResult, submissionResult)
+            }));
+          }
+        });
 
-          // get total number of feedback
-          assessments[i][j].AssessmentGroup[k].reviewerFeedback = 0;
-          _.forEach(assessmentGroup.questions, (q) => {
-            // If API response, the reviewer's answer and comment are empty,
-            // front-end don't consider it as a feedback
-            if (
-              q.reviewerAnswer &&
-              q.reviewerAnswer !== null &&
-              !_.isEmpty(q.reviewerAnswer.answer) &&
-              !_.isEmpty(q.reviewerAnswer.comment)
-            ) {
-              assessments[i][j].AssessmentGroup[k].reviewerFeedback += 1;
-            }
-          });
+        normalised.AssessmentGroup = assessmentGroupResult;
+        assessmentResult.push(normalised);
+      });
 
-          // Set status
-          // let status = assessments[i][j].AssessmentGroup[k].status = 'incomplete';
-          let questionsStatus = [];
-          _.forEach(assessmentGroup.questions, (q) => {
-            if (q.required && q.answer !== null) {
-              if (
-                q.reviewerAnswer !== null &&
-                assessmentGroup.submission.status !== 'pending approval' &&
-                (q.reviewerAnswer.answer || q.reviewerAnswer.comment)
-              ) {
-                questionsStatus.push('reviewed');
-              } else {
-                questionsStatus.push('completed');
-              }
-            }
+      result.push(assessmentResult);
+    });
 
-            if (!q.required && q.answer !== null) {
-              if (
-                q.reviewerAnswer !== null &&
-                assessmentGroup.submission.status !== 'pending approval' &&
-                (q.reviewerAnswer.answer || q.reviewerAnswer.comment)
-              ) {
-                questionsStatus.push('reviewed');
-              } else {
-                questionsStatus.push('completed');
-              }
-            }
+    return result;
+  }
 
-            if (q.answer === null) {
-              questionsStatus.push('incomplete');
-            }
-          });
+  /**
+   * @description filter question by condition (submitter cannot view reviewer
+   *              question before it is published/reviewed)
+   * @param {object} question
+   * @param {string} status
+   */
+  isAccessibleBySubmitter(question, submissionStatus: string) {
+    let accessible = true;
+    let submitterAllowed = false;
 
-          assessments[i][j].AssessmentGroup[k].status = 'incomplete';
-          if (_.every(questionsStatus, (v) => {
-            return (v === 'completed');
-          })) {
-            assessments[i][j].AssessmentGroup[k].status = 'completed';
-          }
-          if (_.includes(questionsStatus, 'reviewed')) {
-            assessments[i][j].AssessmentGroup[k].status = 'reviewed';
-          }
-        });
-      });
-    });
+    if (question.audience.indexOf('submitter') !== -1) {
+      submitterAllowed = true;
+    }
 
-    return assessments;
+    if (!submitterAllowed && submissionStatus !== 'published') {
+      accessible = false;
+    }
+
+    return accessible;
   }
 
   /**
@@ -225,7 +197,7 @@ export class AssessmentsPage {
    *
    * @return {Promise<any>}
    */
-  public pullSubmissions(): Promise<any> {
+   pullSubmissions(): Promise<any> {
     return new Promise((resolve, reject) => {
       // 2nd batch API requests (get_submissions)
       Observable.forkJoin(
@@ -233,47 +205,29 @@ export class AssessmentsPage {
           this.activity.References
         ))
         .subscribe(allSubmissions => {
-          // allSubmissions - response format: [ // context_ids
-          //   [ // assessment group 1
-          //     assessment1,
-          //     assessment2,
-          //     ...
-          //   ],
-          //   [ // assessment group 2
-          //     assessment1,
-          //     assessment2,
-          //     ...
-          //   ],
-          //   ...
-          // ]
+          /** allSubmissions - response format:
+           *  [ // context_ids
+           *    [ // assessment group 1
+           *      assessment1,
+           *      assessment2,
+           *      ...
+           *    ],
+           *    [ // assessment group 2
+           *      assessment1,
+           *      assessment2,
+           *      ...
+           *    ],
+           *    ...
+           *  ]
+           */
           let submissions = [];
           _.forEach(allSubmissions, group => {
-            _.forEach(group, (submission) => {
+            _.forEach(group, submission => {
                 submissions.push(this.submissionService.normalise(submission));
             });
           });
 
-          // check if a submission is specified
-          let currentSubmission = this.navParams.get('currentSubmission');
-          let filteredSubmissions = [];
-
-          submissions.forEach(subm => {
-            if (currentSubmission && currentSubmission.id === subm.id) {
-              filteredSubmissions.push(subm);
-            }
-          });
-          let hasInProgress = _.find(submissions, {status: 'in progress'}); // 'in progress' never > 1
-          let isNew = (!currentSubmission && (filteredSubmissions.length === 0 || !_.isEmpty(hasInProgress)));
-
-          if (isNew) { // new submission
-            this.submissions = !_.isEmpty(hasInProgress) ? [hasInProgress] : [];
-          } else if (!isNew && hasInProgress) { // resume 'in progress'
-            filteredSubmissions.push(hasInProgress);
-            this.submissions = filteredSubmissions;
-          } else if (currentSubmission) { // display current submission
-            filteredSubmissions.push(currentSubmission);
-            this.submissions = filteredSubmissions;
-          }
+          this.submissions = this.filterSubmissions(submissions);
           resolve(submissions);
         }, (err) => {
           console.log('err', err);
@@ -282,8 +236,24 @@ export class AssessmentsPage {
     });
   }
 
-  loadQuestions(): Promise<any> {
-    return new Promise((resolve, reject) => {
+  /**
+   * @description filter submissions data
+   * @param {Array} submissions
+   */
+  filterSubmissions(submissions) {
+    let results = []; // filtered submissions
+
+    // check if a submission is specified (from previous page, from NavParams)
+    let currentSubmission = this.navParams.get('currentSubmission');
+
+    // filteredSubmission: store only submissions related to
+    // currentSubmission (if currentSubmission above exist)
+    let filteredSubmissions = [];
+    submissions.forEach(submission => {
+      if (currentSubmission && currentSubmission.id === submission.id) {
+        filteredSubmissions.push(submission);
+      }
+    });
 
       // get_assessments request with 'assessment_id' & 'structured'
       let getAssessment = (assessmentId) => {
@@ -293,26 +263,50 @@ export class AssessmentsPage {
         });
       };
 
-      // Congregation of assessment ids to fulfill get_assessments API's param requirement
-      let tasks = [];
-      _.forEach(this.activity.References, (reference) => {
-        if (
-          reference.Assessment &&
-          reference.Assessment.id
-        ) {
-          return tasks.push(getAssessment(reference.Assessment.id));
+    return results;
+  }
+
+  /**
+   * @name preStackTasks
+   * @description stack of tasks prepared to handle multiple activity references (ids)
+   */
+  preStackTasks() {
+    // get_assessments request with "assessment_id" & "structured"
+    let getAssessment = (assessmentId) => {
+      // @TODO: we might need to pass in submission id (if available) to get properly filtered assessmnet questions
+      return this.assessmentService.getAll({
+        search: {
+          assessment_id: assessmentId,
+          structured: true
         }
       });
+    };
+
+    let tasks: Array<any> = [];
+    // Congregate assessment ids for rxjs forkJoin (batch API requests)
+    _.forEach(this.activity.References, ref => {
+      if (ref.Assessment && ref.Assessment.id) {
+        tasks.push(getAssessment(ref.Assessment.id));
+      }
+    });
+
+    return tasks;
+  }
 
+  /**
+   * @description loading question from API
+   */
+  loadQuestions(): Promise<any> {
+    return new Promise((resolve, reject) => {
       /**
        * merging submission into question inside of assessment array objects
        * - set question statuses (quantity of total answered)
        * - set submission button status
        */
-      let preprocessAssessmentSubmission = () => {
+      let preprocessAssessmentSubmission = (assessments) => {
         this.assessmentGroups = this.mapSubmissionsToAssessment(
           this.submissions,
-          this.assessmentGroups
+          assessments
         );
 
         // Only allow submit when all required question have answered.
@@ -320,13 +314,10 @@ export class AssessmentsPage {
           _.forEach(groups, assessment => {
             let groupWithAnswers = 0;
             _.forEach(assessment.AssessmentGroup, group => {
-              // console.log('group.answeredQuestions', group.answeredQuestions);
-              // console.log('group.totalRequiredQuestions', group.totalRequiredQuestions);
               if (group.answeredQuestions >= group.totalRequiredQuestions) {
                 groupWithAnswers += 1;
               }
             });
-            // console.log('groupWithAnswers', groupWithAnswers, _.size(assessment.AssessmentGroup));
             if (groupWithAnswers >= _.size(assessment.AssessmentGroup)) {
               this.allowSubmit = true;
             }
@@ -350,42 +341,39 @@ export class AssessmentsPage {
         });
       };
 
-      // first batch API requests (get_assessments)
-      Observable.forkJoin(tasks)
-        .subscribe(
-          (assessments: any) => {
-            this.assessmentGroups = assessments;
-            this.submissions = this.navParams.get('submissions');
+      let setSubmissionAndAssessment = (assessments) => {
+        this.submissions = this.navParams.get('submissions');
 
-            // check if this is from single submission view
-            let currentSubmission = this.navParams.get('currentSubmission');
-            if (currentSubmission) {
-              this.submissions = [currentSubmission];
-            }
+        // check if this is from single submission view
+        let currentSubmission = this.navParams.get('currentSubmission');
+        if (currentSubmission) {
+          this.submissions = [currentSubmission];
+        }
 
-            // pull new when submission is updated or currentSubmission is empty
-            if (this.submissionUpdated || !currentSubmission) {
-              this.pullSubmissions().then(res => {
-                preprocessAssessmentSubmission();
-              }, err => {
-                reject(err);
-              });
-              this.submissionUpdated = false;
-            } else {
-              preprocessAssessmentSubmission();
-            }
-          },
-          (err) => {
-            console.log('err', err);
+        // pull new when submission is updated or currentSubmission is empty
+        if (this.submissionUpdated || !currentSubmission) {
+          this.pullSubmissions().then(res => {
+            preprocessAssessmentSubmission(assessments);
+          }, err => {
             reject(err);
-          }
-        );
+          });
+          this.submissionUpdated = false;
+        } else {
+          preprocessAssessmentSubmission(assessments);
+        }
+      };
+
+      // first batch API requests (get_assessments)
+      Observable.forkJoin(this.preStackTasks())
+        .subscribe(setSubmissionAndAssessment, err => {
+          reject(err);
+        });
     });
   }
 
 
   /**
-   * submit answer and change submission status to done
+   * @description submit answer and change submission status to done
    */
   doSubmit() {
     let loading = this.loadingCtrl.create({
@@ -395,6 +383,8 @@ export class AssessmentsPage {
     loading.present().then(() => {
       let tasks = [];
       _.forEach(this.submissions, (submission) => {
+
+          // @TODO: investigate what causes absent of assessment_id/id/context_id
           if (
             submission &&
             submission.assessment_id &&
@@ -440,9 +430,12 @@ export class AssessmentsPage {
     });
   }
 
+  /**
+   * @description Submit anwsers
+   */
   clickSubmit() {
     const confirm = this.alertCtrl.create({
-      title: 'Submit evidence',
+      title: 'Confirm Submission',
       message: this.submitConfirmMessage,
       buttons: [
         {
@@ -462,8 +455,10 @@ export class AssessmentsPage {
     confirm.present();
   }
 
-  // items popup
-  popupAfterSubmit(){
+  /**
+   * @description  items popup
+   */
+  popupAfterSubmit() {
     const loading = this.loadingCtrl.create({
       content: this.loadingMessages
     });
@@ -473,7 +468,9 @@ export class AssessmentsPage {
         {
           text: 'OK',
           handler: () => {
-            this.navCtrl.setRoot(ActivitiesListPage); // dashboard page
+            // Move to dashboard
+            this.navCtrl.parent.select(0);
+            // this.navCtrl.setRoot(ActivitiesListPage); // dashboard page
           }
         }
       ]
@@ -492,64 +489,69 @@ export class AssessmentsPage {
 
     this.gameService.getItems({
       character_id: this.getCharacterID
-    })
-    .subscribe(
-      data => {
-        this.newItemsData = data.Items;
-        _.forEach(data.Items, (element, index) => {
-          let id = element.id;
-          if(!this.newItemsCount[id]){
-            this.newItemsCount[id] = 0;
-          }
-          this.newItemsCount[id]++;
-        });
-        // compare with previous get_characters() results and generate final index value array result
-        _.forEach(this.newItemsCount, (element, id) => {
-          if(!this.initialItemsCount[id]){
-            this.totalItems.push({ 'count': element, 'id': id });
-          }else {
-            let diffCountVal = element - this.initialItemsCount[id];
-            if(diffCountVal > 0){
-              this.totalItems.push({ 'count': diffCountVal, 'id': id });
-            }
-          }
-        });
+    }).subscribe(
+          data => {
+            this.newItemsData = data.Items;
+            _.forEach(data.Items, (element, index) => {
+              let id = element.id;
+              if(!this.newItemsCount[id]){
+                this.newItemsCount[id] = 0;
+              }
+              this.newItemsCount[id]++;
+            });
+            // compare with previous get_characters() results and generate final index value array result
+            _.forEach(this.newItemsCount, (element, id) => {
+              if(!this.initialItemsCount[id]){
+                this.totalItems.push({ "count": element, "id": id });
+              }else {
+                let diffCountVal = element - this.initialItemsCount[id];
+                if(diffCountVal > 0){
+                  this.totalItems.push({ "count": diffCountVal, "id": id });
+                }
+              }
+            });
 
-        _.forEach(this.totalItems, (element, index) => {
-          element.id = parseInt(element.id);
-        });
+            _.forEach(this.totalItems, (element, index) => {
+              element.id = parseInt(element.id);
+            });
 
-        this.allItemsData = _.intersectionBy(this.newItemsData, this.totalItems, 'id');
-        // get the final object with item occurance count value
-        let groupData = _.groupBy(this.totalItems, 'id');
-        if(this.allItemsData.length === 0){
-          this.gotNewItems = false;
-          this.cacheService.setLocal('gotNewItems', this.gotNewItems);
-          loading.onDidDismiss(() => {
-            alert.present(); // redirect to dashboard page
-          });
-          loading.dismiss();
-        } else {
-          _.map(this.allItemsData, (ele) => {
-            this.combinedItems.push(_.extend({count: groupData[ele.id] || []}, ele));
-          });
-          // display items on dashboard page
-          this.gotNewItems = true;
-          this.cacheService.setLocal('gotNewItems', this.gotNewItems);
-          this.cacheService.setLocal('allNewItems', this.combinedItems);
-          loading.onDidDismiss(() => {
-            this.navCtrl.setRoot(ActivitiesListPage);
-          });
-          loading.dismiss();
-        }
-      },
-      err => {
-        loading.dismiss().then(() => {
-          console.log('Err: ', err);
-        });
-      }
-    );
+            this.allItemsData = _.intersectionBy(this.newItemsData, this.totalItems, 'id');
+            // get the final object with item occurance count value
+            let groupData = _.groupBy(this.totalItems, 'id');
+            if(this.allItemsData.length === 0){
+              this.gotNewItems = false;
+              this.cacheService.setLocal('gotNewItems', this.gotNewItems);
+              loading.onDidDismiss(() => {
+                alert.present(); // redirect to dashboard page
+              });
+              loading.dismiss();
+            } else {
+              _.map(this.allItemsData, (ele) => {
+                this.combinedItems.push(_.extend({count: groupData[ele.id] || []}, ele));
+              });
+              // display items on dashboard page
+              this.gotNewItems = true;
+              this.cacheService.setLocal('gotNewItems', this.gotNewItems);
+              this.cacheService.setLocal('allNewItems', this.combinedItems);
+              loading.onDidDismiss(() => {
+                this.navCtrl.setRoot(ActivitiesListPage);
+              });
+              loading.dismiss();
+            }
+          },
+          err => {
+            loading.dismiss().then(() => {
+              console.log("Err: ", err);
+            });
+          }
+        );
   }
+
+  /**
+   * @description Move to assessment group page
+   * @param {Object} assessment group
+   * @param {Object} activity
+   */
   gotoAssessment(assessmentGroup, activity) {
     this.navCtrl.push(AssessmentsGroupPage, {
       assessmentGroup,
diff --git a/src/pages/assessments/group/assessments-group.html b/src/pages/assessments/group/assessments-group.html
index 43f8bcd9..dc0b3ad5 100644
--- a/src/pages/assessments/group/assessments-group.html
+++ b/src/pages/assessments/group/assessments-group.html
@@ -16,12 +16,13 @@
     </ion-list-header>
   </ion-list>
 
-  <ion-list text-wrap *ngIf="assessmentGroup">
+  <ion-list text-wrap *ngIf="assessmentGroup" class="assessments-group-text">
     <h6 class="strong center">{{assessmentGroup.name}}</h6>
-    <p [innerHTML]="assessment.description"></p>
+    <div [innerHTML]="assessmentGroup.description| keepHtml"></div>
   </ion-list>
 
   <div *ngFor="let question of questions; let i = index;"
+    class="assessments-group-text"
     [ngSwitch]="question.type"
     [ngClass]="{'hr': (i > 0 && i < questions.length)}">
 
@@ -30,43 +31,39 @@ <h6 class="strong center">{{assessmentGroup.name}}</h6>
       <span *ngIf="question.required" class="red">*</span>
     </ion-list>
 
-    <ion-item text-wrap *ngIf="question.description">
+    <ion-item text-wrap *ngIf="question.description" class="description">
       <p [innerHtml]="question.description"></p>
     </ion-item>
 
-    <div *ngFor="let submission of submissions">
-      <pre>{{ submission | json }}</pre>
-    </div>
-
     <!-- type: oneOf -->
     <oneof-question
       [question]="question"
-      [form]="formGroup[question.id]"
+      [form]="formGroup[question.question_id]"
       [disabled]="!canUpdateInput"
       *ngSwitchCase="'oneof'"></oneof-question>
 
     <!-- type: oneOf -->
     <multiple-question
       [question]="question"
-      [form]="formGroup[question.id]"
+      [form]="formGroup[question.question_id]"
       [disabled]="!canUpdateInput"
       *ngSwitchCase="'multiple'"></multiple-question>
 
     <!-- type: file -->
     <file-question
       [question]="question"
-      [form]="formGroup[question.id]"
+      [form]="formGroup[question.question_id]"
       [disabled]="!canUpdateInput"
       *ngSwitchCase="'file'"></file-question>
 
     <!-- type: text -->
     <text-question
       [question]="question"
-      [form]="formGroup[question.id]"
+      [form]="formGroup[question.question_id]"
       [disabled]="!canUpdateInput"
       *ngSwitchCase="'text'"></text-question>
 
     <!-- Reviewer's answer and comment -->
-    <feedback [question]="question" *ngIf="question.review_answer"></feedback>
+    <feedback [question]="question" *ngIf="question.review_answer" class="feedback"></feedback>
   </div>
 </ion-content>
diff --git a/src/pages/assessments/group/assessments-group.page.ts b/src/pages/assessments/group/assessments-group.page.ts
index 568e4cf2..bc2210f3 100644
--- a/src/pages/assessments/group/assessments-group.page.ts
+++ b/src/pages/assessments/group/assessments-group.page.ts
@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { NavParams, NavController, AlertController, LoadingController, Events } from 'ionic-angular';
 import { FormBuilder, Validators, FormGroup, FormControl, FormArray } from '@angular/forms';
 
@@ -6,12 +6,12 @@ import { FormBuilder, Validators, FormGroup, FormControl, FormArray } from '@ang
 import { CacheService } from '../../../shared/cache/cache.service';
 import { ChoiceBase, QuestionBase, Submission, AssessmentService } from '../../../services/assessment.service';
 import * as _ from 'lodash';
-
 @Component({
   selector: 'assessments-group-page',
   templateUrl: './assessments-group.html',
 })
-export class AssessmentsGroupPage {
+export class AssessmentsGroupPage implements OnInit {
+
   activity: any;
   answers: any; // to render & display submitted answers
   assessment: any;
@@ -36,7 +36,7 @@ export class AssessmentsGroupPage {
     public navParams: NavParams
   ) {}
 
-  ionViewDidEnter() {
+  ngOnInit() {
     // navigate from activity page
     this.activity = this.navParams.get('activity') || {};
 
@@ -45,10 +45,13 @@ export class AssessmentsGroupPage {
     if (!_.isEmpty(this.event)) {
       this.activity = this.event;
     }
+  }
 
-    this.assessment = this.activity.assessment; // required for context_id
-    this.cacheKey = `assessment.group.${this.assessment.context_id}`;
+  ionViewDidEnter() {
+    // use assessment object from activity (required for extracting context_id)
+    this.assessment = this.activity.assessment;
 
+    this.cacheKey = `assessment.group.${this.assessment.context_id}`;
     this.assessmentGroup = this.navParams.get('assessmentGroup') || {};
     this.submission = this.navParams.get('submission') || {};
 
@@ -63,6 +66,10 @@ export class AssessmentsGroupPage {
     );
   }
 
+  /**
+   * @name updateSubmission
+   * @description trace changes of input for assessment (to avoid extra checking logics)
+   */
   updateSubmission() {
     this.events.publish('assessment:changes', {
       changed: true
@@ -92,24 +99,32 @@ export class AssessmentsGroupPage {
     }
 
     _.forEach(submission.review, (review) => {
+
       _.forEach(questions, (question, idx) => {
-        if (review.assessment_question_id === question.id) {
-          // text type
+        if (review.assessment_question_id === question.question_id) {
+          // text type (no merging, text question displayed in plain text)
           if (question.type === 'text') {
             questions[idx].review_answer = review;
           }
 
           // oneof type
+          // combine question, when answered by both reviewer and submitter
           if (question.type === 'oneof') {
             questions[idx].review_answer = review;
+            let submitterAnswer = question.answer;
+
             _.forEach(question.choices, (choice, key) => {
-              if (choice.id == review.answer && choice.id == question.answer.answer) {
-                questions[idx].choices[key].name = choice.name + ' (you and reviewer)';
-              }
-              if (choice.id != review.answer && choice.id == question.answer.answer) {
-                questions[idx].choices[key].name = choice.name + ' (you)';
-              }
-              if (choice.id == review.answer && choice.id != question.answer.answer) {
+              if (!_.isEmpty(submitterAnswer)) {
+                if (choice.id == review.answer && choice.id == submitterAnswer.answer) {
+                  questions[idx].choices[key].name = choice.name + ' (you and reviewer)';
+                }
+                else if (choice.id != review.answer && choice.id == submitterAnswer.answer) {
+                  questions[idx].choices[key].name = choice.name + ' (you)';
+                }
+                else if (choice.id == review.answer && choice.id != submitterAnswer.answer) {
+                  questions[idx].choices[key].name = choice.name + ' (reviewer)';
+                }
+              } else if (choice.id == review.answer) { // display reviewer answer
                 questions[idx].choices[key].name = choice.name + ' (reviewer)';
               }
             });
@@ -178,7 +193,14 @@ export class AssessmentsGroupPage {
         group['choices'] = new FormGroup(choices);
       }
 
-      result[question.id] = new FormGroup(group);
+      /**
+       * id and question_id are different id
+       * - id =  has no obvious purpose
+       * - question_id must be used as id for submission
+       *
+       * but for case like this just for index id
+       */
+      result[question.question_id] = new FormGroup(group);
     });
 
     return result;
@@ -204,22 +226,31 @@ export class AssessmentsGroupPage {
 
     return {
       Assessment: {
-          id: submission.assessment_id,
-          context_id: this.getSubmissionContext()
+        id: submission.assessment_id,
+        context_id: this.getSubmissionContext()
       },
       AssessmentSubmissionAnswer: answers
     };
   }
 
   /**
-   * @description store assessment answer/progress locally
+   * @name storeProgress
+   * @description store assessment answer/progress locally (offline)
+   * @example format for cached submission
+   *          {
+   *            Assessment: {
+   *                id: 1,
+   *                context_id: 2
+   *            },
+   *            AssessmentSubmissionAnswer: Array<Submission>
+   *          }
    */
   storeProgress = () => {
     let answers = {};
-    _.forEach(this.formGroup, (question, id) => {
+    _.forEach(this.formGroup, (question, question_id) => {
       let values = question.getRawValue(),
           answer = {
-            assessment_question_id: id,
+            assessment_question_id: question_id,
             answer: values.answer || values.comment,
 
             // store it if choice answer is available or skip
@@ -228,7 +259,7 @@ export class AssessmentsGroupPage {
 
       // set empty string to remove answer
       answer.answer = (answer.answer) ? answer.answer : '';
-      answers[id] = answer;
+      answers[question_id] = answer;
     });
 
     // final step - store submission locally
@@ -248,6 +279,8 @@ export class AssessmentsGroupPage {
 
   /**
    * @description retrieve saved progress from localStorage
+   * @param {Array} questions
+   * @param {Object} answers
    */
   retrieveProgress = (questions: Array<any>, answers?) => {
     let cachedProgress = answers || {}; //this.cache.getLocal(this.cacheKey);
@@ -257,11 +290,11 @@ export class AssessmentsGroupPage {
 
     if (!_.isEmpty(savedProgress)) {
 
-      // index "id" is set as question.id in @Function buildFormGroup above
-      _.forEach(newQuestions, (question, id) => {
+      // index "id" is set as question.question_id in @Function buildFormGroup above
+      _.forEach(newQuestions, (question, question_id) => {
         // check integrity of saved answer (question might get updated)
-        if (savedProgress[id] && savedProgress[id].assessment_question_id == id) {
-          newQuestions[id] = this.setValueWith(question, savedProgress[id]);
+        if (savedProgress[question_id] && savedProgress[question_id].assessment_question_id == question_id) {
+          newQuestions[question_id] = this.setValueWith(question, savedProgress[question_id]);
         }
       });
     }
@@ -289,58 +322,52 @@ export class AssessmentsGroupPage {
   }
 
   /**
-   * @description initiate save progress and return to previous page/navigation stack
+   * @name save
+   * @description save input (partially post submission) and
+   *              return to previous navigation stack
    */
   save() {
     let self = this,
-    loading = this.loadingCtrl.create({
-      content: 'Loading...'
-    }),
-    // to provide a more descriptive error message (if available)
-    failAlert = this.alertCtrl.create({
-      title: 'Fail to submit.'
-    });
-
-    let saveProgress = () => {
-      this.updateSubmission();
-
-      loading.present().then(() => {
-        self.assessmentService.save(self.storeProgress()).subscribe(
-          response => {
-            loading.dismiss().then(() => {
-              self.navCtrl.pop();
-            });
-          },
-          reject => {
-            loading.dismiss().then(() => {
-              failAlert.data.title = reject.msg || failAlert.data.title;
-              failAlert.present().then(() => {
-                console.log('Unable to save', reject);
+      loading = this.loadingCtrl.create({
+        content: 'Loading...'
+      }),
+      // to provide a more descriptive error message (if available)
+      failAlert = this.alertCtrl.create({
+        title: 'Fail to submit.'
+      }),
+      saveProgress = () => {
+        this.updateSubmission();
+
+        loading.present().then(() => {
+          self.assessmentService.save(self.storeProgress()).subscribe(
+            response => {
+              loading.dismiss().then(() => {
+                self.navCtrl.pop();
               });
-            });
-          }
-        );
+            },
+            reject => {
+              loading.dismiss().then(() => {
+                failAlert.data.title = reject.msg || failAlert.data.title;
+                failAlert.present().then(() => {
+                  console.log('Unable to save', reject);
+                });
+              });
+            }
+          );
+        });
+      },
+      confirmBox = this.alertCtrl.create({
+        message: 'You have not completed all required questions. Do you still wish to Save?',
+        buttons: [
+          {
+            text: 'Yes',
+            handler: saveProgress
+          },
+          'No'
+        ]
       });
-    };
-
-    let confirmBox = this.alertCtrl.create({
-      message: 'You have not completed all required questions. Do you still wish to Save?',
-      buttons: [
-        {
-          text: 'Yes',
-          handler: () => {
-            saveProgress();
-          }
-        },
-        {
-          text: 'No',
-          handler: () => {
-            //return false;
-          }
-        }
-      ]
-    });
 
+    // has all compulsory questions answered?
     if (!this.isAllQuestionsAnswered()) {
       confirmBox.present();
     } else {
diff --git a/src/pages/assessments/popup/items-popup.page.ts b/src/pages/assessments/popup/items-popup.page.ts
index 26f57870..1ae14131 100644
--- a/src/pages/assessments/popup/items-popup.page.ts
+++ b/src/pages/assessments/popup/items-popup.page.ts
@@ -33,7 +33,9 @@ export class ItemsPopupPage {
     this.combinedData = this.cacheService.getLocal('allNewItems');
   }
 
-  // close disbaled activity popup
+  /**
+   * @description close disbaled activity popup
+   */
   closeModal() {
     this.viewCtrl.dismiss();
     this.navCtrl.setRoot(TabsPage);
diff --git a/src/pages/events/checkin/event-checkin.page.ts b/src/pages/events/checkin/event-checkin.page.ts
index 49286aea..3e1d4b22 100644
--- a/src/pages/events/checkin/event-checkin.page.ts
+++ b/src/pages/events/checkin/event-checkin.page.ts
@@ -35,13 +35,14 @@ export class EventCheckinPage {
   }
 
   ionViewDidEnter() {
-    this.checkin = this.getCheckinAnswer(this.submissions[0]); // event checkin has just single submission
+    // We assume event checkin has just single submission
+    this.checkin = this.getCheckinAnswer(this.submissions[0]);
     this.assessment = this.assessmentService.normaliseGroup(this.assessmentGroup);
     this.user = this.cache.getLocal('user');
   }
 
   // Only checkin/file upload answer is displayed in check-in view
-  public getCheckinAnswer(submission) {
+  getCheckinAnswer(submission) {
     let result = {};
     submission.answer.forEach(ans => {
       if (typeof ans.answer === 'object') {
diff --git a/src/pages/events/view/events-view.page.ts b/src/pages/events/view/events-view.page.ts
index 9d8c3899..b342f172 100755
--- a/src/pages/events/view/events-view.page.ts
+++ b/src/pages/events/view/events-view.page.ts
@@ -50,7 +50,7 @@ export class EventsViewPage {
     this.event = navParams.get('event');
   }
 
-  public availability(event): string {
+  availability(event): string {
     return (event.isBooked)? terms.booked : event.remaining_capacity + ' of ' + event.capacity + ' seats available';
   }
 
@@ -91,7 +91,8 @@ export class EventsViewPage {
    * @description each event has only one assessment
    * @param {Array} references References array response from get_activity API
    */
-   extractAssessment(references: Array<any>) {
+
+  extractAssessment(references: Array<any>) {
     let ref = references[0];
     ref.Assessment.context_id = ref.context_id;
 
diff --git a/src/pages/forget-password/forget-password.ts b/src/pages/forget-password/forget-password.ts
index 1a324c01..8eadcd16 100644
--- a/src/pages/forget-password/forget-password.ts
+++ b/src/pages/forget-password/forget-password.ts
@@ -8,7 +8,7 @@ import { AlertController,
 import { FormBuilder, Validators } from '@angular/forms';
 import { Observable } from 'rxjs/Observable';
 import { TranslationService } from '../../shared/translation/translation.service';
-import { loadingMessages, errMessages } from '../../app/messages'; 
+import { loadingMessages, errMessages } from '../../app/messages';
 // services
 import { AuthService } from '../../services/auth.service';
 // directives
diff --git a/src/pages/gallery/gallery.ts b/src/pages/gallery/gallery.page.ts
similarity index 100%
rename from src/pages/gallery/gallery.ts
rename to src/pages/gallery/gallery.page.ts
diff --git a/src/pages/login/login.ts b/src/pages/login/login.ts
index 087f80c5..b6d2dbc3 100644
--- a/src/pages/login/login.ts
+++ b/src/pages/login/login.ts
@@ -61,11 +61,13 @@ export class LoginPage {
       password: ['', [Validators.required, Validators.minLength(8)]],
     });
   }
+
   ionViewCanLeave(): boolean {
     // to check whether user is authorized
     let authorized = true;
     return authorized ? true : false;
   }
+
   /**
    * user login function to authenticate user with email and password
    */
@@ -82,10 +84,10 @@ export class LoginPage {
         this.authService.loginAuth(this.email, this.password)
             .subscribe(data => {
               self.cacheService.setLocal('apikey', data.apikey);
-              // saved for 3 types of timeline id in order for later use
               self.cacheService.setLocal('timelineID', data.Timelines[0].Timeline.id);
               self.cacheService.setLocal('teams', data.Teams);
               self.cacheService.setLocal('gotNewItems', false);
+              self.cacheService.setLocal('appConfig', data.Experience.config || {});
               // get game_id data after login
               this.gameService.getGames()
                   .subscribe(data => {
@@ -154,6 +156,7 @@ export class LoginPage {
       });
     });
   }
+
   /**
    * Insert post_auth() api result into localStorage
    * @param {object} data result from API request
@@ -172,6 +175,7 @@ export class LoginPage {
     this.cacheService.setLocal('timeline_id', data.Timelines[0].Timeline.id);
     return Observable.from(cacheProcesses);
   }
+
   /**
    * Insert get_user() api result into localStorage
    * @param {object} user result from API request
@@ -187,6 +191,7 @@ export class LoginPage {
     // to get API KEY and timeline_id and stored in localStorage
     // then other API calls can directly use (API KEY and timeline_id)
   }
+
   /**
    * @TODO we'll come back to this logging workflow later in this development
    *
@@ -202,6 +207,7 @@ export class LoginPage {
     alert.present();
     // handle API calling errors display with alert controller
   }
+
   /**
    * forget password page link function
    */
diff --git a/src/pages/magic-link/magic-link.ts b/src/pages/magic-link/magic-link.ts
index 29612a77..4693a54e 100644
--- a/src/pages/magic-link/magic-link.ts
+++ b/src/pages/magic-link/magic-link.ts
@@ -39,9 +39,11 @@ export class MagicLinkPage {
   ionViewDidLoad() {
     this.auth_token = this.navParams.get('auth_token');
   }
+
   ionViewWillEnter(){
     this.magicLinkAccess();
   }
+
   magicLinkAccess(){
     let observable = this.authService.magicLinkLogin(this.auth_token);
     const loading = this.loadingCtrl.create({
diff --git a/src/pages/rankings/list/rankings.page.ts b/src/pages/rankings/list/rankings.page.ts
index ee1a5dfb..b2540d87 100644
--- a/src/pages/rankings/list/rankings.page.ts
+++ b/src/pages/rankings/list/rankings.page.ts
@@ -34,6 +34,7 @@ export class RankingsPage {
   ionViewWillEnter(){
     this.RankingData();
   }
+
   RankingData(){
     const loading = this.loadingCtrl.create({
       content: this.loadingMessages
@@ -80,6 +81,7 @@ export class RankingsPage {
         });
       });
   }
+
   goRankingDetail(myRanking){
     this.navCtrl.push(RankingDetailsPage, {
       myRanking: myRanking
diff --git a/src/pages/rankings/view/ranking-badges.ts b/src/pages/rankings/view/ranking-badges.ts
index 34fe85aa..7b834b2c 100644
--- a/src/pages/rankings/view/ranking-badges.ts
+++ b/src/pages/rankings/view/ranking-badges.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 import { ViewController, ToastController, LoadingController, NavParams } from 'ionic-angular';
 import { TranslationService } from '../../../shared/translation/translation.service';
-import { loadingMessages, errMessages } from '../../../app/messages'; 
+import { loadingMessages, errMessages } from '../../../app/messages';
 import * as _ from 'lodash';
 // services
 import { AchievementService } from '../../../services/achievement.service';
@@ -12,14 +12,15 @@ import { RankingDetailsPage } from '../view/ranking-details.page';
   templateUrl: 'ranking-badges.html'
 })
 export class RankingBadgesPage {
-  public currentAchievement: any = null;
-  public badgeUrl: string = '../assets/img/default/default-badge.png';
-  public description: string = "No Description Yet ..";
-  public points: number = 0;
-  public achievementName: string = "Achievement";
-  public loadingMessage: any = loadingMessages.LoadingSpinner.loading;
-  public achievementsLoadingErr: any = errMessages.General.loading.load;
-  public achievementsEmptyDataErr: any = errMessages.Activities.achievements.empty;
+  currentAchievement: any = null;
+  badgeUrl: string = '../assets/img/default/default-badge.png';
+  description: string = "No Description Yet ..";
+  points: number = 0;
+  achievementName: string = "Achievement";
+  loadingMessage: any = loadingMessages.LoadingSpinner.loading;
+  achievementsLoadingErr: any = errMessages.General.loading.load;
+  achievementsEmptyDataErr: any = errMessages.Activities.achievements.empty;
+
   constructor(public viewCtrl: ViewController,
               public navParams: NavParams,
               public toastCtrl: ToastController,
@@ -29,8 +30,9 @@ export class RankingBadgesPage {
                 this.currentAchievement = this.navParams.get('achievement');
                 console.log("currentAchievement: ", this.currentAchievement);
               }
+
   // close disbaled activity popup
   closeModal() {
     this.viewCtrl.dismiss();
   }
-}
\ No newline at end of file
+}
diff --git a/src/pages/rankings/view/ranking-details.page.ts b/src/pages/rankings/view/ranking-details.page.ts
index eb13b77d..51316c2d 100644
--- a/src/pages/rankings/view/ranking-details.page.ts
+++ b/src/pages/rankings/view/ranking-details.page.ts
@@ -1,5 +1,6 @@
 import { Component } from '@angular/core';
 import { NavController, NavParams, LoadingController, AlertController, ModalController } from 'ionic-angular';
+
 import { TranslationService } from '../../../shared/translation/translation.service';
 import { loadingMessages, errMessages } from '../../../app/messages';
 import * as _ from 'lodash';
@@ -13,15 +14,15 @@ import { RankingBadgesPage } from './ranking-badges';
   templateUrl: 'ranking-details.html'
 })
 export class RankingDetailsPage {
-  public userAchievementsData: any = [];
-  public achievementBadgeImage = '../assets/img/default/default-badge.png';
-  public achievementName = 'Achievement';
-  public totalPoints = 0;
-  public myRank: any= {};
+  userAchievementsData: any = [];
+  achievementBadgeImage = '../assets/img/default/default-badge.png';
+  achievementName = 'Achievement';
+  totalPoints = 0;
+  myRank: any= {};
+  emptyAchievementMessage = errMessages.Activities.achievements.empty;
+  loadingMessages: any = loadingMessages.LoadingSpinner.loading;
+  emptyErrorMessage: any = errMessages.General.loading.load;
 
-  public emptyAchievementMessage = errMessages.Activities.achievements.empty;
-  public loadingMessages: any = loadingMessages.LoadingSpinner.loading;
-  public emptyErrorMessage: any = errMessages.General.loading.load;
   constructor(public navCtrl: NavController,
               public loadingCtrl: LoadingController,
               public alertCtrl: AlertController,
@@ -44,6 +45,7 @@ export class RankingDetailsPage {
     });
 
   }
+
   userAchievements(): Promise<any> {
     return new Promise((resolve, reject) => {
       this.achievementService.getAchievements()
@@ -67,6 +69,7 @@ export class RankingDetailsPage {
         );
     });
   }
+
   goToBadgeDetailsPage(achievementData){
     let goRankingBadgesPopup = this.modalCtrl.create(RankingBadgesPage, { achievement: achievementData });
     goRankingBadgesPopup.present();
diff --git a/src/pages/registration/register.page.ts b/src/pages/registration/register.page.ts
index 0ee15b5d..acc404da 100644
--- a/src/pages/registration/register.page.ts
+++ b/src/pages/registration/register.page.ts
@@ -241,11 +241,13 @@ export class RegisterPage implements OnInit { // this part of registration is fo
     this.cacheService.setLocal('timelineID', data.Timeline.id);
     return Observable.from(cacheProcesses);
   }
+
   goToLogin() {
     this.cacheService.clear().then(() => {
       this.navCtrl.setRoot(LoginPage);
     });
   }
+
   // check password minmimum length
   checkMinLength(){
     return (this.password.length < 8 || this.verify_password.length < 8) ? this.minLengthCheck = true : this.minLengthCheck = false;
diff --git a/src/pages/registration/registration.page.ts b/src/pages/registration/registration.page.ts
new file mode 100644
index 00000000..fcef1e5a
--- /dev/null
+++ b/src/pages/registration/registration.page.ts
@@ -0,0 +1,116 @@
+import { Component, OnInit } from '@angular/core';
+
+import { CacheService } from '../../shared/cache/cache.service';
+import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
+import { NavController, NavParams, AlertController } from 'ionic-angular';
+import { Observable } from 'rxjs';
+import { TranslationService } from '../../shared/translation/translation.service';
+import { loadingMessages, errMessages } from '../../app/messages';
+// services
+import { AuthService } from '../../services/auth.service';
+import { RequestService } from '../../shared/request/request.service';
+import { NotificationService } from '../../shared/notification/notification.service';
+// pages
+import { LoginPage } from '../../pages/login/login';
+@Component({
+  template: `<term-condition [user]='user'></term-condition>`,
+})
+export class RegistrationPage implements OnInit {
+  user: Object = {
+    email: null,
+    key: null
+  };
+  term: String;
+  content: SafeResourceUrl;
+  prefixUrl: any = this.request.getPrefixUrl();
+  // loadinbg & error message variables
+  verifyFailedErrMessage = errMessages.Registration.verifyFailed.verifyfailed;
+
+  constructor(
+    public nav: NavController,
+    public params: NavParams,
+    public authService: AuthService,
+    public sanitizer: DomSanitizer,
+    public notification: NotificationService,
+    public translationService: TranslationService,
+    public alertCtrl: AlertController,
+    public cache: CacheService,
+    public request: RequestService) {}
+
+  displayError(errorMessage?: any): void {
+    let alert = this.alertCtrl.create({
+      title: 'Invalid registration code',
+      subTitle: errorMessage || 'Registration Code is invalid, please contact our tech support for assistance.',
+      buttons: [{
+        text: 'OK',
+        handler: () => {
+          alert.dismiss().then(() => {
+            this.nav.setRoot(LoginPage).then(() => {
+              window.history.replaceState({}, '', window.location.origin);
+            });
+          })
+          return false;
+        }
+      }]
+    });
+    alert.present();
+  }
+
+  ngOnInit() {
+    // check if email and activation_code are provided in the url/params
+    if (!decodeURIComponent(this.params.get('email')) || !this.params.get('key')) {
+      this.displayError();
+    } else {
+      let email = decodeURIComponent(this.params.get('email')),
+        key = this.params.get('key');
+      this.authService.verifyRegistration({
+        email: email,
+        key: key
+      }).subscribe(res => {
+        this.cache.setLocal('user.email', email);
+        this.cache.setLocal('user.registration_key', key);
+        this.cache.setLocal('user.id', res.data.User.id);
+        this.user = {
+          email: email,
+          key: key
+        };
+        Observable.forkJoin([
+          this.cache.write('user.email', email),
+          this.cache.write('user.registration_key', key),
+          this.cache.write('user.id', res.data.User.id)
+        ]).subscribe(responds => {
+          console.log('RespondsVerify::', responds);
+        });
+      }, err => {
+        console.log(err);
+        this.displayError(err.msg);
+      });
+    }
+  }
+
+  ionViewDidEnter(): void {
+    // this.authService.getTerms().subscribe(res => {
+    //   console.log("terms data: ", res);
+    //   this.term = res.terms_description;
+    //   this.content = this.sanitizer.bypassSecurityTrustResourceUrl(this.prefixUrl + res.terms_url);
+    // });
+    // this.params.get('test');
+  }
+
+  ionViewDidLoad(): void {
+    let category = [];
+    /*if (document.URL.indexOf("?") !== -1) {
+      let splitURL = document.URL.split("?");
+      let splitParams = splitURL[1].split("&");
+      console.log(splitURL, splitParams);
+      splitParams.forEach(param => {
+        let singleURLParam = param.split('=');
+        let urlParameter = {
+          'name': singleURLParam[0],
+          'value': singleURLParam[1]
+        };
+        category.push(urlParameter);
+      });
+    }*/
+  }
+}
diff --git a/src/pages/reset-password/reset-password.ts b/src/pages/reset-password/reset-password.ts
index 269bb63a..d7d82984 100644
--- a/src/pages/reset-password/reset-password.ts
+++ b/src/pages/reset-password/reset-password.ts
@@ -64,19 +64,12 @@ export class ResetPasswordPage implements OnInit {
           verify_password: ['', [Validators.minLength(8), Validators.required]],
       })
     }
-  /**
-   * Detect user device type (mobile or desktop) on initial page load
-   * Purpose: Initially page loaded, this peice code will detect user screen
-              whether is mobile or desktop device (including iPad).
-   * @param {}
-   * @return A calculated ratio value plus screen innerWidth value to determine
-             user screen is mobile device or desktop device. If device is mobile
-             device, ngOnInit() will disable landscape mode for mobile device
-  */
+
   ngOnInit() {}
   ionViewWillEnter() {
     this.verifyKeyEmail();
   }
+
   /**
    * to verify user is whether typed or clicked the email link
    * Purpose: if user is typed the email link key and email, user is not allowed
@@ -111,6 +104,7 @@ export class ResetPasswordPage implements OnInit {
         }, 30000);
       });
   }
+
   /**
    * to update password in db
    * Purpose: store new password for user
@@ -208,14 +202,17 @@ export class ResetPasswordPage implements OnInit {
     });
     alertLogin.present();
   }
+
   // check password minmimum length
   checkMinLength(){
     return (this.password.length < 8 || this.verify_password.length < 8) ? this.minLengthCheck = true : this.minLengthCheck = false;
   }
+
   // check password mismacth issue
   verifyPwdKeyUp() {
     return this.verifyPwd = true;
   }
+
   pwdMatchCheck() {
     return this.password != this.verify_password ? this.isPwdMatch = true : this.isPwdMatch = false;
   }
diff --git a/src/pages/settings/leaderboard/leaderboard-settings.html b/src/pages/settings/leaderboard/leaderboard-settings.html
deleted file mode 100644
index 6ce93c66..00000000
--- a/src/pages/settings/leaderboard/leaderboard-settings.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<ion-header>
-  <ion-navbar>
-    <ion-title>{{ 'SETTINGS.LEADERBOARD' | translate }}</ion-title>
-  </ion-navbar>
-</ion-header>
-<ion-content class="leaderboard-settings">
-  <ion-list>
-    <ion-col>
-      <p col-12>Hi {{ username }} ({{ useremail }}), </p>
-    </ion-col>
-    <ion-col class="flex-display">
-      <p col-10 class="hide-settings">Hide name in leaderboard?</p>
-      <ion-toggle [(ngModel)]="isHide"></ion-toggle>
-    </ion-col>
-  </ion-list>
-</ion-content>
\ No newline at end of file
diff --git a/src/pages/settings/leaderboard/leaderboard-settings.page.ts b/src/pages/settings/leaderboard/leaderboard-settings.page.ts
deleted file mode 100644
index 0c73baf6..00000000
--- a/src/pages/settings/leaderboard/leaderboard-settings.page.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Component } from '@angular/core';
-
-// services
-import { CacheService } from '../../../shared/cache/cache.service';
-
-@Component({
-  selector: 'leaderboard-settings-page',
-  templateUrl: 'leaderboard-settings.html'
-})
-export class LeaderboardSettingsPage {
-  isHide: boolean = false;
-  useremail: string;
-  username: string;
-
-  constructor(
-    public cacheService: CacheService
-  ) {
-    this.useremail = JSON.stringify(this.cacheService.getLocal('email'));
-    this.username = JSON.stringify(this.cacheService.getLocal('name'));
-  }
-}
diff --git a/src/pages/settings/settings.html b/src/pages/settings/settings.html
index 5b516ab6..799dc693 100644
--- a/src/pages/settings/settings.html
+++ b/src/pages/settings/settings.html
@@ -8,23 +8,29 @@
     <ion-list-header>
       {{ 'SETTINGS.PROFILE' | translate }} <span *ngIf="getUserEmail()">({{ getUserEmail() }})</span>
     </ion-list-header>
+
+    <ion-item>
+      <ion-toggle [(ngModel)]="hideName" (ionChange)="triggerHideName()"></ion-toggle>
+      <ion-label>
+        Hide name in rankings
+      </ion-label>
+    </ion-item>
+  </ion-list>
+  <ion-list no-lines>
+    <ion-list-header>
+      {{ 'SETTINGS.SUPPORT' | translate }}
+    </ion-list-header>
     <button ion-item (click)="goToTutorial()">
       <ion-icon name="medkit" item-left></ion-icon> {{ 'SETTINGS.TUTORIAL' | translate }}
     </button>
     <button ion-item (click)="goToTermConditions()">
       <ion-icon name="clipboard" item-left></ion-icon> {{ 'SETTINGS.TERMS' | translate }}
     </button>
-    <!-- <button ion-item (click)="goLeaderBoardSettings()">
-      <ion-icon name="swap" item-left></ion-icon> {{ 'SETTINGS.LEADERBOARD' | translate }}
-    </button> -->
-  </ion-list>
-  <ion-list no-lines>
-    <ion-list-header>
-      {{ 'SETTINGS.SUPPORT' | translate }}
-    </ion-list-header>
     <a ion-item href="mailto:{{helpline}}?Subject=Tech%20Support%20Request" target="_blank">
       <ion-icon name="mail" item-left></ion-icon> {{ 'SETTINGS.HELP' | translate }}
     </a>
+  </ion-list>
+  <ion-list no-lines>
     <button ion-item (click)="logout()">
       <ion-icon name="exit" item-left></ion-icon> {{ 'SETTINGS.LOGOUT' | translate }}
     </button>
diff --git a/src/pages/settings/settings.page.ts b/src/pages/settings/settings.page.ts
index 2fdf7e37..e69c08f0 100644
--- a/src/pages/settings/settings.page.ts
+++ b/src/pages/settings/settings.page.ts
@@ -1,15 +1,15 @@
 import { Component } from '@angular/core';
-import { App, NavController, MenuController, LoadingController } from 'ionic-angular';
+import { App, NavController, MenuController, LoadingController, AlertController } from 'ionic-angular';
 // services
 import { CacheService } from '../../shared/cache/cache.service';
+import { GameService } from '../../services/game.service';
 // pages
-import { LeaderboardSettingsPage } from '../settings/leaderboard/leaderboard-settings.page';
 import { LoginPage } from '../../pages/login/login';
 import { TutorialPage } from '../settings/tutorial/tutorial.page';
 import { TermsConditionsPage } from '../registration/terms-conditions/terms-conditions.page';
 // Others
 import { TranslationService } from '../../shared/translation/translation.service';
-import { loadingMessages, errMessages } from '../../app/messages';
+import { loadingMessages } from '../../app/messages';
 
 @Component({
   selector: 'settings-page',
@@ -17,34 +17,113 @@ import { loadingMessages, errMessages } from '../../app/messages';
 })
 export class SettingsPage {
   helpline: string = "help@practera.com";
+  hideName: boolean = false;
   logoutMessage: any = loadingMessages.Logout.logout;
   settings: any = [];
+  isLock: boolean = false;
   constructor(
     public appCtrl: App,
+    public alertCtrl: AlertController,
+    public cacheService: CacheService,
+    public gameService: GameService,
     public loadingCtrl: LoadingController,
     public menuCtrl: MenuController,
     public navCtrl: NavController,
-    public cache: CacheService,
-    public translationService: TranslationService) {}
-  getUserEmail() {
-    return this.cache.getLocal('email') || '';
+    public translationService: TranslationService,
+  ) {}
+
+  ionViewWillEnter(){
+    this.preload();
+  }
+
+  preload() {
+    const loading = this.loadingCtrl.create({
+      content: 'Loading'
+    });
+    loading.present();
+
+    let gameId = this.cacheService.getLocal('game_id');
+    this.gameService.getCharacters(gameId)
+      .subscribe((characters) => {
+        let me = characters.Characters[0];
+        if(me.meta == null) {
+          this.hideName = false;
+        }
+        if(me.meta != null){
+          if (me.meta.private === 0) {
+            this.hideName = false;
+          } else {
+            this.hideName = true;
+          }
+        }
+        loading.dismiss();
+      }, (err) => {
+        loading.dismiss();
+      });
+  }
+
+  triggerHideName() {
+    if (this.isLock) {
+      this.isLock = false;
+    } else {
+      const showAlert = (msg) => {
+        let alert = this.alertCtrl.create({
+          subTitle: msg,
+          buttons: ['OK']
+        });
+        alert.present();
+      }
+
+      const loader = this.loadingCtrl.create({
+        content: 'Updating'
+      });
+
+      loader.present().then(() => {
+        this.isLock = true;
+        this.gameService.postCharacter({
+          Character: {
+            id: this.cacheService.getLocal('character_id'),
+            meta: {
+              private: (this.hideName) ? 1 : 0
+            }
+          }
+        })
+        .subscribe((result) => {
+          this.isLock = false;
+          loader.dismiss();
+          let msg = 'You name will now be hidden if in the ranking';
+          if (!this.hideName) {
+            msg = 'Your name will now be displayed if in the ranking';
+          }
+          showAlert(msg);
+        }, (err) => {
+          this.hideName = !this.hideName;
+          showAlert('Unabled to change your privacy setting.');
+          loader.dismiss();
+        });
+      });
+    }
   }
-  goLeaderBoardSettings(){
-    this.navCtrl.push(LeaderboardSettingsPage);
+
+  getUserEmail() {
+    return this.cacheService.getLocal('email') || '';
   }
+
   goToTutorial() {
     this.navCtrl.push(TutorialPage);
   }
+
   goToTermConditions() {
     this.navCtrl.push(TermsConditionsPage);
   }
+
   logout() {
     let loader = this.loadingCtrl.create({
       spinner: 'hide',
       content: this.logoutMessage
     });
     loader.present().then(() => {
-      this.cache.clear().then(() => {
+      this.cacheService.clear().then(() => {
         localStorage.clear();
         window.location.reload(); // the reason of doing this is because of we need to refresh page content instead of API data cache issue occurs
         loader.dismiss();
diff --git a/src/pages/spinwheel/celebration.html b/src/pages/spinwheel/celebration.html
deleted file mode 100644
index f736105a..00000000
--- a/src/pages/spinwheel/celebration.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<ion-content>
-  Test
-</ion-content>
diff --git a/src/pages/spinwheel/celebration.page.ts b/src/pages/spinwheel/celebration.page.ts
deleted file mode 100644
index 5bf0adbe..00000000
--- a/src/pages/spinwheel/celebration.page.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  templateUrl: './celebration.html'
-})
-export class CelebrationPage {
-
-}
diff --git a/src/pages/tabs/tabs.html b/src/pages/tabs/tabs.html
index c45f2d85..a32f5ba4 100755
--- a/src/pages/tabs/tabs.html
+++ b/src/pages/tabs/tabs.html
@@ -1,9 +1,4 @@
 <ion-tabs>
   <ion-tab tabsHideOnSubPages="true" [root]="dashboard" tabTitle=" {{ 'TABS.DASHBOARD' | translate }}" tabIcon="md-list-box"></ion-tab>
-  <ion-tab tabsHideOnSubPages="true" [root]="events" tabTitle=" {{ 'TABS.EVENTS' | translate }}" tabIcon="md-calendar"></ion-tab>
-  <ion-tab tabsHideOnSubPages="true" [root]="ranking" tabTitle=" {{ 'TABS.RANKING' | translate }}" tabIcon="md-medal"></ion-tab>
-  <ion-tab tabsHideOnSubPages="true" [root]="settings" tabTitle=" {{ 'TABS.ACCOUNT' | translate }}" tabIcon="md-person"></ion-tab>
+  <ion-tab *ngFor="let tab of tabs" tabsHideOnSubPages="true" [root]="tab.root" tabTitle=" {{ tab.title | translate }}" tabIcon="{{tab.icon}}"></ion-tab>
 </ion-tabs>
-
-
-
diff --git a/src/pages/tabs/tabs.page.ts b/src/pages/tabs/tabs.page.ts
index c0339b8b..847afcbc 100644
--- a/src/pages/tabs/tabs.page.ts
+++ b/src/pages/tabs/tabs.page.ts
@@ -2,11 +2,8 @@ import { Component } from '@angular/core';
 
 // Pages
 import { ActivitiesListPage } from '../activities/list/list.page';
-import { RankingsPage } from '../rankings/list/rankings.page';
-import { SettingsPage } from '../settings/settings.page';
-import { TestPage } from './test.page';
-import { EventsListPage } from '../events/list/list.page';
 // Others
+import { AppConfigService } from '../../shared/app-config/app-config.service';
 import { TranslationService } from '../../shared/translation/translation.service';
 
 @Component({
@@ -16,13 +13,18 @@ import { TranslationService } from '../../shared/translation/translation.service
 export class TabsPage {
   // this tells the tabs component which Pages
   // should be each tab's root Page
-  ranking: any = RankingsPage;
-  // ranking: any = TestPage;
+
+  // We need hardcode at least one tab menu,
+  // otherwise any misconfigure will break
   dashboard: any = ActivitiesListPage;
-  settings: any = SettingsPage;
-  events: any = EventsListPage;
+  tabs: any = [];
 
   constructor(
+    public appConfig: AppConfigService,
     public translationService: TranslationService
   ) {}
+
+  ionViewWillEnter() {
+    this.tabs = this.appConfig.getTabs();
+  }
 }
diff --git a/src/pages/team/team.ts b/src/pages/team/team.page.ts
similarity index 99%
rename from src/pages/team/team.ts
rename to src/pages/team/team.page.ts
index dc33a180..bbeec9df 100644
--- a/src/pages/team/team.ts
+++ b/src/pages/team/team.page.ts
@@ -19,8 +19,6 @@ export class TeamPage {
     public toastCtrl: ToastController
   ) {}
 
-
-
   // @TODO: Move to shared function later...
   _error(err) {
     let toast = this.toastCtrl.create({
diff --git a/src/pages/term-condition/term-condition.page.ts b/src/pages/term-condition/term-condition.page.ts
new file mode 100644
index 00000000..d256d987
--- /dev/null
+++ b/src/pages/term-condition/term-condition.page.ts
@@ -0,0 +1,120 @@
+import { Component, Input } from '@angular/core';
+import { SafeResourceUrl } from '@angular/platform-browser';
+import { NavController, AlertController } from 'ionic-angular';
+
+// services
+import { AuthService } from '../../services/auth.service';
+import { NotificationService } from '../../shared/notification/notification.service';
+// pages
+import { RegisterPage } from '../registration/register.page';
+import { TabsPage } from '../tabs/tabs.page';
+// Others
+import { TranslationService } from '../../shared/translation/translation.service';
+import { loadingMessages, errMessages, generalVariableMessages } from '../../app/messages';
+
+@Component({
+  selector: 'term-condition',
+  templateUrl: 'term-condition.html'
+})
+export class TermConditionPage {
+  @Input('content') content?: SafeResourceUrl;
+  @Input('user') user: any;
+
+  agreed:boolean = false;
+  checkAccessMethod: boolean = false;
+  disagreeErrMessage = errMessages.TermConditions.disagreement.noAccepted;
+  helpEmailMessage = generalVariableMessages.helpMail.email;
+  verifyFailedErrMessage = errMessages.TermConditions.verifyFailed.verifyfailed;
+
+  constructor(
+    public alertCtrl: AlertController,
+    public authService: AuthService,
+    public nav: NavController,
+    public notificationService: NotificationService,
+    public translationService: TranslationService,
+  ) {}
+
+  accessMethod(){
+    return (window.location.href.indexOf('?do=') > -1) ? this.checkAccessMethod = true : this.checkAccessMethod = false
+  }
+
+  displayError(errorMessage?: any): void {
+    let alert = this.alertCtrl.create({
+      title: 'Invalid registration code',
+      subTitle: errorMessage,
+      buttons: [{
+        text: 'Close'
+      }]
+    });
+    alert.present();
+  }
+  backToSAccountPage() {
+    this.nav.popToRoot();
+  }
+
+  ionViewDidEnter() {
+    console.log(this.user);
+  }
+
+  agree(user): void {
+    if (this.agreed === true) {
+      this.nav.push(RegisterPage, user);
+    } else {
+      this.notificationService.present(this.disagreeErrMessage);
+    }
+  }
+  /**
+   * verify if params from url is allowed to proceed with registration
+   */
+  verify(): void {
+    this.authService.verifyRegistration({
+      key: 'test',
+      password: 'test'
+    }).subscribe(
+      res => {
+        console.log(res);
+      },
+      err => {
+        this.notificationService.present(this.verifyFailedErrMessage);
+      },
+      () => {
+        this.nav.push(TabsPage);
+      }
+    );
+  }
+  /**
+   * toggle Read & confirm to proceed next registration page
+   */
+  toggleAgree(): void {
+    this.agreed = !this.agreed;
+  }
+
+  navToRegister(): void {
+    if (this.agreed === true) {
+      console.log(this.nav.getViews());
+    }
+  }
+
+  onTermError(err): void {
+    const supportEmail = this.helpEmailMessage;
+    if ((err.data || {}).msg) {
+      //@TODO: implement error handling
+      console.log({title: "Unable to register", template: `Something went wrong, please contact ${supportEmail}.`});
+    } else if (err.data.msg.indexOf('already registered') != -1) {
+      console.log({
+        title: "Account already registered",
+        template: "Please log in, or click 'forgot password'"
+      });
+    } else {
+      console.log({
+        title: "Invalid registration link",
+        template: `Please check your email again, or contact ${supportEmail}`
+      });
+    }
+  }
+
+  // temporary fix for direct signin
+  signIn(): void {
+    this.nav.push(TabsPage);
+  }
+}
diff --git a/src/services/assessment.service.ts b/src/services/assessment.service.ts
index dbc0e492..722df12e 100755
--- a/src/services/assessment.service.ts
+++ b/src/services/assessment.service.ts
@@ -1,6 +1,7 @@
 import { Injectable } from '@angular/core';
 import { RequestService } from '../shared/request/request.service';
 
+// Others
 import * as _ from 'lodash';
 
 class Assessment {
@@ -15,6 +16,15 @@ class Answer {
   choices?: Array<any>;
 }
 
+export class questionsResult {
+  required: Boolean;
+  answer: any;
+  reviewerAnswer: {
+    answer: any;
+    comment: any;
+  };
+}
+
 export class ChoiceBase<T> {
   id: number;
   value?: number; // or choice id, usually same as "id" above
@@ -32,11 +42,12 @@ export class QuestionBase<T> {
   assessment_id: number;
   name: string;
   type: string;
-  file_type?: string;
-  audience: Array<any>;
+  description: string;
+  required: boolean;
+  audience: string | Array<any>;
+  file_type?: string | any;
   choices?: ChoiceBase<any>[];
   answer?: any;
-  required?: boolean;
   order?: string | number;
 
   constructor(id, assessment_id, name, type) {
@@ -270,9 +281,10 @@ export class AssessmentService {
    */
   normaliseGroup(group) {
     // let result = group;
-    let thisQuestions = group.AssessmentGroupQuestion;
-    thisQuestions = thisQuestions.map(question => {
-      return this.normaliseQuestion(question);
+    let questions = group.AssessmentGroupQuestion;
+    let thisQuestions = [];
+    questions.forEach(question => {
+      thisQuestions.push(this.normaliseQuestion(question));
     });
 
     return {
@@ -285,6 +297,27 @@ export class AssessmentService {
     }
   }
 
+  /**
+   * filter submission by:
+   * - "submitter" as audience
+   * - "submitter" as audience && status as "published"
+   * @name isAccessible
+   * @param {object} question Single normalised assessment
+   *                            object from this.normalise above
+   */
+  public isAccessible(question, status) {
+    let result = true;
+    if (question.audience.indexOf('submitter') === -1) {
+      result = false;
+    }
+
+    if (result && status === 'published') {
+      result = false;
+    }
+
+    return result;
+  }
+
   /*
     turn "AssessmentGroupQuestion" array format from:
     {
@@ -328,18 +361,19 @@ export class AssessmentService {
     });
 
     return {
-      id: question.id,
+      id: question.id, // unknown purpose (be careful with this id)
       assessment_id: question.assessment_question_id,
-      question_id: question.assessment_question_id,
+      question_id: question.assessment_question_id, // use this to indicate question
       group_id: question.assessment_group_id,
       name: thisQuestion.name,
       type: thisQuestion.question_type,
       audience: thisQuestion.audience,
+      description: thisQuestion.description,
       file_type: thisQuestion.file_type,
       required: thisQuestion.is_required,
       choices: choices,
       order: question.order,
-      answer: thisQuestion.answer
+      answer: thisQuestion.answer,
     };
   }
 
@@ -381,4 +415,100 @@ export class AssessmentService {
       weight: choice.weight
     };
   }
+
+  /**
+   * hardcode communication to different server
+   * @param {[type]} assessment_id [description]
+   */
+  public getPostProgramAssessment(assessment_id) {
+    // let url = `${this.prefixUrl}api/assessments.json?assessment_id=${assessment_id}&structured=true`;
+    // let headers = new Headers();
+    // headers.append('appkey', this.appkey);
+    // headers.append('apikey', this.cacheService.getLocalObject('apikey'));
+    // headers.append('timelineID', this.cacheService.getLocalObject('timelineID'));
+    return this.request.get(`api/assessments.json?assessment_id=${assessment_id}&structured=true`);
+  }
+
+  // helpers
+  public getStatus(questionsResult, submissionResult): string {
+    let questionsStatus = [];
+    _.forEach(questionsResult, q => {
+      if (q.required && q.answer !== null) {
+        if (
+          q.reviewerAnswer !== null &&
+          submissionResult.status !== 'pending approval' &&
+          (q.reviewerAnswer.answer || q.reviewerAnswer.comment)
+        ) {
+          questionsStatus.push('reviewed');
+        } else {
+          questionsStatus.push('completed');
+        }
+      }
+
+      if (!q.required && q.answer !== null) {
+        if (
+          q.reviewerAnswer !== null &&
+          submissionResult.status !== 'pending approval' &&
+          (q.reviewerAnswer.answer || q.reviewerAnswer.comment)
+        ) {
+          questionsStatus.push('reviewed');
+        } else {
+          questionsStatus.push('completed');
+        }
+      }
+
+      if (q.answer === null) {
+        questionsStatus.push('incomplete');
+      }
+    });
+
+    // get final status by checking all questions' statuses
+    let status = 'incomplete';
+    if (_.every(questionsStatus, (v) => {
+      return (v === 'completed');
+    })) {
+      status = 'completed';
+    }
+    if (_.includes(questionsStatus, 'reviewed')) {
+      status = 'reviewed';
+    }
+
+    return status;
+  }
+
+  public getSummaries(questionsResult: Array<questionsResult>) {
+    let totalRequiredQuestions = 0;
+    let answeredQuestions = 0;
+    let reviewerFeedback = 0;
+
+    _.forEach(questionsResult, (q) => {
+      // get total number of questions
+      if (q.required) {
+        totalRequiredQuestions += 1;
+      }
+
+      // get total number of answered questions
+      if (q.required && q.answer && q.answer !== null) {
+        answeredQuestions += 1;
+      }
+
+      // get total number of feedback
+      // If API response, the reviewer's answer and comment are empty,
+      // front-end don't consider it as a feedback
+      if (
+        q.reviewerAnswer &&
+        q.reviewerAnswer !== null &&
+        !_.isEmpty(q.reviewerAnswer.answer) &&
+        !_.isEmpty(q.reviewerAnswer.comment)
+      ) {
+        reviewerFeedback += 1;
+      }
+    });
+
+    return {
+      totalRequiredQuestions,
+      answeredQuestions,
+      reviewerFeedback
+    };
+  }
 }
diff --git a/src/services/submission.service.ts b/src/services/submission.service.ts
index 562de8dc..54220189 100755
--- a/src/services/submission.service.ts
+++ b/src/services/submission.service.ts
@@ -1,4 +1,5 @@
 import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs/Observable';
 
 // Others
 import { RequestService } from '../shared/request/request.service';
@@ -214,7 +215,7 @@ export class SubmissionService {
    * extract reference IDs and prepare Observables to retrieve submissions
    * @param {array} references References array responded with get_activities() api
    */
-  getSubmissionsByReferences(references) {
+  getSubmissionsByReferences(references: Array<{context_id : Number}>): Array<Observable<any>> {
     let tasks = []; // multiple API requests
 
     // get_submissions API to retrieve submitted answer
diff --git a/src/shared/app-config/app-config.module.ts b/src/shared/app-config/app-config.module.ts
new file mode 100644
index 00000000..58769a6f
--- /dev/null
+++ b/src/shared/app-config/app-config.module.ts
@@ -0,0 +1,6 @@
+import { NgModule } from '@angular/core';
+import { AppConfigService } from './app-config.service';
+@NgModule({
+  providers: [ AppConfigService ]
+})
+export class AppConfigModule {}
diff --git a/src/shared/app-config/app-config.service.ts b/src/shared/app-config/app-config.service.ts
new file mode 100644
index 00000000..8d7965a6
--- /dev/null
+++ b/src/shared/app-config/app-config.service.ts
@@ -0,0 +1,53 @@
+import { Injectable } from '@angular/core';
+import { CacheService } from '../cache/cache.service';
+
+// Pages
+import { EventsListPage } from '../../pages/events/list/list.page';
+import { GalleryPage } from '../../pages/gallery/gallery.page';
+import { LevelsPage } from '../../pages/levels/list/list.page';
+import { RankingsPage } from '../../pages/rankings/list/rankings.page';
+import { SettingsPage } from '../../pages/settings/settings.page';
+import { TeamPage } from '../../pages/team/team.page';
+
+// Others
+import * as _ from 'lodash';
+
+@Injectable()
+export class AppConfigService {
+  // Mapping page to name,
+  // use for changing page in tab menu
+  pagesMap: any = {
+    events: EventsListPage,
+    rankings: RankingsPage,
+    settings: SettingsPage,
+    gallery: GalleryPage,
+    team: TeamPage
+  }
+
+  constructor (
+    private cacheService: CacheService
+  ) {}
+
+  /**
+   * @description Get full configure data
+   */
+  get(): any {
+    return this.cacheService.getLocal('appConfig');
+  }
+
+  /**
+   * @description Get only configure for tabs
+   */
+  getTabs(): any {
+    let appConfig: any = this.cacheService.getLocal('appConfig');
+    if (!appConfig.tabs) {
+      return appConfig.tabs;
+    }
+
+    let modules = _.sortBy(appConfig.tabs, [(o) => o.order]);
+    return _.map(modules, (o) => {
+      o.root = this.pagesMap[o.name];
+      return o;
+    });
+  }
+}
diff --git a/src/shared/request/request.service.ts b/src/shared/request/request.service.ts
index 9fbb1bdb..5d890a48 100755
--- a/src/shared/request/request.service.ts
+++ b/src/shared/request/request.service.ts
@@ -149,10 +149,6 @@ export class RequestService {
    */
   post(endPoint: string, data: any, header?: any) {
     let headers = this.appendHeader();
-
-    // @TODO: make sure if Content-Type is optional
-    headers = headers.delete('Content-Type');
-    headers = headers.set('Content-Type', 'application/x-www-form-urlencoded');
     return this.http.post(this.prefixUrl + endPoint, data, { headers })
       .map(this.extractData)
       .catch(this.handleError);
diff --git a/src/shared/testModules/pages/test/test-start.page.ts b/src/shared/testModules/pages/test/test-start.page.ts
index 8a6fde14..a3c150f4 100755
--- a/src/shared/testModules/pages/test/test-start.page.ts
+++ b/src/shared/testModules/pages/test/test-start.page.ts
@@ -7,20 +7,15 @@ import { AssessmentsGroupPage } from '../../../../pages/assessments/group/assess
 import { ActivitiesClassicListPage } from '../../../../pages/activities-classic/list/activities-classic-list.page';
 import { EventsListPage } from '../../../../pages/events/list/list.page';
 import { EventsDownloadPage } from '../../../../pages/events/download/events-download.page';
-import { GalleryPage } from '../../../../pages/gallery/gallery';
+import { GalleryPage } from '../../../../pages/gallery/gallery.page';
 import { LevelsListPage } from '../../../../pages/levels/list/list';
 import { LoginPage } from '../../../../pages/login/login';
 import { RegisterPage } from '../../../../pages/registration/register.page';
 import { SettingsPage } from '../../../../pages/settings/settings.page';
 import { EventCheckinPage } from '../../../../pages/events/checkin/event-checkin.page';
-import { TeamPage } from '../../../../pages/team/team';
-import { CelebrationPage } from '../../../../pages/spinwheel/celebration.page';
+import { TeamPage } from '../../../../pages/team/team.page';
 
 const PAGES = [
-  {
-    name: 'celebration',
-    page: CelebrationPage
-  },
   {
     name: 'Check-in',
     page: EventCheckinPage,
diff --git a/src/theme/main.styles.theme.scss b/src/theme/main.styles.theme.scss
index e3706265..1e65b890 100755
--- a/src/theme/main.styles.theme.scss
+++ b/src/theme/main.styles.theme.scss
@@ -30,7 +30,6 @@
 @import "./pages/rankings/view-ranking-details";
 
 // Settings
-@import "./pages/settings/leaderboard";
 @import "./pages/settings/tutorial";
 @import "./pages/settings/settings";
 
diff --git a/src/theme/pages/settings/leaderboard.scss b/src/theme/pages/settings/leaderboard.scss
deleted file mode 100644
index 3f4261df..00000000
--- a/src/theme/pages/settings/leaderboard.scss
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * @description
- *  - leaderboard settings page styling
- * @page
- *  - pages/settings/leaderboard/leaderboard-settings.html
- */
-
-.leaderboard-settings {
-  .hide-settings {
-    padding: 0;
-    margin: 0;
-    display: flex;
-    align-items: center;
-  }
-}
diff --git a/yarn.lock b/yarn.lock
index 3e62e6e9..f89b54ca 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -982,9 +982,9 @@ date-now@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
 
-debug@2, debug@^2.2.0:
-  version "2.6.8"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
+debug@2, debug@2.6.7, debug@^2.2.0:
+  version "2.6.7"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.7.tgz#92bad1f6d05bbb6bba22cca88bcd0ec894c2861e"
   dependencies:
     ms "2.0.0"
 
@@ -1000,12 +1000,6 @@ debug@2.3.3:
   dependencies:
     ms "0.7.2"
 
-debug@2.6.7:
-  version "2.6.7"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.7.tgz#92bad1f6d05bbb6bba22cca88bcd0ec894c2861e"
-  dependencies:
-    ms "2.0.0"
-
 decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
@@ -1026,7 +1020,7 @@ deferred-leveldown@~0.2.0:
   dependencies:
     abstract-leveldown "~0.12.1"
 
-del@2.2.0:
+del@2.2.0, del@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/del/-/del-2.2.0.tgz#9a50f04bf37325e283b4f44e985336c252456bd5"
   dependencies:
@@ -1038,18 +1032,6 @@ del@2.2.0:
     pinkie-promise "^2.0.0"
     rimraf "^2.2.8"
 
-del@^2.2.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
-  dependencies:
-    globby "^5.0.0"
-    is-path-cwd "^1.0.0"
-    is-path-in-cwd "^1.0.0"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-    rimraf "^2.2.8"
-
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
@@ -1654,7 +1636,7 @@ glob-parent@^2.0.0:
   dependencies:
     is-glob "^2.0.0"
 
-glob@7.1.1:
+glob@7.1.1, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@~7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
   dependencies:
@@ -1675,17 +1657,6 @@ glob@^6.0.1:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@~7.1.1:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
 globby@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-4.1.0.tgz#080f54549ec1b82a6c60e631fc82e1211dbe95f8"
@@ -1697,17 +1668,6 @@ globby@^4.0.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
-globby@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
-  dependencies:
-    array-union "^1.0.1"
-    arrify "^1.0.0"
-    glob "^7.0.3"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
 globule@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.0.tgz#1dc49c6822dd9e8a2fa00ba2a295006e8664bd09"
@@ -2202,14 +2162,10 @@ jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
 
-json-loader@0.5.4:
+json-loader@0.5.4, json-loader@^0.5.4:
   version "0.5.4"
   resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.4.tgz#8baa1365a632f58a3c46d20175fc6002c96e37de"
 
-json-loader@^0.5.4:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d"
-
 json-schema-traverse@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
@@ -2509,13 +2465,7 @@ localforage-cordovasqlitedriver@~1.5.0:
     "@types/localforage" "0.0.30"
     localforage ">=1.4.0"
 
-localforage@>=1.4.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/localforage/-/localforage-1.5.0.tgz#6b994e19b56611fa85df3992df397ac4ab66e815"
-  dependencies:
-    lie "3.0.2"
-
-localforage@~1.4.2:
+localforage@>=1.4.0, localforage@~1.4.2:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/localforage/-/localforage-1.4.3.tgz#a212543c39c7c76424edd12bf474c489aaca494c"
   dependencies:
@@ -2724,11 +2674,7 @@ minimist@~0.0.1:
   dependencies:
     minimist "0.0.8"
 
-moment@^2.16.0:
-  version "2.18.1"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.18.1.tgz#c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"
-
-moment@^2.19.1:
+moment@^2.16.0, moment@^2.19.1:
   version "2.19.1"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.19.1.tgz#56da1a2d1cbf01d38b7e1afc31c10bcfa1929167"
 
@@ -3249,26 +3195,18 @@ punycode@^1.2.4, punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
 
-q@1.4.1:
+q@1.4.1, q@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
 
-q@^1.4.1:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/q/-/q-1.5.0.tgz#dd01bac9d06d30e6f219aecb8253ee9ebdc308f1"
-
 qjobs@^1.1.4:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.1.5.tgz#659de9f2cf8dcc27a1481276f205377272382e73"
 
-qs@6.4.0, qs@~6.4.0:
+qs@6.4.0, qs@^6.4.0, qs@~6.4.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
 
-qs@^6.4.0:
-  version "6.5.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.0.tgz#8d04954d364def3efc55b5a0793e1e2c8b1e6e49"
-
 querystring-es3@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
@@ -3348,7 +3286,7 @@ read-pkg@^2.0.0:
     normalize-package-data "^2.3.2"
     path-type "^2.0.0"
 
-"readable-stream@>=1.0.33-1 <1.1.0-0", readable-stream@~1.0.2, readable-stream@~1.0.26, readable-stream@~1.0.26-4:
+"readable-stream@>=1.0.33-1 <1.1.0-0", readable-stream@^1.0.26-4, readable-stream@~1.0.2, readable-stream@~1.0.26, readable-stream@~1.0.26-4:
   version "1.0.34"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
   dependencies:
@@ -3357,15 +3295,6 @@ read-pkg@^2.0.0:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@^1.0.26-4:
-  version "1.1.14"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
 readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.2.2, readable-stream@^2.2.6:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c"
@@ -3812,11 +3741,7 @@ source-map@^0.1.41:
   dependencies:
     amdefine ">=0.0.4"
 
-source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.0, source-map@~0.5.1, source-map@~0.5.3:
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
-
-source-map@^0.5.7:
+source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.0, source-map@~0.5.1, source-map@~0.5.3:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
 
@@ -4172,14 +4097,10 @@ typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
-typescript@2.3.4:
+typescript@2.3.4, typescript@^2.3.3:
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.3.4.tgz#3d38321828231e434f287514959c37a82b629f42"
 
-typescript@^2.3.3:
-  version "2.5.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.5.3.tgz#df3dcdc38f3beb800d4bc322646b04a3f6ca7f0d"
-
 uglify-es@^3.1.0:
   version "3.1.5"
   resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.1.5.tgz#63bae0fd4f9feeda417fee7c0ff685a673819683"
@@ -4445,20 +4366,13 @@ ws@1.1.1:
     options ">=0.0.5"
     ultron "1.0.x"
 
-ws@1.1.2:
+ws@1.1.2, ws@^1.0.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.2.tgz#8a244fa052401e08c9886cf44a85189e1fd4067f"
   dependencies:
     options ">=0.0.5"
     ultron "1.0.x"
 
-ws@^1.0.1:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.4.tgz#57f40d036832e5f5055662a397c4de76ed66bf61"
-  dependencies:
-    options ">=0.0.5"
-    ultron "1.0.x"
-
 wtf-8@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wtf-8/-/wtf-8-1.0.0.tgz#392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a"
@@ -4477,11 +4391,7 @@ xml2js@0.4.4:
     sax "0.6.x"
     xmlbuilder ">=1.0.0"
 
-xmlbuilder@>=1.0.0:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.1.tgz#91cd70897755363eba57c12ddeeab4a341a61f65"
-
-xmlbuilder@^4.1.0:
+xmlbuilder@>=1.0.0, xmlbuilder@^4.1.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-4.2.1.tgz#aa58a3041a066f90eaa16c2f5389ff19f3f461a5"
   dependencies: