diff --git a/package.json b/package.json
index 14b0238..fbc8877 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "instagram-live-streamer",
   "description": "Create streaming links to instagram live",
-  "version": "0.1.6",
+  "version": "0.1.7-beta",
   "private": true,
   "copyright": "Copyright © 2020 Musthaq Ahamad",
   "licence": "MIT",
diff --git a/src/Pages/Comments/index.jsx b/src/Pages/Comments/index.jsx
index f987fac..ba1cc22 100644
--- a/src/Pages/Comments/index.jsx
+++ b/src/Pages/Comments/index.jsx
@@ -9,6 +9,7 @@ import CloseIcon from "../../images/down-arrow.svg";
 import SendIcon from "../../images/direct.svg";
 import Toggle from "../../components/Toggle";
 import MuteIcon from "../../images/mute.svg";
+import PinIcon from "../../images/pin.svg";
 
 function Comments({
   broadcastId,
@@ -20,10 +21,12 @@ function Comments({
 }) {
   const [isMuted, setMuted] = useState(false);
   const [inProgress, setInProgress] = useState(false);
-  const [userComment, setUserComment] = useState('');
+  const [userComment, setUserComment] = useState("");
   const [isCommenting, setCommenting] = useState(false);
+  const [pinnedComment, setPinnedComment] = useState();
   const client = getClient();
-  let lastCommentTs = comments && comments.length>0? comments[0].created_at : 0;
+  let lastCommentTs =
+    comments && comments.length > 0 ? comments[0].created_at : 0;
 
   const startComments = async () => {
     setInProgress(true);
@@ -62,15 +65,34 @@ function Comments({
     }
   };
 
+  const pinComment = async (comment) => {
+    // check if current comment is pinned
+    if (pinnedComment && pinnedComment.pk === comment.pk) {
+      try {
+        setPinnedComment(null);
+        await client.live.unpinComment(broadcastId, comment.pk);
+      } catch (error) {
+        console.error(error);
+      }
+    } else {
+      try {
+        setPinnedComment(comment);
+        await client.live.pinComment(broadcastId, comment.pk);
+      } catch (error) {
+        console.error(error);
+      }
+    }
+  };
+
   const addComment = async () => {
     console.log("adding comments...");
     const comment = userComment;
     // do not comment, if there is no comment text available
     if (!(comment && comment.length > 0)) return;
-    setUserComment('')
+    setUserComment("");
     setCommenting(true);
     await client.live.comment(broadcastId, comment);
-  }
+  };
 
   const toggleComments = async () => {
     try {
@@ -101,6 +123,7 @@ function Comments({
   }, []);
 
   const renderComments = (comments) => {
+    console.log(comments);
     return comments.map((comment) => (
       <div key={comment.pk} className={styles.comment}>
         <img className={styles.profilePic} src={comment.user.profile_pic_url} />
@@ -108,6 +131,18 @@ function Comments({
           <h4 className={styles.title}>{comment.user.username}</h4>
           <p className={styles.text}>{comment.text}</p>
         </div>
+        <div
+          className={`${styles.pinIcon} ${
+            pinnedComment
+              ? pinnedComment.pk === comment.pk
+                ? styles.active
+                : ""
+              : ""
+          }`}
+          onClick={() => pinComment(comment)}
+        >
+          <img src={PinIcon} className={styles.icon} />
+        </div>
       </div>
     ));
   };
@@ -146,11 +181,20 @@ function Comments({
         <>
           <div className={styles.comments}>{renderComments(comments)}</div>
 
-          <form className={styles.commentBox} onSubmit={(e) => {
-            e.preventDefault();
-            addComment();
-          }}>
-            <input type="text" className={styles.commentInput} value={userComment} onChange={(e) => setUserComment(e.target.value)} placeholder={isCommenting? "Loading...":"Press enter to send"}/>
+          <form
+            className={styles.commentBox}
+            onSubmit={(e) => {
+              e.preventDefault();
+              addComment();
+            }}
+          >
+            <input
+              type="text"
+              className={styles.commentInput}
+              value={userComment}
+              onChange={(e) => setUserComment(e.target.value)}
+              placeholder={isCommenting ? "Loading..." : "Press enter to send"}
+            />
             <button className={styles.sendButton} type="submit">
               <img src={SendIcon} alt="" />
             </button>
diff --git a/src/Pages/Comments/styles.module.scss b/src/Pages/Comments/styles.module.scss
index 7903773..a673f5f 100644
--- a/src/Pages/Comments/styles.module.scss
+++ b/src/Pages/Comments/styles.module.scss
@@ -72,7 +72,7 @@
   .comments {
     flex-grow: 1;
     flex-basis: 0;
-    overflow-x: auto;
+    overflow-x: hidden;
     display: flex;
     flex-direction: column-reverse;
 
@@ -95,8 +95,11 @@
         background-color: var(--color-secondary);
         border-radius: 5px;
         flex-basis: 1;
+        flex-grow: 0;
         position: relative;
         margin-left: 10px;
+        max-width: 250px;
+        position: relative;
 
         &:before {
           content: "";
@@ -104,7 +107,7 @@
           height: 0px;
           position: absolute;
           border-left: 10px solid transparent;
-          border-right: 10px  solid var(--color-secondary);
+          border-right: 10px solid var(--color-secondary);
           border-top: 10px solid var(--color-secondary);
           border-bottom: 10px solid transparent;
           left: -16px;
@@ -120,6 +123,46 @@
         .text {
           margin: 0;
           opacity: 0.7;
+          word-wrap: break-word;
+        }
+      }
+      .pinIcon {
+        background-color: var(--color-secondary);
+        align-items: center;
+        justify-content: center;
+        margin-left: 5px;
+        padding: 7px;
+        border-radius: 50%;
+        transition: 0.3s all ease-in-out;
+        display: none;
+
+        .icon {
+          width: 20px;
+          height: 20px;
+          opacity: 0.5;
+        }
+
+        &:hover {
+          cursor: pointer;
+          // background-color: var(--color-primary);
+          .icon {
+            opacity: 1;
+          }
+        }
+
+        &.active {
+          display: flex !important;
+          background-color: var(--color-primary);
+          .icon {
+            transform: rotate(45deg);
+            opacity: 1;
+          }
+        }
+      }
+
+      &:hover {
+        .pinIcon {
+          display: flex;
         }
       }
     }
diff --git a/src/Pages/Home/index.jsx b/src/Pages/Home/index.jsx
index ccc30d5..d8a4b61 100644
--- a/src/Pages/Home/index.jsx
+++ b/src/Pages/Home/index.jsx
@@ -48,7 +48,7 @@ function Home({ profile, dispatch }) {
         previewWidth: 720,
         previewHeight: 1280,
         // this message is not necessary, because it doesn't show up in the notification
-        message: "My message",
+        message: "Streamon",
       });
       console.log({ broadcast_id, upload_url });
       setBroadcastId(broadcast_id);
diff --git a/src/Pages/Login/forms/loginForm.jsx b/src/Pages/Login/forms/loginForm.jsx
index ac09150..79f00a6 100644
--- a/src/Pages/Login/forms/loginForm.jsx
+++ b/src/Pages/Login/forms/loginForm.jsx
@@ -47,7 +47,7 @@ export default function LoginForm({ handleLogin, credError }) {
         Login
       </Button>
       <div className={styles.statusTexts}>
-      <p className={styles.status}>Streamon v0.1.6</p>
+        <p className={styles.status}>Instagram Live Streamer v0.1.7-beta</p>
         <p className={styles.author}>
           <span
             className={styles.link}
diff --git a/src/images/pin.svg b/src/images/pin.svg
new file mode 100644
index 0000000..8fe597d
--- /dev/null
+++ b/src/images/pin.svg
@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24" viewBox="0 0 24 24" width="24">
+    <g>
+        <rect fill="none" height="24" width="24" />
+    </g>
+    <g>
+        <path
+            fill="#fff"
+            d="M16,9V4l1,0c0.55,0,1-0.45,1-1v0c0-0.55-0.45-1-1-1H7C6.45,2,6,2.45,6,3v0 c0,0.55,0.45,1,1,1l1,0v5c0,1.66-1.34,3-3,3h0v2h5.97v7l1,1l1-1v-7H19v-2h0C17.34,12,16,10.66,16,9z"
+            fill-rule="evenodd" />
+    </g>
+</svg>
\ No newline at end of file