diff --git a/components/admin/Federation.vue b/components/admin/Federation.vue
index 1257ca8c..be6d334c 100644
--- a/components/admin/Federation.vue
+++ b/components/admin/Federation.vue
@@ -3,13 +3,25 @@
     el-form(inline label-width='200px')
       el-form-item(:label="$t('admin.enable_federation')")
         el-switch(v-model='enable_federation')
-      el-form-item(:label="$t('admin.enable_comments')")
-        el-switch(v-model='enable_comments')
-      el-form-item(:label="$t('admin.disable_gamification')")
-        el-switch(v-model='disable_gamification')
+        el-popover(:content="$t('admin.enable_federation_help')" trigger='hover')
+          span.ml-1(slot='reference')
+            i.el-icon-info
 
-      el-divider {{$t('common.instances')}}
-      el-table(:data='paginatedInstances' small)
+      el-form-item(v-show='enable_federation' :label="$t('admin.enable_comments')")
+        el-switch(v-model='enable_comments')
+        el-popover(:content="$t('admin.enable_comments_help')" trigger='hover')
+          span.ml-1(slot='reference')
+            i.el-icon-info
+
+      el-form-item(v-show='enable_federation' :label="$t('admin.disable_gamification')")
+        el-switch(v-model='disable_gamification')
+        el-popover(:content="$t('admin.disable_gamification_help')" trigger='hover')
+          span.ml-1(slot='reference')
+            i.el-icon-info
+
+
+      el-divider(v-if='enable_federation') {{$t('common.instances')}}
+      el-table(v-if='enable_federation' :data='paginatedInstances' small)
         el-table-column(label='Domain' width='250')
           template(slot-scope='data')
             span(slot='reference') <img class='instance_thumb' :src="data.row.data.thumbnail"/> {{data.row.domain}}
@@ -19,7 +31,7 @@
         el-table-column(label='Users' width='150')
           template(slot-scope='data')
             span(slot='reference') {{data.row.users}}
-        el-table-column(:label="$t('common.actions')" width='300')
+        el-table-column(:label="$t('common.actions')" width='200')
           template(slot-scope='data')
             el-button-group
               el-button(size='mini'
@@ -27,7 +39,7 @@
                 @click='toggleBlock(data.row)') {{data.row.blocked?$t('admin.unblock_instance'):$t('admin.block_instance')}}
 
       client-only
-        el-pagination(:page-size='perPage' :currentPage.sync='instancePage' :total='instances.length')
+        el-pagination(v-if='enable_federation && instances.length>perPage' :page-size='perPage' :currentPage.sync='instancePage' :total='instances.length')
 
 </template>
 <script>
diff --git a/locales/it.js b/locales/it.js
index 79861282..24a850ef 100644
--- a/locales/it.js
+++ b/locales/it.js
@@ -160,9 +160,12 @@ export default {
     recurrent_event_visible: 'Appuntamenti fissi visibili di default',
     federation: 'Federazione / ActivityPub',
     enable_federation: 'Abilita la federazione!',
+    enable_federation_help: 'Sarà possibile seguire questa istanza dal fediverso',
     select_instance_timezone: 'Seleziona la timezone',
     enable_comments: 'Abilita commenti',
-    disable_gamification: 'Disabilita gamification',
+    enable_comments_help: 'Permette di aggiungere risorse all\'evento dal fediverso',
+    disable_gamification: 'Evita gamification',
+    disable_gamification_help: 'Nasconde le piccole icone che mostrano il numero di boost/bookmark in arrivo dal fediverso',
     block_instance: 'Blocca',
     unblock_instance: 'Sblocca'
   },