diff --git a/src/app/getting-started/getting-started.component.css b/src/app/getting-started/getting-started.component.css
index 4cf9a563ff39cd3bc40181da386c7a23a479cf54..3bdb06d8c44d1413c1e3b258bce409da91dfe4ee 100644
--- a/src/app/getting-started/getting-started.component.css
+++ b/src/app/getting-started/getting-started.component.css
@@ -4,7 +4,6 @@
     width: -webkit-fill-available;
     background: #8C93D8;
     padding: 0 6%;
-    display: inline-flex;
     overflow: hidden;
 }
 
@@ -12,7 +11,7 @@
     position: absolute;
     right: 0%;
     top: 0;
-    width: 40%;
+    width: 50%;
     height: 110vh;
     overflow: hidden;
     pointer-events: none;
@@ -20,10 +19,10 @@
 
 .overflow img{
     position: absolute;
-    width: 140%;
-    height: 140%;
-    margin-right: -100%;
-    margin-top: -60%;
+    width: 30vw;
+    height: 110vh;
+    margin-left: 16vw;
+    margin-top: 0;
 }
 
 .flexbox{
@@ -47,7 +46,7 @@
     font-style: normal;
     font-weight: normal;
     margin: 0;
-    font-size: 122px;
+    font-size: 6vw;
     align-items: center;
     text-align: center;
     font-feature-settings: 'kern' off;
@@ -63,7 +62,7 @@
     font-family: 'Nova Round', cursive;
     font-style: normal;
     font-weight: normal;
-    font-size: 52px;
+    font-size: 2.5vw;
     margin: 1% 0;
     align-items: center;
     text-align: center;
@@ -84,9 +83,8 @@
     font-family: 'Montserrat', sans-serif;
     font-style: normal;
     font-weight: normal;
-    font-size: 24px;
+    font-size: 1.25vw;
     margin: 3% 0;
-    line-height: 29px;
     align-items: center;
     text-align: center;
 
@@ -106,16 +104,24 @@
     font-family: 'Montserrat', sans-serif;
     font-style: normal;
     font-weight: normal;
-    font-size: 24px;
-    line-height: 28px;
+    font-size: 1.25vw;
     align-items: center;
     text-align: center;
 
     color: #FFFAE7;
 }
 
-span{
+.emergency span{
     color: #FF9848;
+    font-size: 1.25vw;
+}
+
+#number{
+    font-weight: bold;
+}
+
+#maplink{
+    text-decoration: underline;
 }
 
 #inputbox{
@@ -139,7 +145,7 @@ span{
     font-family: 'Montserrat', sans-serif;
     font-style: normal;
     font-weight: normal;
-    font-size: 36px;
+    font-size: 1.75vw;
     line-height: 44px;
     justify-self: center;
 
@@ -170,7 +176,7 @@ span{
     justify-content: center;
     display: flex;
     align-items: center;
-    margin: 2% 0;
+    margin: 1.2vw 0;
     transition-duration: 0.4s;
 }
 
@@ -203,14 +209,15 @@ span{
     font-family: 'Montserrat', sans-serif;
     font-style: normal;
     font-weight: normal;
-    font-size: 24px;
+    font-size: 1.25vw;
     text-align: center;
 
     color: #FC5C14;
 }
 
 .cantonbox{
-    height: 4vw;
+    height: 4vh;
+    margin: 1.3vw 0;
 }
 
 .age{
@@ -223,7 +230,7 @@ span{
 .age > .selbox{
     position: relative;
     width: 30%;
-    height: 4vw;
+    height: 4vh;
 }
 
 .submitbox{
@@ -242,7 +249,7 @@ span{
 .submitbox > .selbox{
     position: relative;
     width: 13vw;
-    height: 4vw;
+    height: 4vh;
 }
 
 .submitbox .selbox:hover{
@@ -286,11 +293,11 @@ span{
     border: 1px solid #ccc;
     box-sizing: border-box;
     border-radius: 30px;
-    padding: 10px;
+    padding: .5vw;
     font-family: 'Montserrat', sans-serif;
     font-style: normal;
     font-weight: normal;
-    font-size: 24px;
+    font-size: 1.25vw;
     text-align: center;
     width: 50%;
     outline: none;
@@ -306,8 +313,8 @@ span{
     font-family: 'Montserrat', sans-serif;
     font-style: normal;
     font-weight: normal;
-    font-size: 24px;
-    text-align: center;
+    font-size: 1.25vw;
+    text-align: center;   
     font-size: 1.1em;
     color: rgb(105, 105, 105);
     border: 1px solid #ccc;
diff --git a/src/app/getting-started/getting-started.component.html b/src/app/getting-started/getting-started.component.html
index 8ec9ab9c8193d5384e6192f6c72cd1912691f6f1..858d0bf5e606b7357603d623893e1784bb3ee31e 100644
--- a/src/app/getting-started/getting-started.component.html
+++ b/src/app/getting-started/getting-started.component.html
@@ -5,7 +5,7 @@
             <h2>You Are Not Alone</h2>
             <div class="line1"></div>
             <p>Welcome to the safe place ! Here you can find help and useful information. Come and join the community !</p>
-            <div class="emergency">Are you in an emergency ? Call <span><b>147</b></span> or find help <span><u>near you</u></span></div>
+            <div class="emergency">Are you in an emergency ? Call <span id="number">147</span> or find help <span id="maplink">near you</span></div>
         </div>
         <div id="inputbox">
             <h2>Find help</h2>
diff --git a/src/app/header/header.component.css b/src/app/header/header.component.css
index 486fc49115430c447ac220b8af7391daadc5c6d2..afd23758d68d7125b1898e568c48bf551b903da5 100644
--- a/src/app/header/header.component.css
+++ b/src/app/header/header.component.css
@@ -14,6 +14,10 @@
   padding-top: 20px;
 }
 
+#logo:hover {
+  cursor: pointer;
+}
+
 .nav__list {
   list-style: none;
   margin: 0;
diff --git a/src/app/header/header.component.html b/src/app/header/header.component.html
index a3e15ca52cc3a173295c660199d075d811de7bcb..8e4517193f3c7cc1c7cb854e04f2f1b0b432d5d6 100644
--- a/src/app/header/header.component.html
+++ b/src/app/header/header.component.html
@@ -1,5 +1,5 @@
 <div class="vertical-nav col" id="sidebar">
-  <span id="logo">
+  <span id="logo" [routerLink]="['/']" skipLocationChange>
         <img src="../../assets/favicon.svg" height=96>
   </span>