diff --git a/src/app.vue b/src/app.vue
index d153cd6..a8a06c6 100644
--- a/src/app.vue
+++ b/src/app.vue
@@ -4,9 +4,9 @@
             <div slot="brand">
                 <div class="logo">
                     <a href="/console" v-if="isMicroservice">
-                        <img src="/assets/lambda/images/logo.svg" alt="Lambda Platform">
+                        <img src="/assets/lambda/images/kb-logo.svg" alt="Lambda Platform">
                     </a>
-                    <img v-else src="/assets/lambda/images/logo.svg" alt="Puzzle Visual Builder">
+                    <img v-else src="/assets/lambda/images/kb-logo.svg" alt="Puzzle Visual Builder">
 
                     <div class="language-switcher">
                         <Select size="small" v-if="has_language && languages.length >= 2" v-model="selectedLang"
@@ -60,61 +60,62 @@
                 <!--                        <span>Алхамт процесс</span>-->
                 <!--                    </router-link>-->
                 <!--                </li>-->
-                <li class="divider"></li>
-                <li class="sub-title">
-                    <span>{{ lang.data_processor }}</span>
-                </li>
+<!--                <li class="divider"></li>-->
+<!--                <li class="sub-title">-->
+<!--                    <span>{{ lang.data_processor }}</span>-->
+<!--                </li>-->
 
-                <li>
-                    <router-link to="/datasource">
-                        <i class="ti-server"></i>
-                        <span>{{ lang.data_settings }}</span>
-                    </router-link>
-                </li>
-                <li>
-                    <router-link to="/chart">
-                        <i class="ti-pie-chart"></i>
-                        <span>{{ lang._chart }}</span>
-                    </router-link>
-                </li>
-                <li>
-                    <router-link to="/moqup">
-                        <i class="ti-layout"></i>
-                        <span>{{ lang.original_preparation }}</span>
-                    </router-link>
-                </li>
-                <li v-if="!isMicroservice">
-                    <router-link to="/report">
-                        <i class="ti-layout-accordion-list"></i>
-                        <span>{{ lang._report }}</span>
-                    </router-link>
-                </li>
-                <li v-if="!isMicroservice">
-                    <router-link to="/analytic">
-                        <i class="ti-bar-chart"></i>
-                        <span>{{ lang.analysis }}</span>
-                    </router-link>
-                </li>
+<!--                <li>-->
+<!--                    <router-link to="/datasource">-->
+<!--                        <i class="ti-server"></i>-->
+<!--                        <span>{{ lang.data_settings }}</span>-->
+<!--                    </router-link>-->
+<!--                </li>-->
+<!--                <li>-->
+<!--                    <router-link to="/chart">-->
+<!--                        <i class="ti-pie-chart"></i>-->
+<!--                        <span>{{ lang._chart }}</span>-->
+<!--                    </router-link>-->
+<!--                </li>-->
+<!--                <li>-->
+<!--                    <router-link to="/moqup">-->
+<!--                        <i class="ti-layout"></i>-->
+<!--                        <span>{{ lang.original_preparation }}</span>-->
+<!--                    </router-link>-->
+<!--                </li>-->
+<!--                <li v-if="!isMicroservice">-->
+<!--                    <router-link to="/report">-->
+<!--                        <i class="ti-layout-accordion-list"></i>-->
+<!--                        <span>{{ lang._report }}</span>-->
+<!--                    </router-link>-->
+<!--                </li>-->
+<!--                <li v-if="!isMicroservice">-->
+<!--                    <router-link to="/analytic">-->
+<!--                        <i class="ti-bar-chart"></i>-->
+<!--                        <span>{{ lang.analysis }}</span>-->
+<!--                    </router-link>-->
+<!--                </li>-->
 
-                <li>
-                    <router-link to="/notification">
-                        <i class="ti-bell"></i>
-                        <span>{{ lang.target_statement }}</span>
-                    </router-link>
-                </li>
-                <li>
-                    <router-link to="/graphql">
-                        <img src="/assets/lambda/images/graphql.svg" width="21">&nbsp;
-                        <span>{{ lang.graphql_management }}</span>
-                    </router-link>
-                </li>
+<!--                <li>-->
+<!--                    <router-link to="/notification">-->
+<!--                        <i class="ti-bell"></i>-->
+<!--                        <span>{{ lang.target_statement }}</span>-->
+<!--                    </router-link>-->
+<!--                </li>-->
+<!--                <li>-->
+<!--                    <router-link to="/graphql">-->
+<!--                        <img src="/assets/lambda/images/graphql.svg" width="21">&nbsp;-->
+<!--                        <span>{{ lang.graphql_management }}</span>-->
+<!--                    </router-link>-->
+<!--                </li>-->
+
+<!--                <li>-->
+<!--                    <router-link to="/visual-builder">-->
+<!--                        <i class="ti-panel"></i>-->
+<!--                        <span>{{ lang.web_page }}</span>-->
+<!--                    </router-link>-->
+<!--                </li>-->
 
-                <li>
-                    <router-link to="/visual-builder">
-                        <i class="ti-panel"></i>
-                        <span>{{ lang.web_page }}</span>
-                    </router-link>
-                </li>
                 <li class="divider" v-if="accessAdminModule"></li>
                 <li class="sub-title" v-if="accessAdminModule">
                     <span>{{ lang.usersAndUserGroups }}</span>
diff --git a/src/components/listview.vue b/src/components/listview.vue
index 7121d0d..fcd2e2d 100644
--- a/src/components/listview.vue
+++ b/src/components/listview.vue
@@ -255,18 +255,14 @@ export default {
         filterList($event) {
             let vm = this;
             let q = $event.target.value;
+            console.log(q);
             if (q != "") {
                 let filtered = vm.listData.filter(
-                    (f) => {
-                        f.name
-                            .toString()
-                            .toLowerCase()
-                            .indexOf(q.toLowerCase()) >= 0
-                    }
+                    f => f.name.toLowerCase().includes(q.toLowerCase())
                 );
-                vm.filteredList = filtered.map(o => ({...o}));
+                vm.filteredList = filtered;
             } else {
-                vm.filteredList = vm.listData.map(o => ({...o}));
+                vm.filteredList = vm.listData;
             }
         }
     }
diff --git a/src/modules/agent/views/agentform.vue b/src/modules/agent/views/agentform.vue
index c455674..782342e 100644
--- a/src/modules/agent/views/agentform.vue
+++ b/src/modules/agent/views/agentform.vue
@@ -1,32 +1,50 @@
 <template>
-    <section class="page">
-        <paper-header class="mini" v-if="!withoutHeader">
-            <div slot="right" >
-                <slot name="user-control"></slot>
-            </div>
+    <section class="canvas-aside">
+        <div class="crud-page">
+            <div class="crud-page-body" style="padding: 10px 10px 10px 10px !important">
+                <div class="dg-flex">
+                    <paper-header class="mini" style="box-shadow: rgba(99, 99, 99, 0.2) 0px 2px 8px 0px !important;
+    border-radius: 10px !important; margin-bottom: 20px !important;" v-if="!withoutHeader">
+                        <div slot="right">
+                            <slot name="user-control"></slot>
+                        </div>
 
-            <div slot="nav">
-                <ul>
-                    <li v-if="type == 'profile'">
-                        <router-link to="">
-                            <i class="tu-user"></i>
-                            <span>{{lang.personalInformation}}</span>
-                        </router-link>
-                    </li>
-                    <li v-if="type == 'password'">
-                        <router-link to="">
-                            <span>{{lang.changePassword}}</span>
-                        </router-link>
-                    </li>
-                </ul>
-            </div>
-            <div slot="tool">
+                        <div slot="nav">
+                            <ul>
+                                <li v-if="type == 'profile'">
+                                    <router-link to="">
+                                        <i class="tu-user"></i>
+                                        <span>{{ lang.personalInformation }}</span>
+                                    </router-link>
+                                </li>
+                                <li v-if="type == 'password'">
+                                    <router-link to="">
+                                        <span>{{ lang.changePassword }}</span>
+                                    </router-link>
+                                </li>
+                            </ul>
+                        </div>
+                        <div slot="tool">
+                        </div>
+                    </paper-header>
+                    <section class="page-agent-form" style="height: calc(100vh - 100px) !important;
+            width: 100%!important;
+    border-radius: 10px !important; padding:0!important;
+    box-shadow: rgba(99, 99, 99, 0.2) 0px 2px 8px 0px !important;
+    overflow: hidden;">
+                        <dataform v-if="type == 'profile'" :url="baseUrl ? baseUrl : ''" ref="agentForm"
+                                  style="max-width: 100%; width: 100%!important; display: block!important; padding: 20px;"
+                                  schemaID="user_profile" :editMode="editMode" :do_render="editMode" :onReady="editUser"
+                                  :onSuccess="onSuccess"/>
+                        <dataform v-if="type == 'password'" :url="baseUrl ? baseUrl : ''" ref="agentForm"
+                                  style="max-width: 100%; width: 100%!important; display: block!important; padding: 20px;"
+                                  schemaID="user_password" :editMode="editMode" :do_render="editMode" a
+                                  :onReady="editUser"
+                                  :onSuccess="onSuccess"/>
+                    </section>
+                </div>
             </div>
-        </paper-header>
-        <section class="page-agent-form">
-            <dataform v-if="type == 'profile'" :url="baseUrl ? baseUrl : ''" class="material-form" ref="agentForm" schemaID="user_profile" :editMode="editMode" :do_render="editMode" :onReady="editUser" :onSuccess="onSuccess"/>
-            <dataform v-if="type == 'password'" :url="baseUrl ? baseUrl : ''" class="material-form" ref="agentForm" schemaID="user_password" :editMode="editMode" :do_render="editMode" a :onReady="editUser" :onSuccess="onSuccess"/>
-        </section>
+        </div>
     </section>
 </template>
 
@@ -34,7 +52,7 @@
 import pagination from "./pagination";
 
 export default {
-    props:['type', 'withoutHeader', 'baseUrl'],
+    props: ['type', 'withoutHeader', 'baseUrl'],
     components: {
         'dv-pagination': pagination
     },
@@ -55,7 +73,6 @@ export default {
     },
 
 
-
     methods: {
         onSuccess(data) {
         },
diff --git a/src/modules/dataform/Dataform.vue b/src/modules/dataform/Dataform.vue
index 51cc43a..7f4dbd2 100644
--- a/src/modules/dataform/Dataform.vue
+++ b/src/modules/dataform/Dataform.vue
@@ -73,9 +73,10 @@
                                  :key='col.index' :xs='col.span.xs'
                                  :sm='col.span.sm' :md='col.span.md' :lg='col.span.lg'>
 
-                                <div
-                                    :class="col.name !== '' && col.name !== null && col.name !== undefined ? 'fieldset' : ''">
-                                    <legend v-if="col.name != ''">{{ col.name }}
+                                <div :id='col.id'
+                                    :class="`${col.visibleModelValue? 'lbd-dataform-section-hide':''} ${col.name !== '' && col.name !== null && col.name !== undefined ? 'fieldset' : ''}`">
+                                    <legend>
+                                        <div class="fieldset-title"> {{ col.name }}</div>
                                     <Row v-for='srow in col.children' :key='srow.index'>
                                         <Col v-for='scol in srow.children' :id='scol.id' :key='scol.index' :xs='24'
                                              :sm='24' :md='scol.span.md' :lg='scol.span.lg'>
@@ -234,7 +235,7 @@
                     </Button>
                     <Button type='info' :loading='asyncMode' @click="handleSubmit(meta.model +'-'+ schemaID)">
                     <span v-if='!asyncMode'>
-                        {{ save_btn_text !== 'Хадгалах' && save_btn_text != '' ? save_btn_text : lang.save }}
+                        {{ save_btn_text != '' ? save_btn_text : lang.save }}
                     </span>
                         <span v-else>
                         {{ lang.pleaseWait }}
diff --git a/src/modules/dataform/DataformMixin.js b/src/modules/dataform/DataformMixin.js
index 10c0579..23993d4 100644
--- a/src/modules/dataform/DataformMixin.js
+++ b/src/modules/dataform/DataformMixin.js
@@ -227,7 +227,8 @@ export default {
         afterChange(model, val, oldValue) {
             doTrigger(model, val, this.model, this.schema, this.$refs, this.$Notice, this.editMode)
             if (this.do_render) {
-                if (val != oldValue) {
+                if (val != oldValue)
+                {
                     doFormula(this.formula, model, this.model, this.schema, this.rule, false)
                 }
             }
@@ -291,7 +292,7 @@ export default {
                 this.step = formSchema.step;
             }
 
-            this.ui = formSchema.ui
+            this.ui = formSchema.ui;
             if (formSchema.save_btn_text) {
                 this.save_btn_text = formSchema.save_btn_text
             }
@@ -735,7 +736,6 @@ export default {
             setIdentity(this.identity, null)
             this.schema.forEach(item => {
                 if (item.formType == 'SubForm' && typeof this.$refs[`sf${item.model}`] != 'undefined') {
-                    console.log(this.$refs[`sf${item.model}`]);
                     this.$refs[`sf${item.model}`][0].reset()
                 }
                 //if (item.default != null && !this.editMode) {
@@ -1000,7 +1000,6 @@ export default {
                     }
                 }
             })
-            console.log('selects: ', selects);
 
             return selects
         },
diff --git a/src/modules/dataform/FormBuilder.vue b/src/modules/dataform/FormBuilder.vue
index f0e6f97..1e875f6 100644
--- a/src/modules/dataform/FormBuilder.vue
+++ b/src/modules/dataform/FormBuilder.vue
@@ -176,6 +176,7 @@
                                                       :label='lang.field + (index+1)'>
                                                 <Row :gutter='8' :label='80'>
                                                     <Col span='10'>
+                                                        <div style="display: flex; flex-direction: column; align-items: center">
                                                         <Select v-model='target.field'
                                                                 :placeholder='lang.field'
                                                                 v-if="formulaForm.form == 'main'">
@@ -185,6 +186,13 @@
                                                                 }}
                                                             </Option>
                                                         </Select>
+                                                            <span  v-if="formulaForm.form == 'main'">
+                                                        or </span>
+                                                        <Input type='text' v-model='target.section'
+                                                               v-if="formulaForm.form == 'main'"
+                                                               placeholder='Section Id'/>
+                                                        </div>
+                                                        <div style="display: flex; flex-direction: column; align-items: center;">
                                                         <Select v-model='target.field'
                                                                 :placeholder='lang.field'
                                                                 v-for="(f, f_index) in dataform.schema.filter(ff=>ff.formType === 'SubForm' && ff.model === formulaForm.form && formulaForm.form !== 'main')"
@@ -195,6 +203,7 @@
                                                                 }}
                                                             </Option>
                                                         </Select>
+                                                        </div>
                                                     </Col>
 
                                                     <Col span='10'>
@@ -927,7 +936,7 @@ export default {
 
     watch: {
         reCallDataAw() {
-            console.log('watch ajilj bn')
+
             //this.data();
         }
     },
@@ -998,6 +1007,7 @@ export default {
         addFormulaTarget() {
             this.formulaForm.targets.push({
                 field: '',
+                section:'',
                 prop: ''
             })
         },
diff --git a/src/modules/dataform/FormMoqup.vue b/src/modules/dataform/FormMoqup.vue
index 97e0f0a..7019784 100644
--- a/src/modules/dataform/FormMoqup.vue
+++ b/src/modules/dataform/FormMoqup.vue
@@ -11,19 +11,19 @@
                     <div class='view-port-switcher'>
                         <a href='javascript:void(0)' :class="`${mode.type} ${mode.type == 'xs' ? 'active' :''}`"
                            @click="setMode('xs', langMoqup.phone)">
-                            <Icon type='md-phone-portrait' />
+                            <Icon type='md-phone-portrait'/>
                         </a>
                         <a href='javascript:void(0)' :class="`${mode.type} ${mode.type == 'sm' ? 'active' :''}`"
                            @click="setMode('sm', langMoqup.tablet)">
-                            <Icon type='md-tablet-portrait' />
+                            <Icon type='md-tablet-portrait'/>
                         </a>
                         <a href='javascript:void(0)' :class="`${mode.type} ${mode.type == 'md' ? 'active' :''}`"
                            @click="setMode('md', langMoqup.computer)">
-                            <Icon type='md-laptop' />
+                            <Icon type='md-laptop'/>
                         </a>
                         <a href='javascript:void(0)' :class="`${mode.type} ${mode.type == 'lg' ? 'active' :''}`"
                            @click="setMode('lg', langMoqup.bigComputer)">
-                            <Icon type='md-browsers' />
+                            <Icon type='md-browsers'/>
                         </a>
                     </div>
                 </div>
@@ -48,23 +48,23 @@
 
                                             <span class='tool' @click='addSection(row.id, 1)'>
                                                 <Tooltip :content='lang.section_add'>
-                                                    <Icon type='md-menu' />
+                                                    <Icon type='md-menu'/>
                                                 </Tooltip>
                                             </span>
                                             <span class='tool' @click='addCol(row.id)'>
                                                 <Tooltip :content='lang.add_column'>
-                                                    <Icon type='md-add' />
+                                                    <Icon type='md-add'/>
                                                 </Tooltip>
                                             </span>
 
                                             <span class='tool' @click='deleteFromSchema(row.id)'>
                                                 <Tooltip :content='lang._delete'>
-                                                    <Icon type='md-close' />
+                                                    <Icon type='md-close'/>
                                                 </Tooltip>
                                             </span>
                                             <span class='row-drag-handler tool'>
                                                 <Tooltip :content='lang._move'>
-                                                    <Icon type='md-move' />
+                                                    <Icon type='md-move'/>
                                                 </Tooltip>
                                             </span>
                                         </div>
@@ -83,10 +83,20 @@
                                                      v-if="col.type == 'section'">
                                                     <div class='pz-col easing'>
                                                         <div class='pz-col-control'>
+                                                            <Input type='text' v-model='col.id' size='small'
+                                                                   placeholder='Section Id'
+                                                                   autocomplete="off"
+                                                                   disabled
+                                                                   class='pz-col-input'/>
                                                             <Input type='text' v-model='col.name' size='small'
                                                                    :placeholder='lang.Get_name'
                                                                    autocomplete="off"
-                                                                   class='pz-col-input' />
+                                                                   class='pz-col-input'/>
+                                                            <Checkbox class='pz-col-input'
+                                                                      v-model="col.visibleModelValue">Нуух
+                                                            </Checkbox>
+
+
                                                             <div class='pz-col-control-items'>
                                                                 <Poptip placement='bottom-end' size='small'>
                                                                     <!-- <a href="javascript:void(0)" @click="addSectionCol(srow.id)"> -->
@@ -94,7 +104,7 @@
                                                                   <Badge :count='col.visibleUserRoles.length'
                                                                          v-if='col.visibleUserRoles'
                                                                          class-name='badge-user-roles'></Badge>
-                                                                                <Icon type='md-person-add' />
+                                                                                <Icon type='md-person-add'/>
                                                                             </span>
                                                                     <div class='auto-col' slot='content'>
                                                                         <Select v-model='col.visibleUserRoles' multiple
@@ -108,13 +118,13 @@
                                                                     </div>
                                                                 </Poptip>
                                                                 <span class='tool' @click='addRow(col.id)'>
-                                                                    <Icon type='md-add' />
+                                                                    <Icon type='md-add'/>
                                                                 </span>
                                                                 <span class='tool' @click='deleteFromSchema(col.id)'>
-                                                                    <Icon type='md-close' />
+                                                                    <Icon type='md-close'/>
                                                                 </span>
                                                                 <span class='scol-drag-handler tool'>
-                                                                    <Icon type='md-move' />
+                                                                    <Icon type='md-move'/>
                                                                 </span>
                                                             </div>
                                                         </div>
@@ -132,7 +142,7 @@
                                                                         <Poptip placement='left' size='small'>
                                                                             <!-- <a href="javascript:void(0)" @click="addSectionCol(srow.id)"> -->
                                                                             <span class='tool'>
-                                                                                <Icon type='md-menu' />
+                                                                                <Icon type='md-menu'/>
                                                                             </span>
                                                                             <div class='auto-col' slot='content'>
                                                                                 <a v-for='options in colOptions'
@@ -149,11 +159,11 @@
 
                                                                         <span class='tool'
                                                                               @click='deleteFromSchema(srow.id)'>
-                                                                            <Icon type='md-close' />
+                                                                            <Icon type='md-close'/>
                                                                         </span>
 
                                                                         <span class='srow-drag-handler tool'>
-                                                                            <Icon type='md-move' />
+                                                                            <Icon type='md-move'/>
                                                                         </span>
                                                                     </div>
                                                                     <Col v-for='(scol, scol_index) in srow.children'
@@ -164,16 +174,16 @@
                                                                             <div class='pz-col-control'>
                                                                                 <Input type='text' v-model='scol.id'
                                                                                        size='small'
-                                                                                       class='pz-col-input' />
+                                                                                       class='pz-col-input'/>
                                                                                 <Input type='text' v-model='scol.name'
                                                                                        size='small'
                                                                                        :placeholder='lang.Get_name'
                                                                                        autocomplete="off"
-                                                                                       class='pz-col-input' />
+                                                                                       class='pz-col-input'/>
                                                                                 <div class='pz-col-control-items'>
                                                                                     <a href='javascript:void(0)'
                                                                                        @click='deleteFromSchema(scol.id)'>
-                                                                                        <Icon type='md-close' />
+                                                                                        <Icon type='md-close'/>
                                                                                     </a>
                                                                                 </div>
                                                                             </div>
@@ -213,20 +223,22 @@
                                                     </div>
                                                 </Col>
                                                 <!--  Standart column -->
-                                                <Col :span='col.span[mode.type]'     class="drag-able-column" v-if="col.type == 'col'">
+                                                <Col :span='col.span[mode.type]' class="drag-able-column"
+                                                     v-if="col.type == 'col'">
                                                     <div class='pz-col easing'>
                                                         <div class='pz-col-control'>
                                                             <Input type='text' v-model='col.id' size='small'
-                                                                   class='pz-col-input' />
+                                                                   class='pz-col-input'/>
                                                             <Input type='text' v-model='col.name' size='small'
-                                                                   class='pz-col-input' :placeholder='lang.Get_name' autocomplete="off" />
+                                                                   class='pz-col-input' :placeholder='lang.Get_name'
+                                                                   autocomplete="off"/>
 
                                                             <div class='pz-col-control-items'>
                                                         <span class='tool' @click='deleteFromSchema(col.id)'>
-                                                            <Icon type='md-close' />
+                                                            <Icon type='md-close'/>
                                                         </span>
                                                                 <span class='scol-drag-handler tool'>
-                                                            <Icon type='md-move' />
+                                                            <Icon type='md-move'/>
                                                         </span>
                                                             </div>
                                                         </div>
@@ -306,11 +318,11 @@
     </div>
 </template>
 <script>
-import { element } from './elements'
+import {element} from './elements'
 import Grid from './elements/subform/Grid.vue'
-import { idGenerator } from './utils/methods'
-import { Container, Draggable } from 'vue-smooth-dnd'
-import { applyDrag } from './utils/helpers'
+import {idGenerator} from './utils/methods'
+import {Container, Draggable} from 'vue-smooth-dnd'
+import {applyDrag} from './utils/helpers'
 
 export default {
     props: ['schema', 'ui', 'isDisabled', 'meta', 'schemaID', 'identity', 'use2ColumnLayout'],
@@ -360,8 +372,7 @@ export default {
         }
     },
     mounted() {
-        // console.log('Форм угсрах');
-        //  console.log(this.$props.schema);
+
     },
     computed: {
         lang() {
@@ -505,6 +516,7 @@ export default {
         addSection(parentId, type) {
             let rowItem = {
                 type: 'row',
+                visibleModelValue: 0,
                 id: this.idGenerator('row'),
                 children: [],
                 visibleUserRoles: []
@@ -532,6 +544,7 @@ export default {
             cols.forEach(item => {
                 let colItem = {
                     type: 'col',
+                    visibleModelValue: 0,
                     id: this.idGenerator('col'),
                     span: {
                         xs: item,
@@ -568,7 +581,7 @@ export default {
         handleResize(e, id) {
             this.currentDom = e.target.parentElement
             this.findElId = id
-            console.log(this.findElId)
+
             e.target.parentElement.classList.remove('easing')
             window.addEventListener('mousemove', this.resize, {
                 passive: true
@@ -608,7 +621,7 @@ export default {
                         currentWidth >= colStandartW - 40 &&
                         currentWidth <= colStandartW + 40
                     ) {
-                        console.log(vm.findElId)
+
                         let el = this.findInTree(vm.findElId, vm.ui.schema)
                         el.span[vm.$data.mode.type] = i * 2
                         parent.style.width = '100%'
diff --git a/src/modules/dataform/elements/DateTime.vue b/src/modules/dataform/elements/DateTime.vue
index 95a6140..abc72f4 100644
--- a/src/modules/dataform/elements/DateTime.vue
+++ b/src/modules/dataform/elements/DateTime.vue
@@ -1,8 +1,10 @@
 <template>
-    <FormItem :label=label :prop=rule>
-<!--        <DatePicker v-if="model.form[model.component] === null && meta.disabled" :value="now"-->
+    <FormItem :label=label :prop=rule :key="model.form[model.component]">
+<!--        <DatePicker v-if="model.form[model.component] === null" :value="now"-->
 <!--                    type="datetime" v-model="now"-->
-<!--                    placement="bottom-end" :placeholder="meta && meta.placeHolder !== null ? meta.placeHolder : label"-->
+<!--                    @on-change="getDateValueNow"-->
+<!--                    placement="bottom-end"-->
+<!--                    :placeholder="meta && meta.placeHolder !== null ? meta.placeHolder : label"-->
 <!--                    :disabled="meta && meta.disabled ? meta.disabled : false"-->
 <!--                    format="yyyy-MM-dd HH:mm"-->
 <!--        ></DatePicker>-->
@@ -10,12 +12,10 @@
         <DatePicker
                     type="datetime" v-model="model.form[model.component]"
                     @on-change="getDateValue"
-                    :key="model.form[model.component]"
                     placement="bottom-end"
                     :placeholder="meta && meta.placeHolder !== null ? meta.placeHolder : label"
                     :disabled="meta && meta.disabled ? meta.disabled : false"
                     format="yyyy-MM-dd HH:mm"></DatePicker>
-
     </FormItem>
 </template>
 
diff --git a/src/modules/dataform/scss/_dataform.scss b/src/modules/dataform/scss/_dataform.scss
index dcc1747..45c26b6 100644
--- a/src/modules/dataform/scss/_dataform.scss
+++ b/src/modules/dataform/scss/_dataform.scss
@@ -279,11 +279,17 @@
             legend {
                 width:100%;
                 margin-top: -20px;
-                background-color: white;
+                //background-color: white;
                 padding: 0 10px;
                 font-size: 12px;
                 font-weight: 600;
                 margin-bottom: 10px;
+                .fieldset-title{
+                    background: white;
+                    width: fit-content;
+                    padding-right: 10px;
+                    padding-left: 10px;
+                }
             }
         }
 
@@ -325,3 +331,4 @@
         }
     }
 }
+
diff --git a/src/modules/dataform/scss/style.scss b/src/modules/dataform/scss/style.scss
index 34ff9c9..6049889 100644
--- a/src/modules/dataform/scss/style.scss
+++ b/src/modules/dataform/scss/style.scss
@@ -135,3 +135,7 @@
     background: #F5F6FC;
     padding: 20px 10px;
 }
+
+.lbd-dataform-section-hide{
+    display: none!important;
+}
diff --git a/src/modules/dataform/utils/date.js b/src/modules/dataform/utils/date.js
index f6b5c73..a309271 100644
--- a/src/modules/dataform/utils/date.js
+++ b/src/modules/dataform/utils/date.js
@@ -23,11 +23,11 @@ export function toTime(time) {
 }
 
 export function toDateTime(datetime) {
-    return Moment(datetime, 'YYYY-MM-DD HH:mm:ss')
+    return Moment(datetime, 'YYYY-MM-DD HH:mm:ss').tz('Asia/Ulaanbaatar')
 }
 
 export function now() {
-    return Moment().format("YYYY-MM-DD HH:mm:ss")
+    return Moment().tz('Asia/Ulaanbaatar').format("YYYY-MM-DD HH:mm:ss")
 }
 
 export function getDateTime(date) {
diff --git a/src/modules/dataform/utils/formula_and_trigger.js b/src/modules/dataform/utils/formula_and_trigger.js
index d62259e..fb7df2c 100644
--- a/src/modules/dataform/utils/formula_and_trigger.js
+++ b/src/modules/dataform/utils/formula_and_trigger.js
@@ -36,7 +36,6 @@ export function doFormula(formulas, model, model_, schema_, rule_, subFormModelN
 function doFormula2(formula, model, model_, schema_, rule_, subFormModelName) {
 
     let use_formula = false;
-
     //old one i dont know just commented
     // if (formula['form']) {
     //     if (formula['form'] == 'main')
@@ -62,21 +61,33 @@ function doFormula2(formula, model, model_, schema_, rule_, subFormModelName) {
             if (pre_formula) {
                 let calculated = evil(pre_formula);
                 formula.targets.map(target => {
-                    let schema_index = getSchemaIndex(schema_, target.field);
-                    if (schema_index >= 0) {
-                        if (target.prop == 'value') {
-                            model_[target.field] = calculated;
-                        } else {
-                            if (target.prop == 'hidden') {
-                                if (rule_) {
-                                    if (rule_[target.field]) {
-                                        if (rule_[target.field].length > 0 && rule_[target.field][0].hasOwnProperty("required"))
-                                            rule_[target.field][0].required = calculated ? false : true;
+                    //for filed
+                    if(target.field) {
+                        let schema_index = getSchemaIndex(schema_, target.field);
+                        if (schema_index >= 0) {
+                            if (target.prop == 'value') {
+                                model_[target.field] = calculated;
+                            } else {
+                                if (target.prop == 'hidden') {
+                                    if (rule_) {
+                                        if (rule_[target.field]) {
+                                            if (rule_[target.field].length > 0 && rule_[target.field][0].hasOwnProperty("required"))
+                                                rule_[target.field][0].required = calculated ? false : true;
+                                        }
                                     }
                                 }
+                                // schema_[schema_index][target.prop] = calculated;
+                                Vue.set(schema_[schema_index], target.prop, calculated)
                             }
-                            // schema_[schema_index][target.prop] = calculated;
-                            Vue.set(schema_[schema_index], target.prop, calculated)
+                        }
+                    }
+                    //for section
+                    if(target.section) {
+                        let element = document.getElementById(target.section);
+                        element.classList.remove("lbd-dataform-section-hide");
+                        if (target.prop == 'hidden' && calculated) {
+                            let element = document.getElementById(target.section);
+                            element.classList.add("lbd-dataform-section-hide");
                         }
                     }
                 })
diff --git a/src/modules/datagrid/Datagrid.vue b/src/modules/datagrid/Datagrid.vue
index 68fcb45..df6ffa5 100644
--- a/src/modules/datagrid/Datagrid.vue
+++ b/src/modules/datagrid/Datagrid.vue
@@ -581,10 +581,10 @@ export default {
                 (gridSchema.actions.length > 0 ||
                     (this.$props.actions && this.$props.actions.length > 0))
             ) {
-                let width = gridSchema.actions.length * 50;
+                let width = gridSchema.actions.length * 100;
 
                 if (this.$props.actions) {
-                    width += this.$props.actions.length * 50;
+                    width += this.$props.actions.length * 100;
                 }
 
                 if (this.header != null) {
@@ -604,6 +604,7 @@ export default {
                 let actions = {
                     headerName: "...",
                     width: width,
+                    resizable: false,
                     field: this.identity ? this.identity : 'id',
                     suppressMenu: true,
                     sortable: false,
@@ -624,7 +625,6 @@ export default {
                         actionsVisibility: this.$props.actionvisibility,
                     }
                 };
-
                 if (this.permissions) {
                     if (this.permissions.r || this.permissions.u || this.permissions.d) {
                         if (this.actionPosition == 0) {
@@ -1755,8 +1755,6 @@ export default {
                 this.filterData(1);
             } else {
                 let filters = event.api.getFilterModel();
-                console.log(filters);
-
                 for (let key in filters) {
                     if (Object.prototype.hasOwnProperty.call(filters, key)) {
                         // console.log(filters[key]);
diff --git a/src/modules/datagrid/GridActions.vue b/src/modules/datagrid/GridActions.vue
index 2559810..00c052e 100644
--- a/src/modules/datagrid/GridActions.vue
+++ b/src/modules/datagrid/GridActions.vue
@@ -76,11 +76,6 @@ export default Vue.extend({
             }, {});
         },
     },
-    mounted()
-    {
-      console.log("this.params.methods");
-      console.log(this.params.methods);
-    },
     methods: {
         edit() {
             this.params.methods.edit(this.params.value, this.params.data)
diff --git a/src/modules/krud/templates/canvas-aside.vue b/src/modules/krud/templates/canvas-aside.vue
index ebd79ee..6f507a4 100644
--- a/src/modules/krud/templates/canvas-aside.vue
+++ b/src/modules/krud/templates/canvas-aside.vue
@@ -1,7 +1,7 @@
 <template>
     <section class="canvas-aside">
         <div class="crud-page">
-            <div class="crud-page-body">
+            <div class="crud-page-body" style="padding: 10px 10px 10px 10px !important">
                 <div class="v-nav" v-if="hasVNavSlot">
                     <slot name="v-nav"></slot>
                 </div>
diff --git a/src/modules/krud/templates/edit.vue b/src/modules/krud/templates/edit.vue
index 26d62d8..f4ced0a 100644
--- a/src/modules/krud/templates/edit.vue
+++ b/src/modules/krud/templates/edit.vue
@@ -14,7 +14,7 @@
                 </div>
             </div>
 
-            <div class="crud-page-body">
+            <div class="crud-page-body" style="overflow-y: auto">
                 <div class="v-nav" v-if="hasVNavSlot">
                     <slot name="v-nav"></slot>
                 </div>
diff --git a/src/modules/page/Nav.vue b/src/modules/page/Nav.vue
index 65e22f7..39ca9e2 100644
--- a/src/modules/page/Nav.vue
+++ b/src/modules/page/Nav.vue
@@ -29,7 +29,7 @@
                     <i v-if="item.icon" :class="item.icon"></i>
                 </a>
             </Tooltip>
-            <a href="item.url" v-if="item.link_to == 'link' && !hasTooltip" target="_blank">
+            <a :href="item.url" v-if="item.link_to == 'link' && !hasTooltip" :target="item.target">
                 <i v-if="item.icon" :class="item.icon"></i>
                 <span v-html="getTitle(item)"></span>
             </a>
diff --git a/src/pages/role/views/ProductItem/ProductItem.vue b/src/pages/role/views/ProductItem/ProductItem.vue
index 13ba8dd..e297fdf 100644
--- a/src/pages/role/views/ProductItem/ProductItem.vue
+++ b/src/pages/role/views/ProductItem/ProductItem.vue
@@ -17,7 +17,7 @@
             <div class="menu-control">
                 <span>&nbsp;</span>
                 <span>
-                    <Checkbox :disabled="!permissions[data.id].show" v-model="permissions[data.id].e">E</Checkbox>
+                    <Checkbox :disabled="!permissions[data.id].show" v-model="permissions[data.id].e">E {{permissions[data.id].e}}</Checkbox>
                     <Checkbox :disabled="!permissions[data.id].show" v-model="permissions[data.id].c">C</Checkbox>
                     <Checkbox :disabled="!permissions[data.id].show" v-model="permissions[data.id].r">R</Checkbox>
                     <Checkbox :disabled="!permissions[data.id].show" v-model="permissions[data.id].u">U</Checkbox>
diff --git a/src/pages/role/views/index.vue b/src/pages/role/views/index.vue
index da711bc..73395b4 100644
--- a/src/pages/role/views/index.vue
+++ b/src/pages/role/views/index.vue
@@ -11,17 +11,11 @@
                         </router-link>
                     </li>
                     <li>
-                        <router-link to="/role-multi">
-                            <i class="ti-user"></i>
-                            <span>Олон цэс удирдах</span>
+                        <router-link to="/role-kb-product">
+                            <i class="ti-layout-grid2"></i>
+                            <span>Бүтээгдэхүүн удирдах эрх</span>
                         </router-link>
                     </li>
-                    <!--                    <li>-->
-                    <!--                        <router-link to="/role-kb-product">-->
-                    <!--                            <i class="ti-layout-grid2"></i>-->
-                    <!--                            <span>Бүтээгдэхүүн удирдах эрх</span>-->
-                    <!--                        </router-link>-->
-                    <!--                    </li>-->
                 </ul>
             </div>
         </paper-header>
diff --git a/src/template/paper/components/user-control/UserControl.vue b/src/template/paper/components/user-control/UserControl.vue
index 8848024..c15c5ec 100644
--- a/src/template/paper/components/user-control/UserControl.vue
+++ b/src/template/paper/components/user-control/UserControl.vue
@@ -1,8 +1,15 @@
 <template>
     <div class="user-control">
         <ul>
-            <li class="paper-notification">
-                <notif-widget :user="$user.id"/>
+            <!--            <li class="paper-notification">-->
+            <!--                <notif-widget :user="$user.id"/>-->
+            <!--            </li>-->
+            <li class="paper-credit" v-if="$user && $user.credits && $user.credits>0">
+<span style="border: 1px dashed #2F55D4;
+    padding: 5px;
+    margin-left: 10px;
+    border-radius: 5px;
+    background: #eee;"><h3> {{ $user.credits.toLocaleString() }} төгрөг</h3></span>
             </li>
 
             <li class="avatar-item">
@@ -10,8 +17,9 @@
                     <a href="javascript:void(0)" class="avatar">
                         <img src="/assets/lambda/images/avatar.png" alt="avatar">
                         <div class="avatar-name">
-                            <span>{{lang.welcome}}</span>
-                            <b>{{ $user.first_name ? $user.first_name : $user.login }} {{ $user.org_id ? '/' : '' }} {{ $user.org_id ? $user.org_id : '' }}</b>
+                            <span>{{ lang.welcome }}</span>
+                            <b>{{ $user.first_name ? $user.first_name : $user.login }} {{ $user.org_id ? '/' : '' }}
+                                {{ $user.org_id ? $user.org_id : '' }}</b>
                         </div>
                     </a>
                     <div class="header-profile" slot="content">
@@ -23,25 +31,25 @@
                             <li>
                                 <router-link to="/module/profile">
                                     <Icon type="ios-contact-outline"/>
-                                    <span>{{lang.personalInfo}}</span>
+                                    <span>{{ lang.personalInfo }}</span>
                                 </router-link>
                             </li>
                             <li>
                                 <router-link to="/module/password">
                                     <Icon type="ios-key-outline"/>
-                                    <span>{{lang.changePass}}</span>
+                                    <span>{{ lang.changePass }}</span>
                                 </router-link>
                             </li>
-                            <li v-if="$user.role==1 || $user.role==29">
-                                <a href="/lambda/puzzle" target="_blank">
-                                    <Icon type="ios-settings-outline"/>
-                                    <span>{{lang.superAdminManagement}}</span>
-                                </a>
-                            </li>
+                            <!--                            <li v-if="$user.role==2">-->
+                            <!--                                <a href="/lambda/puzzle" target="_blank">-->
+                            <!--                                    <Icon type="ios-settings-outline"/>-->
+                            <!--                                    <span>{{lang.superAdminManagement}}</span>-->
+                            <!--                                </a>-->
+                            <!--                            </li>-->
                             <li>
                                 <a @click="logoutModal = true">
                                     <Icon type="ios-log-out"/>
-                                    <span >{{lang.logout}}</span>
+                                    <span>{{ lang.logout }}</span>
                                 </a>
                             </li>
                         </ul>
@@ -59,11 +67,11 @@
             <div style="text-align:center">
                 <a @click="logout()">
                     <Icon type="md-log-out"/>
-                    <span>{{common._logout}}</span>
+                    <span>{{ common._logout }}</span>
                 </a>
                 <a @click="cancel()">
                     <Icon type="md-refresh"/>
-                    <span>{{common._cancel}}</span>
+                    <span>{{ common._cancel }}</span>
                 </a>
             </div>
             <div slot="footer" style="display:none;">