diff --git a/src/components/CEventsCalendar/CEventsCalendar.ts.off b/src/components/CEventsCalendar/CEventsCalendar.ts.off
index b253ea05..586f71cc 100755
--- a/src/components/CEventsCalendar/CEventsCalendar.ts.off
+++ b/src/components/CEventsCalendar/CEventsCalendar.ts.off
@@ -254,7 +254,7 @@ export default defineComponent({
 
      */
 
-    watch(locale, (val, oldval) => {
+    watch(() => locale, (val, oldval) => {
       updateFormatters()
     })
 
diff --git a/src/components/CMyAvatar/CMyAvatar.ts b/src/components/CMyAvatar/CMyAvatar.ts
index a3d9f4b4..791de5ef 100755
--- a/src/components/CMyAvatar/CMyAvatar.ts
+++ b/src/components/CMyAvatar/CMyAvatar.ts
@@ -34,8 +34,8 @@ export default defineComponent({
       // console.log('myimgint', this.myimgint)
     }
 
-    watch(
-      imgprofile,
+    watch(() =>
+        imgprofile,
       // @ts-ignore
       (value: string, oldValue: string) => {
         userStore.my.profile.img = value
@@ -44,8 +44,10 @@ export default defineComponent({
     )
 
 
-    watch(
-      myimgvar, (value: string, oldValue: string) => {
+    watch(() =>
+        myimgvar,
+      // @ts-ignore
+      (value: string, oldValue: string) => {
         myimgint.value = ''
         refresh()
       },
diff --git a/src/components/CMyPage/CMyPage.ts b/src/components/CMyPage/CMyPage.ts
index b0c448ff..3550cfa8 100755
--- a/src/components/CMyPage/CMyPage.ts
+++ b/src/components/CMyPage/CMyPage.ts
@@ -1,5 +1,5 @@
 import {
-  defineComponent, onMounted, ref, toRef,
+  defineComponent, onMounted, ref, toRef, watch,
 } from 'vue'
 
 import { IMyPage } from '@src/model'
@@ -53,9 +53,18 @@ export default defineComponent({
     const globalStore = useGlobalStore()
 
     const load = async (): Promise<void> => {
-      if (mypath.value !== '') rec.value = await globalStore.loadPage(mypath.value)
+      // console.log('load', mypath.value)
+      if (mypath.value !== '') rec.value = await globalStore.loadPage('/'+mypath.value)
     }
-    onMounted(load)
+
+    watch(() => props.mypath, async (to: string, from: string) =>  {
+      // console.log('load', mypath.value)
+      if (mypath.value !== '') rec.value = await globalStore.loadPage('/'+mypath.value)
+    })
+
+    // onMounted(load)
+
+    load()
 
     return { rec }
   },
diff --git a/src/components/CMyTeacher/CMyTeacher.ts b/src/components/CMyTeacher/CMyTeacher.ts
index b108b1b2..80fe7678 100755
--- a/src/components/CMyTeacher/CMyTeacher.ts
+++ b/src/components/CMyTeacher/CMyTeacher.ts
@@ -31,7 +31,7 @@ export default defineComponent({
       return getOperatorByUsername(props.username)
     })
 
-    watch(showuserdetails, (value: any, old: any) => {
+    watch(() => showuserdetails, (value: any, old: any) => {
       if (!showuserdetails.value) {
         globalStore.autoplaydisc = autoplaydiscsaved.value
       }
diff --git a/src/components/Header/Header.ts b/src/components/Header/Header.ts
index ed656efb..f42dbf2d 100755
--- a/src/components/Header/Header.ts
+++ b/src/components/Header/Header.ts
@@ -204,7 +204,7 @@ export default defineComponent({
       },
     })
 
-    watch(
+    watch(() =>
       stateconn,
       // @ts-ignore
       (value: string, oldValue: string) => {
diff --git a/src/root/mypage/mypage.ts b/src/root/mypage/mypage.ts
index da1d6370..27126ae6 100755
--- a/src/root/mypage/mypage.ts
+++ b/src/root/mypage/mypage.ts
@@ -19,14 +19,16 @@ export default defineComponent({
     const { setmeta } = MixinMetaTags()
 
     async function created() {
-      console.log('MyPage created')
       rec.value = await globalStore.loadPage(route.path)
+      // console.log('MyPage created', rec.value)
 
       // console.log('mounted', this.rec)
     }
 
     watch(path, async (to: string, from: string) =>  {
+      // console.log('watch path', path)
       rec.value = await globalStore.loadPage(to)
+      // console.log('path change', rec.value)
     })
 
     function meta() {
diff --git a/src/root/mypage/mypage.vue b/src/root/mypage/mypage.vue
index a647d8d7..af5dfdbd 100755
--- a/src/root/mypage/mypage.vue
+++ b/src/root/mypage/mypage.vue
@@ -1,42 +1,19 @@
 <template>
-  <div v-if="isfinishLoading">
+  <div v-if="isfinishLoading && !!rec">
     <CMyPage
       :title="rec.title" :imgbackground="`` + rec.imgback"
+      :mypath="rec.path"
       :sizes="`max-height: ` + rec.heightimg + `px`">
-            <span>{{
-                setmeta({
-                  title: rec.title,
-                  description: rec.description,
-                  keywords: rec.keywords,
-                })
-              }}
-            </span>
 
-      <div class="q-ma-sm q-gutter-sm q-pa-xs">
-        <div v-if="!!rec.img1" class="text-center">
-          <q-img :src="rec.img1" class="img"></q-img>
-        </div>
+      <span>{{
+          setmeta({
+            title: rec.title,
+            description: rec.description,
+            keywords: rec.keywords,
+          })
+        }}
+      </span>
 
-        <div v-if="!!rec.content" v-html="rec.content"></div>
-        <q-video v-if="!!rec.video1" :src="rec.video1" :ratio="rec.ratio1">
-        </q-video>
-
-        <div v-if="!!rec.img2" class="text-center">
-          <q-img :src="rec.img2" class="img"></q-img>
-        </div>
-
-        <div v-if="!!rec.content2" v-html="rec.content2"></div>
-        <q-video v-if="!!rec.video2" :src="rec.video2" :ratio="rec.ratio2"></q-video>
-
-        <div v-if="!!rec.img3" class="text-center">
-          <q-img :src="rec.img2" class="img"></q-img>
-        </div>
-
-        <div v-if="!!rec.content3" v-html="rec.content3"></div>
-        <q-video v-if="!!rec.video3" :src="rec.video3" :ratio="rec.ratio3"></q-video>
-        <div v-if="!!rec.content4" v-html="rec.content4"></div>
-
-      </div>
     </CMyPage>
   </div>
 </template>