diff --git a/packages/comment-widget/src/base-form.ts b/packages/comment-widget/src/base-form.ts
index ed46158..e3a5daf 100644
--- a/packages/comment-widget/src/base-form.ts
+++ b/packages/comment-widget/src/base-form.ts
@@ -329,6 +329,7 @@ export class BaseForm extends LitElement {
       .form__account-info {
         display: flex;
         align-items: center;
+        flex-wrap: wrap;
         gap: 0.75rem;
       }
 
diff --git a/packages/comment-widget/src/comment-widget.ts b/packages/comment-widget/src/comment-widget.ts
index 5282bba..c84e122 100644
--- a/packages/comment-widget/src/comment-widget.ts
+++ b/packages/comment-widget/src/comment-widget.ts
@@ -56,8 +56,7 @@ export class CommentWidget extends LitElement {
   @state()
   comments: CommentVoList = {
     page: 1,
-    // TODO: change to 20
-    size: 5,
+    size: 20,
     total: 0,
     items: [],
     first: true,
@@ -155,6 +154,8 @@ export class CommentWidget extends LitElement {
       console.error('Failed to fetch comments', error);
     } finally {
       this.loading = false;
+
+      this.scrollIntoView({ block: 'start', inline: 'start', behavior: 'smooth' });
     }
   }