diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 9d0916a8e..5c40dfdd5 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -107,21 +107,28 @@ watch(formUrl, async () => {
         <QIcon name="warning" size="md" class="q-mr-md" />
         <span>{{ t('globals.changesToSave') }}</span>
     </QBanner>
-    <QForm v-if="formData" @submit="save" @reset="reset" class="q-pa-md">
-        <slot name="form" :data="formData" :validate="validate" :filter="filter"></slot>
-        <div class="q-mt-lg">
-            <slot name="actions">
-                <QBtn :label="t('globals.save')" type="submit" color="primary" />
-                <QBtn
-                    :label="t('globals.reset')"
-                    type="reset"
-                    class="q-ml-sm"
-                    color="primary"
-                    flat
-                    :disable="!hasChanges"
-                />
-            </slot>
-        </div>
+    <QForm v-if="formData" @submit="save" @reset="reset" class="q-pa-md formModel">
+        <QCard class="q-pa-lg">
+            <slot
+                name="form"
+                :data="formData"
+                :validate="validate"
+                :filter="filter"
+            ></slot>
+            <div class="q-mt-lg">
+                <slot name="actions">
+                    <QBtn :label="t('globals.save')" type="submit" color="primary" />
+                    <QBtn
+                        :label="t('globals.reset')"
+                        type="reset"
+                        class="q-ml-sm"
+                        color="primary"
+                        flat
+                        :disable="!hasChanges"
+                    />
+                </slot>
+            </div>
+        </QCard>
     </QForm>
     <SkeletonForm v-if="!formData" />
     <QInnerLoading
@@ -130,3 +137,16 @@ watch(formUrl, async () => {
         color="primary"
     />
 </template>
+
+<style lang="scss">
+@media screen and (max-width: 800px) {
+    .q-card > div {
+        flex-direction: column;
+    }
+}
+
+.formModel {
+    max-width: 800px;
+    width: 100%;
+}
+</style>
diff --git a/src/css/app.scss b/src/css/app.scss
index a65fcfec6..3c8cc50b6 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -14,12 +14,6 @@ a {
     color: $orange-4;
 }
 
-@media screen and (max-width: $width-md) {
-    .q-form > div {
-        flex-direction: column;
-    }
-}
-
 // Removes chrome autofill background
 input:-webkit-autofill,
 select:-webkit-autofill {
diff --git a/src/css/quasar.variables.scss b/src/css/quasar.variables.scss
index 558aa63f0..d6a55ff93 100644
--- a/src/css/quasar.variables.scss
+++ b/src/css/quasar.variables.scss
@@ -48,12 +48,4 @@ $dark: #292929;
 $layout-shadow-dark: 0 0 10px 2px rgba(0, 0, 0, 0.2), 0 0px 10px rgba(0, 0, 0, 0.24);
 $spacing-md: 16px;
 
-// Width from Salix variables.scss
-
-$width-xs: 400px;
-$width-sm: 544px;
-$width-md: 800px;
-$width-lg: 1280px;
-$width-xl: 1600px;
-
 $width-full: 100%;
diff --git a/src/pages/Claim/Card/ClaimBasicData.vue b/src/pages/Claim/Card/ClaimBasicData.vue
index 3dc5b0a59..f6ba556e9 100644
--- a/src/pages/Claim/Card/ClaimBasicData.vue
+++ b/src/pages/Claim/Card/ClaimBasicData.vue
@@ -92,129 +92,124 @@ const statesFilter = {
     <FetchData url="ClaimStates" @on-fetch="setClaimStates" auto-load />
 
     <div class="column items-center">
-        <QCard>
-            <FormModel
-                :url="`Claims/${route.params.id}`"
-                :url-update="`Claims/updateClaim/${route.params.id}`"
-                :filter="claimFilter"
-                model="claim"
-            >
-                <template #form="{ data, validate, filter }">
-                    <div class="row q-gutter-md q-mb-md">
-                        <div class="col">
-                            <QInput
-                                v-model="data.client.name"
-                                :label="t('claim.basicData.customer')"
-                                disable
-                            />
-                        </div>
-                        <div class="col">
-                            <QInput
-                                v-model="data.created"
-                                mask="####-##-##"
-                                fill-mask="_"
-                                autofocus
-                            >
-                                <template #append>
-                                    <QIcon name="event" class="cursor-pointer">
-                                        <QPopupProxy
-                                            cover
-                                            transition-show="scale"
-                                            transition-hide="scale"
-                                        >
-                                            <QDate
-                                                v-model="data.created"
-                                                mask="YYYY-MM-DD"
-                                            >
-                                                <div class="row items-center justify-end">
-                                                    <QBtn
-                                                        v-close-popup
-                                                        label="Close"
-                                                        color="primary"
-                                                        flat
-                                                    />
-                                                </div>
-                                            </QDate>
-                                        </QPopupProxy>
-                                    </QIcon>
-                                </template>
-                            </QInput>
-                        </div>
+        <FormModel
+            :url="`Claims/${route.params.id}`"
+            :url-update="`Claims/updateClaim/${route.params.id}`"
+            :filter="claimFilter"
+            model="claim"
+        >
+            <template #form="{ data, validate, filter }">
+                <div class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <QInput
+                            v-model="data.client.name"
+                            :label="t('claim.basicData.customer')"
+                            disable
+                        />
                     </div>
-                    <div class="row q-gutter-md q-mb-md">
-                        <div class="col">
-                            <QSelect
-                                v-model="data.workerFk"
-                                :options="workers"
-                                option-value="id"
-                                option-label="name"
-                                emit-value
-                                :label="t('claim.basicData.assignedTo')"
-                                map-options
-                                use-input
-                                @filter="
-                                    (value, update) => filter(value, update, workerFilter)
-                                "
-                                :rules="validate('claim.claimStateFk')"
-                                :input-debounce="0"
-                            >
-                                <template #before>
-                                    <QAvatar color="orange">
-                                        <QImg
-                                            v-if="data.workerFk"
-                                            :src="`/api/Images/user/160x160/${data.workerFk}/download?access_token=${token}`"
-                                            spinner-color="white"
-                                        />
-                                    </QAvatar>
-                                </template>
-                            </QSelect>
-                        </div>
-                        <div class="col">
-                            <QSelect
-                                v-model="data.claimStateFk"
-                                :options="claimStates"
-                                option-value="id"
-                                option-label="description"
-                                emit-value
-                                :label="t('claim.basicData.state')"
-                                map-options
-                                use-input
-                                @filter="
-                                    (value, update) => filter(value, update, statesFilter)
-                                "
-                                :rules="validate('claim.claimStateFk')"
-                                :input-debounce="0"
-                            >
-                            </QSelect>
-                        </div>
+                    <div class="col">
+                        <QInput
+                            v-model="data.created"
+                            mask="####-##-##"
+                            fill-mask="_"
+                            autofocus
+                        >
+                            <template #append>
+                                <QIcon name="event" class="cursor-pointer">
+                                    <QPopupProxy
+                                        cover
+                                        transition-show="scale"
+                                        transition-hide="scale"
+                                    >
+                                        <QDate v-model="data.created" mask="YYYY-MM-DD">
+                                            <div class="row items-center justify-end">
+                                                <QBtn
+                                                    v-close-popup
+                                                    label="Close"
+                                                    color="primary"
+                                                    flat
+                                                />
+                                            </div>
+                                        </QDate>
+                                    </QPopupProxy>
+                                </QIcon>
+                            </template>
+                        </QInput>
                     </div>
-                    <div class="row q-gutter-md q-mb-md">
-                        <div class="col">
-                            <QInput
-                                v-model.number="data.packages"
-                                :label="t('claim.basicData.packages')"
-                                :rules="validate('claim.packages')"
-                                type="number"
-                            />
-                        </div>
-                        <div class="col">
-                            <QInput
-                                v-model="data.rma"
-                                :label="t('claim.basicData.returnOfMaterial')"
-                                :rules="validate('claim.rma')"
-                            />
-                        </div>
+                </div>
+                <div class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <QSelect
+                            v-model="data.workerFk"
+                            :options="workers"
+                            option-value="id"
+                            option-label="name"
+                            emit-value
+                            :label="t('claim.basicData.assignedTo')"
+                            map-options
+                            use-input
+                            @filter="
+                                (value, update) => filter(value, update, workerFilter)
+                            "
+                            :rules="validate('claim.claimStateFk')"
+                            :input-debounce="0"
+                        >
+                            <template #before>
+                                <QAvatar color="orange">
+                                    <QImg
+                                        v-if="data.workerFk"
+                                        :src="`/api/Images/user/160x160/${data.workerFk}/download?access_token=${token}`"
+                                        spinner-color="white"
+                                    />
+                                </QAvatar>
+                            </template>
+                        </QSelect>
                     </div>
-                    <div class="row q-gutter-md q-mb-md">
-                        <div class="col">
-                            <QCheckbox
-                                v-model="data.hasToPickUp"
-                                :label="t('claim.basicData.picked')"
-                            />
-                        </div>
+                    <div class="col">
+                        <QSelect
+                            v-model="data.claimStateFk"
+                            :options="claimStates"
+                            option-value="id"
+                            option-label="description"
+                            emit-value
+                            :label="t('claim.basicData.state')"
+                            map-options
+                            use-input
+                            @filter="
+                                (value, update) => filter(value, update, statesFilter)
+                            "
+                            :rules="validate('claim.claimStateFk')"
+                            :input-debounce="0"
+                        >
+                        </QSelect>
                     </div>
-                </template>
-            </FormModel>
-        </QCard>
+                </div>
+                <div class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <QInput
+                            v-model.number="data.packages"
+                            :label="t('claim.basicData.packages')"
+                            :rules="validate('claim.packages')"
+                            type="number"
+                        />
+                    </div>
+                    <div class="col">
+                        <QInput
+                            v-model="data.rma"
+                            :label="t('claim.basicData.returnOfMaterial')"
+                            :rules="validate('claim.rma')"
+                        />
+                    </div>
+                </div>
+                <div class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <QCheckbox
+                            v-model="data.hasToPickUp"
+                            :label="t('claim.basicData.picked')"
+                        />
+                    </div>
+                </div>
+            </template>
+        </FormModel>
     </div>
 </template>
diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index bc27baf6c..c9460bce6 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -59,121 +59,111 @@ const filterOptions = {
         auto-load
     />
     <div class="column items-center">
-        <QCard>
-            <FormModel :url="`Clients/${route.params.id}`" model="customer">
-                <template #form="{ data, validate, filter }">
-                    <div class="row q-gutter-md q-mb-md">
-                        <div class="col">
-                            <QInput
-                                v-model="data.socialName"
-                                :label="t('customer.basicData.socialName')"
-                                :rules="validate('client.socialName')"
-                                autofocus
-                            />
-                        </div>
-                        <div class="col">
-                            <QSelect
-                                v-model="data.businessTypeFk"
-                                :options="businessTypes"
-                                option-value="code"
-                                option-label="description"
-                                emit-value
-                                :label="t('customer.basicData.businessType')"
-                                map-options
-                                :rules="validate('client.businessTypeFk')"
-                                :input-debounce="0"
-                            />
-                        </div>
+        <FormModel :url="`Clients/${route.params.id}`" model="customer">
+            <template #form="{ data, validate, filter }">
+                <div class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <QInput
+                            v-model="data.socialName"
+                            :label="t('customer.basicData.socialName')"
+                            :rules="validate('client.socialName')"
+                            autofocus
+                        />
                     </div>
-                    <div class="row q-gutter-md q-mb-md">
-                        <div class="col">
-                            <QInput
-                                v-model="data.contact"
-                                :label="t('customer.basicData.contact')"
-                                :rules="validate('client.contact')"
-                                clearable
-                            />
-                        </div>
-                        <div class="col">
-                            <QInput
-                                v-model="data.email"
-                                type="email"
-                                :label="t('customer.basicData.email')"
-                                :rules="validate('client.email')"
-                                clearable
-                            />
-                        </div>
+                    <div class="col">
+                        <QSelect
+                            v-model="data.businessTypeFk"
+                            :options="businessTypes"
+                            option-value="code"
+                            option-label="description"
+                            emit-value
+                            :label="t('customer.basicData.businessType')"
+                            map-options
+                            :rules="validate('client.businessTypeFk')"
+                            :input-debounce="0"
+                        />
                     </div>
-                    <div class="row q-gutter-md q-mb-md">
-                        <div class="col">
-                            <QInput
-                                v-model="data.phone"
-                                :label="t('customer.basicData.phone')"
-                                :rules="validate('client.phone')"
-                                clearable
-                            />
-                        </div>
-                        <div class="col">
-                            <QInput
-                                v-model="data.mobile"
-                                :label="t('customer.basicData.mobile')"
-                                :rules="validate('client.mobile')"
-                                clearable
-                            />
-                        </div>
+                </div>
+                <div class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <QInput
+                            v-model="data.contact"
+                            :label="t('customer.basicData.contact')"
+                            :rules="validate('client.contact')"
+                            clearable
+                        />
                     </div>
-                    <div class="row q-gutter-md q-mb-md">
-                        <div class="col">
-                            <QSelect
-                                v-model="data.salesPersonFk"
-                                :options="workers"
-                                option-value="id"
-                                option-label="name"
-                                emit-value
-                                :label="t('customer.basicData.salesPerson')"
-                                map-options
-                                use-input
-                                @filter="
-                                    (value, update) =>
-                                        filter(value, update, filterOptions)
-                                "
-                                :rules="validate('client.salesPersonFk')"
-                                :input-debounce="0"
-                            >
-                                <template #prepend>
-                                    <QAvatar color="orange">
-                                        <QImg
-                                            v-if="data.salesPersonFk"
-                                            :src="`/api/Images/user/160x160/${data.salesPersonFk}/download?access_token=${token}`"
-                                            spinner-color="white"
-                                        />
-                                    </QAvatar>
-                                </template>
-                            </QSelect>
-                        </div>
-                        <div class="col">
-                            <QSelect
-                                v-model="data.contactChannelFk"
-                                :options="contactChannels"
-                                option-value="id"
-                                option-label="name"
-                                emit-value
-                                :label="t('customer.basicData.contactChannel')"
-                                map-options
-                                :rules="validate('client.contactChannelFk')"
-                                :input-debounce="0"
-                            />
-                        </div>
+                    <div class="col">
+                        <QInput
+                            v-model="data.email"
+                            type="email"
+                            :label="t('customer.basicData.email')"
+                            :rules="validate('client.email')"
+                            clearable
+                        />
                     </div>
-                </template>
-            </FormModel>
-        </QCard>
+                </div>
+                <div class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <QInput
+                            v-model="data.phone"
+                            :label="t('customer.basicData.phone')"
+                            :rules="validate('client.phone')"
+                            clearable
+                        />
+                    </div>
+                    <div class="col">
+                        <QInput
+                            v-model="data.mobile"
+                            :label="t('customer.basicData.mobile')"
+                            :rules="validate('client.mobile')"
+                            clearable
+                        />
+                    </div>
+                </div>
+                <div class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <QSelect
+                            v-model="data.salesPersonFk"
+                            :options="workers"
+                            option-value="id"
+                            option-label="name"
+                            emit-value
+                            :label="t('customer.basicData.salesPerson')"
+                            map-options
+                            use-input
+                            @filter="
+                                (value, update) => filter(value, update, filterOptions)
+                            "
+                            :rules="validate('client.salesPersonFk')"
+                            :input-debounce="0"
+                        >
+                            <template #prepend>
+                                <QAvatar color="orange">
+                                    <QImg
+                                        v-if="data.salesPersonFk"
+                                        :src="`/api/Images/user/160x160/${data.salesPersonFk}/download?access_token=${token}`"
+                                        spinner-color="white"
+                                    />
+                                </QAvatar>
+                            </template>
+                        </QSelect>
+                    </div>
+                    <div class="col">
+                        <QSelect
+                            v-model="data.contactChannelFk"
+                            :options="contactChannels"
+                            option-value="id"
+                            option-label="name"
+                            emit-value
+                            :label="t('customer.basicData.contactChannel')"
+                            map-options
+                            :rules="validate('client.contactChannelFk')"
+                            :input-debounce="0"
+                        />
+                    </div>
+                </div>
+            </template>
+        </FormModel>
     </div>
 </template>
-
-<style lang="scss" scoped>
-.q-card {
-    width: $width-full;
-    max-width: $width-md;
-}
-</style>