diff --git a/src/components/modal/testresult/Show.vue b/src/components/modal/testresult/Show.vue
index 5902e5b..10e2b96 100644
--- a/src/components/modal/testresult/Show.vue
+++ b/src/components/modal/testresult/Show.vue
@@ -1,7 +1,7 @@
 <template>
     <v-container grid-list-xs>
         <material-card color="black" title="Show Test Result" id="printMe">
-            <v-layout align-left justify-left wrap class="px-5 my-3 ShowTestResult">
+            <v-layout align-left justify-left wrap class="my-3 ShowTestResult">
                 <h4 class="ml-4 headline font-weight-bold">Test Type : {{ data.test_type.name }}</h4>
                 <v-flex xs12>
                     <hr class="v-divider theme--light"/>
@@ -71,7 +71,7 @@
                     </v-flex>
                 </v-layout>
             </v-layout>
-            <v-layout align-left justify-left wrap class="px-5 my-3">
+            <v-layout align-left justify-left wrap class="my-3">
                 <h4 class="ml-4 headline CSSD-font font-weight-bold">Special Info</h4>
                 <v-flex xs12>
                     <hr class="v-divider theme--light"/>
@@ -121,7 +121,7 @@
                     </template>
                 </v-layout>
             </v-layout>
-            <v-layout align-left justify-left wrap class="px-5 my-3">
+            <v-layout align-left justify-left wrap class="my-3">
                 <h4 class="ml-4 headline CSSD-font font-weight-bold">Image</h4>
                 <v-flex xs12>
                     <hr class="v-divider theme--light"/>
@@ -143,7 +143,15 @@
             </v-layout>
             <!-- </material-card>
             <material-card> -->
-            <v-layout row wrap align-center justify-center class="px-5 my-3" v-if="$hasRole('Admin|Supervisor')">
+            <v-layout row wrap align-center justify-center class="my-3" v-if="$hasRole('Admin|Supervisor')">
+                <v-flex xs12 md2 sm2 class="text-center">
+                    <v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black" style="padding:10px 60px"
+                           @click="closeModal">
+                        <v-icon class="black--text mr-2 caption">fas fa-times</v-icon>
+                        <span class="black--text">Close</span>
+                    </v-btn>
+                </v-flex>
+                <v-spacer/>
                 <v-flex class="WM-Align-R mr-1" xs12 sm6 md4 lg3
                         v-if="data.verified == 'None' || (data.verified == 'NotVerified' && $hasRole('Admin'))"
                         @click="verify(data.id, 'Verified')">
@@ -152,7 +160,7 @@
                         <span class="white--text">Verify</span>
                     </v-btn>
                 </v-flex>
-                <v-flex class="WM-Align-R" xs12 sm6 md4 lg3
+                <v-flex class="WM-Align-C" xs12 sm6 md3 lg2
                         v-if="data.verified == 'None' || (data.verified == 'Verified' && $hasRole('Admin'))">
                     <v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Gray"
                            @click="verify(data.id, 'NotVerified')">
@@ -160,7 +168,6 @@
                         <span class="black--text">UnVerify</span>
                     </v-btn>
                 </v-flex>
-
                 <v-flex xs6 md2 sm2>
                     <a :href="'https://www.cssd-doc.com/Show/TestResult/'+data.id">
                         <v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Gray">
@@ -170,17 +177,6 @@
                     </a>
                 </v-flex>
             </v-layout>
-            <v-layout row wrap align-center justify-center class="px-5 my-3">
-                <!-- <v-flex class xs6 md2 sm2>
-                    <v-btn
-                        class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Gray"
-                        @click="print"
-                    >
-                        <v-icon class="black--text mr-2 caption">fas fa-print</v-icon>
-                        <span class="black--text">Print</span>
-                    </v-btn>
-                </v-flex> -->
-            </v-layout>
         </material-card>
     </v-container>
 </template>
diff --git a/src/views/TestResult/AddEdit.vue b/src/views/TestResult/AddEdit.vue
index 653ae3a..efd697e 100644
--- a/src/views/TestResult/AddEdit.vue
+++ b/src/views/TestResult/AddEdit.vue
@@ -2,7 +2,7 @@
     <v-form ref="form">
         <v-container grid-list-xs>
             <material-card color="black" title="Submit Test Result">
-                <v-layout wrap class="px-5 my-3" v-if="!$route.params.testResult">
+                <v-layout wrap class="px-3 my-3" v-if="!$route.params.testResult">
                     <v-flex xs12 sm6 md4 lg3 xl2 class="WM-FlexCenter">
                         <v-icon class="fa fa-align-left mr-2 WM-Margin-B-8"/>
                         <v-autocomplete
@@ -25,7 +25,7 @@
                         />
                     </v-flex>
                     <v-spacer/>
-                    <v-flex xs12 sm4 md4 lg3 xl2 class="text-xs-center text-sm-center text-md-center">
+                    <v-flex xs12 sm4 md4 lg4 xl3 class="text-center text-md-right">
                         <v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black"
                                @click="selectTestType"
                                style="padding:10px 60px;">
@@ -34,10 +34,10 @@
                         </v-btn>
                     </v-flex>
                 </v-layout>
-                <v-layout row wrap class="px-5 my-3" v-if="!$route.params.testResult && form.length">
+                <v-layout row wrap class="px-3 my-3" v-if="!$route.params.testResult && form.length">
                     <v-divider/>
                 </v-layout>
-                <v-layout wrap class="px-5 my-3" v-if="form.length">
+                <v-layout wrap class="px-3 my-3" v-if="form.length">
                     <v-flex xs12 sm12 md12>
                         <h3 class="WM-BorderLeftTitle">{{ testTypeNameSelected }}</h3>
                     </v-flex>
@@ -89,9 +89,9 @@
 
                 <!--______________________  DynamicComponent :: Began  _______________________-->
 
-                <v-layout wrap class="px-5 my-3">
+                <v-layout wrap class="px-3 my-3 align-center">
                     <v-flex :class="['pa-2', item.size]" v-for="(item, key) in form" :key="key">
-                        <v-container row md-12 sm-12 xs-12 v-if="item.type == 'Temperature'">
+                        <v-container row md-12 sm-12 xs-12 class="pa-0" v-if="item.type == 'Temperature'">
                             <v-layout row wrap>
                                 <h3 class="WM-BorderLeftTitle">{{ item.name }}</h3>
                             </v-layout>
@@ -110,7 +110,7 @@
                                 </v-container>
                             </v-layout>
                         </v-container>
-                        <v-container row md-12 sm-12 xs-12 v-if="item.type == 'Text'">
+                        <v-container row md-12 sm-12 xs-12 class="pa-0" v-if="item.type == 'Text'">
                             <v-layout row wrap>
                                 <h3 class="WM-BorderLeftTitle">{{ item.name }}</h3>
                             </v-layout>
@@ -125,7 +125,7 @@
                                 </v-container>
                             </v-layout>
                         </v-container>
-                        <v-container row md-12 sm-12 xs-12 v-if="item.type == 'Pressure'">
+                        <v-container row md-12 sm-12 xs-12 class="pa-0" v-if="item.type == 'Pressure'">
                             <v-layout row wrap>
                                 <h3 class="WM-BorderLeftTitle">{{ item.name }}</h3>
                             </v-layout>
@@ -144,7 +144,7 @@
                                 </v-container>
                             </v-layout>
                         </v-container>
-                        <v-container row md-12 sm-12 xs-12 v-if="item.type == 'Select'">
+                        <v-container row md-12 sm-12 xs-12 class="pa-0" v-if="item.type == 'Select'">
                             <v-layout row wrap>
                                 <h3 class="WM-BorderLeftTitle">{{ item.name }}</h3>
                             </v-layout>
@@ -165,7 +165,7 @@
                                 </v-container>
                             </v-layout>
                         </v-container>
-                        <v-container row md-12 sm-12 xs-12 v-if="item.type == 'Checkbox'">
+                        <v-container row md-12 sm-12 xs-12 class="pa-0" v-if="item.type == 'Checkbox'">
                             <v-layout row wrap>
                                 <h3 class="WM-BorderLeftTitle">{{ item.name }}</h3>
                             </v-layout>
@@ -183,7 +183,7 @@
                                 </v-container>
                             </v-layout>
                         </v-container>
-                        <v-container row md-12 sm-12 xs-12 v-if="item.type == 'Radiobutton'">
+                        <v-container row md-12 sm-12 xs-12 class="pa-0" v-if="item.type == 'Radiobutton'">
                             <v-layout row wrap>
                                 <h3 class="WM-BorderLeftTitle">{{ item.name }}</h3>
                             </v-layout>
@@ -202,7 +202,7 @@
                                 </v-container>
                             </v-layout>
                         </v-container>
-                        <v-container row md-12 sm-12 xs-12 v-if="item.type == 'Switch'">
+                        <v-container row md-12 sm-12 xs-12 class="pa-0" v-if="item.type == 'Switch'">
                             <v-layout row wrap>
                                 <h3 class="WM-BorderLeftTitle">{{ item.name }}</h3>
                             </v-layout>
@@ -218,7 +218,7 @@
                                 </v-container>
                             </v-layout>
                         </v-container>
-                        <v-container row md-12 sm-12 xs-12 v-if="item.type == 'Range'">
+                        <v-container row md-12 sm-12 xs-12 class="pa-0" v-if="item.type == 'Range'">
                             <v-layout row wrap>
                                 <h3 class="WM-BorderLeftTitle">{{ item.name }}</h3>
                             </v-layout>
@@ -237,7 +237,7 @@
                                 </v-container>
                             </v-layout>
                         </v-container>
-                        <v-container row md-12 sm-12 xs-12 v-if="item.type == 'Time'">
+                        <v-container row md-12 sm-12 xs-12 class="pa-0" v-if="item.type == 'Time'">
                             <v-layout row wrap>
                                 <h3 class="WM-BorderLeftTitle">{{ item.name }}</h3>
                             </v-layout>
@@ -269,7 +269,7 @@
                                         :class="['pa-2', children.size]"
                                         v-for="(children, keyChildren) in item.children"
                                         :key="keyChildren">
-                                    <v-container fluid v-if="children.type == 'Text'" class="WM-Padding-LR-0">
+                                    <v-container fluid v-if="children.type == 'Text'" class="pa-0">
                                         <p>{{ children.name }}</p>
                                         <v-flex xs12>
                                             <v-text-field
@@ -280,7 +280,7 @@
                                             />
                                         </v-flex>
                                     </v-container>
-                                    <v-container fluid v-if="children.type == 'Temperature'" class="WM-Padding-LR-0">
+                                    <v-container fluid v-if="children.type == 'Temperature'" class="pa-0">
                                         <p>{{ children.name }}</p>
                                         <v-flex xs12>
                                             <v-slider
@@ -293,7 +293,7 @@
                                             />
                                         </v-flex>
                                     </v-container>
-                                    <v-container fluid v-if="children.type == 'Pressure'" class="WM-Padding-LR-0">
+                                    <v-container fluid v-if="children.type == 'Pressure'" class="pa-0">
                                         <p>{{ children.name }}</p>
                                         <v-flex xs12>
                                             <v-slider
@@ -306,7 +306,7 @@
                                             />
                                         </v-flex>
                                     </v-container>
-                                    <v-container fluid v-if="children.type == 'Select'" class="WM-Padding-LR-0">
+                                    <v-container fluid v-if="children.type == 'Select'" class="pa-0">
                                         <p>{{ children.name }}</p>
                                         <v-flex xs12>
                                             <v-select
@@ -321,7 +321,7 @@
                                             />
                                         </v-flex>
                                     </v-container>
-                                    <v-container fluid v-if="children.type == 'Checkbox'" class="WM-Padding-LR-0">
+                                    <v-container fluid v-if="children.type == 'Checkbox'" class="pa-0">
                                         <p>{{ children.name }}</p>
                                         <v-flex xs12 class="WM-FlexWrap mr-3">
                                             <v-checkbox
@@ -333,7 +333,7 @@
                                             />
                                         </v-flex>
                                     </v-container>
-                                    <v-container fluid v-if="children.type == 'Radiobutton'" class="WM-Padding-LR-0">
+                                    <v-container fluid v-if="children.type == 'Radiobutton'" class="pa-0">
                                         <p>{{ children.name }}</p>
                                         <v-flex xs12 class="WM-FlexWrap">
                                             <v-radio-group v-model="formData[children.name+'_'+children.id]">
@@ -346,7 +346,7 @@
                                             </v-radio-group>
                                         </v-flex>
                                     </v-container>
-                                    <v-container fluid v-if="children.type == 'Switch'" class="WM-Padding-LR-0">
+                                    <v-container fluid v-if="children.type == 'Switch'" class="pa-0">
                                         <p>{{ children.name }}</p>
                                         <v-flex xs12>
                                             <v-switch
@@ -356,7 +356,7 @@
                                             />
                                         </v-flex>
                                     </v-container>
-                                    <v-container fluid v-if="children.type == 'Range'" class="WM-Padding-LR-0">
+                                    <v-container fluid v-if="children.type == 'Range'" class="pa-0">
                                         <p>{{ item.name }}</p>
                                         <v-flex xs12>
                                             <v-slider
@@ -368,7 +368,7 @@
                                             />
                                         </v-flex>
                                     </v-container>
-                                    <v-container fluid v-if="children.type == 'Time'" class="WM-Padding-LR-0">
+                                    <v-container fluid v-if="children.type == 'Time'" class="pa-0">
                                         <p>{{ children.name }}</p>
                                         <v-flex xs12>
                                             <v-text-field
@@ -387,24 +387,21 @@
                         </v-layout> -->
                     </v-flex>
                 </v-layout>
-                <v-layout row wrap class="px-5 my-3">
+                <v-layout row wrap class="px-3 my-3">
                     <v-divider/>
                 </v-layout>
-                <v-layout align-center justify-center wrap class="px-5 mt-2">
-                    <v-flex class xs12 sm4 md3>
+                <v-layout align-center justify-center wrap class="px-3 mt-2">
                         <router-link :to="{name: 'AllResultTest'}">
-                            <v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black ml-5">
+                            <v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black">
                                 <v-icon class="black--text mr-2 caption">fas fa-chevron-left</v-icon>
                                 <span class="black--text">Back</span>
                             </v-btn>
                         </router-link>
-                    </v-flex>
-                    <v-flex class xs12 sm4 md3>
+                    <v-spacer/>
                         <v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 60px" @click="submitForm">
                             <v-icon class="white--text mr-2 caption">fas fa-check</v-icon>
                             <span class="white--text">SAVE</span>
                         </v-btn>
-                    </v-flex>
                 </v-layout>
             </material-card>
         </v-container>
@@ -502,7 +499,8 @@ export default {
                             }
                         } else if (result.data.data.inputs[key].type == "Checkbox" || result.data.data.inputs[key].type == "Select") {
                             this.formData[result.data.data.inputs[key].name + "_" + result.data.data.inputs[key].id] = [];
-                        } else {this.formData[result.data.data.inputs[key].name + "_" + result.data.data.inputs[key].id] = "";
+                        } else {
+                            this.formData[result.data.data.inputs[key].name + "_" + result.data.data.inputs[key].id] = "";
                         }
                     }
                 }
diff --git a/src/views/TestResult/List.vue b/src/views/TestResult/List.vue
index c022277..0ae7643 100644
--- a/src/views/TestResult/List.vue
+++ b/src/views/TestResult/List.vue
@@ -2,8 +2,8 @@
     <div class>
         <v-container fluid>
             <material-card class color="black" title="All Test Result" text>
-                <v-layout align-center wrap class="px-5 my-3">
-                    <v-flex xs12 sm4 md4 lg3 xl2 class="WM-FlexCenter pl-3">
+                <v-layout align-center wrap class="px-3 my-3">
+                    <v-flex xs12 sm4 md4 lg3 xl2 class="WM-FlexCenter">
                         <v-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"/>
                         <v-text-field class="py-3 pr-3" v-model="filter.device_id" label="ID"
                                       color="black"/>
@@ -40,7 +40,7 @@
                                            :date-format="date => new Date(date).toDateString()"/>
                         </v-menu>
                     </v-flex>
-                    <v-flex xs12 sm4 md4 lg3 xl2 style="display: flex;align-items: center;">
+                    <v-flex xs12 sm4 md4 lg3 xl2 class="WM-FlexCenter" style="display: flex;align-items: center;">
                         <v-icon class="far fa-calendar-alt mr-2"/>
                         <v-menu lazy :close-on-content-click="true" transition="v-scale-transition" offset-y
                                 v-model="upToMenu" style="width: 100%">
@@ -67,10 +67,10 @@
                         </router-link>
                     </v-flex>
                 </v-layout>
-                <v-layout class="px-4 my-3">
+                <v-layout class="px-3 my-3">
                     <v-divider/>
                 </v-layout>
-                <v-layout align-center wrap class="px-5 my-2">
+                <v-layout align-center wrap class="px-3 my-2">
                     <v-flex md12>
                         <v-data-table :headers="headers" :items="items" hide-actions>
                             <template slot="headerCell" slot-scope="{ header }">
@@ -160,13 +160,14 @@
                     <v-pagination color="black" v-model="currentPage" :length="lastPage"
                                   :total-visible="6"/>
                 </div>
-                <v-layout row wrap align-center justify-center class="mt-3">
+                <v-layout row wrap align-center justify-center class="px-3">
                     <router-link to="/dashboard">
-                        <v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black ml-5">
+                        <v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black">
                             <v-icon class="black--text mr-2 caption">fas fa-chevron-left</v-icon>
                             <span class="black--text">Back</span>
                         </v-btn>
                     </router-link>
+                    <v-spacer/>
                 </v-layout>
             </material-card>
         </v-container>
@@ -201,7 +202,7 @@ export default {
             {sortable: false, text: "Result", value: "result",width:'5%'},
             {sortable: false, text: "Date", value: "date"},
             {sortable: false, text: "Verify", value: "verify",width:'5%'},
-            {sortable: false, text: "Action", value: "action", align: "left",}
+            {sortable: false, text: "Action", value: "action", align: "center",}
         ],
         filter: {
             device_id: '',
diff --git a/src/views/User/MyInfo.vue b/src/views/User/MyInfo.vue
index 957f04f..4e373e2 100644
--- a/src/views/User/MyInfo.vue
+++ b/src/views/User/MyInfo.vue
@@ -2,7 +2,7 @@
     <v-form ref="form">
         <v-container grid-list-xs fluid>
             <material-card color="black" title="My Info">
-                <v-layout align-center justify-center wrap class="px-5 my-3">
+                <v-layout align-center justify-center wrap class="px-3 my-3">
                     <v-flex xs12 sm6 md6 lg3 class="WM-FlexCenter">
                         <v-icon class="fa fa-align-left mr-2 WM-Margin-B-8"/>
                         <v-text-field
@@ -63,27 +63,25 @@
                         </v-textarea>
                     </v-flex>
                 </v-layout>
-                <v-layout row wrap justify-center align-center>
-                    <v-flex xs12 sm4 md4 lg2 class="text-md-center text-sm-center text-xs-center">
-                        <router-link :to="{name: 'Dashboard'}">
-                            <v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black">
-                                <v-icon class="black--text">keyboard_arrow_left</v-icon>
-                                <span class="black--text">Back</span>
-                            </v-btn>
-                        </router-link>
-                    </v-flex>
-                    <v-flex xs12 sm4 md4 lg3 class="text-md-center text-sm-center text-xs-center">
-                        <v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black" @click="changePassword">
-                            <v-icon class="black--text mr-1">fas fa-refresh</v-icon>
-                            <span class="black--text"> Change Password </span>
+                <v-layout row wrap class="px-3 my-3">
+                    <v-divider/>
+                </v-layout>
+                <v-layout row wrap justify-center align-center class="px-3 my-3">
+                    <router-link :to="{name: 'Dashboard'}">
+                        <v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black">
+                            <v-icon class="black--text">keyboard_arrow_left</v-icon>
+                            <span class="black--text">Back</span>
                         </v-btn>
-                    </v-flex>
-                    <v-flex xs12 sm4 md4 lg2 class="text-md-center text-xs-center">
-                        <v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 60px" @click="saveInfo()">
-                            <v-icon class="white--text mr-2 caption">fas fa-check</v-icon>
-                            <span class="white--text">SAVE</span>
-                        </v-btn>
-                    </v-flex>
+                    </router-link>
+                    <v-spacer/>
+                    <v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black" @click="changePassword">
+                        <v-icon class="black--text mr-1">fas fa-refresh</v-icon>
+                        <span class="black--text"> Change Password </span>
+                    </v-btn>
+                    <v-btn class="WM-CyanBlueGradient-BG ml-2" style="padding:10px 60px" @click="saveInfo()">
+                        <v-icon class="white--text mr-2 caption">fas fa-check</v-icon>
+                        <span class="white--text">SAVE</span>
+                    </v-btn>
                 </v-layout>
             </material-card>
         </v-container>