diff --git a/public/asset/default/css/framework.css b/public/asset/default/css/framework.css
index 037ea91..46b4389 100644
--- a/public/asset/default/css/framework.css
+++ b/public/asset/default/css/framework.css
@@ -437,6 +437,10 @@ a:visited.background-color-hover-night-light:hover {
   display: block;
 }
 
+.display-inline-block {
+  display: inline-block;
+}
+
 .display-flex {
   display: flex;
 }
diff --git a/src/Controller/TorrentController.php b/src/Controller/TorrentController.php
index 5885f14..646b8eb 100644
--- a/src/Controller/TorrentController.php
+++ b/src/Controller/TorrentController.php
@@ -789,8 +789,7 @@ class TorrentController extends AbstractController
                 'error'     => [],
                 'attribute' =>
                 [
-                    'value'       => $request->get('locales') ? $request->get('locales') : $torrentLocalesCurrent['value'],
-                    'placeholder' => $translator->trans('Content language')
+                    'value' => $request->get('locales') ? $request->get('locales') : $torrentLocalesCurrent['value'],
                 ]
             ]
         ];
@@ -1143,8 +1142,7 @@ class TorrentController extends AbstractController
                 'error'     => [],
                 'attribute' =>
                 [
-                    'value'       => $torrentSensitiveCurrent['value'],
-                    'placeholder' => $translator->trans('Apply sensitive filters to publication')
+                    'value' => $torrentSensitiveCurrent['value'],
                 ]
             ]
         ];
diff --git a/templates/default/torrent/edit/locales.html.twig b/templates/default/torrent/edit/locales.html.twig
index 282f209..1245721 100644
--- a/templates/default/torrent/edit/locales.html.twig
+++ b/templates/default/torrent/edit/locales.html.twig
@@ -2,9 +2,9 @@
 {% block title %}{{'Edit locales'|trans }} - {{'Torrent'|trans }} #{{ torrentId }} - {{ name }}{% endblock %}
 {% block main_content %}
     <div class="padding-24-px margin-y-8-px border-radius-3-px background-color-night">
-        <div class="margin-b-24-px padding-b-16-px border-bottom-default">
+        <div class="margin-b-16-px padding-b-16-px border-bottom-default">
             <h1>
-                {{'Edit locales for torrent'|trans }}
+                {{'Edit locales for torrent' | trans }}
                 <a href="{{ path('torrent_info', { torrentId : torrentId }) }}">#{{ torrentId }}</a>
             </h1>
         </div>
@@ -13,7 +13,7 @@
                 <label for="locales">
                     {{'Content language'|trans }}
                 </label>
-                <sub class="opacity-0 parent-hover-opacity-09" title="{{ form.locales.attribute.placeholder }}">
+                <sub class="opacity-0 parent-hover-opacity-09" title="{{ 'This torrent contains selected languages' | trans }}">
                     <svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" fill="currentColor" viewBox="0 0 16 16">
                         <path d="M8 16A8 8 0 1 0 8 0a8 8 0 0 0 0 16zm.93-9.412-1 4.705c-.07.34.029.533.304.533.194 0 .487-.07.686-.246l-.088.416c-.287.346-.92.598-1.465.598-.703 0-1.002-.422-.808-1.319l.738-3.468c.064-.293.006-.399-.287-.47l-.451-.081.082-.381 2.29-.287zM8 5.5a1 1 0 1 1 0-2 1 1 0 0 1 0 2z"/>
                     </svg>
@@ -23,26 +23,26 @@
                         {{ error }}
                     </div>
                 {% endfor %}
-                <div class="padding-t-8-px">
-                    <select class="width-100 padding-x-0" name="locales[]" multiple="multiple">
-                        {% for locale in locales %}
+                <div class="margin-t-8-px margin-b-16-px">
+                    {% for locale in locales %}
+                        <div class="margin-t-8-px margin-b-4-px margin-r-8-px display-inline-block min-width-120-px">
                             {% if locale in form.locales.attribute.value %}
-                                <option class="padding-x-8-px padding-y-6-px" value="{{ locale }}" selected="selected">
-                                    {{ locale|locale_name(locale)|u.title }}
-                                </option>
+                                <input type="checkbox" name="locales[]" id="{{ locale }}" value="{{ locale }}" checked="checked" />
                             {% else %}
-                                <option class="padding-x-8-px padding-y-6-px" value="{{ locale }}">
-                                    {{ locale|locale_name(locale)|u.title }}
-                                </option>
+                                <input type="checkbox" name="locales[]" id="{{ locale }}" value="{{ locale }}" />
                             {% endif %}
-                        {% endfor %}
-                        {#
-                        <option class="padding-x-8-px padding-y-8-px" value="other">
-                            {{'Other...'|trans }}
-                        </option>
-                        #}
-                    </select>
+                            <label class="margin-l-4-px" for="{{ locale }}">
+                                {{ locale | locale_name(locale) | u.title }}
+                            </label>
+                        </div>
+                    {% endfor %}
+                    {#
+                    <option class="padding-x-8-px padding-y-8-px" value="other">
+                        {{'Other...'|trans }}
+                    </option>
+                    #}
                 </div>
+                <div class="margin-b-16-px border-bottom-default"></div>
             </div>
             <div class="text-right">
                 <a class="margin-r-8-px" href="{{ path('torrent_info', { torrentId : torrentId }) }}">
diff --git a/templates/default/torrent/edit/sensitive.html.twig b/templates/default/torrent/edit/sensitive.html.twig
index 3ab48e2..1721ac7 100644
--- a/templates/default/torrent/edit/sensitive.html.twig
+++ b/templates/default/torrent/edit/sensitive.html.twig
@@ -14,12 +14,13 @@
                 <label for="sensitive">
                     {{'Sensitive'|trans }}
                 </label>
-                <sub class="opacity-0 parent-hover-opacity-09" title="{{ form.sensitive.attribute.placeholder }}">
+                <sub class="opacity-0 parent-hover-opacity-09" title="{{ 'Mark torrent content as sensitive' | trans }}">
                     <svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" fill="currentColor" viewBox="0 0 16 16">
                         <path d="M8 16A8 8 0 1 0 8 0a8 8 0 0 0 0 16zm.93-9.412-1 4.705c-.07.34.029.533.304.533.194 0 .487-.07.686-.246l-.088.416c-.287.346-.92.598-1.465.598-.703 0-1.002-.422-.808-1.319l.738-3.468c.064-.293.006-.399-.287-.47l-.451-.081.082-.381 2.29-.287zM8 5.5a1 1 0 1 1 0-2 1 1 0 0 1 0 2z"/>
                     </svg>
                 </sub>
             </div>
+            <div class="padding-t-4-px margin-b-16-px border-bottom-default"></div>
             <div class="text-right">
                 <a class="margin-r-8-px" href="{{ path('torrent_info', { torrentId : torrentId }) }}">
                     {{'cancel'|trans }}
diff --git a/templates/default/torrent/submit.html.twig b/templates/default/torrent/submit.html.twig
index 061411e..27f6a14 100644
--- a/templates/default/torrent/submit.html.twig
+++ b/templates/default/torrent/submit.html.twig
@@ -16,36 +16,36 @@
             </div>
             <div class="margin-b-16-px border-bottom-default"></div>
             <div class="margin-y-16-px">
-                <label for="locales">
-                    {{'Content language' | trans }}
-                </label>
-                <sub class="opacity-0 parent-hover-opacity-09" title="{{ 'This torrent contains selected languages' | trans }}">
-                    <svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" fill="currentColor" viewBox="0 0 16 16">
-                        <path d="M8 16A8 8 0 1 0 8 0a8 8 0 0 0 0 16zm.93-9.412-1 4.705c-.07.34.029.533.304.533.194 0 .487-.07.686-.246l-.088.416c-.287.346-.92.598-1.465.598-.703 0-1.002-.422-.808-1.319l.738-3.468c.064-.293.006-.399-.287-.47l-.451-.081.082-.381 2.29-.287zM8 5.5a1 1 0 1 1 0-2 1 1 0 0 1 0 2z"/>
-                    </svg>
-                </sub>
-                {% for error in form.locales.error %}
-                    <div class="text-color-red margin-y-8-px">
-                        {{ error }}
-                    </div>
-                {% endfor %}
-                <div class="padding-t-8-px">
-                    {% for locale in locales %}
-                        <div class="padding-t-8-px">
-                            {% if locale in form.locales.attribute.value %}
-                                <input type="checkbox" name="locales[]" id="{{ locale }}" value="{{ locale }}" checked="checked" />
-                            {% else %}
-                                <input type="checkbox" name="locales[]" id="{{ locale }}" value="{{ locale }}" />
-                            {% endif %}
-                            <label class="margin-l-4-px" for="{{ locale }}">
-                                {{ locale | locale_name(locale) | u.title }}
-                            </label>
+                <div class="margin-b-8-px">
+                    <label for="locales">
+                        {{'Content language' | trans }}
+                    </label>
+                    <sub class="opacity-0 parent-hover-opacity-09" title="{{ 'This torrent contains selected languages' | trans }}">
+                        <svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" fill="currentColor" viewBox="0 0 16 16">
+                            <path d="M8 16A8 8 0 1 0 8 0a8 8 0 0 0 0 16zm.93-9.412-1 4.705c-.07.34.029.533.304.533.194 0 .487-.07.686-.246l-.088.416c-.287.346-.92.598-1.465.598-.703 0-1.002-.422-.808-1.319l.738-3.468c.064-.293.006-.399-.287-.47l-.451-.081.082-.381 2.29-.287zM8 5.5a1 1 0 1 1 0-2 1 1 0 0 1 0 2z"/>
+                        </svg>
+                    </sub>
+                    {% for error in form.locales.error %}
+                        <div class="text-color-red margin-y-8-px">
+                            {{ error }}
                         </div>
                     {% endfor %}
-                    {#
-                    {{'Other...'|trans }}
-                    #}
                 </div>
+                {% for locale in locales %}
+                    <div class="margin-t-8-px margin-b-4-px margin-r-8-px display-inline-block min-width-120-px">
+                        {% if locale in form.locales.attribute.value %}
+                            <input type="checkbox" name="locales[]" id="{{ locale }}" value="{{ locale }}" checked="checked" />
+                        {% else %}
+                            <input type="checkbox" name="locales[]" id="{{ locale }}" value="{{ locale }}" />
+                        {% endif %}
+                        <label class="margin-l-4-px" for="{{ locale }}">
+                            {{ locale | locale_name(locale) | u.title }}
+                        </label>
+                    </div>
+                {% endfor %}
+                {#
+                {{'Other...'|trans }}
+                #}
             </div>
             <div class="margin-b-16-px border-bottom-default"></div>
             <div>