diff --git a/smash/web/templates/doctors/index.html b/smash/web/templates/doctors/index.html
index ceff757997e1aac4645582c49bc277ed6c05d098..1d64262cef902c2a22b2a491151399e618c2887c 100644
--- a/smash/web/templates/doctors/index.html
+++ b/smash/web/templates/doctors/index.html
@@ -37,10 +37,14 @@
                 <th>First name</th>
                 <th>Last name</th>
                 <th>Languages</th>
-                <th>Unit</th>
+                {% if worker_type == 'STAFF' %}
+                    <th>Unit</th>
+                {% endif %}
                 <th>Details</th>
-                <th>On leave</th>
-                <th>Disabled</th>
+                {% if worker_type == 'STAFF' %}
+                    <th>On leave</th>
+                    <th>Disabled</th>
+                {% endif %}
             </tr>
             </thead>
             <tbody>
@@ -56,23 +60,28 @@
                             {% endfor %}
                         {% endautoescape %}
                     </td>
-                    <td>{{ worker.unit }}</td>
+                    {% if worker_type == 'STAFF' %}
+                        <td>{{ worker.unit }}</td>
+                    {% endif %}
                     <td><a href="{% url 'web.views.worker_edit' worker.id %}" type="button"
                            class="btn btn-block btn-default">Details</a></td>
-                    <td>
-                        {% if worker.is_on_leave %}
-                            <button type="button" class="btn btn-block btn-danger">YES</button>
-                        {% else %}
-                            <button type="button" class="btn btn-block btn-success">NO</button>
-                        {% endif %}
-                    </td>
-                    <td>
-                        {% if worker.is_active %}
-                            <a href="{% url 'web.views.worker_disable' worker.id %}" class="btn btn-block btn-warning">DISABLE</a>
-                        {% else %}
-                            YES
-                        {% endif %}
-                    </td>
+                    {% if worker_type == 'STAFF' %}
+                        <td>
+                            {% if worker.is_on_leave %}
+                                <button type="button" class="btn btn-block btn-danger">YES</button>
+                            {% else %}
+                                <button type="button" class="btn btn-block btn-success">NO</button>
+                            {% endif %}
+                        </td>
+                        <td>
+                            {% if worker.is_active %}
+                                <a href="{% url 'web.views.worker_disable' worker.id %}"
+                                   class="btn btn-block btn-warning">DISABLE</a>
+                            {% else %}
+                                YES
+                            {% endif %}
+                        </td>
+                    {% endif %}
                 </tr>
             {% endfor %}
 
diff --git a/smash/web/templates/voucher_types/add_edit.html b/smash/web/templates/voucher_types/add_edit.html
index 40e6e35c53cc59858bf1f630aefae9c1fe99ffec..484492034b2dfcd42c437116ec253f903c9afd2f 100644
--- a/smash/web/templates/voucher_types/add_edit.html
+++ b/smash/web/templates/voucher_types/add_edit.html
@@ -61,7 +61,7 @@
                     </form>
                     {% if voucher_type.study %}
                         <div class="box-header with-border">
-                            <h3>Prices <a title="add a new contact attempt"
+                            <h3>Prices <a title="add a new price"
                                           id="add-contact-attempt"
                                           href="{% url 'web.views.voucher_type_price_add' voucher_type.id %}"
                                           class="text-primary"