diff --git a/src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/freetext-input.js b/src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/freetext-input.js
deleted file mode 100644
index 65b66dc13..000000000
--- a/src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/freetext-input.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import {ShowHide} from 'ChillMainAssets/lib/show_hide/show_hide.js';
-
-window.addEventListener('DOMContentLoaded', function() {
-    let
-        freetextContainer = document.querySelector('#freetext-entity'),
-        entitySelector = document.querySelector('#entity-selector')
-    ;
-    if (null === entitySelector) {
-        return;
-    }
-
-    new ShowHide({
-        debug: true,
-        load_event: null,
-        froms: [entitySelector],
-        container: [freetextContainer],
-        test: function(froms, event) {
-            for (let container of froms) {
-                return container.querySelector('input[value="freetext"]').checked;
-            }
-            console.log('we couldnt find the input');
-            return false;
-        },
-    })
-});
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/showhide-input.js b/src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/showhide-input.js
index da5f812c6..d9da5eb79 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/showhide-input.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/showhide-input.js
@@ -3,7 +3,9 @@ import {ShowHide} from 'ChillMainAssets/lib/show_hide/show_hide.js';
 window.addEventListener('DOMContentLoaded', function() {
     let
         personContainer = document.querySelector('#person-entity'),
-        entitySelector = document.querySelector('#entity-selector')
+        entitySelector = document.querySelector('#entity-selector'),
+        freetextContainer = document.querySelector('#freetext-entity'),
+        thirdpartyContainer = document.querySelector('#thirdparty-entity')
     ;
     if (null === entitySelector) {
         return;
@@ -22,4 +24,32 @@ window.addEventListener('DOMContentLoaded', function() {
             return false;
         },
     })
+
+    new ShowHide({
+        debug: true,
+        load_event: null,
+        froms: [entitySelector],
+        container: [thirdpartyContainer],
+        test: function(froms, event) {
+            for (let container of froms) {
+                return container.querySelector('input[value="thirdparty"]').checked;
+            }
+            console.log('we couldnt find the input');
+            return false;
+        },
+    })
+
+    new ShowHide({
+        debug: true,
+        load_event: null,
+        froms: [entitySelector],
+        container: [freetextContainer],
+        test: function(froms, event) {
+            for (let container of froms) {
+                return container.querySelector('input[value="freetext"]').checked;
+            }
+            console.log('we couldnt find the input');
+            return false;
+        },
+    })
 });
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/thirdparty-input.js b/src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/thirdparty-input.js
deleted file mode 100644
index 876adc7c9..000000000
--- a/src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/thirdparty-input.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import {ShowHide} from 'ChillMainAssets/lib/show_hide/show_hide.js';
-
-window.addEventListener('DOMContentLoaded', function() {
-    let
-        thirdpartyContainer = document.querySelector('#thirdparty-entity'),
-        entitySelector = document.querySelector('#entity-selector')
-    ;
-    if (null === entitySelector) {
-        return;
-    }
-
-    new ShowHide({
-        debug: true,
-        load_event: null,
-        froms: [entitySelector],
-        container: [thirdpartyContainer],
-        test: function(froms, event) {
-            for (let container of froms) {
-                return container.querySelector('input[value="thirdparty"]').checked;
-            }
-            console.log('we couldnt find the input');
-            return false;
-        },
-    })
-});
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
index b572d9d11..cb542b6a1 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
@@ -5,16 +5,12 @@
 {% block title %}{{ 'Person resources'|trans|capitalize ~ ' ' ~ person|chill_entity_render_string }}{% endblock %}
 
 {% block js %}
-    {{ encore_entry_script_tags('page_person_resource_person_input') }}
-    {{ encore_entry_script_tags('page_person_resource_thirdparty_input') }}
-    {{ encore_entry_script_tags('page_person_resource_freetext_input') }}
+    {{ encore_entry_script_tags('page_person_resource_showhide_input') }}
     {{ encore_entry_script_tags('mod_pickentity_type') }}
 {% endblock %}
 
 {% block css %}
-    {{ encore_entry_link_tags('page_person_resource_person_input') }}
-    {{ encore_entry_link_tags('page_person_resource_thirdparty_input') }}
-    {{ encore_entry_link_tags('page_person_resource_freetext_input') }}
+    {{ encore_entry_link_tags('page_person_resource_showhide_input') }}
     {{ encore_entry_link_tags('mod_pickentity_type') }}
 {% endblock %}
 
@@ -63,17 +59,15 @@
                         </div>
                     </div>
                 </div>
-                <div class="item-row">
-                    <section class="chill-entity entity-comment-embeddable">
-                    {% if resource.kind %}
-                        <blockquote class="chill-user-quote">
-                            <div>{{ resource.comment.comment }}<div>
-                        </blockquote>
-                    {% else %}
-                        <p class="chill-no-data-statement">{{ 'no comment found'|trans|capitalize }}</p>
-                    {% endif %}
-                    </section>
-                </div>
+                {% if resource.kind %}
+                    <div class="item-row separator">
+                        <section class="chill-entity entity-comment-embeddable">
+                            <blockquote class="chill-user-quote">
+                                <div>{{ resource.comment.comment }}<div>
+                            </blockquote>
+                        </section>
+                    </div>
+                {% endif %}
                 <div class="item-row separator">
                     <div class="item-col">
                         <ul class="record_actions">
diff --git a/src/Bundle/ChillPersonBundle/chill.webpack.config.js b/src/Bundle/ChillPersonBundle/chill.webpack.config.js
index 45003307b..db97b8136 100644
--- a/src/Bundle/ChillPersonBundle/chill.webpack.config.js
+++ b/src/Bundle/ChillPersonBundle/chill.webpack.config.js
@@ -18,9 +18,7 @@ module.exports = function(encore, entries)
     encore.addEntry('page_person', __dirname + '/Resources/public/page/person/index.js');
     encore.addEntry('page_accompanying_course_index_person_locate', __dirname + '/Resources/public/page/accompanying_course_index/person_locate.js');
     encore.addEntry('page_accompanying_course_index_masonry', __dirname + '/Resources/public/page/accompanying_course_index/masonry.js');
-    encore.addEntry('page_person_resource_person_input', __dirname + '/Resources/public/page/person_resource/person-input.js');
-    encore.addEntry('page_person_resource_thirdparty_input', __dirname + '/Resources/public/page/person_resource/thirdparty-input.js');
-    encore.addEntry('page_person_resource_freetext_input', __dirname + '/Resources/public/page/person_resource/freetext-input.js');
+    encore.addEntry('page_person_resource_showhide_input', __dirname + '/Resources/public/page/person_resource/showhide-input.js');
     encore.addEntry('page_suggest_names', __dirname + '/Resources/public/page/person/suggest-names.js');
     encore.addEntry('page_person_resource', __dirname + '/Resources/public/page/person_resource/index.js');
 };