diff --git a/ayanova/src/views/ay-data-list-view.vue b/ayanova/src/views/ay-data-list-view.vue
index 8ad26af7..c615e78c 100644
--- a/ayanova/src/views/ay-data-list-view.vue
+++ b/ayanova/src/views/ay-data-list-view.vue
@@ -85,52 +85,51 @@
                   </v-card-title>
 
                   <v-card-text>
-                    <v-switch
-                      v-model="item.include"
-                      :label="lt('Include')"
-                      :ref="item.key"
-                      :disabled="
-                        item.sort != null || item.filter.items.length > 0
-                      "
-                      @change="includeChanged(item)"
-                    ></v-switch>
-
                     <div class="d-flex justify-space-between">
-                      <v-btn outlined large @click="move('start', index)"
-                        ><v-icon light Large>fa-step-backward</v-icon></v-btn
+                      <v-switch
+                        v-model="item.include"
+                        :label="lt('Include')"
+                        :ref="item.key"
+                        :disabled="
+                          item.sort != null || item.filter.items.length > 0
+                        "
+                        @change="includeChanged(item)"
+                      ></v-switch>
+                      <template v-if="item.isSortable">
+                        <div @click="toggleSort(item)" class="pl-2 pt-2">
+                          <v-btn v-if="item.sort == null" outlined>
+                            <v-icon>fa-sort</v-icon>{{ lt("Sort") }}</v-btn
+                          >
+                          <v-btn
+                            v-if="item.sort != null && item.sort == '-'"
+                            outlined
+                            ><v-icon>fa-sort-amount-down</v-icon
+                            >{{ lt("Sort") }}</v-btn
+                          >
+                          <v-btn
+                            v-if="item.sort != null && item.sort == '+'"
+                            outlined
+                            ><v-icon>fa-sort-amount-up</v-icon
+                            >{{ lt("Sort") }}</v-btn
+                          >
+                        </div>
+                      </template>
+                    </div>
+                    <div class="d-flex justify-space-between">
+                      <v-btn outlined @click="move('start', index)"
+                        ><v-icon>fa-step-backward</v-icon></v-btn
                       >
-                      <v-btn outlined Large @click="move('left', index)"
-                        ><v-icon Large>fa-backward</v-icon></v-btn
+                      <v-btn outlined @click="move('left', index)"
+                        ><v-icon>fa-backward</v-icon></v-btn
                       >
-                      <v-btn outlined Large @click="move('right', index)"
-                        ><v-icon Large>fa-forward</v-icon></v-btn
+                      <v-btn outlined @click="move('right', index)"
+                        ><v-icon>fa-forward</v-icon></v-btn
                       >
-                      <v-btn outlined Large @click="move('end', index)"
-                        ><v-icon Large>fa-step-forward</v-icon></v-btn
+                      <v-btn outlined @click="move('end', index)"
+                        ><v-icon>fa-step-forward</v-icon></v-btn
                       >
                     </div>
 
-                    <template v-if="item.isSortable">
-                      <div @click="toggleSort(item)" class="pl-2 pt-2">
-                        <v-btn v-if="item.sort == null" outlined Large>
-                          <v-icon large>fa-sort</v-icon>{{ lt("Sort") }}</v-btn
-                        >
-                        <v-btn
-                          v-if="item.sort != null && item.sort == '-'"
-                          outlined
-                          Large
-                          ><v-icon large>fa-sort-amount-down</v-icon
-                          >{{ lt("Sort") }}</v-btn
-                        >
-                        <v-btn
-                          v-if="item.sort != null && item.sort == '+'"
-                          outlined
-                          Large
-                          ><v-icon large>fa-sort-amount-up</v-icon
-                          >{{ lt("Sort") }}</v-btn
-                        >
-                      </div>
-                    </template>
                     <template v-if="item.isFilterable">
                       <v-divider class="mx-4 my-5"></v-divider>
                       <div>