diff --git a/_data/company.yml b/_data/company.yml
index 90a34480..09315531 100644
--- a/_data/company.yml
+++ b/_data/company.yml
@@ -1,10 +1,10 @@
 company_name: Datahack
 mission_statement: >-
-  Datahack is an Israeli non-profit dedicated to the advancement of data science
+  Datahack is an Israeli non-profit dedicated to promoting diversity in AI, data science
   and machine learning in Israel.
-address: 'Givat Ram Campus, Jerusalem'
+address: 'Tel Aviv'
 phone: +92-50-DATA-HACK
-email: contact@datahack-il.com
+email: contact@datahack.org.il
 facebook: datahackil
 twitter: DataHackIL
-youtube: channel/UCdR7G8Yeh52LK1AvfFaEsqQ
\ No newline at end of file
+youtube: channel/UCdR7G8Yeh52LK1AvfFaEsqQ
diff --git a/_includes/icons/site.html b/_includes/icons/site.html
index 91b155aa..b94452cf 100644
--- a/_includes/icons/site.html
+++ b/_includes/icons/site.html
@@ -66,7 +66,7 @@
 
 	{% when "datacoach" %}
 	    <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" focusable="false" width="48" height="48" style="-ms-transform: rotate(360deg); -webkit-transform: rotate(360deg); transform: rotate(360deg);" preserveAspectRatio="xMidYMid meet" viewBox="0 0 24 24">
-	        <path d="M95.4,5L86.8,4c-1.3-0.2-2.5,0.8-2.6,2.1l-0.9,7c-3.9-0.4-8-0.8-12.3-1c-0.8-1-2.1-1.5-3.5-1.4c-0.9,0.1-1.7,0.5-2.3,1.1     c-5-0.2-10.1-0.3-15.2-0.3c-5.2,0-10.3,0.1-15.2,0.3c-0.6-0.6-1.4-1-2.3-1.1c-1.4-0.1-2.6,0.4-3.5,1.4c-4.2,0.3-8.4,0.6-12.3,1     l-0.9-7c-0.2-1.3-1.3-2.2-2.6-2.1L4.6,5C3.3,5.2,2.4,6.3,2.5,7.6l2.1,17.1c0.2,1.3,1.3,2.2,2.6,2.1l8.6-1.1     c1.3-0.2,2.2-1.3,2.1-2.6l-0.8-6.8c3.4-0.4,7-0.7,10.8-0.9l-0.6,6c-1,9.5,4.5,18.5,13.1,21.9l-0.2,19.1l-6,10.4     c-0.4,0.7-0.6,1.4-0.6,2.2l-0.1,16.5c0,2.5,2,4.5,4.5,4.5c0,0,0,0,0,0c2.5,0,4.5-2,4.5-4.5l0.1-15.4l6.4-11h2.3l6.4,11l0.1,15.4     c0,2.5,2,4.5,4.5,4.5c0,0,0,0,0,0c2.5,0,4.5-2.1,4.5-4.5L66.5,75c0-0.8-0.2-1.5-0.6-2.2l-6-10.4l-0.2-19.1     c8.6-3.3,14-12.4,13.1-21.9l-0.6-6c3.7,0.3,7.3,0.6,10.8,0.9l-0.8,6.8c-0.2,1.3,0.8,2.5,2.1,2.6l8.6,1.1c1.3,0.2,2.5-0.8,2.6-2.1     l2.1-17.1C97.6,6.3,96.7,5.2,95.4,5z M64,15l0.7,7.2c0.6,6.1-2.9,11.8-8.4,13.7c-3.9,1.3-8.7,1.3-12.6,0c-5.5-1.9-9-7.6-8.4-13.7     L36,15c0,0,0,0,0,0c4.6-0.2,9.2-0.3,14-0.3C54.7,14.7,59.4,14.8,64,15C64,15,64,15,64,15z" fill="#3F21D6"/>
+	        <path d="M96 64c0-17.7 14.3-32 32-32h32c17.7 0 32 14.3 32 32V224v64V448c0 17.7-14.3 32-32 32H128c-17.7 0-32-14.3-32-32V384H64c-17.7 0-32-14.3-32-32V288c-17.7 0-32-14.3-32-32s14.3-32 32-32V160c0-17.7 14.3-32 32-32H96V64zm448 0v64h32c17.7 0 32 14.3 32 32v64c17.7 0 32 14.3 32 32s-14.3 32-32 32v64c0 17.7-14.3 32-32 32H544v64c0 17.7-14.3 32-32 32H480c-17.7 0-32-14.3-32-32V288 224 64c0-17.7 14.3-32 32-32h32c17.7 0 32 14.3 32 32zM416 224v64H224V224H416z" fill="#3F21D6"/>
 	        <rect x="0" y="0" width="24" height="24" fill="rgba(0, 0, 0, 0)" />
 	     </svg>
 
diff --git a/index.html b/index.html
index a06ae90d..344c8bc1 100644
--- a/index.html
+++ b/index.html
@@ -115,7 +115,7 @@ <h3 class="editable">
 				<!--<a href="https://www.dataconf.org" target="_blank" style="color:#3F21D6;text-decoration:none">DataConf</a>--><text style="color:#3F21D6">DataCoach</text>
 			</h3>
 			<p class="editable">
-				A joint program - with the Technion, Tsofen nonprofit and several tech companies - coaching Arab STEM students from their final year of undergrad’s through their master’s degree and all the way to their first data science position.
+				Coaching Arab STEM students from their Bachelor's final year of through their master’s to their first data science position. Partners: Israel Innovation Authority, Technion, Tsofen, Forter & more.
 			</p>
 		</li>
 	</ul>
@@ -196,7 +196,7 @@ <h2 class="editable" style="text-align: center;">
             	<blockquote> <!--row 1-->
             		<div class="attribute">
             			<p class="meta">
-            				<span class="image"><img class="editable" src="{{ site.baseurl }}/team/gal_hever.jpg" alt="Gal Hever" /></span>
+            				<span class="image"><img class="editable" src="{{ site.baseurl }}images/team/gal_hever.jpg" alt="Gal Hever" /></span>
             				<span class="author editable"><strong>Gal Hever, DataNights Lead</strong></span>
             			</p>
             		</div>
@@ -204,7 +204,7 @@ <h2 class="editable" style="text-align: center;">
             	<blockquote> <!--row 2-->
             		<div class="attribute">
             			<p class="meta">
-            				<span class="image"><img class="editable" src="{{ site.baseurl }}/team/daniel.jpg" alt="Daniel Marcous" /></span>
+            				<span class="image"><img class="editable" src="{{ site.baseurl }}images/team/daniel.jpg" alt="Daniel Marcous" /></span>
             				<span class="author editable"><strong>Daniel Marcous, KaggleIL Lead</strong></span>
             			</p>
             		</div>
@@ -212,7 +212,7 @@ <h2 class="editable" style="text-align: center;">
             	<blockquote> <!--row 3-->
             		<div class="attribute">
             			<p class="meta">
-            				<span class="image"><img class="editable" src="{{ site.baseurl }}/team/avihay.jpg" alt="Avihay Levi" /></span>
+            				<span class="image"><img class="editable" src="{{ site.baseurl }}images/team/avihay.jpg" alt="Avihay Levi" /></span>
             				<span class="author editable"><strong>Avihay Levi, DataTalks HFA</strong></span>
             			</p>
             		</div>
@@ -220,7 +220,7 @@ <h2 class="editable" style="text-align: center;">
             	<blockquote> <!--row 4-->
             		<div class="attribute">
             			<p class="meta">
-            				<span class="image"><img class="editable" src="{{ site.baseurl }}/team/new_recruit.jpg" alt="Maybe it's you?" /></span>
+            				<span class="image"><img class="editable" src="{{ site.baseurl }}images/team/new_recruit.jpg" alt="Maybe it's you?" /></span>
             				<span class="author editable"><strong>Maybe it's you? Contact us!</strong></span>
             			</p>
             		</div>
@@ -240,7 +240,7 @@ <h2 class="editable" style="text-align: center;">
             	<blockquote> <!--row 2-->
             		<div class="attribute">
             			<p class="meta">
-            				<span class="image"><img class="editable" src="{{ site.baseurl }}/team/amnon_wahle.jpg" alt="Amnon Wahle" /></span>
+            				<span class="image"><img class="editable" src="{{ site.baseurl }}images/team/amnon_wahle.jpg" alt="Amnon Wahle" /></span>
             				<span class="author editable"><strong>Amnon Wahle, DataNights</strong></span>
             			</p>
             		</div>
@@ -248,7 +248,7 @@ <h2 class="editable" style="text-align: center;">
             	<blockquote> <!--row 3-->
             		<div class="attribute">
             			<p class="meta">
-            				<span class="image"><img class="editable" src="{{ site.baseurl }}/team/nitzan.jpg" alt="Nitzan Guberman" /></span>
+            				<span class="image"><img class="editable" src="{{ site.baseurl }}images/team/nitzan.jpg" alt="Nitzan Guberman" /></span>
             				<span class="author editable"><strong>Nitzan Guberman, Hackathon Runner</strong></span>
             			</p>
             		</div>
@@ -256,7 +256,7 @@ <h2 class="editable" style="text-align: center;">
             	<blockquote> <!--row 4-->
             		<div class="attribute">
             			<p class="meta">
-            				<span class="image"><img class="editable" src="{{ site.baseurl }}/team/dean_langsam.jpg" alt="Dean Langsam" /></span>
+            				<span class="image"><img class="editable" src="{{ site.baseurl }}images/team/dean_langsam.jpg" alt="Dean Langsam" /></span>
             				<span class="author editable"><strong>Dean Langsam, Marketing & Social</strong></span>
             			</p>
             		</div>
@@ -268,7 +268,7 @@ <h2 class="editable" style="text-align: center;">
             	<blockquote> <!--row 1-->
             		<div class="attribute">
             			<p class="meta">
-            				<span class="image"><img class="editable" src="{{ site.baseurl }}/team/inbar.jpg" alt="Inbar Naor" /></span>
+            				<span class="image"><img class="editable" src="{{ site.baseurl }}images/team/inbar.jpg" alt="Inbar Naor" /></span>
             				<span class="author editable"><strong>Inbar Naor, Founder & Board</strong></span>
             			</p>
             		</div>
@@ -276,7 +276,7 @@ <h2 class="editable" style="text-align: center;">
             	<blockquote> <!--row 2-->
             		<div class="attribute">
             			<p class="meta">
-            				<span class="image"><img class="editable" src="{{ site.baseurl }}/team/adam.jpg" alt="Adam Rosenthal" /></span>
+            				<span class="image"><img class="editable" src="{{ site.baseurl }}images/team/adam.jpg" alt="Adam Rosenthal" /></span>
             				<span class="author editable"><strong>Adam Rosenthal, Finance Officer</strong></span>
             			</p>
             		</div>
@@ -284,7 +284,7 @@ <h2 class="editable" style="text-align: center;">
             	<blockquote> <!--row 3-->
             		<div class="attribute">
             			<p class="meta">
-            				<span class="image"><img class="editable" src="{{ site.baseurl }}/team/tom_beer.jpg" alt="Tome Beer, DataTalks Haifa" /></span>
+            				<span class="image"><img class="editable" src="{{ site.baseurl }}images/team/tom_beer.jpg" alt="Tome Beer, DataTalks Haifa" /></span>
             				<span class="author editable"><strong>Tome Beer, DataTalks Haifa</strong></span>
             			</p>
             		</div>
@@ -292,7 +292,7 @@ <h2 class="editable" style="text-align: center;">
             	<blockquote> <!--row 4-->
             		<div class="attribute">
             			<p class="meta">
-            				<span class="image"><img class="editable" src="{{ site.baseurl }}/team/dana.jpg" alt="Dana Kaner" /></span>
+            				<span class="image"><img class="editable" src="{{ site.baseurl }}images/team/dana.jpg" alt="Dana Kaner" /></span>
             				<span class="author editable"><strong>Dana Kaner, DataLearn Lead</strong></span>
             			</p>
             		</div>
@@ -304,7 +304,7 @@ <h2 class="editable" style="text-align: center;">
             	<blockquote> <!--row 1-->
             		<div class="attribute">
             			<p class="meta">
-            				<span class="image"><img class="editable" src="{{ site.baseurl }}/team/sharon.jpg" alt="Sharon Cooper" /></span>
+            				<span class="image"><img class="editable" src="{{ site.baseurl }}images/team/sharon.jpg" alt="Sharon Cooper" /></span>
             				<span class="author editable"><strong>Sharon Cooper, DataTalks Lead</strong></span>
             			</p>
             		</div>
@@ -312,7 +312,7 @@ <h2 class="editable" style="text-align: center;">
             	<blockquote> <!--row 2-->
             		<div class="attribute">
             			<p class="meta">
-            				<span class="image"><img class="editable" src="{{ site.baseurl }}/team/asaf.jpg" alt="Nitzan Guberman" /></span>
+            				<span class="image"><img class="editable" src="{{ site.baseurl }}images/team/asaf.jpg" alt="Nitzan Guberman" /></span>
             				<span class="author editable"><strong>Assaf Valdersky, DataTalks Lead</strong></span>
             			</p>
             		</div>
@@ -320,7 +320,7 @@ <h2 class="editable" style="text-align: center;">
             	<blockquote> <!--row 3-->
             		<div class="attribute">
             			<p class="meta">
-            				<span class="image"><img class="editable" src="{{ site.baseurl }}/team/aviv.jpg" alt="Aviv Rotman" /></span>
+            				<span class="image"><img class="editable" src="{{ site.baseurl }}images/team/aviv.jpg" alt="Aviv Rotman" /></span>
             				<span class="author editable"><strong>Aviv Rotman, Hackathon Runner</strong></span>
             			</p>
             		</div>
@@ -328,7 +328,7 @@ <h2 class="editable" style="text-align: center;">
             	<blockquote> <!--row 4-->
             		<div class="attribute">
             			<p class="meta">
-            				<span class="image"><img class="editable" src="{{ site.baseurl }}/team/new_recruit.jpg" alt="Maybe it's you?" /></span>
+            				<span class="image"><img class="editable" src="{{ site.baseurl }}images/team/new_recruit.jpg" alt="Maybe it's you?" /></span>
             				<span class="author editable"><strong>Maybe it's you? Contact us!</strong></span>
             			</p>
             		</div>