diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index b13f8cb7e..97144809a 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -2176,6 +2176,9 @@
   "yourSessionID": {
     "message": "Your Session ID"
   },
+  "setStatus": {
+    "message": "Set a status..."
+  },
   "setAccountPasswordTitle": {
     "message": "Set Account Password",
     "description": "Prompt for user to set account password in settings view"
@@ -2658,20 +2661,20 @@
     "message": "Channels"
   },
   "addChannel": {
-    "message": "Add channel"
+    "message": "Join Open Group"
   },
   "enterChannelURL": {
-    "message": "Enter Channel URL"
+    "message": "Enter Open Group URL"
   },
   "channelUrlPlaceholder": {
-    "message": "https://yourchannel.lokinet.org"
+    "message": "https://myopengroup.lokinet.org"
   },
   "addChannelDescription": {
     "message":
-      "Enter the URL of the public channel you'd like to join in the format above."
+      "Enter an open group URL."
   },
   "joinChannel": {
-    "message": "Join Channel"
+    "message": "Join Open Group"
   },
   "next": {
     "message": "Next"
diff --git a/js/models/conversations.js b/js/models/conversations.js
index c3c80e381..6284a9387 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -257,6 +257,9 @@
       const messageSelected = this.selectedMessages.size > 0;
 
       if (messageSelected) {
+        // Hide ellipses icon
+        $('.title-wrapper .session-icon.ellipses').css({opacity:0});
+
         $('.messages li, .messages > div').addClass('shadowed');
         $('.message-selection-overlay').addClass('overlay');
         $('.module-conversation-header').addClass('overlayed');
@@ -268,6 +271,9 @@
           $(`#${messageId}`).removeClass('shadowed');
         }
       } else {
+        // Hide ellipses icon
+        $('.title-wrapper .session-icon.ellipses').css({opacity:1});
+
         $('.messages li, .messages > div').removeClass('shadowed');
         $('.message-selection-overlay').removeClass('overlay');
         $('.module-conversation-header').removeClass('overlayed');
diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss
index 9baf6d4f8..8f5056e6e 100644
--- a/stylesheets/_session.scss
+++ b/stylesheets/_session.scss
@@ -524,8 +524,7 @@ label {
 
   .close-button {
     float: left;
-    margin-top: 17px;
-    margin-left: 7px;
+    margin: 17px 0px 0px 0px;
   }
 }
 .message-selection-overlay div[role='button'] {
@@ -1385,7 +1384,7 @@ button.module-scroll-down {
 /* Memberlist */
 .member-list-container .member {
   &-item {
-    font-family: "SF Pro Text";
+    font-family: 'SF Pro Text';
     padding: $session-margin-sm $session-margin-md;
     background-color: $session-shade-5;
 
diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx
index ac8dadc01..6ec6404de 100644
--- a/ts/components/conversation/ConversationHeader.tsx
+++ b/ts/components/conversation/ConversationHeader.tsx
@@ -243,6 +243,7 @@ export class ConversationHeader extends React.Component<Props> {
           iconType={SessionIconType.Search}
           iconSize={SessionIconSize.Large}
           iconPadded={true}
+          onClick={this.highlightMessageSearch}
         />
       </div>
     );
@@ -377,6 +378,12 @@ export class ConversationHeader extends React.Component<Props> {
     }
   }
 
+  public highlightMessageSearch(){
+    // This is a temporary fix. In future we want to search
+    // messages in the current conversation
+    $('.session-search-input input').focus();
+  }
+
   private renderMemberCount() {
     const memberCount = this.props.members.length;
 
@@ -482,4 +489,5 @@ export class ConversationHeader extends React.Component<Props> {
       </React.Fragment>
     );
   }
+  
 }
diff --git a/ts/global.d.ts b/ts/global.d.ts
index d94312f61..246bfcb39 100644
--- a/ts/global.d.ts
+++ b/ts/global.d.ts
@@ -18,9 +18,9 @@ interface Window {
   Signal: any;
   Whisper: any;
   ConversationController: any;
-  
+
   // Following function needs to be written in background.js
-  // getMemberList: any;  
+  // getMemberList: any;
 
   setPassword: any;
   textsecure: any;