diff --git a/cypress.json b/cypress.json
index 0e2f33593c..dfe859b431 100644
--- a/cypress.json
+++ b/cypress.json
@@ -2,6 +2,5 @@
   "viewportWidth": 1080,
   "viewportHeight": 920,
   "video": false,
-  "testFiles": "**/theme/theme.spec.js",
-  "ignoreTestFiles": ["**/*.test.js"]
+  "ignoreTestFiles": ["**/*.test.js","**/custom_xml/custom_xml_vendor.xml","**/custom_xml/custom_xml.spec.js"]
 }
diff --git a/src-electron/validation/validation.js b/src-electron/validation/validation.js
index 03973cb568..f1f606cd6f 100644
--- a/src-electron/validation/validation.js
+++ b/src-electron/validation/validation.js
@@ -34,7 +34,7 @@ async function validateAttribute(db, endpointTypeId, attributeRef, clusterRef) {
     clusterRef
   )
   let attribute = await queryZcl.selectAttributeById(db, attributeRef)
-
+    console.log("mehtest",attribute)
   return validateSpecificAttribute(endpointAttribute, attribute)
 }
 
@@ -68,7 +68,10 @@ async function validateNoDuplicateEndpoints(
 
 function validateSpecificAttribute(endpointAttribute, attribute) {
   let defaultAttributeIssues = []
-  if (!types.isString(attribute.type)) {
+  if(attribute.isNullable && endpointAttribute.defaultValue == 'null'){
+    return { defaultValue: defaultAttributeIssues }
+  }
+  else if (!types.isString(attribute.type)) {
     if (types.isFloat(attribute.type)) {
       if (!isValidFloat(endpointAttribute.defaultValue))
         defaultAttributeIssues.push('Invalid Float')
diff --git a/src/components/ZclAttributeManager.vue b/src/components/ZclAttributeManager.vue
index 2f0fcbb20d..f7beaa6cf3 100644
--- a/src/components/ZclAttributeManager.vue
+++ b/src/components/ZclAttributeManager.vue
@@ -173,6 +173,11 @@ limitations under the License.
               bottom-slots
               hide-bottom-space
               outlined
+              :disable="
+                !selection.includes(
+                  hashAttributeIdClusterId(props.row.id, selectedCluster.id)
+                )
+              "
               :value="
                 selectionDefault[
                   hashAttributeIdClusterId(props.row.id, selectedCluster.id)
@@ -196,7 +201,18 @@ limitations under the License.
                   selectedCluster.id
                 )
               "
-            />
+            >
+            <template v-slot:append >
+              <q-btn v-if="props.row.isNullable" color="secondary" label="Null" size="sm" @click="
+                handleLocalChange(
+                  null,
+                  'defaultValue',
+                  props.row,
+                  selectedCluster.id
+                )
+              " />
+            </template>
+          </q-input>
           </q-td>
         </q-tr>
       </template>
diff --git a/src/layouts/ZclLayout.vue b/src/layouts/ZclLayout.vue
index 64d69e443d..b2239c8e2e 100644
--- a/src/layouts/ZclLayout.vue
+++ b/src/layouts/ZclLayout.vue
@@ -62,6 +62,9 @@ limitations under the License.
           id="preference"
           to="/preference"
         />
+        <q-btn flat @click="homeDialog = !homeDialog" icon="mdi-alert-circle">
+          <q-tooltip> About </q-tooltip>
+        </q-btn>
       </q-toolbar>
       <q-layout
         view="hHh Lpr lff"
@@ -161,6 +164,9 @@ limitations under the License.
         </q-page-container>
       </q-layout>
     </div>
+    <q-dialog v-model="homeDialog">
+      <About />
+    </q-dialog>
   </div>
 </template>
 
@@ -170,6 +176,7 @@ import Exceptions from '../components/Exceptions.vue'
 import ZclInformationSetup from '../components/ZclInformationSetup.vue'
 import ZclConfiguratorLayout from './ZclConfiguratorLayout.vue'
 import SqlQuery from '../components/SqlQuery.vue'
+import About from '../pages/About.vue'
 const restApi = require(`../../src-shared/rest-api.js`)
 const rendApi = require(`../../src-shared/rend-api.js`)
 const observable = require('../util/observable.js')
@@ -245,6 +252,7 @@ export default {
     ZclConfiguratorLayout,
     SqlQuery,
     Exceptions,
+    About,
   },
   data() {
     return {
@@ -264,6 +272,7 @@ export default {
       index: 0,
       maxIndex: 0,
       generationDirectory: '',
+      homeDialog: false,
     }
   },
   computed: {
diff --git a/src/pages/About.vue b/src/pages/About.vue
index f4692e297a..e6e5e0d0be 100644
--- a/src/pages/About.vue
+++ b/src/pages/About.vue
@@ -14,15 +14,21 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <template>
-  <div>
-    <q-img src="~assets/zap_splash.png">
-      <div class="absolute-bottom text-subtitle1 text-center">
-        Version {{ version }} (fl {{ featureLevel }}, {{ date }}, #{{ hash }})
-        <br />
-        &copy; 2020 by the authors. Released as open-source, under terms of
-        Apache 2.0 license. {{ version }}
-      </div>
-    </q-img>
+  <div style="width: 100%; height: auto">
+    <q-card>
+      <q-card-section
+        ><q-img src="~assets/zap_splash.png">
+          <div class="absolute-bottom text-subtitle1 text-center">
+            Version {{ version }} (fl {{ featureLevel }}, {{ date }}, #{{
+              hash
+            }})
+            <br />
+            &copy; 2020 by the authors. Released as open-source, under terms of
+            Apache 2.0 license. {{ version }}
+          </div>
+        </q-img>
+      </q-card-section>
+    </q-card>
   </div>
 </template>
 <script>
diff --git a/src/pages/Preference.vue b/src/pages/Preference.vue
index fb2586f042..73a49da7ec 100644
--- a/src/pages/Preference.vue
+++ b/src/pages/Preference.vue
@@ -15,12 +15,8 @@ limitations under the License.
 -->
 <template>
   <div>
-    <q-toolbar class="shadow-2" >
-      <q-btn 
-      icon="arrow_back"
-      to="/"
-      label="Back"
-      />
+    <q-toolbar class="shadow-2">
+      <q-btn icon="arrow_back" to="/" label="Back" />
     </q-toolbar>
     <q-splitter v-model="splitterModel" style="height: 100%">
       <template v-slot:before>
@@ -32,11 +28,6 @@ limitations under the License.
             icon="mdi-file-document-edit-outline"
             label="Generation"
           />
-          <q-tab
-            name="About"
-            icon="mdi-alert-circle"
-            label="About"
-          />
         </q-tabs>
       </template>
 
@@ -49,7 +40,7 @@ limitations under the License.
           transition-prev="jump-up"
           transition-next="jump-up"
         >
-        <q-tab-panel name="user">
+          <q-tab-panel name="user">
             <PreferenceUser />
           </q-tab-panel>
           <q-tab-panel name="package">
@@ -59,11 +50,6 @@ limitations under the License.
           <q-tab-panel name="gen">
             <PreferenceGeneration />
           </q-tab-panel>
-          <q-tab-panel name="About">
-            <About />
-          </q-tab-panel>
-
-          
         </q-tab-panels>
       </template>
     </q-splitter>
@@ -73,14 +59,12 @@ limitations under the License.
 import PreferencePackage from './PreferencePackage.vue'
 import PreferenceGeneration from './PreferenceGeneration.vue'
 import PreferenceUser from './PreferenceUser.vue'
-import About from './About.vue'
 export default {
   name: 'Preference',
   components: {
     PreferencePackage,
     PreferenceGeneration,
     PreferenceUser,
-    About,
   },
   data() {
     return {