diff --git a/client/web/compose/src/views/Admin/Pages/Builder.vue b/client/web/compose/src/views/Admin/Pages/Builder.vue
index e2a13ec2f..e1a7628aa 100644
--- a/client/web/compose/src/views/Admin/Pages/Builder.vue
+++ b/client/web/compose/src/views/Admin/Pages/Builder.vue
@@ -20,7 +20,7 @@
         value-field="pageLayoutID"
         text-field="label"
         style="max-width: 300px;"
-        @change="setLayout"
+        @change="setLayout()"
       />
 
       <b-button-group
diff --git a/client/web/reporter/src/views/Report/Builder.vue b/client/web/reporter/src/views/Report/Builder.vue
index 80e27f59b..16107f5d8 100644
--- a/client/web/reporter/src/views/Report/Builder.vue
+++ b/client/web/reporter/src/views/Report/Builder.vue
@@ -7,45 +7,37 @@
     </portal>
 
     <portal to="topbar-tools">
-      <div
-        class="d-inline-block mr-2"
-      >
-        <b-input-group
-          size="sm"
-          class="flex-nowrap"
-        >
-          <vue-select
-            v-model="scenarios.selected"
-            :options="scenarioOptions"
-            :get-option-key="getOptionKey"
-            :placeholder="$t('builder:pick-scenario')"
-            :calculate-position="calculateDropdownPosition"
-            class="bg-white rounded"
-            @input="refreshReport()"
-          />
+      <b-input-group style="max-width: 300px;">
+        <vue-select
+          v-model="scenarios.selected"
+          :options="scenarioOptions"
+          :get-option-key="getOptionKey"
+          :placeholder="$t('builder:pick-scenario')"
+          :calculate-position="calculateDropdownPosition"
+          class="bg-white rounded"
+          @input="refreshReport()"
+        />
 
-          <b-input-group-append>
-            <b-button
-              variant="light"
-              :disabled="!canUpdate"
-              size="sm"
-              :title="$t('builder:tooltip.configure-scenarios')"
-              @click="openScenarioConfigurator"
-            >
-              <font-awesome-icon
-                :icon="['fas', 'cog']"
-                class="text-primary"
-              />
-            </b-button>
-          </b-input-group-append>
-        </b-input-group>
-      </div>
+        <b-input-group-append>
+          <b-button
+            variant="light"
+            :disabled="!canUpdate"
+            :title="$t('builder:tooltip.configure-scenarios')"
+            @click="openScenarioConfigurator"
+          >
+            <font-awesome-icon
+              :icon="['fas', 'cog']"
+              class="text-primary"
+            />
+          </b-button>
+        </b-input-group-append>
+      </b-input-group>
 
       <b-button
         :disabled="!canUpdate"
         variant="info"
         size="sm"
-        class="mr-1"
+        class="mr-1 ml-2"
         @click="openDatasourceConfigurator"
       >
         {{ $t('builder:datasources.label') }}
diff --git a/client/web/reporter/src/views/Report/View.vue b/client/web/reporter/src/views/Report/View.vue
index 50e7394b3..2d9758ac6 100644
--- a/client/web/reporter/src/views/Report/View.vue
+++ b/client/web/reporter/src/views/Report/View.vue
@@ -7,20 +7,17 @@
     </portal>
 
     <portal to="topbar-tools">
-      <div
+      <vue-select
         v-if="scenarioOptions.length"
-        class="d-inline-block mr-2"
-      >
-        <vue-select
-          v-model="scenarios.selected"
-          :options="scenarioOptions"
-          :get-option-key="getOptionKey"
-          :placeholder="$t('pick-scenario')"
-          :calculate-position="calculateDropdownPosition"
-          class="bg-white rounded"
-          @input="refreshReport()"
-        />
-      </div>
+        v-model="scenarios.selected"
+        :options="scenarioOptions"
+        :get-option-key="getOptionKey"
+        :placeholder="$t('pick-scenario')"
+        :calculate-position="calculateDropdownPosition"
+        class="bg-white rounded mr-2"
+        style="max-width: 300px;"
+        @input="refreshReport()"
+      />
 
       <b-button-group
         v-if="canUpdate"