diff --git a/webui-src/app/channels/channels.js b/webui-src/app/channels/channels.js
index 1a474c0..06f57cb 100644
--- a/webui-src/app/channels/channels.js
+++ b/webui-src/app/channels/channels.js
@@ -67,22 +67,5 @@ module.exports = {
     return m(Layout, {
       pathInfo: vnode.attrs,
     });
-    // if (Object.prototype.hasOwnProperty.call(vnode.attrs, 'mMsgId')) {
-    //   return m(Layout, {
-    //     check: 0, // for channel description
-    //     channelId: vnode.attrs.mGroupId,
-    //     msgId: vnode.attrs.mMsgId,
-    //   });
-    // } else if (Object.prototype.hasOwnProperty.call(vnode.attrs, 'mGroupId')) {
-    //   return m(Layout, {
-    //     check: 1, // for channel description
-    //     id: vnode.attrs.mGroupId,
-    //   });
-    // }
-    // return m(Layout, {
-    //   check: 2,
-    //   tab: vnode.attrs.tab,
-    // });
-    // this check is implemented for Layout and helps to send in updated list each time.
   },
 };
diff --git a/webui-src/app/channels/channels_util.js b/webui-src/app/channels/channels_util.js
index c148a7e..c9de7b5 100644
--- a/webui-src/app/channels/channels_util.js
+++ b/webui-src/app/channels/channels_util.js
@@ -166,33 +166,6 @@ const ChannelView = () => {
               style: 'display:' + (csubscribed ? 'block' : 'none'),
             },
             m('h3', 'Posts'),
-            // plist.map((post) => [
-            // Object.keys(plist).map((key, index) => [
-            //   m(
-            //     'div',
-            //     {
-            //       class: 'card',
-            //       onclick: () => {
-            //         m.route.set('/channels/:tab/:mGroupId/:mMsgId', {
-            //           tab: m.route.param().tab,
-            //           mGroupId: v.attrs.id,
-            //           mMsgId: key,
-            //         });
-            //       },
-            //     },
-            //     [
-            //       m('img', {
-            //         class: 'card-img',
-            //         src: 'data:image/png;base64,' + plist[key].mThumbnail.mData.base64,
-
-            //         alt: 'header',
-            //       }),
-            //       m('div', { class: 'card-info' }, [
-            //         m('h4', { class: 'card-title' }, plist[key].mMeta.mMsgName),
-            //       ]),
-            //     ]
-            //   ),
-            // ])
           ),
         ]
       ),
diff --git a/webui-src/app/forums/forums.js b/webui-src/app/forums/forums.js
index 87b4ddb..8d756d8 100644
--- a/webui-src/app/forums/forums.js
+++ b/webui-src/app/forums/forums.js
@@ -24,7 +24,6 @@ const sections = {
 };
 
 const Layout = {
-  // oninit : getForums.load,
   onupdate: getForums.load,
   view: (vnode) =>
     m('.tab-page', [
@@ -38,12 +37,12 @@ const Layout = {
       m(
         '.forum-node-panel',
 
-        vnode.attrs.check
+        Object.prototype.hasOwnProperty.call(vnode.attrs.pathInfo, 'mGroupId')
           ? m(util.MessageView, {
-              id: vnode.attrs.id,
+              id: vnode.attrs.pathInfo.mGroupId,
             })
-          : m(sections[vnode.attrs.tab], {
-              list: getForums[vnode.attrs.tab],
+          : m(sections[vnode.attrs.pathInfo.tab], {
+              list: getForums[vnode.attrs.pathInfo.tab],
             })
       ),
     ]),
@@ -51,16 +50,8 @@ const Layout = {
 
 module.exports = {
   view: (vnode) => {
-    if (Object.prototype.hasOwnProperty.call(vnode.attrs, 'mGroupId')) {
-      return m(Layout, {
-        check: true, // for forum description
-        id: vnode.attrs.mGroupId,
-      });
-    }
     return m(Layout, {
-      check: false,
-      tab: vnode.attrs.tab,
+      pathInfo: vnode.attrs,
     });
-    // this check is implemented for Layout and helps to send in updated list each time.
   },
 };
diff --git a/webui-src/app/forums/my_forums.js b/webui-src/app/forums/my_forums.js
index 35821a2..f68ca38 100644
--- a/webui-src/app/forums/my_forums.js
+++ b/webui-src/app/forums/my_forums.js
@@ -1,11 +1,9 @@
 const m = require('mithril');
 
 const Layout = () => {
-    return{
-        view: () => [
-            m('.widget', [m('h2', 'My Forums'), m('hr'), ])
-        ]
-    };
+  return {
+    view: () => [m('.widget', [m('h2', 'My Forums'), m('hr')])],
+  };
 };
 
 module.exports = Layout();
diff --git a/webui-src/app/forums/other_forums.js b/webui-src/app/forums/other_forums.js
index 05c773b..3fd468c 100644
--- a/webui-src/app/forums/other_forums.js
+++ b/webui-src/app/forums/other_forums.js
@@ -1,11 +1,9 @@
 const m = require('mithril');
 
 const Layout = () => {
-    return{
-        view: () => [
-            m('.widget', [m('h2', 'Other Forums'), m('hr'), ])
-        ]
-    };
+  return {
+    view: () => [m('.widget', [m('h2', 'Other Forums'), m('hr')])],
+  };
 };
 
 module.exports = Layout();
diff --git a/webui-src/app/forums/popular_forums.js b/webui-src/app/forums/popular_forums.js
index ff4c6ea..5d0ba84 100644
--- a/webui-src/app/forums/popular_forums.js
+++ b/webui-src/app/forums/popular_forums.js
@@ -9,22 +9,20 @@ const Layout = () => {
         m('hr'),
         m(
           util.Table,
-          m(
-            'tbody',
-            [v.attrs.list.map((forum) =>
+          m('tbody', [
+            v.attrs.list.map((forum) =>
               m(util.ForumSummary, {
                 details: forum,
                 category: 'PopularForums',
-              }),
+              })
             ),
             v.attrs.list.map((forum) =>
               m(util.DisplayForumsFromList, {
                 id: forum.mGroupId,
                 category: 'PopularForums',
-              }),
+              })
             ),
-          ]
-          )
+          ])
         ),
       ]),
     ],
@@ -32,4 +30,3 @@ const Layout = () => {
 };
 
 module.exports = Layout;
-
diff --git a/webui-src/app/forums/subscribed_forums.js b/webui-src/app/forums/subscribed_forums.js
index 9d817d2..a75a185 100644
--- a/webui-src/app/forums/subscribed_forums.js
+++ b/webui-src/app/forums/subscribed_forums.js
@@ -9,22 +9,20 @@ const Layout = () => {
         m('hr'),
         m(
           util.Table,
-          m(
-            'tbody',
-            [v.attrs.list.map((forum) =>
+          m('tbody', [
+            v.attrs.list.map((forum) =>
               m(util.ForumSummary, {
                 details: forum,
                 category: 'SubscribedForums',
-              }),
+              })
             ),
             v.attrs.list.map((forum) =>
               m(util.DisplayForumsFromList, {
                 id: forum.mGroupId,
                 category: 'SubscribedForums',
-              }),
+              })
             ),
-          ]
-          )
+          ])
         ),
       ]),
     ],
@@ -32,4 +30,3 @@ const Layout = () => {
 };
 
 module.exports = Layout;
-