diff --git a/members.html b/members.html
index 7804658..3f022c7 100644
--- a/members.html
+++ b/members.html
@@ -37,4 +37,5 @@ title: Liikmed - Lapikud
     </ul>
   </div>
 
-</div>
\ No newline at end of file
+</div>
+
diff --git a/mentors.html b/mentors.html
index 16b882a..5ee6f39 100644
--- a/mentors.html
+++ b/mentors.html
@@ -43,35 +43,24 @@ title: Mentorid - Lapikud
           <li>
             Telefon: <a href="tel:{{ contactMethod.value }}">{{ contactMethod.value }}</a>
           </li>
-          {% endif %}
-
-          {% if contactMethod.name == 'E-mail' %}
+          {% elsif contactMethod.name == 'E-mail' %}
           <li>
             E-mail: <a href="mailto: {{ contactMethod.value }}">{{ contactMethod.value }}</a>
           </li>
-          {% endif %}
-
-          {% if contactMethod.name == 'Messenger' %}
+          {% elsif contactMethod.name == 'Messenger' %}
           <li>
             Messenger: <a href="{{ contactMethod.value }}">{{ contactMethod.value }}</a>
           </li>
-          {% endif %}
-
-          {% if contactMethod.name == 'Telegram' %}
+          {% elsif contactMethod.name == 'Telegram' %}
           <li>
             Telegram: <a href="{{ contactMethod.value }}">{{ contactMethod.value }}</a>
           </li>
-          {% endif %}
-
-          {% if contactMethod.name == 'Facebook' %}
+          {% elsif contactMethod.name == 'Facebook' %}
           <!--<p>Facebook <a href="{{ contactMethod.value }}">{{ contactMethod.value }}</a></p>-->
           <li>
             <a href="{{ contactMethod.value }}">Facebook</a>
           </li>
-          {% endif %}
-
-          {% if contactMethod.name != 'Telefon' and contactMethod.name != 'E-mail' and contactMethod.name != 'Messenger'
-          and contactMethod.name != 'Facebook' and contactMethod.name != 'Telegram' %}
+          {% else %}
           <li>
             {{ contactMethod.name }}: {{ contactMethod.value }}
           </li>