diff --git a/frontend/app/components/auth-panel/__anonymous-login-form/index.ts b/frontend/app/components/auth-panel/__anonymous-login-form/index.ts
index 134b7c86..a6df1772 100644
--- a/frontend/app/components/auth-panel/__anonymous-login-form/index.ts
+++ b/frontend/app/components/auth-panel/__anonymous-login-form/index.ts
@@ -1,3 +1,3 @@
-import './auth-panel__anonymous-login-form.scss';
-
 export { AnonymousLoginForm } from './auth-panel__anonymous-login-form';
+
+import './auth-panel__anonymous-login-form.scss';
diff --git a/frontend/app/components/auth-panel/__email-login-form/index.ts b/frontend/app/components/auth-panel/__email-login-form/index.ts
index eade0573..ca1697f0 100644
--- a/frontend/app/components/auth-panel/__email-login-form/index.ts
+++ b/frontend/app/components/auth-panel/__email-login-form/index.ts
@@ -1,3 +1,3 @@
-import './auth-panel__email-login-form.scss';
-
 export { EmailLoginForm, EmailLoginFormConnected } from './auth-panel__email-login-form';
+
+import './auth-panel__email-login-form.scss';
diff --git a/frontend/app/components/auth-panel/__user-id/index.ts b/frontend/app/components/auth-panel/__user-id/index.ts
index 0a741abd..ae781725 100644
--- a/frontend/app/components/auth-panel/__user-id/index.ts
+++ b/frontend/app/components/auth-panel/__user-id/index.ts
@@ -1,3 +1,3 @@
-import './auth-panel__user-id.scss';
-
 export { UserID } from './auth-panel__user-id';
+
+import './auth-panel__user-id.scss';
diff --git a/frontend/app/components/auth-panel/index.ts b/frontend/app/components/auth-panel/index.ts
index 7e03ca7f..779d12c4 100644
--- a/frontend/app/components/auth-panel/index.ts
+++ b/frontend/app/components/auth-panel/index.ts
@@ -1,3 +1,5 @@
+export { AuthPanel } from './auth-panel';
+
 import './auth-panel.scss';
 
 import './__readonly-label/auth-panel__readonly-label.scss';
@@ -18,5 +20,3 @@ import './_theme/_light/auth-panel_theme_light.scss';
 import './_logged-in/auth-panel_logged-in.scss';
 
 import './__dropdown-provider/auth-panel__dropdown-provider.scss';
-
-export { AuthPanel } from './auth-panel';
diff --git a/frontend/app/components/avatar-icon/index.ts b/frontend/app/components/avatar-icon/index.ts
index dc67c600..572b27b9 100644
--- a/frontend/app/components/avatar-icon/index.ts
+++ b/frontend/app/components/avatar-icon/index.ts
@@ -1,4 +1,4 @@
+export { AvatarIcon } from './avatar-icon';
+
 import './avatar-icon.scss';
 import './_default/avatar-icon_default.scss';
-
-export { AvatarIcon } from './avatar-icon';
diff --git a/frontend/app/components/button/index.ts b/frontend/app/components/button/index.ts
index bbd5ea59..14ce2c9d 100644
--- a/frontend/app/components/button/index.ts
+++ b/frontend/app/components/button/index.ts
@@ -1,8 +1,8 @@
+export { Button } from './button';
+
 import './button.scss';
 
 import './_kind/_link/button_kind_link.scss';
 import './_kind/_text/button_kind_text.scss';
 
 import './_focused/button_focused.scss';
-
-export { Button } from './button';
diff --git a/frontend/app/components/comment/comment.tsx b/frontend/app/components/comment/comment.tsx
index ed80a559..8e26d963 100644
--- a/frontend/app/components/comment/comment.tsx
+++ b/frontend/app/components/comment/comment.tsx
@@ -542,10 +542,10 @@ export class Comment extends Component<Props, State> {
       );
     }
 
-    if (this.props.inView === false) {
+    if (!props.editMode && this.props.inView === false) {
       const [width, height] = this.base ? [this.base.scrollWidth, this.base.scrollHeight] : [100, 100];
       return (
-        <div
+        <article
           id={props.disabled ? undefined : `${COMMENT_NODE_CLASSNAME_PREFIX}${o.id}`}
           style={{
             width: `${width}px`,
diff --git a/frontend/app/components/comment/styles.ts b/frontend/app/components/comment/styles.ts
index 2a9c9791..d5b18ce2 100644
--- a/frontend/app/components/comment/styles.ts
+++ b/frontend/app/components/comment/styles.ts
@@ -1,3 +1,5 @@
+import '@app/components/raw-content';
+
 import './comment.scss';
 
 import './__action/comment__action.scss';
@@ -47,5 +49,3 @@ import './_view/_user/comment_view_user.scss';
 
 import './_theme/_dark/comment_theme_dark.scss';
 import './_theme/_light/comment_theme_light.scss';
-
-import '@app/components/raw-content';
diff --git a/frontend/app/components/dropdown/index.ts b/frontend/app/components/dropdown/index.ts
index c079805c..c039e235 100644
--- a/frontend/app/components/dropdown/index.ts
+++ b/frontend/app/components/dropdown/index.ts
@@ -1,3 +1,9 @@
+import Dropdown from './dropdown';
+
+export default Dropdown;
+
+export { default as DropdownItem } from './__item';
+
 import './dropdown.scss';
 import './_active/dropdown_active.scss';
 
@@ -8,9 +14,3 @@ import './__content/dropdown__content.scss';
 
 import './_theme/_dark/dropdown_theme_dark.scss';
 import './_theme/_light/dropdown_theme_light.scss';
-
-import Dropdown from './dropdown';
-
-export default Dropdown;
-
-export { default as DropdownItem } from './__item';
diff --git a/frontend/app/components/input/styles.ts b/frontend/app/components/input/styles.ts
index c75b61dc..d32c8759 100644
--- a/frontend/app/components/input/styles.ts
+++ b/frontend/app/components/input/styles.ts
@@ -1,3 +1,5 @@
+import '@app/components/raw-content';
+
 import './input.scss';
 
 import './__actions/input__actions.scss';
@@ -21,5 +23,3 @@ import './__markdown-toolbar/input__markdown-toolbar.scss';
 
 import './_theme/_dark/input_theme_dark.scss';
 import './_theme/_light/input_theme_light.scss';
-
-import '@app/components/raw-content';
diff --git a/frontend/app/components/list-comments/index.ts b/frontend/app/components/list-comments/index.ts
index 6a0df3e1..19dd7c9c 100644
--- a/frontend/app/components/list-comments/index.ts
+++ b/frontend/app/components/list-comments/index.ts
@@ -1,5 +1,5 @@
+export { ListComments } from './list-comments';
+
 import './list-comments.scss';
 
 import './__item/list-comments__item.scss';
-
-export { ListComments } from './list-comments';
diff --git a/frontend/app/components/root/in-view/in-view.tsx b/frontend/app/components/root/in-view/in-view.tsx
index ff5d85ca..c6a2c005 100644
--- a/frontend/app/components/root/in-view/in-view.tsx
+++ b/frontend/app/components/root/in-view/in-view.tsx
@@ -10,7 +10,7 @@ interface State {
   ref: Element | undefined;
 }
 
-const instance_map: Map<Element, Component<Props, State>> = new Map();
+const instance_map: WeakMap<Element, Component<Props, State>> = new WeakMap();
 
 const observer = new IntersectionObserver(
   entries => {
diff --git a/frontend/app/components/root/index.ts b/frontend/app/components/root/index.ts
index 17b01efa..303f2297 100644
--- a/frontend/app/components/root/index.ts
+++ b/frontend/app/components/root/index.ts
@@ -1,3 +1,5 @@
+export { Root, ConnectedRoot } from './root';
+
 import './root.scss';
 
 import './__copyright/root__copyright.scss';
@@ -11,5 +13,3 @@ import './__threads/root__threads.scss';
 
 import './_theme/_dark/root_theme_dark.scss';
 import './_theme/_light/root_theme_light.scss';
-
-export { Root, ConnectedRoot } from './root';
diff --git a/frontend/app/components/settings/index.ts b/frontend/app/components/settings/index.ts
index ba3d40d6..49286637 100644
--- a/frontend/app/components/settings/index.ts
+++ b/frontend/app/components/settings/index.ts
@@ -1,3 +1,8 @@
+import withTheme from '../../components/with-theme';
+import Settings from './settings';
+
+export default withTheme(Settings);
+
 import './settings.scss';
 
 import './__action/settings__action.scss';
@@ -9,8 +14,3 @@ import './__username/settings__username.scss';
 import './__user-id/settings__user-id.scss';
 import './_theme/_dark/settings_theme_dark.scss';
 import './_theme/_light/settings_theme_light.scss';
-
-import withTheme from '../../components/with-theme';
-import Settings from './settings';
-
-export default withTheme(Settings);
diff --git a/frontend/app/components/thread/index.ts b/frontend/app/components/thread/index.ts
index 6fd13765..f8d9ab6a 100644
--- a/frontend/app/components/thread/index.ts
+++ b/frontend/app/components/thread/index.ts
@@ -1,4 +1,4 @@
+export { ConnectedThread as Thread } from './thread';
+
 import './thread.scss';
 import './_theme_dark/thread_theme_dark.scss';
-
-export { ConnectedThread as Thread } from './thread';
diff --git a/frontend/app/components/user-info/index.ts b/frontend/app/components/user-info/index.ts
index 2fe6e07f..7f12bf69 100644
--- a/frontend/app/components/user-info/index.ts
+++ b/frontend/app/components/user-info/index.ts
@@ -1,8 +1,8 @@
+export { ConnectedUserInfo as UserInfo } from './user-info';
+
 import './user-info.scss';
 
 import './__avatar/user-info__avatar.scss';
 import './__id/user-info__id.scss';
 import './__preloader/user-info__preloader.scss';
 import './__title/user-info__title.scss';
-
-export { ConnectedUserInfo as UserInfo } from './user-info';