diff --git a/build.gradle b/build.gradle
index 9eeb21e1..3cba0890 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,7 +26,7 @@ apply plugin: 'jacoco'
 apply plugin: 'org.asciidoctor.convert'
 
 group = 'com.upc.gessi.qrapids'
-version = '2.0'
+version = '2.0.1'
 sourceCompatibility = 1.8
 
 war {
@@ -84,7 +84,7 @@ dependencies {
 	compile files('libs/qrapids-qr_generator-0.2.jar')
 
 	//Add qr-eval jar compilation
-	compile files('libs/qrapids-eval-2.0.jar')
+	compile files('libs/qrapids-eval-2.1.jar')
 
 	testCompile('org.springframework.boot:spring-boot-starter-test')
 	compile('org.apache.logging.log4j:log4j-api:2.9.1')
diff --git a/docs/asciidoc/index.adoc b/docs/asciidoc/index.adoc
index f7314f7a..431e8752 100644
--- a/docs/asciidoc/index.adoc
+++ b/docs/asciidoc/index.adoc
@@ -1,5 +1,5 @@
 = Q-Rapids Dashboard API REST Documentation
-v2.0, {docdate}
+v2.0.1, {docdate}
 :toc: left
 
 :sectnums:
diff --git a/docs/asciidoc/index.html b/docs/asciidoc/index.html
index a2377928..d67912f4 100644
--- a/docs/asciidoc/index.html
+++ b/docs/asciidoc/index.html
@@ -5,7 +5,7 @@
 <!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge"><![endif]-->
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <meta name="generator" content="Asciidoctor 1.5.8">
-<meta name="author" content="v2.0, 2021-02-22">
+<meta name="author" content="v2.0.1, 2021-05-25">
 <title>Q-Rapids Dashboard API REST Documentation</title>
 <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700">
 <style>
@@ -435,7 +435,7 @@
 <div id="header">
 <h1>Q-Rapids Dashboard API REST Documentation</h1>
 <div class="details">
-<span id="author" class="author">v2.0, 2021-02-22</span><br>
+<span id="author" class="author">v2.0.1, 2021-05-25</span><br>
 </div>
 <div id="toc" class="toc2">
 <div id="toctitle">Table of Contents</div>
@@ -2101,7 +2101,7 @@ <h4 id="_get_detailed_current_evaluation_http_response">HTTP response</h4>
       "second" : "Good"
     },
     "value_description" : "Good (0.80)",
-    "date" : [ 2021, 2, 22 ],
+    "date" : [ 2021, 5, 25 ],
     "datasource" : null,
     "rationale" : "parameters: {...}, formula: ...",
     "confidence80" : null,
@@ -2109,8 +2109,8 @@ <h4 id="_get_detailed_current_evaluation_http_response">HTTP response</h4>
     "forecastingError" : null,
     "mismatchDays" : 0,
     "missingMetrics" : null,
-    "strategicIndicators" : [ "processperformance" ],
-    "formattedDate" : "2021-02-22"
+    "formattedDate" : "2021-05-25",
+    "strategicIndicators" : [ "processperformance" ]
   } ]
 } ]</code></pre>
 </div>
@@ -2362,7 +2362,7 @@ <h4 id="_get_one_detailed_current_evaluation_http_response">HTTP response</h4>
       "second" : "Good"
     },
     "value_description" : "Good (0.80)",
-    "date" : [ 2021, 2, 22 ],
+    "date" : [ 2021, 5, 25 ],
     "datasource" : null,
     "rationale" : "parameters: {...}, formula: ...",
     "confidence80" : null,
@@ -2370,8 +2370,8 @@ <h4 id="_get_one_detailed_current_evaluation_http_response">HTTP response</h4>
     "forecastingError" : null,
     "mismatchDays" : 0,
     "missingMetrics" : null,
-    "strategicIndicators" : [ "processperformance" ],
-    "formattedDate" : "2021-02-22"
+    "formattedDate" : "2021-05-25",
+    "strategicIndicators" : [ "processperformance" ]
   } ]
 } ]</code></pre>
 </div>
@@ -2609,7 +2609,7 @@ <h4 id="_get_detailed_historical_evaluation_http_response">HTTP response</h4>
       "second" : "Good"
     },
     "value_description" : "Good (0.80)",
-    "date" : [ 2021, 2, 22 ],
+    "date" : [ 2021, 5, 25 ],
     "datasource" : null,
     "rationale" : "parameters: {...}, formula: ...",
     "confidence80" : null,
@@ -2617,8 +2617,8 @@ <h4 id="_get_detailed_historical_evaluation_http_response">HTTP response</h4>
     "forecastingError" : null,
     "mismatchDays" : 0,
     "missingMetrics" : null,
-    "strategicIndicators" : [ "processperformance" ],
-    "formattedDate" : "2021-02-22"
+    "formattedDate" : "2021-05-25",
+    "strategicIndicators" : [ "processperformance" ]
   } ]
 } ]</code></pre>
 </div>
@@ -2878,7 +2878,7 @@ <h4 id="_get_one_detailed_historical_evaluation_http_response">HTTP response</h4
       "second" : "Good"
     },
     "value_description" : "Good (0.80)",
-    "date" : [ 2021, 2, 22 ],
+    "date" : [ 2021, 5, 25 ],
     "datasource" : null,
     "rationale" : "parameters: {...}, formula: ...",
     "confidence80" : null,
@@ -2886,8 +2886,8 @@ <h4 id="_get_one_detailed_historical_evaluation_http_response">HTTP response</h4
     "forecastingError" : null,
     "mismatchDays" : 0,
     "missingMetrics" : null,
-    "strategicIndicators" : [ "processperformance" ],
-    "formattedDate" : "2021-02-22"
+    "formattedDate" : "2021-05-25",
+    "strategicIndicators" : [ "processperformance" ]
   } ]
 } ]</code></pre>
 </div>
@@ -3125,7 +3125,7 @@ <h4 id="_get_detailed_prediction_evaluation_http_response">HTTP response</h4>
       "second" : "Good"
     },
     "value_description" : "Good (0.80)",
-    "date" : [ 2021, 2, 22 ],
+    "date" : [ 2021, 5, 25 ],
     "datasource" : "Forecast",
     "rationale" : "Forecast",
     "confidence80" : null,
@@ -3133,8 +3133,8 @@ <h4 id="_get_detailed_prediction_evaluation_http_response">HTTP response</h4>
     "forecastingError" : null,
     "mismatchDays" : 0,
     "missingMetrics" : null,
-    "strategicIndicators" : [ "processperformance" ],
-    "formattedDate" : "2021-02-22"
+    "formattedDate" : "2021-05-25",
+    "strategicIndicators" : [ "processperformance" ]
   } ]
 } ]</code></pre>
 </div>
@@ -3386,7 +3386,7 @@ <h4 id="_get_one_detailed_prediction_evaluation_http_response">HTTP response</h4
       "second" : "Good"
     },
     "value_description" : "Good (0.80)",
-    "date" : [ 2021, 2, 22 ],
+    "date" : [ 2021, 5, 25 ],
     "datasource" : "Forecast",
     "rationale" : "Forecast",
     "confidence80" : null,
@@ -3394,8 +3394,8 @@ <h4 id="_get_one_detailed_prediction_evaluation_http_response">HTTP response</h4
     "forecastingError" : null,
     "mismatchDays" : 0,
     "missingMetrics" : null,
-    "strategicIndicators" : [ "processperformance" ],
-    "formattedDate" : "2021-02-22"
+    "formattedDate" : "2021-05-25",
+    "strategicIndicators" : [ "processperformance" ]
   } ]
 } ]</code></pre>
 </div>
@@ -4774,7 +4774,7 @@ <h4 id="_get_current_evaluation_2_http_response">HTTP response</h4>
     "second" : "Good"
   },
   "value_description" : "Good (0.80)",
-  "date" : [ 2021, 2, 22 ],
+  "date" : [ 2021, 5, 25 ],
   "datasource" : null,
   "rationale" : "parameters: {...}, formula: ...",
   "confidence80" : null,
@@ -4782,8 +4782,8 @@ <h4 id="_get_current_evaluation_2_http_response">HTTP response</h4>
   "forecastingError" : null,
   "mismatchDays" : 0,
   "missingMetrics" : null,
-  "strategicIndicators" : [ "processperformance" ],
-  "formattedDate" : "2021-02-22"
+  "formattedDate" : "2021-05-25",
+  "strategicIndicators" : [ "processperformance" ]
 } ]</code></pre>
 </div>
 </div>
@@ -4974,7 +4974,7 @@ <h4 id="_get_one_current_evaluation_2_http_response">HTTP response</h4>
     "second" : "Good"
   },
   "value_description" : "Good (0.80)",
-  "date" : [ 2021, 2, 22 ],
+  "date" : [ 2021, 5, 25 ],
   "datasource" : null,
   "rationale" : "parameters: {...}, formula: ...",
   "confidence80" : null,
@@ -4982,8 +4982,8 @@ <h4 id="_get_one_current_evaluation_2_http_response">HTTP response</h4>
   "forecastingError" : null,
   "mismatchDays" : 0,
   "missingMetrics" : null,
-  "strategicIndicators" : [ "processperformance" ],
-  "formattedDate" : "2021-02-22"
+  "formattedDate" : "2021-05-25",
+  "strategicIndicators" : [ "processperformance" ]
 }</code></pre>
 </div>
 </div>
@@ -5160,7 +5160,7 @@ <h4 id="_get_historical_evaluation_2_http_response">HTTP response</h4>
     "second" : "Good"
   },
   "value_description" : "Good (0.80)",
-  "date" : [ 2021, 2, 22 ],
+  "date" : [ 2021, 5, 25 ],
   "datasource" : null,
   "rationale" : "parameters: {...}, formula: ...",
   "confidence80" : null,
@@ -5168,8 +5168,8 @@ <h4 id="_get_historical_evaluation_2_http_response">HTTP response</h4>
   "forecastingError" : null,
   "mismatchDays" : 0,
   "missingMetrics" : null,
-  "strategicIndicators" : [ "processperformance" ],
-  "formattedDate" : "2021-02-22"
+  "formattedDate" : "2021-05-25",
+  "strategicIndicators" : [ "processperformance" ]
 } ]</code></pre>
 </div>
 </div>
@@ -5366,7 +5366,7 @@ <h4 id="_get_prediction_evaluation_2_http_response">HTTP response</h4>
     "second" : "Good"
   },
   "value_description" : "Good (0.80)",
-  "date" : [ 2021, 2, 22 ],
+  "date" : [ 2021, 5, 25 ],
   "datasource" : "Forecast",
   "rationale" : "Forecast",
   "confidence80" : {
@@ -5380,8 +5380,8 @@ <h4 id="_get_prediction_evaluation_2_http_response">HTTP response</h4>
   "forecastingError" : null,
   "mismatchDays" : 0,
   "missingMetrics" : null,
-  "strategicIndicators" : [ "processperformance" ],
-  "formattedDate" : "2021-02-22"
+  "formattedDate" : "2021-05-25",
+  "strategicIndicators" : [ "processperformance" ]
 } ]</code></pre>
 </div>
 </div>
@@ -5575,7 +5575,7 @@ <h4 id="_get_detailed_current_evaluation_2_http_response">HTTP response</h4>
     "description" : "Percentage of tests under the testing duration threshold",
     "value" : 0.8,
     "value_description" : "0,80",
-    "date" : [ 2021, 2, 22 ],
+    "date" : [ 2021, 5, 25 ],
     "datasource" : null,
     "rationale" : "parameters: {...}, formula: ...",
     "confidence80" : null,
@@ -5792,7 +5792,7 @@ <h4 id="_get_one_detailed_current_evaluation_2_http_response">HTTP response</h4>
 [ {
   "id" : "testingperformance",
   "name" : "Testing Performance",
-  "date" : [ 2021, 2, 22 ],
+  "date" : [ 2021, 5, 25 ],
   "value" : {
     "first" : 0.8,
     "second" : "Good"
@@ -5806,7 +5806,7 @@ <h4 id="_get_one_detailed_current_evaluation_2_http_response">HTTP response</h4>
     "description" : "Percentage of tests under the testing duration threshold",
     "value" : 0.8,
     "value_description" : "0,80",
-    "date" : [ 2021, 2, 22 ],
+    "date" : [ 2021, 5, 25 ],
     "datasource" : null,
     "rationale" : "parameters: {...}, formula: ...",
     "confidence80" : null,
@@ -5892,7 +5892,7 @@ <h4 id="_get_detailed_current_evaluation_for_strategic_indicator_request_paramet
 <h4 id="_get_detailed_current_evaluation_for_strategic_indicator_curl_request">Curl request</h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'http://localhost:8080/api/strategicIndicators/processperformance/qualityFactors/metrics/historical?prj=test&amp;from=2021-02-15&amp;to=2021-02-22' -i -X GET</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'http://localhost:8080/api/strategicIndicators/processperformance/qualityFactors/metrics/historical?prj=test&amp;from=2021-05-18&amp;to=2021-05-25' -i -X GET</code></pre>
 </div>
 </div>
 </div>
@@ -6037,7 +6037,7 @@ <h4 id="_get_detailed_current_evaluation_for_strategic_indicator_http_response">
     "description" : "Percentage of tests under the testing duration threshold",
     "value" : 0.8,
     "value_description" : "0,80",
-    "date" : [ 2021, 2, 22 ],
+    "date" : [ 2021, 5, 25 ],
     "datasource" : null,
     "rationale" : "parameters: {...}, formula: ...",
     "confidence80" : null,
@@ -6101,7 +6101,7 @@ <h4 id="_get_detailed_historical_evaluation_2_request_parameters">Request parame
 <h4 id="_get_detailed_historical_evaluation_2_curl_request">Curl request</h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'http://localhost:8080/api/qualityFactors/metrics/historical?prj=test&amp;from=2021-02-15&amp;to=2021-02-22' -i -X GET</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'http://localhost:8080/api/qualityFactors/metrics/historical?prj=test&amp;from=2021-05-18&amp;to=2021-05-25' -i -X GET</code></pre>
 </div>
 </div>
 </div>
@@ -6246,7 +6246,7 @@ <h4 id="_get_detailed_historical_evaluation_2_http_response">HTTP response</h4>
     "description" : "Percentage of tests under the testing duration threshold",
     "value" : 0.8,
     "value_description" : "0,80",
-    "date" : [ 2021, 2, 22 ],
+    "date" : [ 2021, 5, 25 ],
     "datasource" : null,
     "rationale" : "parameters: {...}, formula: ...",
     "confidence80" : null,
@@ -6477,7 +6477,7 @@ <h4 id="_get_one_detailed_historical_evaluation_2_http_response">HTTP response</
     "description" : "Percentage of tests under the testing duration threshold",
     "value" : 0.8,
     "value_description" : "0,80",
-    "date" : [ 2021, 2, 22 ],
+    "date" : [ 2021, 5, 25 ],
     "datasource" : null,
     "rationale" : "parameters: {...}, formula: ...",
     "confidence80" : null,
@@ -6700,7 +6700,7 @@ <h4 id="_get_detailed_historical_evaluation_for_strategic_indicator_http_respons
     "description" : "Percentage of tests under the testing duration threshold",
     "value" : 0.8,
     "value_description" : "0,80",
-    "date" : [ 2021, 2, 22 ],
+    "date" : [ 2021, 5, 25 ],
     "datasource" : null,
     "rationale" : "parameters: {...}, formula: ...",
     "confidence80" : null,
@@ -6929,7 +6929,7 @@ <h4 id="_get_detailed_prediction_evaluation_2_http_response">HTTP response</h4>
     "description" : "Percentage of tests under the testing duration threshold",
     "value" : 0.8,
     "value_description" : "0,80",
-    "date" : [ 2021, 2, 22 ],
+    "date" : [ 2021, 5, 25 ],
     "datasource" : "Forecast",
     "rationale" : "Forecast",
     "confidence80" : {
@@ -7186,7 +7186,7 @@ <h4 id="_get_one_detailed_prediction_evaluation_2_http_response">HTTP response</
     "description" : "Percentage of tests under the testing duration threshold",
     "value" : 0.8,
     "value_description" : "0,80",
-    "date" : [ 2021, 2, 22 ],
+    "date" : [ 2021, 5, 25 ],
     "datasource" : "Forecast",
     "rationale" : "Forecast",
     "confidence80" : {
@@ -7443,7 +7443,7 @@ <h4 id="_get_detailed_prediction_evaluation_for_strategic_indicator_http_respons
     "description" : "Percentage of tests under the testing duration threshold",
     "value" : 0.8,
     "value_description" : "0,80",
-    "date" : [ 2021, 2, 22 ],
+    "date" : [ 2021, 5, 25 ],
     "datasource" : "Forecast",
     "rationale" : "Forecast",
     "confidence80" : {
@@ -8095,7 +8095,7 @@ <h4 id="_simulate_quality_factors_assessment_http_response">HTTP response</h4>
     "second" : "Good"
   },
   "value_description" : "Good (0.80)",
-  "date" : [ 2021, 2, 22 ],
+  "date" : [ 2021, 5, 25 ],
   "datasource" : null,
   "rationale" : "parameters: {...}, formula: ...",
   "confidence80" : null,
@@ -8103,8 +8103,8 @@ <h4 id="_simulate_quality_factors_assessment_http_response">HTTP response</h4>
   "forecastingError" : null,
   "mismatchDays" : 0,
   "missingMetrics" : null,
-  "strategicIndicators" : [ "processperformance" ],
-  "formattedDate" : "2021-02-22"
+  "formattedDate" : "2021-05-25",
+  "strategicIndicators" : [ "processperformance" ]
 } ]</code></pre>
 </div>
 </div>
@@ -8426,7 +8426,7 @@ <h4 id="_get_current_evaluation_3_http_response">HTTP response</h4>
   "description" : "Percentage of tests under the testing duration threshold",
   "value" : 0.8,
   "value_description" : "0,80",
-  "date" : [ 2021, 2, 22 ],
+  "date" : [ 2021, 5, 25 ],
   "datasource" : null,
   "rationale" : "parameters: {...}, formula: ...",
   "confidence80" : null,
@@ -8600,7 +8600,7 @@ <h4 id="_get_single_current_evaluation_http_response">HTTP response</h4>
   "description" : "Percentage of tests under the testing duration threshold",
   "value" : 0.8,
   "value_description" : "0,80",
-  "date" : [ 2021, 2, 22 ],
+  "date" : [ 2021, 5, 25 ],
   "datasource" : null,
   "rationale" : "parameters: {...}, formula: ...",
   "confidence80" : null,
@@ -8760,7 +8760,7 @@ <h4 id="_get_historical_evaluation_3_http_response">HTTP response</h4>
   "description" : "Percentage of tests under the testing duration threshold",
   "value" : 0.8,
   "value_description" : "0,80",
-  "date" : [ 2021, 2, 22 ],
+  "date" : [ 2021, 5, 25 ],
   "datasource" : null,
   "rationale" : "parameters: {...}, formula: ...",
   "confidence80" : null,
@@ -8942,7 +8942,7 @@ <h4 id="_get_single_historical_evaluation_http_response">HTTP response</h4>
   "description" : "Percentage of tests under the testing duration threshold",
   "value" : 0.8,
   "value_description" : "0,80",
-  "date" : [ 2021, 2, 22 ],
+  "date" : [ 2021, 5, 25 ],
   "datasource" : null,
   "rationale" : "parameters: {...}, formula: ...",
   "confidence80" : null,
@@ -9172,7 +9172,7 @@ <h4 id="_get_historical_evaluation_for_quality_factor_http_response">HTTP respon
     "description" : "Percentage of tests under the testing duration threshold",
     "value" : 0.8,
     "value_description" : "0,80",
-    "date" : [ 2021, 2, 22 ],
+    "date" : [ 2021, 5, 25 ],
     "datasource" : null,
     "rationale" : "parameters: {...}, formula: ...",
     "confidence80" : null,
@@ -9353,7 +9353,7 @@ <h4 id="_get_prediction_http_response">HTTP response</h4>
   "description" : "Percentage of tests under the testing duration threshold",
   "value" : 0.8,
   "value_description" : "0,80",
-  "date" : [ 2021, 2, 22 ],
+  "date" : [ 2021, 5, 25 ],
   "datasource" : "Forecast",
   "rationale" : "Forecast",
   "confidence80" : {
@@ -9609,7 +9609,7 @@ <h4 id="_get_prediction_for_quality_factor_http_response">HTTP response</h4>
     "description" : "Percentage of tests under the testing duration threshold",
     "value" : 0.8,
     "value_description" : "0,80",
-    "date" : [ 2021, 2, 22 ],
+    "date" : [ 2021, 5, 25 ],
     "datasource" : "Forecast",
     "rationale" : "Forecast",
     "confidence80" : {
@@ -9932,7 +9932,7 @@ <h4 id="_get_all_alerts_http_response">HTTP response</h4>
   "valueDescription" : "Normal (0.40)",
   "threshold" : 0.5,
   "category" : "category",
-  "date" : 1613988151890,
+  "date" : 1621942219811,
   "status" : "NEW",
   "reqAssociat" : true,
   "artefacts" : null
@@ -10732,7 +10732,7 @@ <h4 id="_add_quality_requirement_for_alert_http_response">HTTP response</h4>
 
 {
   "id" : 3,
-  "date" : 1613988151325,
+  "date" : 1621942219275,
   "requirement" : "The ratio of files without duplications should be at least 0.8",
   "description" : "The ratio of files without duplications should be at least the given value",
   "goal" : "Improve the quality of the source code",
@@ -10926,7 +10926,7 @@ <h4 id="_get_all_quality_requirements_http_response">HTTP response</h4>
 
 [ {
   "id" : 3,
-  "date" : 1613988157062,
+  "date" : 1621942223761,
   "requirement" : "The ratio of files without duplications should be at least 0.8",
   "description" : "The ratio of files without duplications should be at least the given value",
   "goal" : "Improve the quality of the source code",
@@ -10942,7 +10942,7 @@ <h4 id="_get_all_quality_requirements_http_response">HTTP response</h4>
     "valueDescription" : null,
     "threshold" : 0.5,
     "category" : "category",
-    "date" : 1613988157062,
+    "date" : 1621942223761,
     "status" : "NEW",
     "reqAssociat" : true,
     "artefacts" : null
@@ -11086,7 +11086,7 @@ <h4 id="_add_quality_requirement_http_response">HTTP response</h4>
 
 {
   "id" : 3,
-  "date" : 1613988157202,
+  "date" : 1621942223858,
   "requirement" : "The ratio of files without duplications should be at least 0.8",
   "description" : "The ratio of files without duplications should be at least the given value",
   "goal" : "Improve the quality of the source code",
@@ -11609,7 +11609,7 @@ <h4 id="_get_all_decisions_http_response">HTTP response</h4>
 [ {
   "id" : 2,
   "type" : "ADD",
-  "date" : 1613988152881,
+  "date" : 1621942220610,
   "author" : null,
   "rationale" : "User comments",
   "patternId" : 100,
@@ -11822,7 +11822,7 @@ <h4 id="_get_feedback_for_strategic_indicator_http_response">HTTP response</h4>
 
 [ {
   "strategicIndicatorId" : 1,
-  "date" : "2021-02-22",
+  "date" : "2021-05-25",
   "author" : null,
   "oldValue" : 0.6,
   "newValue" : 0.75
@@ -13346,6 +13346,11 @@ <h4 id="_get_all_profiles_response_fields">Response fields</h4>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Default visualization for Detailed Factors view</p></td>
 </tr>
 <tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>[].mView</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>String</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Default visualization for Metrics view</p></td>
+</tr>
+<tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>[].qmView</code></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>String</code></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Default visualization for Quality Model view</p></td>
@@ -13413,7 +13418,7 @@ <h4 id="_get_all_profiles_http_response">HTTP response</h4>
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
-Content-Length: 435
+Content-Length: 457
 Content-Type: application/json;charset=UTF-8
 
 [ {
@@ -13423,6 +13428,7 @@ <h4 id="_get_all_profiles_http_response">HTTP response</h4>
   "qualityLevel" : "ALL",
   "dsiView" : "Radar",
   "dqfView" : "Radar",
+  "mView" : "Gauge",
   "qmView" : "Graph",
   "projects" : [ {
     "id" : 1,
@@ -13521,6 +13527,11 @@ <h4 id="_get_single_profile_response_fields">Response fields</h4>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Default visualization for Detailed Factors view</p></td>
 </tr>
 <tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>mView</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>String</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Default visualization for Metrics view</p></td>
+</tr>
+<tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>qmView</code></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>String</code></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Default visualization for Quality Model view</p></td>
@@ -13589,7 +13600,7 @@ <h4 id="_get_single_profile_http_response">HTTP response</h4>
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
 Content-Type: application/json;charset=UTF-8
-Content-Length: 431
+Content-Length: 453
 
 {
   "id" : 1,
@@ -13598,6 +13609,7 @@ <h4 id="_get_single_profile_http_response">HTTP response</h4>
   "qualityLevel" : "ALL",
   "dsiView" : "Radar",
   "dqfView" : "Radar",
+  "mView" : "Gauge",
   "qmView" : "Graph",
   "projects" : [ {
     "id" : 1,
@@ -13654,6 +13666,10 @@ <h4 id="_new_profile_request_parameters">Request parameters</h4>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Value for default Detailed Factors view representation: Radar, Stacked or Polar</p></td>
 </tr>
 <tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>m_view</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Value for default Metrics view representation: Gauge or Slider</p></td>
+</tr>
+<tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>qm_view</code></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Value for default Quality Model view representation: Graph or Sunburst</p></td>
 </tr>
@@ -13676,7 +13692,7 @@ <h4 id="_new_profile_curl_request">Curl request</h4>
 <div class="content">
 <pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'http://localhost:8080/api/profiles' -i -X POST \
     -H 'Content-Type: multipart/form-data' \
-    -d 'name=Test&amp;description=Test+profile&amp;quality_level=ALL&amp;dsi_view=Radar&amp;dqf_view=Radar&amp;qm_view=Graph&amp;projects_info=%5B%7B%22si%22%3A%5B%5D%2C%22prj%22%3A1%2C%22all_si%22%3Atrue%7D%5D'</code></pre>
+    -d 'name=Test&amp;description=Test+profile&amp;quality_level=ALL&amp;dsi_view=Radar&amp;dqf_view=Radar&amp;m_view=Gauge&amp;qm_view=Graph&amp;projects_info=%5B%7B%22si%22%3A%5B%5D%2C%22prj%22%3A1%2C%22all_si%22%3Atrue%7D%5D'</code></pre>
 </div>
 </div>
 </div>
@@ -13755,6 +13771,10 @@ <h5 id="_path_parameters_3_request_parameters">Request parameters</h5>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Value for default Detailed Factors view representation: Radar, Stacked or Polar</p></td>
 </tr>
 <tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>m_view</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Value for default Metrics view representation: Gauge or Slider</p></td>
+</tr>
+<tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>qm_view</code></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Value for default Quality Model view representation: Graph or Sunburst</p></td>
 </tr>
@@ -13777,7 +13797,7 @@ <h5 id="_path_parameters_3_curl_request">Curl request</h5>
 <div class="content">
 <pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'http://localhost:8080/api/profiles/1' -i -X PUT \
     -H 'Content-Type: multipart/form-data' \
-    -d 'name=Test&amp;description=Test+profile&amp;quality_level=ALL&amp;dsi_view=Radar&amp;dqf_view=Radar&amp;qm_view=Graph&amp;projects_info=%5B%7B%22si%22%3A%5B%5D%2C%22prj%22%3A1%2C%22all_si%22%3Atrue%7D%5D'</code></pre>
+    -d 'name=Test&amp;description=Test+profile&amp;quality_level=ALL&amp;dsi_view=Radar&amp;dqf_view=Radar&amp;m_view=Gauge&amp;qm_view=Graph&amp;projects_info=%5B%7B%22si%22%3A%5B%5D%2C%22prj%22%3A1%2C%22all_si%22%3Atrue%7D%5D'</code></pre>
 </div>
 </div>
 </div>
@@ -13923,7 +13943,7 @@ <h4 id="_get_project_milestones_request_parameters">Request parameters</h4>
 <h4 id="_get_project_milestones_curl_request">Curl request</h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'http://localhost:8080/api/milestones?prj=test&amp;date=2021-02-22' -i -X GET</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'http://localhost:8080/api/milestones?prj=test&amp;date=2021-05-25' -i -X GET</code></pre>
 </div>
 </div>
 </div>
@@ -13975,7 +13995,7 @@ <h4 id="_get_project_milestones_http_response">HTTP response</h4>
 Content-Type: application/json;charset=UTF-8
 
 [ {
-  "date" : "2021-02-25",
+  "date" : "2021-05-28",
   "name" : "Version 1.3",
   "description" : "Version 1.3 adding new features",
   "type" : "Release"
@@ -14067,10 +14087,10 @@ <h4 id="_get_project_phases_http_response">HTTP response</h4>
 Content-Length: 156
 
 [ {
-  "dateFrom" : "2021-02-07",
+  "dateFrom" : "2021-05-10",
   "name" : "Development",
   "description" : "Implementation of project functionalities",
-  "dateTo" : "2021-03-09"
+  "dateTo" : "2021-06-09"
 } ]</code></pre>
 </div>
 </div>
@@ -14081,7 +14101,7 @@ <h4 id="_get_project_phases_http_response">HTTP response</h4>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2021-02-22 11:01:45 +0100
+Last updated 2021-05-25 13:32:58 +0200
 </div>
 </div>
 </body>
diff --git a/docs/index.html b/docs/index.html
index a2377928..d67912f4 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -5,7 +5,7 @@
 <!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge"><![endif]-->
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <meta name="generator" content="Asciidoctor 1.5.8">
-<meta name="author" content="v2.0, 2021-02-22">
+<meta name="author" content="v2.0.1, 2021-05-25">
 <title>Q-Rapids Dashboard API REST Documentation</title>
 <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700">
 <style>
@@ -435,7 +435,7 @@
 <div id="header">
 <h1>Q-Rapids Dashboard API REST Documentation</h1>
 <div class="details">
-<span id="author" class="author">v2.0, 2021-02-22</span><br>
+<span id="author" class="author">v2.0.1, 2021-05-25</span><br>
 </div>
 <div id="toc" class="toc2">
 <div id="toctitle">Table of Contents</div>
@@ -2101,7 +2101,7 @@ <h4 id="_get_detailed_current_evaluation_http_response">HTTP response</h4>
       "second" : "Good"
     },
     "value_description" : "Good (0.80)",
-    "date" : [ 2021, 2, 22 ],
+    "date" : [ 2021, 5, 25 ],
     "datasource" : null,
     "rationale" : "parameters: {...}, formula: ...",
     "confidence80" : null,
@@ -2109,8 +2109,8 @@ <h4 id="_get_detailed_current_evaluation_http_response">HTTP response</h4>
     "forecastingError" : null,
     "mismatchDays" : 0,
     "missingMetrics" : null,
-    "strategicIndicators" : [ "processperformance" ],
-    "formattedDate" : "2021-02-22"
+    "formattedDate" : "2021-05-25",
+    "strategicIndicators" : [ "processperformance" ]
   } ]
 } ]</code></pre>
 </div>
@@ -2362,7 +2362,7 @@ <h4 id="_get_one_detailed_current_evaluation_http_response">HTTP response</h4>
       "second" : "Good"
     },
     "value_description" : "Good (0.80)",
-    "date" : [ 2021, 2, 22 ],
+    "date" : [ 2021, 5, 25 ],
     "datasource" : null,
     "rationale" : "parameters: {...}, formula: ...",
     "confidence80" : null,
@@ -2370,8 +2370,8 @@ <h4 id="_get_one_detailed_current_evaluation_http_response">HTTP response</h4>
     "forecastingError" : null,
     "mismatchDays" : 0,
     "missingMetrics" : null,
-    "strategicIndicators" : [ "processperformance" ],
-    "formattedDate" : "2021-02-22"
+    "formattedDate" : "2021-05-25",
+    "strategicIndicators" : [ "processperformance" ]
   } ]
 } ]</code></pre>
 </div>
@@ -2609,7 +2609,7 @@ <h4 id="_get_detailed_historical_evaluation_http_response">HTTP response</h4>
       "second" : "Good"
     },
     "value_description" : "Good (0.80)",
-    "date" : [ 2021, 2, 22 ],
+    "date" : [ 2021, 5, 25 ],
     "datasource" : null,
     "rationale" : "parameters: {...}, formula: ...",
     "confidence80" : null,
@@ -2617,8 +2617,8 @@ <h4 id="_get_detailed_historical_evaluation_http_response">HTTP response</h4>
     "forecastingError" : null,
     "mismatchDays" : 0,
     "missingMetrics" : null,
-    "strategicIndicators" : [ "processperformance" ],
-    "formattedDate" : "2021-02-22"
+    "formattedDate" : "2021-05-25",
+    "strategicIndicators" : [ "processperformance" ]
   } ]
 } ]</code></pre>
 </div>
@@ -2878,7 +2878,7 @@ <h4 id="_get_one_detailed_historical_evaluation_http_response">HTTP response</h4
       "second" : "Good"
     },
     "value_description" : "Good (0.80)",
-    "date" : [ 2021, 2, 22 ],
+    "date" : [ 2021, 5, 25 ],
     "datasource" : null,
     "rationale" : "parameters: {...}, formula: ...",
     "confidence80" : null,
@@ -2886,8 +2886,8 @@ <h4 id="_get_one_detailed_historical_evaluation_http_response">HTTP response</h4
     "forecastingError" : null,
     "mismatchDays" : 0,
     "missingMetrics" : null,
-    "strategicIndicators" : [ "processperformance" ],
-    "formattedDate" : "2021-02-22"
+    "formattedDate" : "2021-05-25",
+    "strategicIndicators" : [ "processperformance" ]
   } ]
 } ]</code></pre>
 </div>
@@ -3125,7 +3125,7 @@ <h4 id="_get_detailed_prediction_evaluation_http_response">HTTP response</h4>
       "second" : "Good"
     },
     "value_description" : "Good (0.80)",
-    "date" : [ 2021, 2, 22 ],
+    "date" : [ 2021, 5, 25 ],
     "datasource" : "Forecast",
     "rationale" : "Forecast",
     "confidence80" : null,
@@ -3133,8 +3133,8 @@ <h4 id="_get_detailed_prediction_evaluation_http_response">HTTP response</h4>
     "forecastingError" : null,
     "mismatchDays" : 0,
     "missingMetrics" : null,
-    "strategicIndicators" : [ "processperformance" ],
-    "formattedDate" : "2021-02-22"
+    "formattedDate" : "2021-05-25",
+    "strategicIndicators" : [ "processperformance" ]
   } ]
 } ]</code></pre>
 </div>
@@ -3386,7 +3386,7 @@ <h4 id="_get_one_detailed_prediction_evaluation_http_response">HTTP response</h4
       "second" : "Good"
     },
     "value_description" : "Good (0.80)",
-    "date" : [ 2021, 2, 22 ],
+    "date" : [ 2021, 5, 25 ],
     "datasource" : "Forecast",
     "rationale" : "Forecast",
     "confidence80" : null,
@@ -3394,8 +3394,8 @@ <h4 id="_get_one_detailed_prediction_evaluation_http_response">HTTP response</h4
     "forecastingError" : null,
     "mismatchDays" : 0,
     "missingMetrics" : null,
-    "strategicIndicators" : [ "processperformance" ],
-    "formattedDate" : "2021-02-22"
+    "formattedDate" : "2021-05-25",
+    "strategicIndicators" : [ "processperformance" ]
   } ]
 } ]</code></pre>
 </div>
@@ -4774,7 +4774,7 @@ <h4 id="_get_current_evaluation_2_http_response">HTTP response</h4>
     "second" : "Good"
   },
   "value_description" : "Good (0.80)",
-  "date" : [ 2021, 2, 22 ],
+  "date" : [ 2021, 5, 25 ],
   "datasource" : null,
   "rationale" : "parameters: {...}, formula: ...",
   "confidence80" : null,
@@ -4782,8 +4782,8 @@ <h4 id="_get_current_evaluation_2_http_response">HTTP response</h4>
   "forecastingError" : null,
   "mismatchDays" : 0,
   "missingMetrics" : null,
-  "strategicIndicators" : [ "processperformance" ],
-  "formattedDate" : "2021-02-22"
+  "formattedDate" : "2021-05-25",
+  "strategicIndicators" : [ "processperformance" ]
 } ]</code></pre>
 </div>
 </div>
@@ -4974,7 +4974,7 @@ <h4 id="_get_one_current_evaluation_2_http_response">HTTP response</h4>
     "second" : "Good"
   },
   "value_description" : "Good (0.80)",
-  "date" : [ 2021, 2, 22 ],
+  "date" : [ 2021, 5, 25 ],
   "datasource" : null,
   "rationale" : "parameters: {...}, formula: ...",
   "confidence80" : null,
@@ -4982,8 +4982,8 @@ <h4 id="_get_one_current_evaluation_2_http_response">HTTP response</h4>
   "forecastingError" : null,
   "mismatchDays" : 0,
   "missingMetrics" : null,
-  "strategicIndicators" : [ "processperformance" ],
-  "formattedDate" : "2021-02-22"
+  "formattedDate" : "2021-05-25",
+  "strategicIndicators" : [ "processperformance" ]
 }</code></pre>
 </div>
 </div>
@@ -5160,7 +5160,7 @@ <h4 id="_get_historical_evaluation_2_http_response">HTTP response</h4>
     "second" : "Good"
   },
   "value_description" : "Good (0.80)",
-  "date" : [ 2021, 2, 22 ],
+  "date" : [ 2021, 5, 25 ],
   "datasource" : null,
   "rationale" : "parameters: {...}, formula: ...",
   "confidence80" : null,
@@ -5168,8 +5168,8 @@ <h4 id="_get_historical_evaluation_2_http_response">HTTP response</h4>
   "forecastingError" : null,
   "mismatchDays" : 0,
   "missingMetrics" : null,
-  "strategicIndicators" : [ "processperformance" ],
-  "formattedDate" : "2021-02-22"
+  "formattedDate" : "2021-05-25",
+  "strategicIndicators" : [ "processperformance" ]
 } ]</code></pre>
 </div>
 </div>
@@ -5366,7 +5366,7 @@ <h4 id="_get_prediction_evaluation_2_http_response">HTTP response</h4>
     "second" : "Good"
   },
   "value_description" : "Good (0.80)",
-  "date" : [ 2021, 2, 22 ],
+  "date" : [ 2021, 5, 25 ],
   "datasource" : "Forecast",
   "rationale" : "Forecast",
   "confidence80" : {
@@ -5380,8 +5380,8 @@ <h4 id="_get_prediction_evaluation_2_http_response">HTTP response</h4>
   "forecastingError" : null,
   "mismatchDays" : 0,
   "missingMetrics" : null,
-  "strategicIndicators" : [ "processperformance" ],
-  "formattedDate" : "2021-02-22"
+  "formattedDate" : "2021-05-25",
+  "strategicIndicators" : [ "processperformance" ]
 } ]</code></pre>
 </div>
 </div>
@@ -5575,7 +5575,7 @@ <h4 id="_get_detailed_current_evaluation_2_http_response">HTTP response</h4>
     "description" : "Percentage of tests under the testing duration threshold",
     "value" : 0.8,
     "value_description" : "0,80",
-    "date" : [ 2021, 2, 22 ],
+    "date" : [ 2021, 5, 25 ],
     "datasource" : null,
     "rationale" : "parameters: {...}, formula: ...",
     "confidence80" : null,
@@ -5792,7 +5792,7 @@ <h4 id="_get_one_detailed_current_evaluation_2_http_response">HTTP response</h4>
 [ {
   "id" : "testingperformance",
   "name" : "Testing Performance",
-  "date" : [ 2021, 2, 22 ],
+  "date" : [ 2021, 5, 25 ],
   "value" : {
     "first" : 0.8,
     "second" : "Good"
@@ -5806,7 +5806,7 @@ <h4 id="_get_one_detailed_current_evaluation_2_http_response">HTTP response</h4>
     "description" : "Percentage of tests under the testing duration threshold",
     "value" : 0.8,
     "value_description" : "0,80",
-    "date" : [ 2021, 2, 22 ],
+    "date" : [ 2021, 5, 25 ],
     "datasource" : null,
     "rationale" : "parameters: {...}, formula: ...",
     "confidence80" : null,
@@ -5892,7 +5892,7 @@ <h4 id="_get_detailed_current_evaluation_for_strategic_indicator_request_paramet
 <h4 id="_get_detailed_current_evaluation_for_strategic_indicator_curl_request">Curl request</h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'http://localhost:8080/api/strategicIndicators/processperformance/qualityFactors/metrics/historical?prj=test&amp;from=2021-02-15&amp;to=2021-02-22' -i -X GET</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'http://localhost:8080/api/strategicIndicators/processperformance/qualityFactors/metrics/historical?prj=test&amp;from=2021-05-18&amp;to=2021-05-25' -i -X GET</code></pre>
 </div>
 </div>
 </div>
@@ -6037,7 +6037,7 @@ <h4 id="_get_detailed_current_evaluation_for_strategic_indicator_http_response">
     "description" : "Percentage of tests under the testing duration threshold",
     "value" : 0.8,
     "value_description" : "0,80",
-    "date" : [ 2021, 2, 22 ],
+    "date" : [ 2021, 5, 25 ],
     "datasource" : null,
     "rationale" : "parameters: {...}, formula: ...",
     "confidence80" : null,
@@ -6101,7 +6101,7 @@ <h4 id="_get_detailed_historical_evaluation_2_request_parameters">Request parame
 <h4 id="_get_detailed_historical_evaluation_2_curl_request">Curl request</h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'http://localhost:8080/api/qualityFactors/metrics/historical?prj=test&amp;from=2021-02-15&amp;to=2021-02-22' -i -X GET</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'http://localhost:8080/api/qualityFactors/metrics/historical?prj=test&amp;from=2021-05-18&amp;to=2021-05-25' -i -X GET</code></pre>
 </div>
 </div>
 </div>
@@ -6246,7 +6246,7 @@ <h4 id="_get_detailed_historical_evaluation_2_http_response">HTTP response</h4>
     "description" : "Percentage of tests under the testing duration threshold",
     "value" : 0.8,
     "value_description" : "0,80",
-    "date" : [ 2021, 2, 22 ],
+    "date" : [ 2021, 5, 25 ],
     "datasource" : null,
     "rationale" : "parameters: {...}, formula: ...",
     "confidence80" : null,
@@ -6477,7 +6477,7 @@ <h4 id="_get_one_detailed_historical_evaluation_2_http_response">HTTP response</
     "description" : "Percentage of tests under the testing duration threshold",
     "value" : 0.8,
     "value_description" : "0,80",
-    "date" : [ 2021, 2, 22 ],
+    "date" : [ 2021, 5, 25 ],
     "datasource" : null,
     "rationale" : "parameters: {...}, formula: ...",
     "confidence80" : null,
@@ -6700,7 +6700,7 @@ <h4 id="_get_detailed_historical_evaluation_for_strategic_indicator_http_respons
     "description" : "Percentage of tests under the testing duration threshold",
     "value" : 0.8,
     "value_description" : "0,80",
-    "date" : [ 2021, 2, 22 ],
+    "date" : [ 2021, 5, 25 ],
     "datasource" : null,
     "rationale" : "parameters: {...}, formula: ...",
     "confidence80" : null,
@@ -6929,7 +6929,7 @@ <h4 id="_get_detailed_prediction_evaluation_2_http_response">HTTP response</h4>
     "description" : "Percentage of tests under the testing duration threshold",
     "value" : 0.8,
     "value_description" : "0,80",
-    "date" : [ 2021, 2, 22 ],
+    "date" : [ 2021, 5, 25 ],
     "datasource" : "Forecast",
     "rationale" : "Forecast",
     "confidence80" : {
@@ -7186,7 +7186,7 @@ <h4 id="_get_one_detailed_prediction_evaluation_2_http_response">HTTP response</
     "description" : "Percentage of tests under the testing duration threshold",
     "value" : 0.8,
     "value_description" : "0,80",
-    "date" : [ 2021, 2, 22 ],
+    "date" : [ 2021, 5, 25 ],
     "datasource" : "Forecast",
     "rationale" : "Forecast",
     "confidence80" : {
@@ -7443,7 +7443,7 @@ <h4 id="_get_detailed_prediction_evaluation_for_strategic_indicator_http_respons
     "description" : "Percentage of tests under the testing duration threshold",
     "value" : 0.8,
     "value_description" : "0,80",
-    "date" : [ 2021, 2, 22 ],
+    "date" : [ 2021, 5, 25 ],
     "datasource" : "Forecast",
     "rationale" : "Forecast",
     "confidence80" : {
@@ -8095,7 +8095,7 @@ <h4 id="_simulate_quality_factors_assessment_http_response">HTTP response</h4>
     "second" : "Good"
   },
   "value_description" : "Good (0.80)",
-  "date" : [ 2021, 2, 22 ],
+  "date" : [ 2021, 5, 25 ],
   "datasource" : null,
   "rationale" : "parameters: {...}, formula: ...",
   "confidence80" : null,
@@ -8103,8 +8103,8 @@ <h4 id="_simulate_quality_factors_assessment_http_response">HTTP response</h4>
   "forecastingError" : null,
   "mismatchDays" : 0,
   "missingMetrics" : null,
-  "strategicIndicators" : [ "processperformance" ],
-  "formattedDate" : "2021-02-22"
+  "formattedDate" : "2021-05-25",
+  "strategicIndicators" : [ "processperformance" ]
 } ]</code></pre>
 </div>
 </div>
@@ -8426,7 +8426,7 @@ <h4 id="_get_current_evaluation_3_http_response">HTTP response</h4>
   "description" : "Percentage of tests under the testing duration threshold",
   "value" : 0.8,
   "value_description" : "0,80",
-  "date" : [ 2021, 2, 22 ],
+  "date" : [ 2021, 5, 25 ],
   "datasource" : null,
   "rationale" : "parameters: {...}, formula: ...",
   "confidence80" : null,
@@ -8600,7 +8600,7 @@ <h4 id="_get_single_current_evaluation_http_response">HTTP response</h4>
   "description" : "Percentage of tests under the testing duration threshold",
   "value" : 0.8,
   "value_description" : "0,80",
-  "date" : [ 2021, 2, 22 ],
+  "date" : [ 2021, 5, 25 ],
   "datasource" : null,
   "rationale" : "parameters: {...}, formula: ...",
   "confidence80" : null,
@@ -8760,7 +8760,7 @@ <h4 id="_get_historical_evaluation_3_http_response">HTTP response</h4>
   "description" : "Percentage of tests under the testing duration threshold",
   "value" : 0.8,
   "value_description" : "0,80",
-  "date" : [ 2021, 2, 22 ],
+  "date" : [ 2021, 5, 25 ],
   "datasource" : null,
   "rationale" : "parameters: {...}, formula: ...",
   "confidence80" : null,
@@ -8942,7 +8942,7 @@ <h4 id="_get_single_historical_evaluation_http_response">HTTP response</h4>
   "description" : "Percentage of tests under the testing duration threshold",
   "value" : 0.8,
   "value_description" : "0,80",
-  "date" : [ 2021, 2, 22 ],
+  "date" : [ 2021, 5, 25 ],
   "datasource" : null,
   "rationale" : "parameters: {...}, formula: ...",
   "confidence80" : null,
@@ -9172,7 +9172,7 @@ <h4 id="_get_historical_evaluation_for_quality_factor_http_response">HTTP respon
     "description" : "Percentage of tests under the testing duration threshold",
     "value" : 0.8,
     "value_description" : "0,80",
-    "date" : [ 2021, 2, 22 ],
+    "date" : [ 2021, 5, 25 ],
     "datasource" : null,
     "rationale" : "parameters: {...}, formula: ...",
     "confidence80" : null,
@@ -9353,7 +9353,7 @@ <h4 id="_get_prediction_http_response">HTTP response</h4>
   "description" : "Percentage of tests under the testing duration threshold",
   "value" : 0.8,
   "value_description" : "0,80",
-  "date" : [ 2021, 2, 22 ],
+  "date" : [ 2021, 5, 25 ],
   "datasource" : "Forecast",
   "rationale" : "Forecast",
   "confidence80" : {
@@ -9609,7 +9609,7 @@ <h4 id="_get_prediction_for_quality_factor_http_response">HTTP response</h4>
     "description" : "Percentage of tests under the testing duration threshold",
     "value" : 0.8,
     "value_description" : "0,80",
-    "date" : [ 2021, 2, 22 ],
+    "date" : [ 2021, 5, 25 ],
     "datasource" : "Forecast",
     "rationale" : "Forecast",
     "confidence80" : {
@@ -9932,7 +9932,7 @@ <h4 id="_get_all_alerts_http_response">HTTP response</h4>
   "valueDescription" : "Normal (0.40)",
   "threshold" : 0.5,
   "category" : "category",
-  "date" : 1613988151890,
+  "date" : 1621942219811,
   "status" : "NEW",
   "reqAssociat" : true,
   "artefacts" : null
@@ -10732,7 +10732,7 @@ <h4 id="_add_quality_requirement_for_alert_http_response">HTTP response</h4>
 
 {
   "id" : 3,
-  "date" : 1613988151325,
+  "date" : 1621942219275,
   "requirement" : "The ratio of files without duplications should be at least 0.8",
   "description" : "The ratio of files without duplications should be at least the given value",
   "goal" : "Improve the quality of the source code",
@@ -10926,7 +10926,7 @@ <h4 id="_get_all_quality_requirements_http_response">HTTP response</h4>
 
 [ {
   "id" : 3,
-  "date" : 1613988157062,
+  "date" : 1621942223761,
   "requirement" : "The ratio of files without duplications should be at least 0.8",
   "description" : "The ratio of files without duplications should be at least the given value",
   "goal" : "Improve the quality of the source code",
@@ -10942,7 +10942,7 @@ <h4 id="_get_all_quality_requirements_http_response">HTTP response</h4>
     "valueDescription" : null,
     "threshold" : 0.5,
     "category" : "category",
-    "date" : 1613988157062,
+    "date" : 1621942223761,
     "status" : "NEW",
     "reqAssociat" : true,
     "artefacts" : null
@@ -11086,7 +11086,7 @@ <h4 id="_add_quality_requirement_http_response">HTTP response</h4>
 
 {
   "id" : 3,
-  "date" : 1613988157202,
+  "date" : 1621942223858,
   "requirement" : "The ratio of files without duplications should be at least 0.8",
   "description" : "The ratio of files without duplications should be at least the given value",
   "goal" : "Improve the quality of the source code",
@@ -11609,7 +11609,7 @@ <h4 id="_get_all_decisions_http_response">HTTP response</h4>
 [ {
   "id" : 2,
   "type" : "ADD",
-  "date" : 1613988152881,
+  "date" : 1621942220610,
   "author" : null,
   "rationale" : "User comments",
   "patternId" : 100,
@@ -11822,7 +11822,7 @@ <h4 id="_get_feedback_for_strategic_indicator_http_response">HTTP response</h4>
 
 [ {
   "strategicIndicatorId" : 1,
-  "date" : "2021-02-22",
+  "date" : "2021-05-25",
   "author" : null,
   "oldValue" : 0.6,
   "newValue" : 0.75
@@ -13346,6 +13346,11 @@ <h4 id="_get_all_profiles_response_fields">Response fields</h4>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Default visualization for Detailed Factors view</p></td>
 </tr>
 <tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>[].mView</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>String</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Default visualization for Metrics view</p></td>
+</tr>
+<tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>[].qmView</code></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>String</code></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Default visualization for Quality Model view</p></td>
@@ -13413,7 +13418,7 @@ <h4 id="_get_all_profiles_http_response">HTTP response</h4>
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
-Content-Length: 435
+Content-Length: 457
 Content-Type: application/json;charset=UTF-8
 
 [ {
@@ -13423,6 +13428,7 @@ <h4 id="_get_all_profiles_http_response">HTTP response</h4>
   "qualityLevel" : "ALL",
   "dsiView" : "Radar",
   "dqfView" : "Radar",
+  "mView" : "Gauge",
   "qmView" : "Graph",
   "projects" : [ {
     "id" : 1,
@@ -13521,6 +13527,11 @@ <h4 id="_get_single_profile_response_fields">Response fields</h4>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Default visualization for Detailed Factors view</p></td>
 </tr>
 <tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>mView</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>String</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Default visualization for Metrics view</p></td>
+</tr>
+<tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>qmView</code></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>String</code></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Default visualization for Quality Model view</p></td>
@@ -13589,7 +13600,7 @@ <h4 id="_get_single_profile_http_response">HTTP response</h4>
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
 Content-Type: application/json;charset=UTF-8
-Content-Length: 431
+Content-Length: 453
 
 {
   "id" : 1,
@@ -13598,6 +13609,7 @@ <h4 id="_get_single_profile_http_response">HTTP response</h4>
   "qualityLevel" : "ALL",
   "dsiView" : "Radar",
   "dqfView" : "Radar",
+  "mView" : "Gauge",
   "qmView" : "Graph",
   "projects" : [ {
     "id" : 1,
@@ -13654,6 +13666,10 @@ <h4 id="_new_profile_request_parameters">Request parameters</h4>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Value for default Detailed Factors view representation: Radar, Stacked or Polar</p></td>
 </tr>
 <tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>m_view</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Value for default Metrics view representation: Gauge or Slider</p></td>
+</tr>
+<tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>qm_view</code></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Value for default Quality Model view representation: Graph or Sunburst</p></td>
 </tr>
@@ -13676,7 +13692,7 @@ <h4 id="_new_profile_curl_request">Curl request</h4>
 <div class="content">
 <pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'http://localhost:8080/api/profiles' -i -X POST \
     -H 'Content-Type: multipart/form-data' \
-    -d 'name=Test&amp;description=Test+profile&amp;quality_level=ALL&amp;dsi_view=Radar&amp;dqf_view=Radar&amp;qm_view=Graph&amp;projects_info=%5B%7B%22si%22%3A%5B%5D%2C%22prj%22%3A1%2C%22all_si%22%3Atrue%7D%5D'</code></pre>
+    -d 'name=Test&amp;description=Test+profile&amp;quality_level=ALL&amp;dsi_view=Radar&amp;dqf_view=Radar&amp;m_view=Gauge&amp;qm_view=Graph&amp;projects_info=%5B%7B%22si%22%3A%5B%5D%2C%22prj%22%3A1%2C%22all_si%22%3Atrue%7D%5D'</code></pre>
 </div>
 </div>
 </div>
@@ -13755,6 +13771,10 @@ <h5 id="_path_parameters_3_request_parameters">Request parameters</h5>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Value for default Detailed Factors view representation: Radar, Stacked or Polar</p></td>
 </tr>
 <tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>m_view</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Value for default Metrics view representation: Gauge or Slider</p></td>
+</tr>
+<tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>qm_view</code></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Value for default Quality Model view representation: Graph or Sunburst</p></td>
 </tr>
@@ -13777,7 +13797,7 @@ <h5 id="_path_parameters_3_curl_request">Curl request</h5>
 <div class="content">
 <pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'http://localhost:8080/api/profiles/1' -i -X PUT \
     -H 'Content-Type: multipart/form-data' \
-    -d 'name=Test&amp;description=Test+profile&amp;quality_level=ALL&amp;dsi_view=Radar&amp;dqf_view=Radar&amp;qm_view=Graph&amp;projects_info=%5B%7B%22si%22%3A%5B%5D%2C%22prj%22%3A1%2C%22all_si%22%3Atrue%7D%5D'</code></pre>
+    -d 'name=Test&amp;description=Test+profile&amp;quality_level=ALL&amp;dsi_view=Radar&amp;dqf_view=Radar&amp;m_view=Gauge&amp;qm_view=Graph&amp;projects_info=%5B%7B%22si%22%3A%5B%5D%2C%22prj%22%3A1%2C%22all_si%22%3Atrue%7D%5D'</code></pre>
 </div>
 </div>
 </div>
@@ -13923,7 +13943,7 @@ <h4 id="_get_project_milestones_request_parameters">Request parameters</h4>
 <h4 id="_get_project_milestones_curl_request">Curl request</h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'http://localhost:8080/api/milestones?prj=test&amp;date=2021-02-22' -i -X GET</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'http://localhost:8080/api/milestones?prj=test&amp;date=2021-05-25' -i -X GET</code></pre>
 </div>
 </div>
 </div>
@@ -13975,7 +13995,7 @@ <h4 id="_get_project_milestones_http_response">HTTP response</h4>
 Content-Type: application/json;charset=UTF-8
 
 [ {
-  "date" : "2021-02-25",
+  "date" : "2021-05-28",
   "name" : "Version 1.3",
   "description" : "Version 1.3 adding new features",
   "type" : "Release"
@@ -14067,10 +14087,10 @@ <h4 id="_get_project_phases_http_response">HTTP response</h4>
 Content-Length: 156
 
 [ {
-  "dateFrom" : "2021-02-07",
+  "dateFrom" : "2021-05-10",
   "name" : "Development",
   "description" : "Implementation of project functionalities",
-  "dateTo" : "2021-03-09"
+  "dateTo" : "2021-06-09"
 } ]</code></pre>
 </div>
 </div>
@@ -14081,7 +14101,7 @@ <h4 id="_get_project_phases_http_response">HTTP response</h4>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2021-02-22 11:01:45 +0100
+Last updated 2021-05-25 13:32:58 +0200
 </div>
 </div>
 </body>
diff --git a/lib/javax.annotation.jar b/lib/javax.annotation.jar
new file mode 100644
index 00000000..52dca7f5
Binary files /dev/null and b/lib/javax.annotation.jar differ
diff --git a/lib/javax.ejb.jar b/lib/javax.ejb.jar
new file mode 100644
index 00000000..4ebf5ecd
Binary files /dev/null and b/lib/javax.ejb.jar differ
diff --git a/lib/javax.jms.jar b/lib/javax.jms.jar
new file mode 100644
index 00000000..d31451ad
Binary files /dev/null and b/lib/javax.jms.jar differ
diff --git a/lib/javax.persistence.jar b/lib/javax.persistence.jar
new file mode 100644
index 00000000..21d80e0e
Binary files /dev/null and b/lib/javax.persistence.jar differ
diff --git a/lib/javax.resource.jar b/lib/javax.resource.jar
new file mode 100644
index 00000000..696a2345
Binary files /dev/null and b/lib/javax.resource.jar differ
diff --git a/lib/javax.servlet.jar b/lib/javax.servlet.jar
new file mode 100644
index 00000000..0519e4a4
Binary files /dev/null and b/lib/javax.servlet.jar differ
diff --git a/lib/javax.servlet.jsp.jar b/lib/javax.servlet.jsp.jar
new file mode 100644
index 00000000..9c0631ce
Binary files /dev/null and b/lib/javax.servlet.jsp.jar differ
diff --git a/lib/javax.servlet.jsp.jstl.jar b/lib/javax.servlet.jsp.jstl.jar
new file mode 100644
index 00000000..7be17cc7
Binary files /dev/null and b/lib/javax.servlet.jsp.jstl.jar differ
diff --git a/lib/javax.transaction.jar b/lib/javax.transaction.jar
new file mode 100644
index 00000000..729c6952
Binary files /dev/null and b/lib/javax.transaction.jar differ
diff --git a/libs/qrapids-eval-2.0.jar b/libs/qrapids-eval-2.1.jar
similarity index 62%
rename from libs/qrapids-eval-2.0.jar
rename to libs/qrapids-eval-2.1.jar
index d75e3d21..df7caee2 100644
Binary files a/libs/qrapids-eval-2.0.jar and b/libs/qrapids-eval-2.1.jar differ
diff --git a/sonar-project.properties b/sonar-project.properties
index ed483e4e..a1fe69f1 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -2,7 +2,7 @@ sonar.projectKey=q-rapids_qrapids-dashboard
 
 sonar.projectName=qrapids-dashboard
 
-sonar.projectVersion=2.0
+sonar.projectVersion=2.0.1
 
 sonar.sources=src/main/java
 sonar.tests=src/test/java
diff --git a/src/main/java/com/upc/gessi/qrapids/QrapidsApplication.java b/src/main/java/com/upc/gessi/qrapids/QrapidsApplication.java
index 4e0ea953..441f1d65 100644
--- a/src/main/java/com/upc/gessi/qrapids/QrapidsApplication.java
+++ b/src/main/java/com/upc/gessi/qrapids/QrapidsApplication.java
@@ -21,6 +21,7 @@
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 
 import java.io.IOException;
+import java.sql.Timestamp;
 import java.text.ParseException;
 import java.time.ZoneId;
 import java.util.*;
@@ -49,6 +50,9 @@ public BCryptPasswordEncoder bCryptPasswordEncoder() {
 	@Scheduled(cron = "${cron.expression:-}") // default -> disable scheduled task
 	public void scheduleTask() throws ParseException, ProjectNotFoundException, IOException, CategoriesException {
 		// ToDo: decide if we also copy this code to assessSI function
+		Logger logger = LoggerFactory.getLogger(Alerts.class);
+		logger.info("Start Scheduled task: " + new Timestamp(System.currentTimeMillis()));
+		logger.info("projects dir: " + projectsDir);
 		LocalDate evaluationLocalDate = LocalDate.now(); // we need LocalDate for assessStrategicIndicators
 		Date evaluationDate= Date.from(evaluationLocalDate.atStartOfDay(ZoneId.systemDefault()).toInstant()); // we need Date for evaluateQualityModel in qrapids-eval libs
 
@@ -58,16 +62,13 @@ public void scheduleTask() throws ParseException, ProjectNotFoundException, IOEx
 		Eval.evaluateQualityModel(projectsDir, evaluationDate, null);
 
 		boolean correct = true;
-		// first assess factors for all projects
 		correct = context.getBean(FactorsController.class).assessQualityFactors(null, evaluationLocalDate);
 
 		if (correct) {
-			// then assess strategic indicator for all projects
 			correct = context.getBean(StrategicIndicatorsController.class).assessStrategicIndicators(null, evaluationLocalDate);
 		}
 
 		if (!correct) { // check if the assessment complete with error
-			Logger logger = LoggerFactory.getLogger(Alerts.class);
 			logger.error(evaluationLocalDate + ": factors or strategic indicators assessment complete with error.");
 		}
 	}
diff --git a/src/main/java/com/upc/gessi/qrapids/app/domain/adapters/Forecast.java b/src/main/java/com/upc/gessi/qrapids/app/domain/adapters/Forecast.java
index 8d6bdd86..a5f0ab86 100644
--- a/src/main/java/com/upc/gessi/qrapids/app/domain/adapters/Forecast.java
+++ b/src/main/java/com/upc/gessi/qrapids/app/domain/adapters/Forecast.java
@@ -307,6 +307,9 @@ private List<DTOFactorEvaluation> getDtoFactors(List<DTOFactorEvaluation> factor
 
         List<DTOFactorEvaluation> result = new ArrayList<>();
 
+        //get current date
+        LocalDate current = factor.get(0).getDate();
+
         JsonParser parser = new JsonParser();
         JsonArray data = parser.parse(content.toString()).getAsJsonArray();
         for (int i = 0; i < data.size(); ++i) {
@@ -317,13 +320,13 @@ private List<DTOFactorEvaluation> getDtoFactors(List<DTOFactorEvaluation> factor
                 getFactorWithError(factor, result, object);
             }
             else {
-                getFactors(factor, result, object);
+                getFactors(current, factor, result, object);
             }
         }
         return result;
     }
 
-    private void getFactors(List<DTOFactorEvaluation> factor, List<DTOFactorEvaluation> result, JsonObject object) {
+    private void getFactors(LocalDate current, List<DTOFactorEvaluation> factor, List<DTOFactorEvaluation> result, JsonObject object) {
         //check if json values are null
         JsonArray lower80;
         if (!object.get(LOWER_80).isJsonNull()) lower80 = object.getAsJsonArray(LOWER_80);
@@ -348,11 +351,11 @@ private void getFactors(List<DTOFactorEvaluation> factor, List<DTOFactorEvaluati
         String id = object.get(ID).getAsString();
 
         for (DTOFactorEvaluation f : factor) {
-            buildFactor(result, lower80, upper80, lower95, upper95, mean, id, f);
+            buildFactor(result, lower80, upper80, lower95, upper95, mean, id, f, current);
         }
     }
 
-    private void buildFactor(List<DTOFactorEvaluation> result, JsonArray lower80, JsonArray upper80, JsonArray lower95, JsonArray upper95, JsonArray mean, String id, DTOFactorEvaluation f) {
+    private void buildFactor(List<DTOFactorEvaluation> result, JsonArray lower80, JsonArray upper80, JsonArray lower95, JsonArray upper95, JsonArray mean, String id, DTOFactorEvaluation f, LocalDate current) {
         if (f.getId().equals(id) && lower80.size() == upper80.size() && lower95.size() == upper95.size() && lower80.size() == lower95.size() && lower80.size() == mean.size()) {
             if (lower80.size() > 0) {
                 for (int j = 0; j < lower80.size(); ++j) {
@@ -361,14 +364,14 @@ private void buildFactor(List<DTOFactorEvaluation> result, JsonArray lower80, Js
                             f.getDescription(),
                             f.getDatasource(),
                             f.getRationale(),
-                            LocalDate.now().plusDays((long) j + 1), Pair.of(aux,factorsController.getFactorLabelFromValue(aux)), Pair.of(upper80.get(j).getAsFloat(), lower80.get(j).getAsFloat()), Pair.of(upper95.get(j).getAsFloat(), lower95.get(j).getAsFloat())));
+                            current.plusDays((long) j + 1), Pair.of(aux,factorsController.getFactorLabelFromValue(aux)), Pair.of(upper80.get(j).getAsFloat(), lower80.get(j).getAsFloat()), Pair.of(upper95.get(j).getAsFloat(), lower95.get(j).getAsFloat())));
                 }
             } else {
                 result.add(new DTOFactorEvaluation(f.getId(), f.getName(),
                         f.getDescription(),
                         f.getDatasource(),
                         f.getRationale(),
-                        LocalDate.now().plusDays((long) 1), null, null, null));
+                        current.plusDays((long) 1), null, null, null));
             }
         }
     }
@@ -431,6 +434,7 @@ private List<DTODetailedFactorEvaluation> getDtoQualityFactors(List<DTODetailedF
             metricsMatrix.add(new ArrayList<>());
         }
 
+        // get current date
         LocalDate current = factor.get(0).getMetrics().get(0).getDate();
 
         JsonParser parser = new JsonParser();
diff --git a/src/main/java/com/upc/gessi/qrapids/app/domain/adapters/QMA/QMADetailedStrategicIndicators.java b/src/main/java/com/upc/gessi/qrapids/app/domain/adapters/QMA/QMADetailedStrategicIndicators.java
index 3bcd6f5c..05e0f49e 100644
--- a/src/main/java/com/upc/gessi/qrapids/app/domain/adapters/QMA/QMADetailedStrategicIndicators.java
+++ b/src/main/java/com/upc/gessi/qrapids/app/domain/adapters/QMA/QMADetailedStrategicIndicators.java
@@ -76,7 +76,7 @@ public List<DTODetailedStrategicIndicatorEvaluation> CurrentEvaluation(String id
             evals.add(StrategicIndicator.getFactorsEvaluations(prj, id));
         }
 
-        dsi = StrategicIndicatorFactorEvaluationDTOtoDTODetailedStrategicIndicator(prj, profile, evals, filterDB);
+        dsi = StrategicIndicatorFactorEvaluationDTOtoDTODetailedStrategicIndicator(prj, profile, evals, filterDB, true);
         //Connection.closeConnection();
         return dsi;
     }
@@ -97,13 +97,13 @@ public List<DTODetailedStrategicIndicatorEvaluation> HistoricalData(String id, L
             evals = new ArrayList<>();
             evals.add(StrategicIndicator.getFactorsEvaluations(prj, id, from, to));
         }
-        dsi = StrategicIndicatorFactorEvaluationDTOtoDTODetailedStrategicIndicator(prj, profile, evals, true);
+        dsi = StrategicIndicatorFactorEvaluationDTOtoDTODetailedStrategicIndicator(prj, profile, evals, true, false);
         //Connection.closeConnection();
         return dsi;
     }
 
 
-    private List<DTODetailedStrategicIndicatorEvaluation> StrategicIndicatorFactorEvaluationDTOtoDTODetailedStrategicIndicator(String prj, String profile, List<StrategicIndicatorFactorEvaluationDTO> evals, boolean filterDB) throws ProjectNotFoundException {
+    private List<DTODetailedStrategicIndicatorEvaluation> StrategicIndicatorFactorEvaluationDTOtoDTODetailedStrategicIndicator(String prj, String profile, List<StrategicIndicatorFactorEvaluationDTO> evals, boolean filterDB, boolean currentData) throws ProjectNotFoundException {
         List<DTODetailedStrategicIndicatorEvaluation> dsi = new ArrayList<>();
         boolean found; // to check if the SI is in the database
         //for each Detailed Strategic Indicador
@@ -120,8 +120,9 @@ private List<DTODetailedStrategicIndicatorEvaluation> StrategicIndicatorFactorEv
                 d.setMismatchDays(evaluation.getMismatchDays());
                 d.setMissingFactors(evaluation.getMissingElements());
                 //set Factors to Detailed Strategic Indicator
-                d.setFactors(FactorEvaluationDTOListToDTOFactorList(element.getFactors(),prjRep.findByExternalId(prj).getId(), profile, false));
-
+                String siExternalID = null;
+                if(currentData) siExternalID = element.getID();
+                d.setFactors(FactorEvaluationDTOListToDTOFactorList(siExternalID, element.getFactors(),prjRep.findByExternalId(prj).getId(), profile, false));
                 // Get value
                 List<DTOAssessment> categories = strategicIndicatorsController.getCategories();
                 EstimationEvaluationDTO estimation = element.getEstimation().get(0);
@@ -158,8 +159,9 @@ private void setValueAndThresholdToCategories(List<DTOAssessment> categories, Es
         }
     }
 
-    public List<DTOFactorEvaluation> FactorEvaluationDTOListToDTOFactorList(List<FactorEvaluationDTO> factors, Long prjID, String profileId, boolean filterDB) {
+    public List<DTOFactorEvaluation> FactorEvaluationDTOListToDTOFactorList(String siExternalID, List<FactorEvaluationDTO> factors, Long prjID, String profileId, boolean filterDB) {
         List<DTOFactorEvaluation> listFact = new ArrayList<>();
+        Optional<Project> project = prjRep.findById(prjID);
         //for each factor in the Detailed Strategic Indicator
         for (Iterator<FactorEvaluationDTO> iterFactor = factors.iterator(); iterFactor.hasNext(); ) {
             FactorEvaluationDTO factor = iterFactor.next();
@@ -170,12 +172,17 @@ public List<DTOFactorEvaluation> FactorEvaluationDTOListToDTOFactorList(List<Fac
                 //for each evaluation create new factor with factor name and id, and evaluation date and value
                 for (Iterator<EvaluationDTO> iterFactEval = factor.getEvaluations().iterator(); iterFactEval.hasNext(); ) {
                     EvaluationDTO evaluation = iterFactEval.next();
-                    listFact.add(FactorEvaluationDTOToDTOFactor(factor, evaluation));
+                    // check if the factor belongs to the si
+                    boolean addFactor = true;
+                    if (siExternalID != null && !siRep.findByExternalIdAndProjectId(siExternalID,project.get().getId()).getQuality_factors().contains(factor.getID())) {
+                        addFactor = false;
+                    }
+                    if (addFactor)
+                        listFact.add(FactorEvaluationDTOToDTOFactor(factor, evaluation));
                 }
             }
         }
         // filter by profile
-        Optional<Project> project = prjRep.findById(prjID);
         if ((profileId != null) && (!profileId.equals("null"))) { // if profile not null
             Profile profile = profilesController.findProfileById(profileId);
             if (profile.getAllSIByProject(project.get())) { // if allSI true, return all quality factors
diff --git a/src/main/java/com/upc/gessi/qrapids/app/domain/adapters/QMA/QMAMetrics.java b/src/main/java/com/upc/gessi/qrapids/app/domain/adapters/QMA/QMAMetrics.java
index 0cd070ff..f4301f8a 100644
--- a/src/main/java/com/upc/gessi/qrapids/app/domain/adapters/QMA/QMAMetrics.java
+++ b/src/main/java/com/upc/gessi/qrapids/app/domain/adapters/QMA/QMAMetrics.java
@@ -31,12 +31,14 @@ public class QMAMetrics {
 
     // it was made to use these variables in static method
     private static ProfilesController profilesController;
+    private static QualityFactorRepository factorRepository;
     private static ProjectRepository prjRep;
     private static ProfileProjectStrategicIndicatorsRepository profileProjectStrategicIndicatorsRepository;
 
     @Autowired
-    public QMAMetrics(ProfilesController profilesController, ProjectRepository prjRep, ProfileProjectStrategicIndicatorsRepository profileProjectStrategicIndicatorsRepository) {
+    public QMAMetrics(ProfilesController profilesController, QualityFactorRepository factorRepository, ProjectRepository prjRep, ProfileProjectStrategicIndicatorsRepository profileProjectStrategicIndicatorsRepository) {
         QMAMetrics.profilesController = profilesController;
+        QMAMetrics.factorRepository = factorRepository;
         QMAMetrics.prjRep = prjRep;
         QMAMetrics.profileProjectStrategicIndicatorsRepository = profileProjectStrategicIndicatorsRepository;
     }
@@ -53,7 +55,7 @@ public List<DTOMetricEvaluation> CurrentEvaluation(String id, String prj, String
         else
             evals = Factor.getMetricsEvaluations(prj, id).getMetrics();
         //Connection.closeConnection();
-        result = MetricEvaluationDTOListToDTOMetricList(evals, prj, profile);
+        result = MetricEvaluationDTOListToDTOMetricList(id, evals, prj, profile);
 
         return result;
     }
@@ -75,7 +77,7 @@ public List<DTOMetricEvaluation> HistoricalData(String id, LocalDate from, Local
         else
             evals = Factor.getMetricsEvaluations(prj, id, from, to).getMetrics();
         //Connection.closeConnection();
-        result = MetricEvaluationDTOListToDTOMetricList(evals, prj, profile);
+        result = MetricEvaluationDTOListToDTOMetricList(null, evals, prj, profile);
 
         return result;
     }
@@ -85,23 +87,29 @@ public List<DTOMetricEvaluation> SingleHistoricalData (String metricId, LocalDat
         MetricEvaluationDTO metricEvaluationDTO = Metric.getSingleEvaluation(prj, metricId, from, to);
         List<MetricEvaluationDTO> metricEvaluationDTOList = new ArrayList<>();
         metricEvaluationDTOList.add(metricEvaluationDTO);
-        return MetricEvaluationDTOListToDTOMetricList(metricEvaluationDTOList, prj, profile);
+        return MetricEvaluationDTOListToDTOMetricList(null, metricEvaluationDTOList, prj, profile);
     }
 
 
-    static List<DTOMetricEvaluation> MetricEvaluationDTOListToDTOMetricList(List<MetricEvaluationDTO> evals, String prj, String profileId) {
+    static List<DTOMetricEvaluation> MetricEvaluationDTOListToDTOMetricList(String factorExternalID, List<MetricEvaluationDTO> evals, String prj, String profileId) {
         List<DTOMetricEvaluation> m = new ArrayList<>();
+        Project project = prjRep.findByExternalId(prj);
         for (Iterator<MetricEvaluationDTO> iterMetrics = evals.iterator(); iterMetrics.hasNext(); ) {
             MetricEvaluationDTO metric = iterMetrics.next();
             if (metric != null) {
                 for (Iterator<EvaluationDTO> iterEvals = metric.getEvaluations().iterator(); iterEvals.hasNext(); ) {
                     EvaluationDTO evaluation = iterEvals.next();
-                    m.add(MetricEvaluationDTOToDTOMetric(metric, evaluation));
+                    // check if the metric belongs to the factor
+                    boolean addMetric = true;
+                    if (factorExternalID != null && !factorRepository.findByExternalIdAndProjectId(factorExternalID,project.getId()).getMetrics().contains(metric.getID())) {
+                        addMetric = false;
+                    }
+                    if (addMetric)
+                        m.add(MetricEvaluationDTOToDTOMetric(metric, evaluation));
                 }
             }
         }
         // filter by profile
-        Project project = prjRep.findByExternalId(prj);
         if ((profileId != null) && (!profileId.equals("null"))) { // if profile not null
             Profile profile = profilesController.findProfileById(profileId);
             if (profile.getAllSIByProject(project)) { // if allSI true, return all metrics
@@ -177,7 +185,7 @@ private static List<MetricEvaluationDTO> MetricEvaluationDTOtoDTOMetric(List<DTO
 
     public List<DTOMetricEvaluation> getAllMetrics(String prj, String profile) throws IOException {
         qmacon.initConnexion();
-        return MetricEvaluationDTOListToDTOMetricList(Metric.getEvaluations(prj), prj, profile);
+        return MetricEvaluationDTOListToDTOMetricList(null, Metric.getEvaluations(prj), prj, profile);
     }
 
 }
diff --git a/src/main/java/com/upc/gessi/qrapids/app/domain/adapters/QMA/QMAQualityFactors.java b/src/main/java/com/upc/gessi/qrapids/app/domain/adapters/QMA/QMAQualityFactors.java
index 3d3101ef..9ea20753 100644
--- a/src/main/java/com/upc/gessi/qrapids/app/domain/adapters/QMA/QMAQualityFactors.java
+++ b/src/main/java/com/upc/gessi/qrapids/app/domain/adapters/QMA/QMAQualityFactors.java
@@ -128,7 +128,7 @@ public List<DTODetailedFactorEvaluation> CurrentEvaluation(String id, String prj
             profile = null; // if we are asking for concrete indicator, we don't need to filter by profile
         }
 //            Connection.closeConnection();
-        return FactorMetricEvaluationDTOListToDTOQualityFactorList(prjRep.findByExternalId(prj).getId(),evals, profile, filterDB);
+        return FactorMetricEvaluationDTOListToDTOQualityFactorList(prjRep.findByExternalId(prj).getId(),evals, profile, filterDB, true);
     }
 
     private static List<FactorEvaluationDTO> FactorEvaluationDTOtoDTOFactor(List<DTOFactorEvaluation> factors, String prj)
@@ -178,7 +178,7 @@ public List<DTODetailedFactorEvaluation> HistoricalData(String id, LocalDate fro
             profile = null; // if we are asking for concrete indicator, we don't need to filter by profile
         }
 //        Connection.closeConnection();
-        qf = FactorMetricEvaluationDTOListToDTOQualityFactorList(prjRep.findByExternalId(prj).getId(),evals, profile, true);
+        qf = FactorMetricEvaluationDTOListToDTOQualityFactorList(prjRep.findByExternalId(prj).getId(),evals, profile, true, false);
 
         return qf;
     }
@@ -192,12 +192,12 @@ public boolean isCategoriesEmpty() {
 
     public List<DTOFactorEvaluation> getAllFactors(String prj, String profile, boolean filterDB) throws IOException {
         qmacon.initConnexion();
-        return qmaDetailedStrategicIndicators.FactorEvaluationDTOListToDTOFactorList(Factor.getEvaluations(prj), prjRep.findByExternalId(prj).getId(), profile, filterDB);
+        return qmaDetailedStrategicIndicators.FactorEvaluationDTOListToDTOFactorList(null, Factor.getEvaluations(prj), prjRep.findByExternalId(prj).getId(), profile, filterDB);
     }
 
     public List<DTOFactorEvaluation> getAllFactorsHistoricalData(String prj, String profile, LocalDate from, LocalDate to) throws IOException {
         qmacon.initConnexion();
-        return qmaDetailedStrategicIndicators.FactorEvaluationDTOListToDTOFactorList(Factor.getEvaluations(prj, from, to), prjRep.findByExternalId(prj).getId(), profile,true);
+        return qmaDetailedStrategicIndicators.FactorEvaluationDTOListToDTOFactorList(null, Factor.getEvaluations(prj, from, to), prjRep.findByExternalId(prj).getId(), profile,true);
     }
 
     public void setFactorStrategicIndicatorRelation(List<DTOFactorEvaluation> factors, String prj) throws IOException {
@@ -206,9 +206,9 @@ public void setFactorStrategicIndicatorRelation(List<DTOFactorEvaluation> factor
         Factor.setStrategicIndicatorRelation(qma_factors);
     }
 
-    private List<DTODetailedFactorEvaluation> FactorMetricEvaluationDTOListToDTOQualityFactorList(Long prjID,List<FactorMetricEvaluationDTO> evals, String profileId,  boolean filterDB) throws ProjectNotFoundException {
+    private List<DTODetailedFactorEvaluation> FactorMetricEvaluationDTOListToDTOQualityFactorList(Long prjID,List<FactorMetricEvaluationDTO> evals, String profileId,  boolean filterDB, boolean currentData) throws ProjectNotFoundException {
         List<DTODetailedFactorEvaluation> qf = new ArrayList<>();
-        boolean found; // to check if the SI is in the database
+        boolean found; // to check if the factor is in the database
 
         // get project info
         Iterator<FactorMetricEvaluationDTO> iter = evals.iterator();
@@ -224,7 +224,10 @@ private List<DTODetailedFactorEvaluation> FactorMetricEvaluationDTOListToDTOQual
             else found = true; // because we want make fetch
             // only return Detailed Quality Factor if it is in local database
             if (found) {
-                DTODetailedFactorEvaluation df = new DTODetailedFactorEvaluation(qualityFactor.getID(), qualityFactor.getName(), QMAMetrics.MetricEvaluationDTOListToDTOMetricList(qualityFactor.getMetrics(), project.getExternalId() ,profileId));
+                // check metric composition this factor
+                String factorExternalID = null;
+                if (currentData) factorExternalID = qualityFactor.getID();
+                DTODetailedFactorEvaluation df = new DTODetailedFactorEvaluation(qualityFactor.getID(), qualityFactor.getName(), QMAMetrics.MetricEvaluationDTOListToDTOMetricList(factorExternalID, qualityFactor.getMetrics(), project.getExternalId() ,profileId));
                 EvaluationDTO evaluation = qualityFactor.getEvaluations().get(0);
                 df.setDate(evaluation.getEvaluationDate());
                 df.setValue(Pair.of(evaluation.getValue(), factorsController.getFactorLabelFromValue(evaluation.getValue())));
diff --git a/src/main/java/com/upc/gessi/qrapids/app/domain/adapters/QMA/QMARelations.java b/src/main/java/com/upc/gessi/qrapids/app/domain/adapters/QMA/QMARelations.java
index cf5b413a..d391a12f 100644
--- a/src/main/java/com/upc/gessi/qrapids/app/domain/adapters/QMA/QMARelations.java
+++ b/src/main/java/com/upc/gessi/qrapids/app/domain/adapters/QMA/QMARelations.java
@@ -169,8 +169,8 @@ private void buildSIFactorRelation(Map<String, DTORelationsSI> strategicIndicato
                 strategicIndicator = new DTORelationsSI(target.getID());
                 strategicIndicator.setName(thisSI.getName());
                 strategicIndicatorsMap.put(target.getID(), strategicIndicator);
+                strategicIndicator.setValue(target.getValue());
             }
-            strategicIndicator.setValue(target.getValue());
             try {
                 Float value = Float.parseFloat(strategicIndicator.getValue());
                 String label = strategicIndicatorsController.getLabel(value);
diff --git a/src/main/java/com/upc/gessi/qrapids/app/domain/adapters/QMA/QMASimulation.java b/src/main/java/com/upc/gessi/qrapids/app/domain/adapters/QMA/QMASimulation.java
index b7fda2c4..c4ddd157 100644
--- a/src/main/java/com/upc/gessi/qrapids/app/domain/adapters/QMA/QMASimulation.java
+++ b/src/main/java/com/upc/gessi/qrapids/app/domain/adapters/QMA/QMASimulation.java
@@ -37,7 +37,7 @@ public List<DTOFactorEvaluation> simulateQualityFactors (Map<String, Float> metr
         }
         Collection<FactorEvaluationDTO> factors = model.simulate();
         List<FactorEvaluationDTO> factorsList = new ArrayList<>(factors);
-        return qmaDetailedStrategicIndicators.FactorEvaluationDTOListToDTOFactorList(factorsList, prjRep.findByExternalId(prj).getId(), profile,true);
+        return qmaDetailedStrategicIndicators.FactorEvaluationDTOListToDTOFactorList(null, factorsList, prjRep.findByExternalId(prj).getId(), profile,true);
     }
 
 }
diff --git a/src/main/java/com/upc/gessi/qrapids/app/domain/controllers/FactorsController.java b/src/main/java/com/upc/gessi/qrapids/app/domain/controllers/FactorsController.java
index 655c9df4..39f12ab8 100644
--- a/src/main/java/com/upc/gessi/qrapids/app/domain/controllers/FactorsController.java
+++ b/src/main/java/com/upc/gessi/qrapids/app/domain/controllers/FactorsController.java
@@ -333,8 +333,11 @@ private boolean assessDateProjectQualityFactors(String project, LocalDate evalua
             evaluationDate = new Date().toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
             metricList = metricsController.getAllMetricsCurrentEvaluation(project, null);
         }
-        else
+        else {
             metricList = metricsController.getAllMetricsHistoricalEvaluation(project, null, evaluationDate, evaluationDate);
+            // when there is no historic metrics values for specified day --> take the last assessment
+            if (metricList.size() == 0) metricList = metricsController.getAllMetricsCurrentEvaluation(project, null);
+        }
         metricEvaluationQma.setMetrics(metricList);
 
         // CHECK METRICS ALERTS
diff --git a/src/main/java/com/upc/gessi/qrapids/app/domain/controllers/MetricsController.java b/src/main/java/com/upc/gessi/qrapids/app/domain/controllers/MetricsController.java
index ab4f083e..5dbab701 100644
--- a/src/main/java/com/upc/gessi/qrapids/app/domain/controllers/MetricsController.java
+++ b/src/main/java/com/upc/gessi/qrapids/app/domain/controllers/MetricsController.java
@@ -10,6 +10,8 @@
 import com.upc.gessi.qrapids.app.presentation.rest.dto.DTOMetricEvaluation;
 import com.upc.gessi.qrapids.app.domain.exceptions.CategoriesException;
 import org.elasticsearch.ElasticsearchStatusException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -68,11 +70,16 @@ public List<Metric> getMetricsByProject (String prj) throws ProjectNotFoundExcep
         return metricRepository.findByProject_IdOrderByName(project.getId());
     }
 
-    public void importMetricsAndUpdateDatabase() throws IOException, CategoriesException, ProjectNotFoundException {
+    public void importMetricsAndUpdateDatabase() throws IOException, CategoriesException {
         List<String> projects = projectController.getAllProjectsExternalID();
         for (String prj : projects) {
             List<DTOMetricEvaluation> metrics = getAllMetricsCurrentEvaluation(prj, null);
-            updateDataBaseWithNewMetrics(prj,metrics);
+            try {
+                updateDataBaseWithNewMetrics(prj, metrics);
+            } catch (ProjectNotFoundException e) {
+                Logger logger = LoggerFactory.getLogger(MetricsController.class);
+                logger.error(e.getMessage(), e);
+            }
         }
     }
 
diff --git a/src/main/java/com/upc/gessi/qrapids/app/domain/controllers/ProfilesController.java b/src/main/java/com/upc/gessi/qrapids/app/domain/controllers/ProfilesController.java
index 86ebee9f..e7b9ffae 100644
--- a/src/main/java/com/upc/gessi/qrapids/app/domain/controllers/ProfilesController.java
+++ b/src/main/java/com/upc/gessi/qrapids/app/domain/controllers/ProfilesController.java
@@ -39,8 +39,8 @@ public boolean checkNewProfileByName(String name) throws ProfileNotFoundExceptio
         return (pr == null);
     }
 
-    public void newProfile(String name, String description, Profile.QualityLevel qualityLevel, Profile.DetailedViews dsiView, Profile.DetailedViews dqfView, Profile.QualityModelView qmView, Map<String, Pair<Boolean, List<String>>> projectInfo) {
-        Profile profile = new Profile(name, description, qualityLevel, dsiView, dqfView, qmView);
+    public void newProfile(String name, String description, Profile.QualityLevel qualityLevel, Profile.DetailedViews dsiView, Profile.DetailedViews dqfView, Profile.MetricsView mView, Profile.QualityModelView qmView, Map<String, Pair<Boolean, List<String>>> projectInfo) {
+        Profile profile = new Profile(name, description, qualityLevel, dsiView, dqfView, mView, qmView);
         List<ProfileProjects> ppList = new ArrayList<>(); // prepare list of profile projects
         List<ProfileProjectStrategicIndicators> ppsiList = new ArrayList<>();
         for ( Map.Entry<String, org.springframework.data.util.Pair<Boolean, List<String>>> project : projectInfo.entrySet()) {
@@ -83,7 +83,7 @@ public int compare(DTOProject o1, DTOProject o2) {
                     }
                 });
                 return new DTOProfile(profile.getId(), profile.getName(), profile.getDescription(), String.valueOf(profile.getQualityLevel()),
-                        String.valueOf(profile.getDsiView()), String.valueOf(profile.getDqfView()), String.valueOf(profile.getQmView()), relatedProjects, relatedAllSIs);
+                        String.valueOf(profile.getDsiView()), String.valueOf(profile.getDqfView()),String.valueOf(profile.getmView()), String.valueOf(profile.getQmView()), relatedProjects, relatedAllSIs);
             }
         }
         return null;
@@ -111,7 +111,7 @@ public int compare(DTOProject o1, DTOProject o2) {
                 }
             });
             DTOProfile profile = new DTOProfile(pr.getId(), pr.getName(), pr.getDescription(), String.valueOf(pr.getQualityLevel()),
-                    String.valueOf(pr.getDsiView()), String.valueOf(pr.getDqfView()), String.valueOf(pr.getQmView()), relatedProjects, relatedAllSIs);
+                    String.valueOf(pr.getDsiView()), String.valueOf(pr.getDqfView()), String.valueOf(pr.getmView()), String.valueOf(pr.getQmView()), relatedProjects, relatedAllSIs);
             profiles.add(profile);
         }
         Collections.sort(profiles, new Comparator<DTOProfile>() {
@@ -130,7 +130,7 @@ public boolean checkProfileByName(Long id, String name) throws ProfileNotFoundEx
         return (pr == null || pr.getId() == id);
     }
 
-    public void updateProfile(Long id, String name, String description, Profile.QualityLevel qualityLevel, Profile.DetailedViews dsiView, Profile.DetailedViews dqfView, Profile.QualityModelView qmView, Map<String, Pair<Boolean, List<String>>> projectInfo) throws ProfileProjectsNotFoundException {
+    public void updateProfile(Long id, String name, String description, Profile.QualityLevel qualityLevel, Profile.DetailedViews dsiView, Profile.DetailedViews dqfView, Profile.MetricsView mView, Profile.QualityModelView qmView, Map<String, Pair<Boolean, List<String>>> projectInfo) throws ProfileProjectsNotFoundException {
         Optional<Profile> profileOptional = profileRep.findById(id);
         Profile profile = profileOptional.get();
         // update profile information
@@ -139,6 +139,7 @@ public void updateProfile(Long id, String name, String description, Profile.Qual
         profile.setQualityLevel(qualityLevel);
         profile.setDsiView(dsiView);
         profile.setDqfView(dqfView);
+        profile.setmView(mView);
         profile.setQmView(qmView);
         // delete old ProfileProjects List
         List<ProfileProjects> oldProfileProjectsList = profile.getProfileProjectsList();
diff --git a/src/main/java/com/upc/gessi/qrapids/app/domain/controllers/StrategicIndicatorsController.java b/src/main/java/com/upc/gessi/qrapids/app/domain/controllers/StrategicIndicatorsController.java
index 646c1492..ded0b342 100644
--- a/src/main/java/com/upc/gessi/qrapids/app/domain/controllers/StrategicIndicatorsController.java
+++ b/src/main/java/com/upc/gessi/qrapids/app/domain/controllers/StrategicIndicatorsController.java
@@ -360,8 +360,11 @@ private boolean assessDateProjectStrategicIndicators(String project, LocalDate e
             evaluationDate = new Date().toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
             factorList = factorsController.getAllFactorsEvaluation(project, null,false);
         }
-        else
-            factorList = factorsController.getAllFactorsHistoricalEvaluation(project, null,evaluationDate, evaluationDate);
+        else {
+            factorList = factorsController.getAllFactorsHistoricalEvaluation(project, null, evaluationDate, evaluationDate);
+            // when there is no historic factors values for specified day --> take the last assessment
+            if (factorList.size() == 0) factorList = factorsController.getAllFactorsEvaluation(project, null,false);
+        }
         factorEvaluationQma.setFactors(factorList);
         return assessProjectStrategicIndicators(evaluationDate, project, factorEvaluationQma);
     }
@@ -677,15 +680,16 @@ public Float getValueFromLabel (String label) {
     }
 
     public void fetchStrategicIndicators () throws IOException, CategoriesException, ProjectNotFoundException, QualityFactorNotFoundException, StrategicIndicatorQualityFactorNotFoundException, StrategicIndicatorNotFoundException {
-        List<String> projects = projectsController.importProjectsAndUpdateDatabase();
+        List<String> projects = projectsController.getAllProjectsExternalID();
         for(String projectExternalId : projects) {
             List<DTODetailedStrategicIndicatorEvaluation> dtoDetailedStrategicIndicators = new ArrayList<>();
+            Project project = new Project();
             try {
                 dtoDetailedStrategicIndicators = getAllDetailedStrategicIndicatorsCurrentEvaluation(projectExternalId, null, false);
+                project = projectsController.findProjectByExternalId(projectExternalId);
             } catch (Exception e) {
                 logger.error(e.getMessage(), e);
             }
-            Project project = projectsController.findProjectByExternalId(projectExternalId);
             for (DTODetailedStrategicIndicatorEvaluation dtoDetailedStrategicIndicator : dtoDetailedStrategicIndicators) {
                 List<String> factors = new ArrayList<>();
                 for (DTOFactorEvaluation f : dtoDetailedStrategicIndicator.getFactors()) {
@@ -696,7 +700,10 @@ public void fetchStrategicIndicators () throws IOException, CategoriesException,
                 // check if si is in data base and update it
                 Strategic_Indicator strategicIndicator = strategicIndicatorRepository.findByNameAndProject_Id(dtoDetailedStrategicIndicator.getName(),project.getId());
                 if (strategicIndicator != null) {
-                    editStrategicIndicator(strategicIndicator.getId(), strategicIndicator.getName(),strategicIndicator.getDescription(), strategicIndicator.getThreshold().toString(), null, factors);
+                    if (strategicIndicator.getThreshold() != null)
+                        editStrategicIndicator(strategicIndicator.getId(), strategicIndicator.getName(),strategicIndicator.getDescription(), strategicIndicator.getThreshold().toString(), null, factors);
+                    else
+                        editStrategicIndicator(strategicIndicator.getId(), strategicIndicator.getName(),strategicIndicator.getDescription(), "", null, factors);
                 } else { // save it if it's new
                     saveStrategicIndicator(dtoDetailedStrategicIndicator.getName(), "", "" , null, factors, project);
                 }
diff --git a/src/main/java/com/upc/gessi/qrapids/app/domain/models/Profile.java b/src/main/java/com/upc/gessi/qrapids/app/domain/models/Profile.java
index 101ee392..7cf02439 100644
--- a/src/main/java/com/upc/gessi/qrapids/app/domain/models/Profile.java
+++ b/src/main/java/com/upc/gessi/qrapids/app/domain/models/Profile.java
@@ -37,6 +37,14 @@ public enum DetailedViews {
         Radar, Stacked, Polar
     }
 
+    @Enumerated(EnumType.STRING)
+    @ColumnDefault("'Gauge'")
+    private MetricsView mView = MetricsView.Gauge;
+
+    public enum MetricsView {
+        Gauge, Slider
+    }
+
     @Enumerated(EnumType.STRING)
     @ColumnDefault("'Graph'")
     private QualityModelView qmView = QualityModelView.Graph;
@@ -61,12 +69,13 @@ public Profile(String name, String description, QualityLevel qualityLevel) {
         this.qualityLevel = qualityLevel;
     }
 
-    public Profile(String name, String description, QualityLevel qualityLevel, DetailedViews dsiview, DetailedViews dqfview, QualityModelView qmview) {
+    public Profile(String name, String description, QualityLevel qualityLevel, DetailedViews dsiview, DetailedViews dqfview, MetricsView mview, QualityModelView qmview) {
         this.name = name;
         this.description = description;
         this.qualityLevel = qualityLevel;
         this.dsiView = dsiview;
         this.dqfView = dqfview;
+        this.mView = mview;
         this.qmView = qmview;
     }
 
@@ -118,6 +127,14 @@ public void setDqfView(DetailedViews dqfView) {
         this.dqfView = dqfView;
     }
 
+    public MetricsView getmView() {
+        return mView;
+    }
+
+    public void setmView(MetricsView mView) {
+        this.mView = mView;
+    }
+
     public QualityModelView getQmView() {
         return qmView;
     }
diff --git a/src/main/java/com/upc/gessi/qrapids/app/domain/models/Strategic_Indicator.java b/src/main/java/com/upc/gessi/qrapids/app/domain/models/Strategic_Indicator.java
index 15b0febe..97639a5f 100644
--- a/src/main/java/com/upc/gessi/qrapids/app/domain/models/Strategic_Indicator.java
+++ b/src/main/java/com/upc/gessi/qrapids/app/domain/models/Strategic_Indicator.java
@@ -10,7 +10,7 @@
     'strategic_indicator_quality_factors name for the table in the database, the table storing the quality_factors list
  */
 
-//TODO: refactor to have the name of the table 'strategic_indicator_quality_factor' independent to the this class name
+//ToDo: refactor to have the name of the table 'strategic_indicator_quality_factor' independent to the this class name
 
 @Entity
 @Table(name="strategic_indicator",
diff --git a/src/main/java/com/upc/gessi/qrapids/app/presentation/rest/dto/DTOProfile.java b/src/main/java/com/upc/gessi/qrapids/app/presentation/rest/dto/DTOProfile.java
index 0fe086f6..8980183d 100644
--- a/src/main/java/com/upc/gessi/qrapids/app/presentation/rest/dto/DTOProfile.java
+++ b/src/main/java/com/upc/gessi/qrapids/app/presentation/rest/dto/DTOProfile.java
@@ -11,19 +11,21 @@ public class DTOProfile {
     private String qualityLevel;
     private String dsiView;
     private String dqfView;
+    private String mView;
     private String qmView;
     private List<DTOProject> projects;
     private List<Pair<Long, Boolean>> allSIs;
 
 
     public DTOProfile(Long id, String name, String description, String qualityLevel, String dsiview, String dqfview,
-                      String qmview, List<DTOProject> projects, List<Pair<Long, Boolean>> allSIs) {
+                      String mview,String qmview, List<DTOProject> projects, List<Pair<Long, Boolean>> allSIs) {
         this.id = id;
         this.name = name;
         this.description = description;
         this.qualityLevel = qualityLevel;
         this.dsiView = dsiview;
         this.dqfView = dqfview;
+        this.mView = mview;
         this.qmView = qmview;
         this.projects = projects;
         this.allSIs = allSIs;
@@ -77,6 +79,14 @@ public void setDqfView(String dqfView) {
         this.dqfView = dqfView;
     }
 
+    public String getmView() {
+        return mView;
+    }
+
+    public void setmView(String mView) {
+        this.mView = mView;
+    }
+
     public String getQmView() {
         return qmView;
     }
diff --git a/src/main/java/com/upc/gessi/qrapids/app/presentation/rest/services/Metrics.java b/src/main/java/com/upc/gessi/qrapids/app/presentation/rest/services/Metrics.java
index fa1954b8..e9a93267 100644
--- a/src/main/java/com/upc/gessi/qrapids/app/presentation/rest/services/Metrics.java
+++ b/src/main/java/com/upc/gessi/qrapids/app/presentation/rest/services/Metrics.java
@@ -38,7 +38,7 @@ public class Metrics {
     public void importMetrics() {
         try {
             metricsController.importMetricsAndUpdateDatabase();
-        } catch (CategoriesException | ProjectNotFoundException e) {
+        } catch (CategoriesException e) {
             logger.error(e.getMessage(), e);
             throw new ResponseStatusException(HttpStatus.CONFLICT, Messages.CATEGORIES_DO_NOT_MATCH);
         } catch (IOException e) {
diff --git a/src/main/java/com/upc/gessi/qrapids/app/presentation/rest/services/Profiles.java b/src/main/java/com/upc/gessi/qrapids/app/presentation/rest/services/Profiles.java
index 4ffcf9fb..1ed9aa44 100644
--- a/src/main/java/com/upc/gessi/qrapids/app/presentation/rest/services/Profiles.java
+++ b/src/main/java/com/upc/gessi/qrapids/app/presentation/rest/services/Profiles.java
@@ -39,6 +39,7 @@ public void newProfile(HttpServletRequest request, HttpServletResponse response)
             Profile.QualityLevel qualityLevel = Profile.QualityLevel.valueOf(request.getParameter("quality_level"));
             Profile.DetailedViews dsiView = Profile.DetailedViews.valueOf(request.getParameter("dsi_view"));
             Profile.DetailedViews dqfView = Profile.DetailedViews.valueOf(request.getParameter("dqf_view"));
+            Profile.MetricsView mView = Profile.MetricsView.valueOf(request.getParameter("m_view"));
             Profile.QualityModelView qmView = Profile.QualityModelView.valueOf(request.getParameter("qm_view"));
             JsonParser parser = new JsonParser();
             JsonArray projectsInfoJsonArray = parser.parse(request.getParameter("projects_info")).getAsJsonArray();
@@ -56,7 +57,7 @@ public void newProfile(HttpServletRequest request, HttpServletResponse response)
                 projectsInfoMap.put(projectID, Pair.of(allSI,si));
             }
             if (profileCont.checkNewProfileByName(name)) {
-                profileCont.newProfile(name, description, qualityLevel, dsiView, dqfView, qmView, projectsInfoMap);
+                profileCont.newProfile(name, description, qualityLevel, dsiView, dqfView, mView, qmView, projectsInfoMap);
             } else {
                 throw new ElementAlreadyPresentException();
             }
@@ -106,6 +107,7 @@ public void updateProfile(@PathVariable Long id, HttpServletRequest request) {
             Profile.QualityLevel qualityLevel = Profile.QualityLevel.valueOf(request.getParameter("quality_level"));
             Profile.DetailedViews dsiView = Profile.DetailedViews.valueOf(request.getParameter("dsi_view"));
             Profile.DetailedViews dqfView = Profile.DetailedViews.valueOf(request.getParameter("dqf_view"));
+            Profile.MetricsView mView = Profile.MetricsView.valueOf(request.getParameter("m_view"));
             Profile.QualityModelView qmView = Profile.QualityModelView.valueOf(request.getParameter("qm_view"));
             JsonParser parser = new JsonParser();
             JsonArray projectsInfoJsonArray = parser.parse(request.getParameter("projects_info")).getAsJsonArray();
@@ -123,7 +125,7 @@ public void updateProfile(@PathVariable Long id, HttpServletRequest request) {
                 projectsInfoMap.put(projectID, Pair.of(allSI, si));
             }
             if (profileCont.checkProfileByName(id, name)) {
-                profileCont.updateProfile(id, name, description, qualityLevel, dsiView, dqfView, qmView, projectsInfoMap);
+                profileCont.updateProfile(id, name, description, qualityLevel, dsiView, dqfView, mView, qmView, projectsInfoMap);
             } else {
                 throw new ElementAlreadyPresentException();
             }
diff --git a/src/main/java/com/upc/gessi/qrapids/app/presentation/rest/services/helpers/Messages.java b/src/main/java/com/upc/gessi/qrapids/app/presentation/rest/services/helpers/Messages.java
index 458d334f..8686fc2b 100644
--- a/src/main/java/com/upc/gessi/qrapids/app/presentation/rest/services/helpers/Messages.java
+++ b/src/main/java/com/upc/gessi/qrapids/app/presentation/rest/services/helpers/Messages.java
@@ -9,5 +9,6 @@ public class Messages {
     public static final String CATEGORIES_DO_NOT_MATCH = "The categories do not match";
     public static final String ASSESSMENT_ERROR = "Assessment error";
     public static final String STRATEGIC_INDICATOR_NOT_FOUND = "Strategic indicator not found";
+    public static final String FACTOR_NOT_FOUND = "Factor not found";
     public static final String FACTOR_DELETE_FORBIDDEN = "This factor can't be deleted, it's involved in Strategic Indicators computation";
 }
diff --git a/src/main/java/com/upc/gessi/qrapids/app/presentation/web/mapping/MetricsController.java b/src/main/java/com/upc/gessi/qrapids/app/presentation/web/mapping/MetricsController.java
index be4bc0f2..c6c81b74 100644
--- a/src/main/java/com/upc/gessi/qrapids/app/presentation/web/mapping/MetricsController.java
+++ b/src/main/java/com/upc/gessi/qrapids/app/presentation/web/mapping/MetricsController.java
@@ -10,6 +10,16 @@ public String CurrentChart(){
         return "Metrics/CurrentChart";
     }
 
+    @RequestMapping("/Metrics/CurrentChartGauge")
+    public String CurrentChartGauge(){
+        return "Metrics/CurrentChart";
+    }
+
+    @RequestMapping("/Metrics/CurrentChartSlider")
+    public String CurrentSlider(){
+        return "Metrics/CurrentSlider";
+    }
+
     @RequestMapping("/Metrics/CurrentTable")
     public String CurrentTable(){
         return "Metrics/CurrentTable";
diff --git a/src/main/resources/static/css/bootstrap-slider.min.css b/src/main/resources/static/css/bootstrap-slider.min.css
index 7fb2c9b2..935b240d 100644
--- a/src/main/resources/static/css/bootstrap-slider.min.css
+++ b/src/main/resources/static/css/bootstrap-slider.min.css
@@ -38,4 +38,4 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  * OTHER DEALINGS IN THE SOFTWARE.
  *
- * ========================================================= */.slider{display:inline-block;vertical-align:middle;position:relative}.slider.slider-horizontal{width:210px;height:20px}.slider.slider-horizontal .slider-track{height:10px;width:100%;margin-top:-5px;top:50%;left:0}.slider.slider-horizontal .slider-selection,.slider.slider-horizontal .slider-track-low,.slider.slider-horizontal .slider-track-high{height:100%;top:0;bottom:0}.slider.slider-horizontal .slider-tick,.slider.slider-horizontal .slider-handle{margin-left:-10px}.slider.slider-horizontal .slider-tick.triangle,.slider.slider-horizontal .slider-handle.triangle{position:relative;top:50%;-ms-transform:translateY(-50%);transform:translateY(-50%);border-width:0 10px 10px 10px;width:0;height:0;border-bottom-color:#2e6da4;margin-top:0}.slider.slider-horizontal .slider-tick-container{white-space:nowrap;position:absolute;top:0;left:0;width:100%}.slider.slider-horizontal .slider-tick-label-container{white-space:nowrap;margin-top:20px}.slider.slider-horizontal .slider-tick-label-container .slider-tick-label{padding-top:4px;display:inline-block;text-align:center}.slider.slider-horizontal .tooltip{-ms-transform:translateX(-50%);transform:translateX(-50%)}.slider.slider-horizontal.slider-rtl .slider-track{left:initial;right:0}.slider.slider-horizontal.slider-rtl .slider-tick,.slider.slider-horizontal.slider-rtl .slider-handle{margin-left:initial;margin-right:-10px}.slider.slider-horizontal.slider-rtl .slider-tick-container{left:initial;right:0}.slider.slider-horizontal.slider-rtl .tooltip{-ms-transform:translateX(50%);transform:translateX(50%)}.slider.slider-vertical{height:210px;width:20px}.slider.slider-vertical .slider-track{width:10px;height:100%;left:25%;top:0}.slider.slider-vertical .slider-selection{width:100%;left:0;top:0;bottom:0}.slider.slider-vertical .slider-track-low,.slider.slider-vertical .slider-track-high{width:100%;left:0;right:0}.slider.slider-vertical .slider-tick,.slider.slider-vertical .slider-handle{margin-top:-10px}.slider.slider-vertical .slider-tick.triangle,.slider.slider-vertical .slider-handle.triangle{border-width:10px 0 10px 10px;width:1px;height:1px;border-left-color:#2e6da4;border-right-color:#2e6da4;margin-left:0;margin-right:0}.slider.slider-vertical .slider-tick-label-container{white-space:nowrap}.slider.slider-vertical .slider-tick-label-container .slider-tick-label{padding-left:4px}.slider.slider-vertical .tooltip{-ms-transform:translateY(-50%);transform:translateY(-50%)}.slider.slider-vertical.slider-rtl .slider-track{left:initial;right:25%}.slider.slider-vertical.slider-rtl .slider-selection{left:initial;right:0}.slider.slider-vertical.slider-rtl .slider-tick.triangle,.slider.slider-vertical.slider-rtl .slider-handle.triangle{border-width:10px 10px 10px 0}.slider.slider-vertical.slider-rtl .slider-tick-label-container .slider-tick-label{padding-left:initial;padding-right:4px}.slider.slider-disabled .slider-handle{background-image:-webkit-linear-gradient(top,#dfdfdf 0,#bebebe 100%);background-image:-o-linear-gradient(top,#dfdfdf 0,#bebebe 100%);background-image:linear-gradient(to bottom,#dfdfdf 0,#bebebe 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdfdfdf',endColorstr='#ffbebebe',GradientType=0)}.slider.slider-disabled .slider-track{background-image:-webkit-linear-gradient(top,#e5e5e5 0,#e9e9e9 100%);background-image:-o-linear-gradient(top,#e5e5e5 0,#e9e9e9 100%);background-image:linear-gradient(to bottom,#e5e5e5 0,#e9e9e9 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe5e5e5',endColorstr='#ffe9e9e9',GradientType=0);cursor:not-allowed}.slider input{display:none}.slider .tooltip{pointer-events:none}.slider .tooltip.top{margin-top:-36px}.slider .tooltip-inner{white-space:nowrap;max-width:none}.slider .hide{display:none}.slider-track{position:absolute;cursor:pointer;background-image:-webkit-linear-gradient(top,#f5f5f5 0,#f9f9f9 100%);background-image:-o-linear-gradient(top,#f5f5f5 0,#f9f9f9 100%);background-image:linear-gradient(to bottom,#f5f5f5 0,#f9f9f9 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5',endColorstr='#fff9f9f9',GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);border-radius:4px}.slider-selection{position:absolute;background-image:-webkit-linear-gradient(top,#f9f9f9 0,#f5f5f5 100%);background-image:-o-linear-gradient(top,#f9f9f9 0,#f5f5f5 100%);background-image:linear-gradient(to bottom,#f9f9f9 0,#f5f5f5 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff9f9f9',endColorstr='#fff5f5f5',GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;border-radius:4px}.slider-selection.tick-slider-selection{background-image:-webkit-linear-gradient(top,#8ac1ef 0,#82b3de 100%);background-image:-o-linear-gradient(top,#8ac1ef 0,#82b3de 100%);background-image:linear-gradient(to bottom,#8ac1ef 0,#82b3de 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff8ac1ef',endColorstr='#ff82b3de',GradientType=0)}.slider-track-low,.slider-track-high{position:absolute;background:transparent;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;border-radius:4px}.slider-handle{position:absolute;top:0;width:20px;height:20px;background-color:#337ab7;background-image:-webkit-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:-o-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:linear-gradient(to bottom,#337ab7 0,#2e6da4 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7',endColorstr='#ff2e6da4',GradientType=0);filter:none;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 2px rgba(0,0,0,.05);border:0 solid transparent}.slider-handle:hover{cursor:pointer}.slider-handle.round{border-radius:50%}.slider-handle.triangle{background:transparent none}.slider-handle.custom{background:transparent none}.slider-handle.custom::before{line-height:20px;font-size:20px;content:'\2605';color:#726204}.slider-tick{position:absolute;cursor:pointer;width:20px;height:20px;background-image:-webkit-linear-gradient(top,#f9f9f9 0,#f5f5f5 100%);background-image:-o-linear-gradient(top,#f9f9f9 0,#f5f5f5 100%);background-image:linear-gradient(to bottom,#f9f9f9 0,#f5f5f5 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff9f9f9',endColorstr='#fff5f5f5',GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;filter:none;opacity:.8;border:0 solid transparent}.slider-tick.round{border-radius:50%}.slider-tick.triangle{background:transparent none}.slider-tick.custom{background:transparent none}.slider-tick.custom::before{line-height:20px;font-size:20px;content:'\2605';color:#726204}.slider-tick.in-selection{background-image:-webkit-linear-gradient(top,#8ac1ef 0,#82b3de 100%);background-image:-o-linear-gradient(top,#8ac1ef 0,#82b3de 100%);background-image:linear-gradient(to bottom,#8ac1ef 0,#82b3de 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff8ac1ef',endColorstr='#ff82b3de',GradientType=0);opacity:1
\ No newline at end of file
+ * ========================================================= */.slider{display:inline-block;vertical-align:middle;position:relative}.slider.slider-horizontal{width:210px;height:20px}.slider.slider-horizontal .slider-track{height:10px;width:100%;margin-top:-5px;top:50%;left:0}.slider.slider-horizontal .slider-selection,.slider.slider-horizontal .slider-track-low,.slider.slider-horizontal .slider-track-high{height:100%;top:0;bottom:0}.slider.slider-horizontal .slider-tick,.slider.slider-horizontal .slider-handle{margin-left:-10px}.slider.slider-horizontal .slider-tick.triangle,.slider.slider-horizontal .slider-handle.triangle{position:relative;top:50%;-ms-transform:translateY(-50%);transform:translateY(-50%);border-width:0 10px 10px 10px;width:0;height:0;border-bottom-color:#0f0f0f;margin-top:0}.slider.slider-horizontal .slider-tick-container{white-space:nowrap;position:absolute;top:0;left:0;width:100%;display: none;}.slider.slider-horizontal .slider-tick-label-container{white-space:nowrap;margin-top:20px}.slider.slider-horizontal .slider-tick-label-container .slider-tick-label{padding-top:4px;display:inline-block;text-align:center}.slider.slider-horizontal .tooltip{-ms-transform:translateX(-50%);transform:translateX(-50%)}.slider.slider-horizontal.slider-rtl .slider-track{left:initial;right:0}.slider.slider-horizontal.slider-rtl .slider-tick,.slider.slider-horizontal.slider-rtl .slider-handle{margin-left:initial;margin-right:-10px}.slider.slider-horizontal.slider-rtl .slider-tick-container{left:initial;right:0;display: none;}.slider.slider-horizontal.slider-rtl .tooltip{-ms-transform:translateX(50%);transform:translateX(50%)}.slider.slider-vertical{height:210px;width:20px}.slider.slider-vertical .slider-track{width:10px;height:100%;left:25%;top:0}.slider.slider-vertical .slider-selection{width:100%;left:0;top:0;bottom:0}.slider.slider-vertical .slider-track-low,.slider.slider-vertical .slider-track-high{width:100%;left:0;right:0}.slider.slider-vertical .slider-tick,.slider.slider-vertical .slider-handle{margin-top:-10px}.slider.slider-vertical .slider-tick.triangle,.slider.slider-vertical .slider-handle.triangle{border-width:10px 0 10px 10px;width:1px;height:1px;border-left-color:#2e6da4;border-right-color:#2e6da4;margin-left:0;margin-right:0}.slider.slider-vertical .slider-tick-label-container{white-space:nowrap}.slider.slider-vertical .slider-tick-label-container .slider-tick-label{padding-left:4px}.slider.slider-vertical .tooltip{-ms-transform:translateY(-50%);transform:translateY(-50%)}.slider.slider-vertical.slider-rtl .slider-track{left:initial;right:25%}.slider.slider-vertical.slider-rtl .slider-selection{left:initial;right:0}.slider.slider-vertical.slider-rtl .slider-tick.triangle,.slider.slider-vertical.slider-rtl .slider-handle.triangle{border-width:10px 10px 10px 0}.slider.slider-vertical.slider-rtl .slider-tick-label-container .slider-tick-label{padding-left:initial;padding-right:4px}.slider.slider-disabled .slider-handle{background-image:-webkit-linear-gradient(top,#dfdfdf 0,#bebebe 100%);background-image:-o-linear-gradient(top,#dfdfdf 0,#bebebe 100%);background-image:linear-gradient(to bottom,#dfdfdf 0,#bebebe 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdfdfdf',endColorstr='#ffbebebe',GradientType=0)}.slider.slider-disabled .slider-track{background-image:-webkit-linear-gradient(top,#e5e5e5 0,#e9e9e9 100%);background-image:-o-linear-gradient(top,#e5e5e5 0,#e9e9e9 100%);background-image:linear-gradient(to bottom,#e5e5e5 0,#e9e9e9 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe5e5e5',endColorstr='#ffe9e9e9',GradientType=0);cursor:not-allowed}.slider input{display:none}.slider .tooltip{pointer-events:none}.slider .tooltip.top{margin-top:-36px}.slider .tooltip-inner{white-space:nowrap;max-width:none}.slider .hide{display:none}.slider-track{position:absolute;cursor:pointer;background-image:-webkit-linear-gradient(top,#f5f5f5 0,#f9f9f9 100%);background-image:-o-linear-gradient(top,#f5f5f5 0,#f9f9f9 100%);background-image:linear-gradient(to bottom,#f5f5f5 0,#f9f9f9 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5',endColorstr='#fff9f9f9',GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);border-radius:4px}.slider-selection{position:absolute;background-image:-webkit-linear-gradient(top,#f9f9f9 0,#f5f5f5 100%);background-image:-o-linear-gradient(top,#f9f9f9 0,#f5f5f5 100%);background-image:linear-gradient(to bottom,#f9f9f9 0,#f5f5f5 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff9f9f9',endColorstr='#fff5f5f5',GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;border-radius:4px}.slider-selection.tick-slider-selection{background-image:-webkit-linear-gradient(top,#8ac1ef 0,#82b3de 100%);background-image:-o-linear-gradient(top,#8ac1ef 0,#82b3de 100%);background-image:linear-gradient(to bottom,#8ac1ef 0,#82b3de 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff8ac1ef',endColorstr='#ff82b3de',GradientType=0)}.slider-track-low,.slider-track-high{position:absolute;background:transparent;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;border-radius:4px}.slider-handle{position:absolute;top:0;width:20px;height:20px;background-color:#337ab7;background-image:-webkit-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:-o-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:linear-gradient(to bottom,#337ab7 0,#2e6da4 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7',endColorstr='#ff2e6da4',GradientType=0);filter:none;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 2px rgba(0,0,0,.05);border:0 solid transparent}.slider-handle:hover{cursor:pointer}.slider-handle.round{border-radius:50%}.slider-handle.triangle{background:transparent none}.slider-handle.custom{background:transparent none}.slider-handle.custom::before{line-height:20px;font-size:20px;content:'\2605';color:#726204}.slider-tick{position:absolute;cursor:pointer;width:20px;height:20px;background-image:-webkit-linear-gradient(top,#f9f9f9 0,#f5f5f5 100%);background-image:-o-linear-gradient(top,#f9f9f9 0,#f5f5f5 100%);background-image:linear-gradient(to bottom,#f9f9f9 0,#f5f5f5 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff9f9f9',endColorstr='#fff5f5f5',GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;filter:none;opacity:.8;border:0 solid transparent}.slider-tick.round{border-radius:50%}.slider-tick.triangle{background:transparent none}.slider-tick.custom{background:transparent none}.slider-tick.custom::before{line-height:20px;font-size:20px;content:'\2605';color:#726204}.slider-tick.in-selection{background-image:-webkit-linear-gradient(top,#8ac1ef 0,#82b3de 100%);background-image:-o-linear-gradient(top,#8ac1ef 0,#82b3de 100%);background-image:linear-gradient(to bottom,#8ac1ef 0,#82b3de 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff8ac1ef',endColorstr='#ff82b3de',GradientType=0);opacity:1
\ No newline at end of file
diff --git a/src/main/resources/static/icons/gauge_chart.png b/src/main/resources/static/icons/gauge_chart.png
new file mode 100644
index 00000000..156899e5
Binary files /dev/null and b/src/main/resources/static/icons/gauge_chart.png differ
diff --git a/src/main/resources/static/icons/slider_chart.png b/src/main/resources/static/icons/slider_chart.png
new file mode 100644
index 00000000..11ceb628
Binary files /dev/null and b/src/main/resources/static/icons/slider_chart.png differ
diff --git a/src/main/resources/static/js/configQF.js b/src/main/resources/static/js/configQF.js
index 1b5a3385..7a6edf48 100644
--- a/src/main/resources/static/js/configQF.js
+++ b/src/main/resources/static/js/configQF.js
@@ -66,6 +66,7 @@ function clickOnTree(e){
             $("#QFThreshold").attr("placeholder", "Specify minimum acceptable value for the quality factor here");
             $("#QFThreshold").val(qf.threshold);
             $("#QFCompositionTitle").text("Quality Factor Composition");
+            $("#QFCompositionWarning").text("Warning: Changing the composition of Quality Factor will affect its historical data interpretation."); // add warning
             $("#deleteQF").show();
             if (metrics.length > 0) {
                 showMetrics();
@@ -105,6 +106,7 @@ function newQF() {
     $("#QFThreshold").attr("placeholder", "Specify minimum acceptable value for the quality factor here");
     $("#QFThreshold").val("");
     $("#QFCompositionTitle").text("Step 2 - Select the corresponding metrics");
+    $("#QFCompositionWarning").text(""); // clean warning
     $("#deleteQF").hide();
     if (metrics.length > 0)
         showMetrics();
diff --git a/src/main/resources/static/js/configSI.js b/src/main/resources/static/js/configSI.js
index c368feaa..79e54a7d 100644
--- a/src/main/resources/static/js/configSI.js
+++ b/src/main/resources/static/js/configSI.js
@@ -98,6 +98,7 @@ function clickOnTree(e){
                 $("#SINetwork").hide();
             }
             $("#SICompositionTitle").text("Strategic Indicator Composition");
+            $("#SICompositionWarning").text("Warning: Changing the composition of Strategic Indicator will affect its historical data interpretation."); // add warning
             $("#deleteSI").show();
             if (factors.length > 0) {
                 showFactors();
@@ -143,6 +144,7 @@ function newSI() {
         $("#SINetwork").hide();
     }
     $("#SICompositionTitle").text("Step 2 - Select the corresponding factors");
+    $("#SICompositionWarning").text(""); // clean warning
     $("#deleteSI").hide();
     if (factors.length > 0)
         showFactors();
diff --git a/src/main/resources/static/js/gaugeChartMet.js b/src/main/resources/static/js/gaugeChartMet.js
index 045d99e1..77cef0fd 100644
--- a/src/main/resources/static/js/gaugeChartMet.js
+++ b/src/main/resources/static/js/gaugeChartMet.js
@@ -8,6 +8,8 @@ var target;
 var tau = Math.PI / 2;
 var id = false;
 
+var factors;
+
 var url;
 if (getParameterByName('id').length !== 0) {
     id = true;
@@ -21,6 +23,17 @@ var metricsDB = [];
 
 var urlLink;
 
+var groupByFactor = new Boolean(sessionStorage.getItem("groupByFactor"));
+
+
+function clickCheckbox(){
+    var checkbox = document.getElementById("groupByFactorCheckbox");
+    sessionStorage.removeItem("groupByFactor");
+    if (checkbox.checked == true)
+        sessionStorage.setItem("groupByFactor", checkbox.checked.toString());
+    location.href = serverUrl + "/Metrics/CurrentChartGauge";
+}
+
 function getData(width, height) {
     jQuery.ajax({
         dataType: "json",
@@ -38,7 +51,8 @@ function getData(width, height) {
                 async: true,
                 success: function (dataDB) {
                     metricsDB = dataDB;
-                    getMetricsCategories(data, width, height);
+                    getFactors(data, width, height);
+                    //getMetricsCategories(data, width, height);
                 }});
         },
         error: function(jqXHR, textStatus, errorThrown) {
@@ -51,136 +65,214 @@ function getData(width, height) {
     });
 }
 
+function getFactors(data, width, height) {
+    if (id)
+        url = parseURLComposed("../api/qualityFactors/metrics/current");
+    else
+        url = "../api/qualityFactors/metrics/current?profile=" + profileId
+    jQuery.ajax({
+        dataType: "json",
+        url: url,
+        cache: false,
+        type: "GET",
+        async: true,
+        success: function (dataF) {
+            sortMyDataAlphabetically(dataF);
+            factors = dataF;
+            console.log("factors");
+            console.log(factors);
+            getMetricsCategories(data, width, height);
+        }
+    });
+}
+
+function sortMyDataAlphabetically (factors) {
+    function compare (a, b) {
+        if (a.name < b.name) return -1;
+        else if (a.name > b.name) return 1;
+        else return 0;
+    }
+    factors.sort(compare);
+}
+
 function getMetricsCategories (data, width, height) {
     jQuery.ajax({
         url: "../api/metrics/categories",
         type: "GET",
         async: true,
         success: function (categories) {
+            console.log("groupByFactor " + groupByFactor);
             if (id) { // in case we show metrics for one detailed factor
-                drawChart(data[0].metrics, "#gaugeChart", width, height, categories);
+                if (groupByFactor.valueOf() == true)
+                    drawChartByFactor(data[0].metrics, "#gaugeChart", width, height, categories);
+                else drawChart(data[0].metrics, "#gaugeChart", width, height, categories);
             } else { // in case we show all metrics
-                drawChart(data, "#gaugeChart", width, height, categories);
+                if (groupByFactor.valueOf() == true)
+                    drawChartByFactor(data, "#gaugeChart", width, height, categories);
+                else drawChart(data, "#gaugeChart", width, height, categories);
             }
         }
     });
 }
 
 function drawChart(metrics, container, width, height, categories) {
-
     for (i = 0; i < metrics.length; ++i) {
+        drawMetricGauge(0, i, metrics[i], container, width, height, categories);
+    }
+}
 
-        //0 to 1 values to angular values
-        angle = metrics[i].value * 180 + 90;
-        upperThresh = 0.66 * Math.PI - Math.PI / 2;
-        lowThresh = 0.33 * Math.PI - Math.PI / 2;
-
-        var arc = d3.arc()      //create arc starting at -90 degreees
-            .innerRadius(70*width/250)
-            .outerRadius(110*width/250)
-            .startAngle(-tau);
-
-        //make chart a hyperlink
-        var textColor = "#000";
-        urlLink = metricsDB.find(function (element) {
-            return element.externalId === metrics[i].id;
-        }).webUrl;
-        console.log(urlLink);
-        if (urlLink) {
-            //create chart svg with hyperlink
-            var svg = d3.select(container).append("svg")
-                .attr("width", width)
-                .attr("height", height)
-                .attr("class", "chart")
-                .append("a")
-                .attr("xlink:href", function (d) {
-                    return urlLink
-                })
-                .attr("target","_blank")
-                .append("g")
-                .attr("transform",
-                    "translate(" + width / 2 + "," + height / 2 + ")");
-            textColor = "#0177a6";
-        } else {
-            //create chart svg
-            var svg = d3.select(container).append("svg")
-                .attr("width", width)
-                .attr("height", height)
-                .attr("class", "chart")
-                .append("g")
-                .attr("transform",
-                    "translate(" + width / 2 + "," + height / 2 + ")");
+function drawChartByFactor(metrics, container, width, height, categories) {
+    var gaugeChart = $("#gaugeChart");
+    for (j = 0; j < factors.length; j++) {
+        var divF = document.createElement('div');
+        divF.style.marginTop = "1em";
+        divF.style.marginBottom = "1em";
+
+        var labelF = document.createElement('label');
+        labelF.id = factors[j].id;
+        labelF.textContent = factors[j].name;
+        divF.appendChild(labelF);
+
+        gaugeChart.append(divF);
+        for (i = 0; i < factors[j].metrics.length; ++i) {
+            drawMetricGauge(j, i, factors[j].metrics[i], container, width, height, categories);
+        }
+    }
+    // Add metrics without factor
+    var divNOF = document.createElement('div');
+    divNOF.id = "divwithoutfactor";
+    divNOF.style.marginTop = "1em";
+    divNOF.style.marginBottom = "1em";
+
+    var labelNOF = document.createElement('label');
+    labelNOF.id = "withoutfactor";
+    labelNOF.textContent = "Metrics not associated to any factor";
+    divNOF.appendChild(labelNOF);
+
+    metrics.forEach(function (metric) {
+        var msvg = document.getElementById(metric.id);
+        if (!msvg) {
+            if (!document.getElementById("divwithoutfactor"))
+                gaugeChart.append(divNOF);
+            drawMetricGauge(j, i, metric, container, width, height, categories);
         }
+    });
+}
+
+function drawMetricGauge(j, i, metric, container, width, height, categories) {
+    //0 to 1 values to angular values
+    angle = metric.value * 180 + 90;
+    upperThresh = 0.66 * Math.PI - Math.PI / 2;
+    lowThresh = 0.33 * Math.PI - Math.PI / 2;
+
+    var arc = d3.arc()      //create arc starting at -90 degreees
+        .innerRadius(70*width/250)
+        .outerRadius(110*width/250)
+        .startAngle(-tau);
+
+    //make chart a hyperlink
+    var textColor = "#000";
+    var findMet = metricsDB.find(function (element) {
+        return element.externalId === metric.id;
+    });
+    if (findMet) { // if metric not found it will be undefined
+        urlLink = findMet.webUrl;
+    }
+    if (urlLink) {
+        //create chart svg with hyperlink
+        var svg = d3.select(container).append("svg")
+            .attr("id", metric.id)
+            .attr("width", width)
+            .attr("height", height)
+            .attr("class", "chart")
+            .append("a")
+            .attr("xlink:href", function (d) {
+                return urlLink
+            })
+            .attr("target","_blank")
+            .append("g")
+            .attr("transform",
+                "translate(" + width / 2 + "," + height / 2 + ")");
+        textColor = "#0177a6";
+    } else {
+        //create chart svg
+        var svg = d3.select(container).append("svg")
+            .attr("id", metric.id)
+            .attr("width", width)
+            .attr("height", height)
+            .attr("class", "chart")
+            .append("g")
+            .attr("transform",
+                "translate(" + width / 2 + "," + height / 2 + ")");
+    }
+
+    //draw blue background for charts
+    svg.append("path")
+        .datum({endAngle: Math.PI / 2})
+        .style("fill", "#0579A8")
+        .attr("d", arc);
 
-        //draw blue background for charts
+    categories.forEach(function (category) {
+        var threshold = category.upperThreshold * Math.PI - Math.PI / 2;
         svg.append("path")
-            .datum({endAngle: Math.PI / 2})
-            .style("fill", "#0579A8")
+            .datum({endAngle: threshold})
+            .style("fill", category.color)
             .attr("d", arc);
+    });
 
-        categories.forEach(function (category) {
-            var threshold = category.upperThreshold * Math.PI - Math.PI / 2;
-            svg.append("path")
-                .datum({endAngle: threshold})
-                .style("fill", category.color)
-                .attr("d", arc);
-        });
-
-        //create needle
-        var arc2 = d3.arc()
-            .innerRadius(0)
-            .outerRadius(100*width/250)
-            .startAngle(-0.05)
-            .endAngle(0.05);
-
-        //draw needle in correct position depending on it's angle
-        svg.append("path")
-            .style("fill", "#000")
-            .attr("d", arc2)
-            .attr("transform", "translate(" + -100*width/250 * Math.cos((angle - 90) / 180 * Math.PI) + "," + -100*width/250 * Math.sin((angle - 90) / 180 * Math.PI) + ") rotate(" + angle + ")");
-
-        //create small circle at needle base
-        var arc3 = d3.arc()
-            .innerRadius(0)
-            .outerRadius(10*width/250)
-            .startAngle(0)
-            .endAngle(Math.PI * 2);
-
-        //draw needle base
-        svg.append("path")
-            .style("fill", "#000")
-            .attr("d", arc3);
-
-        //add text under the gauge
-        var name;
-        if (metrics[i].name.length > 23) name = metrics[i].name.slice(0, 20) + "...";
-        else name = metrics[i].name;
-        svg.append("text")
-            .attr("id", "name" + i)
-            .attr("x", 0)
-            .attr("y", 50*width/250)
-            .attr("text-anchor", "middle")
-            .attr("fill", textColor)
-            .attr("title", metrics[i].name)
-            .style("font-size", 11+8*width/250+"px")
-            .text(name);
-
-        d3.select("#name"+i).append("title").text(metrics[i].name);
-
-        //add label under the text
-        var text;
-        if (isNaN(metrics[i].value))
-            text = metrics[i].value;
-        else text = metrics[i].value.toFixed(2);
-        svg.append("text")
-            .attr("x", 0)
-            .attr("y", 50*width/250 + 30)
-            .attr("text-anchor", "middle")
-            .attr("fill", textColor)
-            .style("font-size", 11+6*width/250+"px")
-            .text(text);
+    //create needle
+    var arc2 = d3.arc()
+        .innerRadius(0)
+        .outerRadius(100*width/250)
+        .startAngle(-0.05)
+        .endAngle(0.05);
 
-    }
+    //draw needle in correct position depending on it's angle
+    svg.append("path")
+        .style("fill", "#000")
+        .attr("d", arc2)
+        .attr("transform", "translate(" + -100*width/250 * Math.cos((angle - 90) / 180 * Math.PI) + "," + -100*width/250 * Math.sin((angle - 90) / 180 * Math.PI) + ") rotate(" + angle + ")");
+
+    //create small circle at needle base
+    var arc3 = d3.arc()
+        .innerRadius(0)
+        .outerRadius(10*width/250)
+        .startAngle(0)
+        .endAngle(Math.PI * 2);
+
+    //draw needle base
+    svg.append("path")
+        .style("fill", "#000")
+        .attr("d", arc3);
+
+    //add text under the gauge
+    var name;
+    if (metric.name.length > 23) name = metric.name.slice(0, 20) + "...";
+    else name = metric.name;
+    svg.append("text")
+        .attr("id", "name" + i + j)
+        .attr("x", 0)
+        .attr("y", 50*width/250)
+        .attr("text-anchor", "middle")
+        .attr("fill", textColor)
+        .attr("title", metric.name)
+        .style("font-size", 11+8*width/250+"px")
+        .text(name);
+
+    d3.select("#name"+i+j).append("title").text(metric.name);
+
+    //add label under the text
+    var text;
+    if (isNaN(metric.value))
+        text = metric.value;
+    else text = metric.value.toFixed(2);
+    svg.append("text")
+        .attr("x", 0)
+        .attr("y", 50*width/250 + 30)
+        .attr("text-anchor", "middle")
+        .attr("fill", textColor)
+        .style("font-size", 11+6*width/250+"px")
+        .text(text);
 }
 
 function sortDataAlphabetically (metrics) {
diff --git a/src/main/resources/static/js/navScript.js b/src/main/resources/static/js/navScript.js
index 260da2b5..5bb977eb 100644
--- a/src/main/resources/static/js/navScript.js
+++ b/src/main/resources/static/js/navScript.js
@@ -1,5 +1,5 @@
 var currentURL = window.location.href;
-var viewMode, DSIRepresentationMode, DQFRepresentationMode, qmMode, time, assessment, prediction, products, simulation, configuration, userName;
+var viewMode, DSIRepresentationMode, DQFRepresentationMode, metRepresentationMode, qmMode, time, assessment, prediction, products, simulation, configuration, userName;
 
 var serverUrl = null;
 if (!(serverUrl = sessionStorage.getItem("serverUrl"))) {
@@ -12,6 +12,8 @@ if (!(serverUrl = sessionStorage.getItem("serverUrl"))) {
         success: function (data) {
             serverUrl = data.serverUrl;
             sessionStorage.setItem("serverUrl", serverUrl);
+            // Set Metrics view checkbox
+            //sessionStorage.setItem("groupByFactor", "false");
             checkAlertsPending();
         }
     })
@@ -88,6 +90,9 @@ if (!(DSIRepresentationMode = sessionStorage.getItem("DSIRepresentationMode")))
 if (!(DQFRepresentationMode = sessionStorage.getItem("DQFRepresentationMode"))) {
     DQFRepresentationMode = "Radar";
 }
+if (!(metRepresentationMode = sessionStorage.getItem("metRepresentationMode"))) {
+    metRepresentationMode = "Gauge";
+}
 if (!(qmMode = sessionStorage.getItem("qmMode"))) {
     qmMode = "Graph";
 }
@@ -114,6 +119,7 @@ if (!(simulation = sessionStorage.getItem("simulation"))) {
 sessionStorage.setItem("viewMode", viewMode);
 sessionStorage.setItem("DSIRepresentationMode", DSIRepresentationMode);
 sessionStorage.setItem("DQFRepresentationMode", DQFRepresentationMode);
+sessionStorage.setItem("metRepresentationMode", metRepresentationMode)
 sessionStorage.setItem("qmMode", qmMode);
 sessionStorage.setItem("time", time);
 
@@ -164,9 +170,21 @@ if (currentURL.search("/HistoricTable") !== -1) {
     viewMode = "Chart";
     DQFRepresentationMode = sessionStorage.getItem("DQFRepresentationMode");
     time = "Current";
+} else if (currentURL.search("/Metrics/CurrentChartGauge") !== -1){
+    viewMode = "Chart";
+    metRepresentationMode = "Gauge";
+    time = "Current";
+} else if (currentURL.search("/Metrics/CurrentChartSlider") !== -1){
+    viewMode = "Chart";
+    metRepresentationMode = "Slider";
+    time = "Current";
+} else if (currentURL.search("/Metrics/CurrentChart") !== -1) {
+    viewMode = "Chart";
+    metRepresentationMode = sessionStorage.getItem("metRepresentationMode");
+    time = "Current";
 } else if (currentURL.search("/CurrentChart") !== -1) {
     viewMode = "Chart";
-    // TODO decide if necessary
+    metRepresentationMode = sessionStorage.getItem("metRepresentationMode");
     DQFRepresentationMode = sessionStorage.getItem("DQFRepresentationMode");
     DSIRepresentationMode = sessionStorage.getItem("DSIRepresentationMode");
     time = "Current";
@@ -182,6 +200,7 @@ if (currentURL.search("/QualityModelGraph") !== -1) {
 sessionStorage.setItem("viewMode", viewMode);
 sessionStorage.setItem("DSIRepresentationMode", DSIRepresentationMode);
 sessionStorage.setItem("DQFRepresentationMode", DQFRepresentationMode);
+sessionStorage.setItem("metRepresentationMode", metRepresentationMode);
 sessionStorage.setItem("qmMode", qmMode);
 sessionStorage.setItem("time", time);
 
@@ -196,6 +215,7 @@ if (currentURL.search("/DetailedStrategicIndicators/CurrentChart") !== -1) {
 } else if(currentURL.search("/DetailedQualityFactors/CurrentChart") !== -1) {
     $("#" + DQFRepresentationMode).css("background-color", "#ffc380");
 }
+$("#" + metRepresentationMode).css("background-color", "#ffc380");
 $("#" + qmMode).css("background-color", "#ffc380");
 $("#" + time).css("background-color", "#ffc380");
 
@@ -368,6 +388,12 @@ else if (assessment === "DetailedStrategicIndicators") {
     } else {
         $("#Assessment").attr("href", serverUrl + "/" + assessment  + "/" + time + viewMode);
     }
+} else if (assessment === "Metrics") {
+    if (time == "Current" && viewMode == "Chart") {
+        $("#Assessment").attr("href", serverUrl + "/" + assessment + "/" + time + viewMode + metRepresentationMode);
+    } else {
+        $("#Assessment").attr("href", serverUrl + "/" + assessment  + "/" + time + viewMode);
+    }
 } else $("#Assessment").attr("href", serverUrl + "/" + assessment  + "/" + time + viewMode);
 
 $("#Prediction").attr("href", serverUrl + "/" + prediction + "/" + "PredictionChart");
@@ -397,7 +423,12 @@ if ((time == "Current") && (viewMode == "Chart")) {
 
 $("#DetailedQualityFactorsPrediction").attr("href", serverUrl + "/DetailedQualityFactors/PredictionChart");
 
-$("#MetricsAssessment").attr("href", serverUrl + "/Metrics/" + time + viewMode);
+if ((time == "Current") && (viewMode == "Chart")) {
+    console.log("metRepresentationMode " + metRepresentationMode);
+    $("#MetricsAssessment").attr("href", serverUrl + "/Metrics/" + time + viewMode + metRepresentationMode);
+} else {
+    $("#MetricsAssessment").attr("href", serverUrl + "/Metrics/" + time + viewMode);
+}
 
 $("#MetricsPrediction").attr("href", serverUrl + "/Metrics/PredictionChart");
 
@@ -480,7 +511,9 @@ function menuNav (urlNav) {
             urlNav = urlNav + "&siid=" + siid;
         }
     }
-    if (location.href.includes("/DetailedQualityFactors") && urlNav == "CurrentChart") {
+    if (location.href.includes("/Metrics") && urlNav == "CurrentChart"){
+        location.href = urlNav + metRepresentationMode;
+    } else if (location.href.includes("/DetailedQualityFactors") && urlNav == "CurrentChart") {
         location.href = urlNav + DQFRepresentationMode;
     } else if (location.href.includes("/DetailedStrategicIndicators") && urlNav == "CurrentChart") {
         location.href = urlNav + DSIRepresentationMode;
diff --git a/src/main/resources/static/js/polarChart.js b/src/main/resources/static/js/polarChart.js
index 8271dee4..999cc289 100644
--- a/src/main/resources/static/js/polarChart.js
+++ b/src/main/resources/static/js/polarChart.js
@@ -12,9 +12,9 @@ function drawChart() {
             var name = getParameterByName('si');
             var id = getParameterByName('siid');
             if (name.length != 0) //if we know from which Detailed Strategic Indicator we are coming
-                var urlLink = "../Metrics/CurrentChart?id=" + ids[i] + "&si=" + name + "&siid=" + id + "&name=" + title;
+                var urlLink = "../Metrics/CurrentChart" + metRepresentationMode + "?id=" + ids[i] + "&si=" + name + "&siid=" + id + "&name=" + title;
             else
-                var urlLink = "../Metrics/CurrentChart?id=" + ids[i] + "&name=" + title;
+                var urlLink = "../Metrics/CurrentChart" + metRepresentationMode + "?id=" + ids[i] + "&name=" + title;
         }
         a.setAttribute("href", urlLink);
         a.innerHTML = t[0] + "<br/>" + t[1];
diff --git a/src/main/resources/static/js/profile.js b/src/main/resources/static/js/profile.js
index 7b390542..64ead9df 100644
--- a/src/main/resources/static/js/profile.js
+++ b/src/main/resources/static/js/profile.js
@@ -8,6 +8,7 @@ var prjExternalID;
 var qualityLevel = ""; // specify (ALL, METRICS_FACTORS, METRICS)
 var dsiView = ""; // specify (Radar, Stacked, Polar)
 var dqfView = ""; // specify (Radar, Stacked, Polar)
+var mView = ""; // specify (Gauge, Slider)
 var qmView = ""; // specify (Graph, Sunburst)
 
 function getProjects() {
@@ -303,7 +304,6 @@ function clickOnTree(e){
             allowedRow.appendChild(allowedSIsCol);
             profileForm.appendChild(allowedRow);
 
-            // TODO
             var title3Row = document.createElement('div');
             title3Row.classList.add("profileInfoRow");
             var title3P = document.createElement('p');
@@ -446,6 +446,54 @@ function clickOnTree(e){
             // add BtnGroup to text paragraph
             dqfViewP.appendChild(dqfViewBtnGroup);
 
+            // Metrics visualization case
+            var mViewP = document.createElement('p');
+            mViewP.appendChild(document.createTextNode("Metrics view:   "));
+            mViewP.setAttribute('id', 'mViewP');
+            mViewP.setAttribute('style', 'font-size: 19.5px; margin-bottom: 1%');
+            var mViewBtnGroup = document.createElement('div');
+            mViewBtnGroup.classList.add("btn-group");
+            mViewBtnGroup.setAttribute('id', 'mViewBtnGroup');
+            // Gauge case
+            var mViewGaugeBtn = document.createElement('button');
+            mViewGaugeBtn.classList.add("btn");
+            mViewGaugeBtn.classList.add("btn-primary");
+            mViewGaugeBtn.setAttribute('id', 'mView_Gauge');
+            mViewGaugeBtn.setAttribute('type', 'button');
+            mViewGaugeBtn.setAttribute('style', 'background-color: #ffffff');
+            mViewGaugeBtn.setAttribute('value', 'Gauge');
+            mViewGaugeBtn.onclick = mViewUpdate;
+            var imgGauge = document.createElement('img');
+            imgGauge.setAttribute('class', 'icons');
+            imgGauge.setAttribute('src', '../icons/gauge_chart.png');
+            mViewGaugeBtn.appendChild(imgGauge);
+            // Slider case
+            var mViewSliderBtn = document.createElement('button');
+            mViewSliderBtn.classList.add("btn");
+            mViewSliderBtn.classList.add("btn-primary");
+            mViewSliderBtn.setAttribute('id', 'mView_Slider');
+            mViewSliderBtn.setAttribute('type', 'button');
+            mViewSliderBtn.setAttribute('style', 'background-color: #ffffff');
+            mViewSliderBtn.setAttribute('value', 'Slider');
+            mViewSliderBtn.onclick = mViewUpdate;
+            var imgSlider = document.createElement('img');
+            imgSlider.setAttribute('class', 'icons');
+            imgSlider.setAttribute('src', '../icons/slider_chart.png');
+            mViewSliderBtn.appendChild(imgSlider);
+
+            // update Metrics view visualizations and check the correct button
+            mView = data.mView;
+            if (mView == "Gauge")
+                mViewGaugeBtn.setAttribute('style', 'background-color: rgb(255, 195, 128)');
+            else if (mView == "Slider")
+                mViewSliderBtn.setAttribute('style', 'background-color: rgb(255, 195, 128)');
+
+            // add buttons to BtnGroup
+            mViewBtnGroup.appendChild(mViewGaugeBtn);
+            mViewBtnGroup.appendChild(mViewSliderBtn);
+            // add BtnGroup to text paragraph
+            mViewP.appendChild(mViewBtnGroup);
+
             // QM visualization case
             var qmViewP = document.createElement('p');
             qmViewP.appendChild(document.createTextNode("Quality Model view:   "));
@@ -509,6 +557,7 @@ function clickOnTree(e){
 
             visualizationsCol.appendChild(dsiViewP);
             visualizationsCol.appendChild(dqfViewP);
+            visualizationsCol.appendChild(mViewP);
             visualizationsCol.appendChild(qmViewP);
             visualizationsRow.appendChild(visualizationsCol);
             profileForm.appendChild(visualizationsRow);
@@ -542,7 +591,6 @@ function clickOnTree(e){
 }
 
 function dsiViewUpdate() {
-    // TODO
     console.log("Button clicked, id "+this.value);
     dsiView = this.value;
     var dsiViewBtnGroup = document.getElementById('dsiViewBtnGroup');
@@ -555,7 +603,6 @@ function dsiViewUpdate() {
 }
 
 function dqfViewUpdate() {
-    // TODO
     console.log("Button clicked, value " + this.value);
     dqfView = this.value;
     var dqfViewBtnGroup = document.getElementById('dqfViewBtnGroup');
@@ -567,6 +614,18 @@ function dqfViewUpdate() {
     }
 }
 
+function mViewUpdate() {
+    console.log("Button clicked, value " + this.value);
+    mView = this.value;
+    var mViewBtnGroup = document.getElementById('mViewBtnGroup');
+    for (var j = 0; j < mViewBtnGroup.children.length; j++) {
+        if (mViewBtnGroup.children[j].id == this.id)
+            mViewBtnGroup.children[j].setAttribute('style', 'background-color: rgb(255, 195, 128)');
+        else
+            mViewBtnGroup.children[j].setAttribute('style', 'background-color: #ffffff');
+    }
+}
+
 function qmViewUpdate() {
     console.log("Button clicked, value " + this.value);
     qmView = this.value;
@@ -765,7 +824,6 @@ function newProfile() {
     allowedRow.appendChild(allowedSIsCol);
     profileForm.appendChild(allowedRow);
 
-    // TODO
     var title3Row = document.createElement('div');
     title3Row.classList.add("profileInfoRow");
     var title3P = document.createElement('p');
@@ -890,9 +948,50 @@ function newProfile() {
     // add BtnGroup to "Step 3.2 - ..."
     dqfViewP.appendChild(dqfViewBtnGroup);
 
+    // Metrics visualization case
+    var mViewP = document.createElement('p');
+    mViewP.appendChild(document.createTextNode("Step 3.3 - Metrics view:   "));
+    mViewP.setAttribute('id', 'mViewP');
+    mViewP.setAttribute('style', 'font-size: 19.5px; margin-bottom: 1%');
+    var mViewBtnGroup = document.createElement('div');
+    mViewBtnGroup.classList.add("btn-group");
+    mViewBtnGroup.setAttribute('id', 'mViewBtnGroup');
+    // Gauge case DEFAULT
+    var mViewGaugeBtn = document.createElement('button');
+    mViewGaugeBtn.classList.add("btn");
+    mViewGaugeBtn.classList.add("btn-primary");
+    mViewGaugeBtn.setAttribute('id', 'mView_Gauge');
+    mViewGaugeBtn.setAttribute('type', 'button');
+    mViewGaugeBtn.setAttribute('style', 'background-color: rgb(255, 195, 128)');
+    mViewGaugeBtn.setAttribute('value', 'Gauge');
+    mView = "Gauge";
+    mViewGaugeBtn.onclick = mViewUpdate;
+    var imgGauge = document.createElement('img');
+    imgGauge.setAttribute('class', 'icons');
+    imgGauge.setAttribute('src', '../icons/gauge_chart.png');
+    mViewGaugeBtn.appendChild(imgGauge);
+    // Slider case
+    var mViewSliderBtn = document.createElement('button');
+    mViewSliderBtn.classList.add("btn");
+    mViewSliderBtn.classList.add("btn-primary");
+    mViewSliderBtn.setAttribute('id', 'mView_Slider');
+    mViewSliderBtn.setAttribute('type', 'button');
+    mViewSliderBtn.setAttribute('style', 'background-color: #ffffff');
+    mViewSliderBtn.setAttribute('value', 'Slider');
+    mViewSliderBtn.onclick = mViewUpdate;
+    var imgSlider = document.createElement('img');
+    imgSlider.setAttribute('class', 'icons');
+    imgSlider.setAttribute('src', '../icons/slider_chart.png');
+    mViewSliderBtn.appendChild(imgSlider);
+    // add buttons to BtnGroup
+    mViewBtnGroup.appendChild(mViewGaugeBtn);
+    mViewBtnGroup.appendChild(mViewSliderBtn);
+    // add BtnGroup to "Step 3.3 - ..."
+    mViewP.appendChild(mViewBtnGroup);
+
     // QM visualization case
     var qmViewP = document.createElement('p');
-    qmViewP.appendChild(document.createTextNode("Step 3.3 - Quality Model view:   "));
+    qmViewP.appendChild(document.createTextNode("Step 3.4 - Quality Model view:   "));
     qmViewP.setAttribute('id', 'qmViewP');
     qmViewP.setAttribute('style', 'font-size: 19.5px; margin-bottom: 1%');
     var qmViewBtnGroup = document.createElement('div');
@@ -928,11 +1027,12 @@ function newProfile() {
     // add buttons to BtnGroup
     qmViewBtnGroup.appendChild(qmViewGraphBtn);
     qmViewBtnGroup.appendChild(qmViewSunburstBtn);
-    // add BtnGroup to "Step 3.3 - ..."
+    // add BtnGroup to "Step 3.4 - ..."
     qmViewP.appendChild(qmViewBtnGroup);
 
     visualizationsCol.appendChild(dsiViewP);
     visualizationsCol.appendChild(dqfViewP);
+    visualizationsCol.appendChild(mViewP);
     visualizationsCol.appendChild(qmViewP);
     visualizationsRow.appendChild(visualizationsCol);
     profileForm.appendChild(visualizationsRow);
@@ -1496,6 +1596,7 @@ function saveNewProfile() {
 
     console.log(dsiView);
     console.log(dqfView);
+    console.log(mView);
     console.log(qmView);
 
     if ($('#profileName').val() != "" && allowedProjects.length > 0) {
@@ -1505,6 +1606,7 @@ function saveNewProfile() {
         formData.append("quality_level", qualityLevel);
         formData.append("dsi_view", dsiView);
         formData.append("dqf_view", dqfView);
+        formData.append("m_view", mView);
         formData.append("qm_view", qmView);
         formData.append("projects_info", JSON.stringify(allowedProjects));
 
@@ -1603,6 +1705,7 @@ function saveProfile() {
 
     console.log(dsiView);
     console.log(dqfView);
+    console.log(mView);
     console.log(qmView);
 
     if ($('#profileName').val() != "" && allowedProjects.length > 0) {
@@ -1612,6 +1715,7 @@ function saveProfile() {
         formData.append("quality_level", qualityLevel);
         formData.append("dsi_view", dsiView);
         formData.append("dqf_view", dqfView);
+        formData.append("m_view",mView);
         formData.append("qm_view", qmView);
         formData.append("projects_info", JSON.stringify(allowedProjects));
 
diff --git a/src/main/resources/static/js/projectsSelector.js b/src/main/resources/static/js/projectsSelector.js
index 5b327e89..d9481e38 100644
--- a/src/main/resources/static/js/projectsSelector.js
+++ b/src/main/resources/static/js/projectsSelector.js
@@ -141,6 +141,7 @@ function showProjectSelector (projects) {
             // if without profile select representationMode and qmMode to default values
             sessionStorage.setItem("DSIRepresentationMode", "Radar");
             sessionStorage.setItem("DQFRepresentationMode", "Radar");
+            sessionStorage.setItem("metRepresentationMode", "Gauge");
             sessionStorage.setItem("qmMode", "Graph");
         } else {
             jQuery.ajax({
@@ -153,11 +154,16 @@ function showProjectSelector (projects) {
                     // select representationMode and qmMode by profile
                     sessionStorage.setItem("DSIRepresentationMode", data.dsiView);
                     sessionStorage.setItem("DQFRepresentationMode", data.dqfView);
+                    sessionStorage.setItem("metRepresentationMode", data.mView);
                     sessionStorage.setItem("qmMode", data.qmView);
                     // specific cases: redirect to correct visualization
                     if (currentURL.search("/QualityModel") !== -1) // qm
                         url = serverUrl + "/QualityModel" + sessionStorage.getItem("qmMode");
-                    else if (currentURL.search("/DetailedStrategicIndicators/CurrentChart") !== -1) // dsi
+                    else if (currentURL.search("/Metrics/CurrentChart") !== -1) {// metrics
+                        console.log("else if metrics");
+                        console.log(sessionStorage.getItem("metRepresentationMode"));
+                        url = serverUrl + "/Metrics/CurrentChart" + sessionStorage.getItem("metRepresentationMode");
+                    } else if (currentURL.search("/DetailedStrategicIndicators/CurrentChart") !== -1) // dsi
                         url = serverUrl + "/DetailedStrategicIndicators/CurrentChart" + sessionStorage.getItem("DSIRepresentationMode");
                     else if (currentURL.search("/DetailedQualityFactors/CurrentChart") !== -1) // dqf
                         url = serverUrl + "/DetailedQualityFactors/CurrentChart" + sessionStorage.getItem("DQFRepresentationMode");
@@ -169,7 +175,7 @@ function showProjectSelector (projects) {
                         if (currentURL.search("/Prediction") !== -1)
                             url = serverUrl + "/Metrics/PredictionChart";
                         else
-                            url = serverUrl + "/Metrics/" + time + viewMode;
+                            url = serverUrl + "/Metrics/" + time + viewMode + sessionStorage.getItem("metRepresentationMode");
                     } else if (data.qualityLevel == "METRICS_FACTORS") {
                         sessionStorage.setItem("prediction", "QualityFactors");
                         sessionStorage.setItem("configuration", "Categories");
diff --git a/src/main/resources/static/js/radarChart.js b/src/main/resources/static/js/radarChart.js
index 901d6aa2..aa22c40f 100644
--- a/src/main/resources/static/js/radarChart.js
+++ b/src/main/resources/static/js/radarChart.js
@@ -10,9 +10,9 @@ function drawChart() {
             var name = getParameterByName('si');
             var id = getParameterByName('siid');
             if (name.length != 0) //if we know from which Detailed Strategic Indicator we are coming
-                var urlLink = "../Metrics/CurrentChart?id=" + ids[i] + "&si=" + name + "&siid=" + id + "&name=" + title;
+                var urlLink = "../Metrics/CurrentChart" + metRepresentationMode + "?id=" + ids[i] + "&si=" + name + "&siid=" + id + "&name=" + title;
             else
-                var urlLink = "../Metrics/CurrentChart?id=" + ids[i] + "&name=" + title;
+                var urlLink = "../Metrics/CurrentChart" + metRepresentationMode + "?id=" + ids[i] + "&name=" + title;
         }
         a.setAttribute("href", urlLink);
         a.innerHTML = titles[i];
diff --git a/src/main/resources/static/js/sliderChartMet.js b/src/main/resources/static/js/sliderChartMet.js
new file mode 100644
index 00000000..209cb466
--- /dev/null
+++ b/src/main/resources/static/js/sliderChartMet.js
@@ -0,0 +1,256 @@
+var currentColor = "#696969";
+var metrics = [];
+var metricsDB = [];
+var factors = [];
+var categories = [];
+
+var profileId = sessionStorage.getItem("profile_id");
+
+var id = false;
+var urlLink;
+
+var url;
+if (getParameterByName('id').length !== 0) {
+    id = true;
+    url = parseURLComposed("../api/qualityFactors/metrics/current");
+} else {
+    var profileId = sessionStorage.getItem("profile_id");
+    url = parseURLComposed("../api/metrics/current?profile="+profileId);
+}
+
+function getAllMetrics(){
+    $.ajax({
+        url : url,
+        type: "GET",
+        success: function (response) {
+            if (id) // in case we show metrics for one detailed factor
+                metrics = response[0].metrics;
+            else // in case we show all metrics
+                metrics = response;
+            sortDataAlphabetically(metrics);
+            jQuery.ajax({
+                dataType: "json",
+                url: "../api/metrics",
+                cache: false,
+                type: "GET",
+                async: true,
+                success: function (dataDB) {
+                    metricsDB = dataDB;
+                    getMetricsCategoriesAndShow();
+                }});
+        }
+    });
+}
+
+function getFactors() {
+    if (id)
+        url = parseURLComposed("../api/qualityFactors/metrics/current");
+    else
+        url = "../api/qualityFactors/metrics/current?profile=" + profileId
+    jQuery.ajax({
+        dataType: "json",
+        url: url,
+        cache: false,
+        type: "GET",
+        async: true,
+        success: function (data) {
+            sortMyDataAlphabetically(data);
+            factors = data;
+            console.log("factors");
+            console.log(factors);
+            showMetricsSliders();
+        }
+    });
+}
+
+function sortMyDataAlphabetically (factors) {
+    function compare (a, b) {
+        if (a.name < b.name) return -1;
+        else if (a.name > b.name) return 1;
+        else return 0;
+    }
+    factors.sort(compare);
+}
+
+function getMetricsCategoriesAndShow () {
+    var url = "../api/metrics/categories";
+    $.ajax({
+        url : url,
+        type: "GET",
+        success: function (response) {
+            categories = response;
+            getFactors();
+        }
+    });
+}
+
+function showMetricsSliders () {
+    // Metrics categories
+    var rangeHighlights = [];
+    var start = 0;
+    categories.sort(function (a, b) {
+        return a.upperThreshold - b.upperThreshold;
+    });
+    for (var i = 0; i < categories.length; i++) {
+        var end = categories[i].upperThreshold;
+        var offset = 0;
+        if (end < 1) offset = 0.02;
+        var range = {
+            start: start,
+            end: end + offset,
+            class: categories[i].name
+        };
+        rangeHighlights.push(range);
+        start = end;
+    }
+
+    var metricsDiv = $("#metricsSliders");
+
+    console.log(metrics);
+
+    for (i = 0; i < factors.length; i++) {
+
+        var divF = document.createElement('div');
+        divF.style.marginTop = "1em";
+        divF.style.marginBottom = "1em";
+
+        var labelF = document.createElement('label');
+        labelF.id = factors[i].id;
+        labelF.textContent = factors[i].name;
+        divF.appendChild(labelF);
+
+        factors[i].metrics.forEach(function (metric) {
+            var div = document.createElement('div');
+            div.id = "div" + metric.id;
+            div.style.marginTop = "1em";
+            div.style.marginBottom = "1em";
+
+            var label = document.createElement('label');
+            label.id = metric.id;
+            label.textContent = metric.name + " " + metric.value.toFixed(2);
+            label.title = metric.description;
+            label.style.marginLeft = "1em";
+
+            var findMet = metricsDB.find(function (element) {
+                return element.externalId === metric.id;
+            });
+            if (findMet) { // if metric not found it will be undefined
+                urlLink = findMet.webUrl;
+            }
+            if (urlLink) {
+                label.textContent = "";
+                var a = document.createElement('a');
+                a.href = urlLink;
+                a.target = "_blank";
+                a.textContent = metric.name + " " + metric.value.toFixed(2);
+                label.appendChild(a);
+            }
+
+            var slider = document.createElement("input");
+            slider.id = i + "sliderValue" + metric.id;
+            slider.style.width = "60%";
+            slider.style.height = "100%";
+            var value = 0;
+            if (metric.value !== 'NaN')
+                value = metric.value;
+            var sliderConfig = {
+                id: "slider" + metric.id,
+                min: 0,
+                max: 1,
+                step: 0.01,
+                value: value,
+                ticks: [value],
+                lock_to_ticks: true,
+                handle: 'triangle'
+            };
+            sliderConfig.rangeHighlights = [];
+            Array.prototype.push.apply(sliderConfig.rangeHighlights, rangeHighlights);
+            div.appendChild(slider);
+            div.appendChild(label);
+            divF.append(div);
+            metricsDiv.append(divF);
+            $("#" + slider.id).slider(sliderConfig);
+        });
+    }
+    // Add metrics without factor
+    var divNOF = document.createElement('div');
+    divNOF.style.marginTop = "1em";
+    divNOF.style.marginBottom = "1em";
+
+    var labelNOF = document.createElement('label');
+    labelNOF.id = "withoutfactor";
+    labelNOF.textContent = "Metrics not associated to any factor";
+    divNOF.appendChild(labelNOF);
+    metrics.forEach(function (metric) {
+        var mdiv = document.getElementById("div"+metric.id);
+        if (!mdiv) {
+            console.log(mdiv);
+            var div = document.createElement('div');
+            div.id = "div" + metric.id;
+            div.style.marginTop = "1em";
+            div.style.marginBottom = "1em";
+
+            var label = document.createElement('label');
+            label.id = metric.id;
+            label.textContent = metric.name + " " + metric.value.toFixed(2);
+            label.title = metric.description;
+            label.style.marginLeft = "1em";
+
+            var findMet = metricsDB.find(function (element) {
+                return element.externalId === metric.id;
+            });
+            if (findMet) { // if metric not found it will be undefined
+                urlLink = findMet.webUrl;
+            }
+            if (urlLink) {
+                label.textContent = "";
+                var a = document.createElement('a');
+                a.href = urlLink;
+                a.target = "_blank";
+                a.textContent = metric.name + " " + metric.value.toFixed(2);
+                label.appendChild(a);
+            }
+
+            var slider = document.createElement("input");
+            slider.id = "sliderValue" + metric.id;
+            slider.style.width = "60%";
+            slider.style.height = "100%";
+            var value = 0;
+            if (metric.value !== 'NaN')
+                value = metric.value;
+            var sliderConfig = {
+                id: "slider" + metric.id,
+                min: 0,
+                max: 1,
+                step: 0.01,
+                value: value,
+                ticks: [value],
+                lock_to_ticks: true,
+                handle: 'triangle'
+            };
+            sliderConfig.rangeHighlights = [];
+            Array.prototype.push.apply(sliderConfig.rangeHighlights, rangeHighlights);
+            div.appendChild(slider);
+            div.appendChild(label);
+            divNOF.append(div);
+            metricsDiv.append(divNOF);
+            $("#"+slider.id).slider(sliderConfig);
+        }
+    });
+    for (var j = 0; j < categories.length; j++) {
+        $(".slider-rangeHighlight." + categories[j].name).css("background", categories[j].color)
+    }
+}
+
+function sortDataAlphabetically (metrics) {
+    function compare (a, b) {
+        if (a.name < b.name) return -1;
+        else if (a.name > b.name) return 1;
+        else return 0;
+    }
+    metrics.sort(compare);
+}
+
+window.onload = function() {
+    getAllMetrics();
+}
\ No newline at end of file
diff --git a/src/main/resources/static/js/stackedLineChart.js b/src/main/resources/static/js/stackedLineChart.js
index d48ae506..f04c866c 100644
--- a/src/main/resources/static/js/stackedLineChart.js
+++ b/src/main/resources/static/js/stackedLineChart.js
@@ -320,9 +320,12 @@ function drawChart() {
             urlLink = "../DetailedStrategicIndicators/HistoricChart?id=" + ids[i] + "&name=" + texts[i];
             a.setAttribute("href", urlLink);
         } else { // case of metrics link
-            urlLink = metricsDB.find(function (element) {
+            console.log(ids[i]);
+            var findMet = metricsDB.find(function (element) {
                 return element.externalId === ids[i];
-            }).webUrl;
+            });
+            if (findMet)  // if metric not found it will be undefined
+                urlLink = findMet.webUrl;
             if (urlLink) {
                 a.setAttribute("href", urlLink);
                 a.setAttribute("target","_blank")
diff --git a/src/main/resources/templates/DetailedQualityFactors/CurrentTable.html b/src/main/resources/templates/DetailedQualityFactors/CurrentTable.html
index c4e8df0e..99881877 100644
--- a/src/main/resources/templates/DetailedQualityFactors/CurrentTable.html
+++ b/src/main/resources/templates/DetailedQualityFactors/CurrentTable.html
@@ -51,7 +51,7 @@ <h1 id="title" align="center"></h1>
                         <span class="caret"></span>
                     </span>
                 </th>
-                <th ng-click="sortBy('rationale')">Rationale (Metric)
+                <th ng-click="sortBy('rationale')">Technical Details (Metric)
                     <span ng-show="sortType == 'rationale' &amp;&amp; sortReverse" class="caret"></span>
                     <span ng-show="sortType == 'rationale' &amp;&amp; !sortReverse" class="dropup">
                         <span class="caret"></span>
diff --git a/src/main/resources/templates/DetailedQualityFactors/HistoricTable.html b/src/main/resources/templates/DetailedQualityFactors/HistoricTable.html
index 71e22d76..90e5afef 100644
--- a/src/main/resources/templates/DetailedQualityFactors/HistoricTable.html
+++ b/src/main/resources/templates/DetailedQualityFactors/HistoricTable.html
@@ -74,7 +74,7 @@ <h1 id="title" align="center"></h1>
                         <span class="caret"></span>
                     </span>
                 </th>
-                <th ng-click="sortBy('rationale')">Rationale (Metric)
+                <th ng-click="sortBy('rationale')">Technical Details (Metric)
                     <span ng-show="sortType == 'rationale' &amp;&amp; sortReverse" class="caret"></span>
                     <span ng-show="sortType == 'rationale' &amp;&amp; !sortReverse" class="dropup">
                         <span class="caret"></span>
diff --git a/src/main/resources/templates/DetailedStrategicIndicators/CurrentTable.html b/src/main/resources/templates/DetailedStrategicIndicators/CurrentTable.html
index a1f5246f..af36e73a 100644
--- a/src/main/resources/templates/DetailedStrategicIndicators/CurrentTable.html
+++ b/src/main/resources/templates/DetailedStrategicIndicators/CurrentTable.html
@@ -57,7 +57,7 @@ <h1 id="title" align="center"></h1>
                         <span class="caret"></span>
                     </span>
                 </th>
-                <th ng-click="sortBy('rationale')">Rationale (Factor)
+                <th ng-click="sortBy('rationale')">Technical Details (Factor)
                     <span ng-show="sortType == 'rationale' &amp;&amp; sortReverse" class="caret"></span>
                     <span ng-show="sortType == 'rationale' &amp;&amp; !sortReverse" class="dropup">
                         <span class="caret"></span>
diff --git a/src/main/resources/templates/DetailedStrategicIndicators/HistoricTable.html b/src/main/resources/templates/DetailedStrategicIndicators/HistoricTable.html
index 26eaf825..1625c8f2 100644
--- a/src/main/resources/templates/DetailedStrategicIndicators/HistoricTable.html
+++ b/src/main/resources/templates/DetailedStrategicIndicators/HistoricTable.html
@@ -74,7 +74,7 @@ <h1 id="title" align="center"></h1>
                         <span class="caret"></span>
                     </span>
                 </th>
-                <th ng-click="sortBy('rationale')">Rationale (Factor)
+                <th ng-click="sortBy('rationale')">Technical Details (Factor)
                     <span ng-show="sortType == 'rationale' &amp;&amp; sortReverse" class="caret"></span>
                     <span ng-show="sortType == 'rationale' &amp;&amp; !sortReverse" class="dropup">
                         <span class="caret"></span>
diff --git a/src/main/resources/templates/Fragments/TemplateDashboard.html b/src/main/resources/templates/Fragments/TemplateDashboard.html
index 66b726f7..638c9e4b 100644
--- a/src/main/resources/templates/Fragments/TemplateDashboard.html
+++ b/src/main/resources/templates/Fragments/TemplateDashboard.html
@@ -262,6 +262,18 @@ <h4 style="display: inline">Project: </h4>
             </button>
         </div>
     </th:block>
+    <th:block th:fragment="MetricRepresentationMode">
+        <div class="btn-group" style="display: flex; justify-content: flex-end; margin-right: 5px; margin-top: 5px;">
+            <button id="Gauge" type="button" onclick="menuNav(time + viewMode + 'Gauge')" class="btn btn-primary" style="background-color: #ffffff" data-toggle="tooltip" title="View assessment with gauge charts">
+                <img class="icons" th:src="@{/icons/gauge_chart.png}"
+                     src="../../static/icons/gauge_chart.png" alt="gauge chart representation"/>
+            </button>
+            <button id="Slider" type="button" onclick="menuNav(time + viewMode + 'Slider')" class="btn btn-primary" style="background-color: #ffffff" data-toggle="tooltip" title="View assessment with slider charts">
+                <img class="icons" th:src="@{/icons/slider_chart.png}"
+                     src="../../static/icons/slider_chart.png" alt="slider chart representation"/>
+            </button>
+        </div>
+    </th:block>
     <th:block th:fragment="QualityModelView">
         <div class="btn-group" style="display: flex; justify-content: flex-end; margin-right: 5px;">
             <button id="Graph" type="button" onclick="menuNav('QualityModelGraph')" class="btn btn-primary" style="background-color: #ffffff" data-toggle="tooltip" title="View quality model with graph chart">
diff --git a/src/main/resources/templates/Metrics/CurrentChart.html b/src/main/resources/templates/Metrics/CurrentChart.html
index 6b9d6300..98dbfee4 100644
--- a/src/main/resources/templates/Metrics/CurrentChart.html
+++ b/src/main/resources/templates/Metrics/CurrentChart.html
@@ -8,7 +8,17 @@
 <div th:replace="Fragments/Template :: logo"></div>
 <div th:replace="Fragments/TemplateDashboard :: navBarDashboard"></div>
 <div th:replace="Fragments/TemplateDashboard :: navSubBarAssessmentDashboard"></div>
-<div th:replace="Fragments/TemplateDashboard :: ProjectSelector"></div>
+<table style="width:100%">
+    <tr>
+        <td width="80%"><div th:replace="Fragments/TemplateDashboard :: ProjectSelector"></div></td>
+        <td width="20%">
+            <div th:replace="Fragments/TemplateDashboard :: MetricRepresentationMode"></div>
+            <form style="display: flex; justify-content: flex-end; margin-right: 5px; font-size: 12px">
+                <input type="checkbox" id="groupByFactorCheckbox" onclick="clickCheckbox()">&nbsp;Group by factor</input>
+            </form>
+        </td>
+    </tr>
+</table>
 <br/>
 <br/>
 <h1 id="title" align="center"></h1>
@@ -21,6 +31,10 @@ <h1 id="title" align="center"></h1>
 <script type="text/javascript" src="../../static/js/gaugeChart.js" th:src="@{/js/gaugeChartMet.js}"></script>
 <script>
     window.onload = function() {
+        var groupByFactor = new Boolean(sessionStorage.getItem("groupByFactor"));
+        if (groupByFactor.valueOf() == true) {
+            document.getElementById("groupByFactorCheckbox").setAttribute("checked","checked");
+        }
         getData(200, 200, true);
     };
 </script>
diff --git a/src/main/resources/templates/Metrics/CurrentSlider.html b/src/main/resources/templates/Metrics/CurrentSlider.html
new file mode 100644
index 00000000..06677e60
--- /dev/null
+++ b/src/main/resources/templates/Metrics/CurrentSlider.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <th:block th:replace="Fragments/TemplateDashboard :: basicHeader"></th:block>
+    <script type="text/javascript" src="../../static/js/lib/d3.v4.min.js" th:src="@{/js/lib/d3.v4.min.js}"></script>
+    <link rel="stylesheet" th:href="@{/css/bootstrap-slider.min.css}" />
+    <script type="text/javascript" th:src="@{/js/bootstrap-slider.min.js}"></script>
+    <script type="text/javascript" th:src="@{/js/lib/Chart.min.js}"></script>
+</head>
+<body>
+<div th:replace="Fragments/Template :: logo"></div>
+<div th:replace="Fragments/TemplateDashboard :: navBarDashboard"></div>
+<div th:replace="Fragments/TemplateDashboard :: navSubBarAssessmentDashboard"></div>
+<table style="width:100%">
+    <tr>
+        <td width="80%"><div th:replace="Fragments/TemplateDashboard :: ProjectSelector"></div></td>
+        <td width="20%"><div th:replace="Fragments/TemplateDashboard :: MetricRepresentationMode"></div></td>
+    </tr>
+</table>
+<br/>
+<br/>
+<h1 id="title" align="center"></h1>
+<p th:replace="Fragments/TemplateDashboard :: navLinkMetrics"></p>
+<div style="width:100%; overflow: hidden; padding-left: 5%; padding-right: 5%;">
+    <div id="metrics" style=" width: 100%; float: left; position: absolute;">
+        <br/>
+        <div id="metricsSliders"/>
+    </div>
+
+</div>
+<br/>
+</body>
+<th:block th:replace="Fragments/TemplateDashboard :: scriptsBasic"></th:block>
+<script type="text/javascript" src="../../static/js/sliderChartMet.js" th:src="@{/js/sliderChartMet.js}"></script>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/Metrics/CurrentTable.html b/src/main/resources/templates/Metrics/CurrentTable.html
index d0dc7d81..08bf41ad 100644
--- a/src/main/resources/templates/Metrics/CurrentTable.html
+++ b/src/main/resources/templates/Metrics/CurrentTable.html
@@ -45,7 +45,7 @@ <h1 id="title" align="center"></h1>
                         <span class="caret"></span>
                     </span>
                 </th>
-                <th ng-click="sortBy('rationale')">Rationale
+                <th ng-click="sortBy('rationale')">Technical Details
                     <span ng-show="sortType == 'rationale' &amp;&amp; sortReverse" class="caret"></span>
                     <span ng-show="sortType == 'rationale' &amp;&amp; !sortReverse" class="dropup">
                         <span class="caret"></span>
diff --git a/src/main/resources/templates/Metrics/HistoricTable.html b/src/main/resources/templates/Metrics/HistoricTable.html
index 4a32cd36..f9c90244 100644
--- a/src/main/resources/templates/Metrics/HistoricTable.html
+++ b/src/main/resources/templates/Metrics/HistoricTable.html
@@ -68,7 +68,7 @@ <h1 id="title" align="center"></h1>
                         <span class="caret"></span>
                     </span>
                 </th>
-                <th ng-click="sortBy('rationale')">Rationale
+                <th ng-click="sortBy('rationale')">Technical Details
                     <span ng-show="sortType == 'rationale' &amp;&amp; sortReverse" class="caret"></span>
                     <span ng-show="sortType == 'rationale' &amp;&amp; !sortReverse" class="dropup">
                         <span class="caret"></span>
diff --git a/src/main/resources/templates/QualityFactors/AdditionalScreens/QualityFactorsConfig.html b/src/main/resources/templates/QualityFactors/AdditionalScreens/QualityFactorsConfig.html
index 0a16167e..484a570c 100644
--- a/src/main/resources/templates/QualityFactors/AdditionalScreens/QualityFactorsConfig.html
+++ b/src/main/resources/templates/QualityFactors/AdditionalScreens/QualityFactorsConfig.html
@@ -43,9 +43,10 @@
                 <p style="font-size: 18px; margin-right: 1%">Threshold: </p>
                 <input id="QFThreshold" type="number" step="0.01" min="0" max="1" rows="1" style="width: 100%;"></input>
             </div>
-            <div class="QFInfoRow">
+            <div class="QFInfoRow" style="margin-bottom: 1%">
                 <p id="QFCompositionTitle" style="font-size: 36px; margin-right: 1%">2. Quality Factor Composition</p>
             </div>
+            <div class="QFInfoRow" style="margin-top: 0%; margin-bottom: 1.5%"><p id="QFCompositionWarning" style="font-size: 14px"></p></div>
             <div class="QFInfoRow">
                 <div class="selectionColumn" style="width: 100%">
                     <p style="font-size: 18px; margin-bottom: 1%">Available Metrics: </p>
diff --git a/src/main/resources/templates/QualityFactors/CurrentTable.html b/src/main/resources/templates/QualityFactors/CurrentTable.html
index bfba201f..ac5c880c 100644
--- a/src/main/resources/templates/QualityFactors/CurrentTable.html
+++ b/src/main/resources/templates/QualityFactors/CurrentTable.html
@@ -53,7 +53,7 @@ <h1 id="title" align="center"></h1>
                         <span class="caret"></span>
                     </span>
             </th-->
-            <th ng-click="sortBy('rationale')">Rationale
+            <th ng-click="sortBy('rationale')">Technical Details
                 <span ng-show="sortType == 'rationale' &amp;&amp; sortReverse" class="caret"></span>
                 <span ng-show="sortType == 'rationale' &amp;&amp; !sortReverse" class="dropup">
                         <span class="caret"></span>
diff --git a/src/main/resources/templates/QualityFactors/HistoricTable.html b/src/main/resources/templates/QualityFactors/HistoricTable.html
index f49382ca..7449797c 100644
--- a/src/main/resources/templates/QualityFactors/HistoricTable.html
+++ b/src/main/resources/templates/QualityFactors/HistoricTable.html
@@ -74,7 +74,7 @@ <h1 id="title" align="center"></h1>
                         <span class="caret"></span>
                     </span>
                 </th-->
-                <th ng-click="sortBy('rationale')">Rationale
+                <th ng-click="sortBy('rationale')">Technical Details
                     <span ng-show="sortType == 'rationale' &amp;&amp; sortReverse" class="caret"></span>
                     <span ng-show="sortType == 'rationale' &amp;&amp; !sortReverse" class="dropup">
                         <span class="caret"></span>
diff --git a/src/main/resources/templates/StrategicIndicators/AdditionalScreens/StrategicIndicatorsConfig.html b/src/main/resources/templates/StrategicIndicators/AdditionalScreens/StrategicIndicatorsConfig.html
index a13ea266..0b4de766 100644
--- a/src/main/resources/templates/StrategicIndicators/AdditionalScreens/StrategicIndicatorsConfig.html
+++ b/src/main/resources/templates/StrategicIndicators/AdditionalScreens/StrategicIndicatorsConfig.html
@@ -47,14 +47,14 @@
                 <p id="SINetworkLabel" style="font-size: 18px; margin-right: 1%">Assessment model: </p>
                 <input id="SINetwork" type="file"></input>
             </div>
-            <div class="SIInfoRow">
+            <div class="SIInfoRow" style="margin-bottom: 1%">
                 <p id="SICompositionTitle" style="font-size: 36px; margin-right: 1%">2. Strategic Indicator Composition</p>
             </div>
+            <div class="SIInfoRow" style="margin-top: 0%; margin-bottom: 1.5%"><p id="SICompositionWarning" style="font-size: 14px"></p></div>
             <div class="SIInfoRow">
                 <div class="selectionColumn" style="width: 100%">
                     <p style="font-size: 18px; margin-bottom: 1%">Available Factors: </p>
                     <select id="avFactorsBox" multiple="multiple" style="height: 150px;">
-
                     </select>
                 </div>
                 <div class="selectionColumn" style="padding-top:30px;">
diff --git a/src/main/resources/templates/StrategicIndicators/CurrentTable.html b/src/main/resources/templates/StrategicIndicators/CurrentTable.html
index e530a314..2497322f 100644
--- a/src/main/resources/templates/StrategicIndicators/CurrentTable.html
+++ b/src/main/resources/templates/StrategicIndicators/CurrentTable.html
@@ -49,7 +49,7 @@
                         <span class="caret"></span>
                     </span>
                 </th>
-                <th ng-click="sortBy('rationale')">Rationale
+                <th ng-click="sortBy('rationale')">Technical Details
                     <span ng-show="sortType == 'rationale' &amp;&amp; sortReverse" class="caret"></span>
                     <span ng-show="sortType == 'rationale' &amp;&amp; !sortReverse" class="dropup">
                         <span class="caret"></span>
diff --git a/src/main/resources/templates/StrategicIndicators/HistoricTable.html b/src/main/resources/templates/StrategicIndicators/HistoricTable.html
index f749ea5b..b2462fca 100644
--- a/src/main/resources/templates/StrategicIndicators/HistoricTable.html
+++ b/src/main/resources/templates/StrategicIndicators/HistoricTable.html
@@ -71,7 +71,7 @@
                         <span class="caret"></span>
                     </span>
                 </th>
-                <th ng-click="sortBy('rationale')">Rationale
+                <th ng-click="sortBy('rationale')">Technical Details
                     <span ng-show="sortType == 'rationale' &amp;&amp; sortReverse" class="caret"></span>
                     <span ng-show="sortType == 'rationale' &amp;&amp; !sortReverse" class="dropup">
                         <span class="caret"></span>
diff --git a/src/test/java/com/upc/gessi/qrapids/app/domain/controllers/StrategicIndicatorsControllerTest.java b/src/test/java/com/upc/gessi/qrapids/app/domain/controllers/StrategicIndicatorsControllerTest.java
index 7e258698..fb6f7b3f 100644
--- a/src/test/java/com/upc/gessi/qrapids/app/domain/controllers/StrategicIndicatorsControllerTest.java
+++ b/src/test/java/com/upc/gessi/qrapids/app/domain/controllers/StrategicIndicatorsControllerTest.java
@@ -1232,7 +1232,7 @@ public void fetchStrategicIndicators() throws IOException, CategoriesException,
         List<String> projectsList = new ArrayList<>();
         projectsList.add(project.getExternalId());
 
-        when(projectsController.importProjectsAndUpdateDatabase()).thenReturn(projectsList);
+        when(projectsController.getAllProjectsExternalID()).thenReturn(projectsList);
         when(projectsController.findProjectByExternalId(project.getExternalId())).thenReturn(project);
 
         DTOStrategicIndicatorEvaluation dtoStrategicIndicatorEvaluation = domainObjectsBuilder.buildDTOStrategicIndicatorEvaluation();
@@ -1280,7 +1280,7 @@ public void fetchStrategicIndicators() throws IOException, CategoriesException,
         strategicIndicatorsController.fetchStrategicIndicators();
 
         // Then
-        verify(projectsController, times(1)).importProjectsAndUpdateDatabase();
+        verify(projectsController, times(1)).getAllProjectsExternalID();
         verify(projectsController, times(1)).findProjectByExternalId(project.getExternalId());
 
         ArgumentCaptor<Strategic_Indicator> argumentSI = ArgumentCaptor.forClass(Strategic_Indicator.class);
diff --git a/src/test/java/com/upc/gessi/qrapids/app/presentation/rest/services/ProfilesTest.java b/src/test/java/com/upc/gessi/qrapids/app/presentation/rest/services/ProfilesTest.java
index 2ee08e01..0c410808 100644
--- a/src/test/java/com/upc/gessi/qrapids/app/presentation/rest/services/ProfilesTest.java
+++ b/src/test/java/com/upc/gessi/qrapids/app/presentation/rest/services/ProfilesTest.java
@@ -86,13 +86,14 @@ public void getProfiles() throws Exception {
         String qualityLevel = "ALL";
         String dsiView = "Radar";
         String dqfView = "Radar";
+        String mView = "Gauge";
         String qmView = "Graph";
 
         Pair<Long, Boolean> pair = Pair.of(projectId, true);
         List<Pair<Long, Boolean>> allSIs = new ArrayList<>();
         allSIs.add(pair);
 
-        DTOProfile dtoProfile = new DTOProfile(profileId, profileName, profileDescription, qualityLevel, dsiView, dqfView, qmView, dtoProjectList, allSIs);
+        DTOProfile dtoProfile = new DTOProfile(profileId, profileName, profileDescription, qualityLevel, dsiView, dqfView, mView, qmView, dtoProjectList, allSIs);
         List<DTOProfile> dtoProfileList = new ArrayList<>();
         dtoProfileList.add(dtoProfile);
 
@@ -111,6 +112,7 @@ public void getProfiles() throws Exception {
                 .andExpect(jsonPath("$[0].qualityLevel", is(qualityLevel)))
                 .andExpect(jsonPath("$[0].dsiView", is(dsiView)))
                 .andExpect(jsonPath("$[0].dqfView", is(dqfView)))
+                .andExpect(jsonPath("$[0].mView", is(mView)))
                 .andExpect(jsonPath("$[0].qmView", is(qmView)))
                 .andExpect(jsonPath("$[0].projects", hasSize(1)))
                 .andExpect(jsonPath("$[0].projects[0].id", is(projectId.intValue())))
@@ -139,6 +141,8 @@ public void getProfiles() throws Exception {
                                         .description("Default visualization for Detailed Strategic Indicators view"),
                                 fieldWithPath("[].dqfView")
                                         .description("Default visualization for Detailed Factors view"),
+                                fieldWithPath("[].mView")
+                                        .description("Default visualization for Metrics view"),
                                 fieldWithPath("[].qmView")
                                         .description("Default visualization for Quality Model view"),
                                 fieldWithPath("[].projects")
@@ -188,13 +192,14 @@ public void getProfileById() throws Exception {
         String qualityLevel = "ALL";
         String dsiView = "Radar";
         String dqfView = "Radar";
+        String mView = "Gauge";
         String qmView = "Graph";
 
         Pair<Long, Boolean> pair = Pair.of(projectId, true);
         List<Pair<Long, Boolean>> allSIs = new ArrayList<>();
         allSIs.add(pair);
 
-        DTOProfile dtoProfile = new DTOProfile(profileId, profileName, profileDescription, qualityLevel, dsiView, dqfView, qmView, dtoProjectList, allSIs);
+        DTOProfile dtoProfile = new DTOProfile(profileId, profileName, profileDescription, qualityLevel, dsiView, dqfView, mView, qmView, dtoProjectList, allSIs);
 
         when(profilesController.getProfileById(profileId.toString())).thenReturn(dtoProfile);
 
@@ -210,6 +215,7 @@ public void getProfileById() throws Exception {
                 .andExpect(jsonPath("$.qualityLevel", is(qualityLevel)))
                 .andExpect(jsonPath("$.dsiView", is(dsiView)))
                 .andExpect(jsonPath("$.dqfView", is(dqfView)))
+                .andExpect(jsonPath("$.mView", is(mView)))
                 .andExpect(jsonPath("$.qmView", is(qmView)))
                 .andExpect(jsonPath("$.projects", hasSize(1)))
                 .andExpect(jsonPath("$.projects[0].id", is(projectId.intValue())))
@@ -242,6 +248,8 @@ public void getProfileById() throws Exception {
                                         .description("Default visualization for Detailed Strategic Indicators view"),
                                 fieldWithPath("dqfView")
                                         .description("Default visualization for Detailed Factors view"),
+                                fieldWithPath("mView")
+                                        .description("Default visualization for Metrics view"),
                                 fieldWithPath("qmView")
                                         .description("Default visualization for Quality Model view"),
                                 fieldWithPath("projects")
@@ -291,6 +299,7 @@ public void updateProfile() throws Exception {
         Profile.QualityLevel qualityLevel = Profile.QualityLevel.valueOf("ALL");
         Profile.DetailedViews dsiView = Profile.DetailedViews.valueOf("Radar");
         Profile.DetailedViews dqfView = Profile.DetailedViews.valueOf("Radar");
+        Profile.MetricsView mView = Profile.MetricsView.valueOf("Gauge");
         Profile.QualityModelView qmView = Profile.QualityModelView.valueOf("Graph");
 
         Pair<Long, Boolean> pair = Pair.of(projectId, true);
@@ -319,6 +328,7 @@ public void updateProfile() throws Exception {
                 .param("quality_level", qualityLevel.toString())
                 .param("dsi_view", dsiView.toString())
                 .param("dqf_view", dqfView.toString())
+                .param("m_view", mView.toString())
                 .param("qm_view", qmView.toString())
                 .param("projects_info", projects_info)
                 .with(new RequestPostProcessor() {
@@ -345,6 +355,8 @@ public MockHttpServletRequest postProcessRequest(MockHttpServletRequest request)
                                         .description("Value for default Detailed Strategic Indicators view representation: Radar, Stacked or Polar"),
                                 parameterWithName("dqf_view")
                                         .description("Value for default Detailed Factors view representation: Radar, Stacked or Polar"),
+                                parameterWithName("m_view")
+                                        .description("Value for default Metrics view representation: Gauge or Slider"),
                                 parameterWithName("qm_view")
                                         .description("Value for default Quality Model view representation: Graph or Sunburst"),
                                 parameterWithName("projects_info")
@@ -353,7 +365,7 @@ public MockHttpServletRequest postProcessRequest(MockHttpServletRequest request)
 
         // Verify mock interactions
         verify(profilesController, times(1)).checkProfileByName(profileId, profileName);
-        verify(profilesController, times(1)).updateProfile(profileId, profileName, profileDescription, qualityLevel, dsiView, dqfView, qmView, projectsInfoMap);
+        verify(profilesController, times(1)).updateProfile(profileId, profileName, profileDescription, qualityLevel, dsiView, dqfView, mView, qmView, projectsInfoMap);
 
         verifyNoMoreInteractions(profilesController);
     }
@@ -376,6 +388,7 @@ public void updateProfileNameAlreadyExists() throws Exception {
         Profile.QualityLevel qualityLevel = Profile.QualityLevel.valueOf("ALL");
         Profile.DetailedViews dsiView = Profile.DetailedViews.valueOf("Radar");
         Profile.DetailedViews dqfView = Profile.DetailedViews.valueOf("Radar");
+        Profile.MetricsView mView = Profile.MetricsView.valueOf("Gauge");
         Profile.QualityModelView qmView = Profile.QualityModelView.valueOf("Graph");
 
         Pair<Long, Boolean> pair = Pair.of(projectId, true);
@@ -401,6 +414,7 @@ public void updateProfileNameAlreadyExists() throws Exception {
                 .param("quality_level", qualityLevel.toString())
                 .param("dsi_view", dsiView.toString())
                 .param("dqf_view", dqfView.toString())
+                .param("m_view", mView.toString())
                 .param("qm_view", qmView.toString())
                 .param("projects_info", projects_info)
                 .with(new RequestPostProcessor() {
@@ -427,6 +441,8 @@ public MockHttpServletRequest postProcessRequest(MockHttpServletRequest request)
                                         .description("Value for default Detailed Strategic Indicators view representation: Radar, Stacked or Polar"),
                                 parameterWithName("dqf_view")
                                         .description("Value for default Detailed Factors view representation: Radar, Stacked or Polar"),
+                                parameterWithName("m_view")
+                                        .description("Value for default Metrics view representation: Gauge or Slider"),
                                 parameterWithName("qm_view")
                                         .description("Value for default Quality Model view representation: Graph or Sunburst"),
                                 parameterWithName("projects_info")
@@ -455,6 +471,7 @@ public void newProfile() throws Exception {
         Profile.QualityLevel qualityLevel = Profile.QualityLevel.valueOf("ALL");
         Profile.DetailedViews dsiView = Profile.DetailedViews.valueOf("Radar");
         Profile.DetailedViews dqfView = Profile.DetailedViews.valueOf("Radar");
+        Profile.MetricsView mView = Profile.MetricsView.valueOf("Gauge");
         Profile.QualityModelView qmView = Profile.QualityModelView.valueOf("Graph");
 
         Pair<Long, Boolean> pair = Pair.of(projectId, true);
@@ -483,6 +500,7 @@ public void newProfile() throws Exception {
                 .param("quality_level", qualityLevel.toString())
                 .param("dsi_view", dsiView.toString())
                 .param("dqf_view", dqfView.toString())
+                .param("m_view", mView.toString())
                 .param("qm_view", qmView.toString())
                 .param("projects_info", projects_info);
 
@@ -502,6 +520,8 @@ public void newProfile() throws Exception {
                                         .description("Value for default Detailed Strategic Indicators view representation: Radar, Stacked or Polar"),
                                 parameterWithName("dqf_view")
                                         .description("Value for default Detailed Factors view representation: Radar, Stacked or Polar"),
+                                parameterWithName("m_view")
+                                        .description("Value for default Metrics view representation: Gauge or Slider"),
                                 parameterWithName("qm_view")
                                         .description("Value for default Quality Model view representation: Graph or Sunburst"),
                                 parameterWithName("projects_info")
@@ -510,7 +530,7 @@ public void newProfile() throws Exception {
 
         // Verify mock interactions
         verify(profilesController, times(1)).checkNewProfileByName(profileName);
-        verify(profilesController, times(1)).newProfile(profileName, profileDescription, qualityLevel, dsiView, dqfView, qmView, projectsInfoMap);
+        verify(profilesController, times(1)).newProfile(profileName, profileDescription, qualityLevel, dsiView, dqfView, mView, qmView, projectsInfoMap);
 
         verifyNoMoreInteractions(profilesController);
     }
@@ -532,6 +552,7 @@ public void newProductNameAlreadyExists() throws Exception {
         Profile.QualityLevel qualityLevel = Profile.QualityLevel.valueOf("ALL");
         Profile.DetailedViews dsiView = Profile.DetailedViews.valueOf("Radar");
         Profile.DetailedViews dqfView = Profile.DetailedViews.valueOf("Radar");
+        Profile.MetricsView mView = Profile.MetricsView.valueOf("Gauge");
         Profile.QualityModelView qmView = Profile.QualityModelView.valueOf("Graph");
 
         Pair<Long, Boolean> pair = Pair.of(projectId, true);
@@ -557,6 +578,7 @@ public void newProductNameAlreadyExists() throws Exception {
                 .param("quality_level", qualityLevel.toString())
                 .param("dsi_view", dsiView.toString())
                 .param("dqf_view", dqfView.toString())
+                .param("m_view", mView.toString())
                 .param("qm_view", qmView.toString())
                 .param("projects_info", projects_info);