diff --git a/app/build.gradle b/app/build.gradle
index 3879b9d..026fef6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -53,7 +53,7 @@ repositories {
 }
 
 dependencies {
-    implementation('com.ciscowebex:androidsdk:2.5.0-SNAPSHOT@aar', {
+    implementation('com.ciscowebex:androidsdk:2.5.0@aar', {
         transitive = true
         changing = true
     })
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 13003a1..305714d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -27,6 +27,7 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.GET_TASKS" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
     <application
         android:name="com.ciscowebex.androidsdk.kitchensink.KitchenSinkApp"
diff --git a/app/src/main/java/com/ciscowebex/androidsdk/kitchensink/launcher/fragments/CallFragment.java b/app/src/main/java/com/ciscowebex/androidsdk/kitchensink/launcher/fragments/CallFragment.java
index 9ca4f2a..a21599e 100644
--- a/app/src/main/java/com/ciscowebex/androidsdk/kitchensink/launcher/fragments/CallFragment.java
+++ b/app/src/main/java/com/ciscowebex/androidsdk/kitchensink/launcher/fragments/CallFragment.java
@@ -34,6 +34,8 @@
 import android.content.ServiceConnection;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Binder;
 import android.os.Build;
@@ -184,6 +186,15 @@ public class CallFragment extends BaseFragment {
     @BindView(R.id.floatButton)
     ImageView floatButton;
 
+    @BindView(R.id.tab_callcontrol)
+    TextView tabCallControl;
+
+    @BindView(R.id.tab_aux_video)
+    TextView tabAuxVideo;
+
+    @BindView(R.id.tab_participants)
+    TextView tabParticipants;
+
     private ParticipantsAdapter participantsAdapter;
     private Snackbar snackbar;
 
@@ -222,6 +233,17 @@ public static CallFragment newInstance(String id) {
     @Override
     public void onStart() {
         super.onStart();
+        Drawable drawableCallControl = getResources().getDrawable(R.drawable.ic_file_word, null);
+        Drawable drawableAuxVideo = getResources().getDrawable(R.drawable.ic_file_excel, null);
+        Drawable drawableParticipants = getResources().getDrawable(R.drawable.ic_file_zip, null);
+        Rect bounds = new Rect(0, 0, 120, 120);
+        drawableCallControl.setBounds(bounds);
+        drawableAuxVideo.setBounds(bounds);
+        drawableParticipants.setBounds(bounds);
+        tabCallControl.setCompoundDrawables(null, drawableCallControl, null, null);
+        tabAuxVideo.setCompoundDrawables(null, drawableAuxVideo, null, null);
+        tabParticipants.setCompoundDrawables(null, drawableParticipants, null, null);
+
         agent = WebexAgent.getInstance();
         screenSwitcher = new FullScreenSwitcher(getActivity(), layout, remoteView);
         updateScreenShareView();
diff --git a/app/src/main/java/com/ciscowebex/androidsdk/kitchensink/launcher/fragments/LauncherFragment.java b/app/src/main/java/com/ciscowebex/androidsdk/kitchensink/launcher/fragments/LauncherFragment.java
index 99e1743..cc69e98 100644
--- a/app/src/main/java/com/ciscowebex/androidsdk/kitchensink/launcher/fragments/LauncherFragment.java
+++ b/app/src/main/java/com/ciscowebex/androidsdk/kitchensink/launcher/fragments/LauncherFragment.java
@@ -33,6 +33,7 @@
 import com.ciscowebex.androidsdk.kitchensink.ui.BaseFragment;
 
 import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
 
 import butterknife.OnClick;
 
@@ -84,8 +85,8 @@ public void logout() {
     }
 
     @SuppressWarnings("unused")
-    @Subscribe
-    public void onEventMainThread(LogoutEvent event) {
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onMessageEvent(LogoutEvent event) {
         dismissBusyIndicator();
         toast("Logout success");
         Intent i = new Intent(getActivity(), LoginActivity.class);
diff --git a/app/src/main/java/com/ciscowebex/androidsdk/kitchensink/launcher/fragments/MessageFragment.java b/app/src/main/java/com/ciscowebex/androidsdk/kitchensink/launcher/fragments/MessageFragment.java
index 5c5a00e..ecc6a63 100644
--- a/app/src/main/java/com/ciscowebex/androidsdk/kitchensink/launcher/fragments/MessageFragment.java
+++ b/app/src/main/java/com/ciscowebex/androidsdk/kitchensink/launcher/fragments/MessageFragment.java
@@ -25,6 +25,7 @@
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.ciscowebex.androidsdk.kitchensink.R;
 import com.ciscowebex.androidsdk.kitchensink.actions.WebexAgent;
@@ -203,7 +204,7 @@ private void hideSoftKeyboard() {
         InputMethodManager inputMethodManager =
                 (InputMethodManager) getActivity().getSystemService(
                         Activity.INPUT_METHOD_SERVICE);
-        if (inputMethodManager != null) {
+        if (inputMethodManager != null && getActivity().getCurrentFocus() != null) {
             inputMethodManager.hideSoftInputFromWindow(
                     getActivity().getCurrentFocus().getWindowToken(), 0);
         }
@@ -213,7 +214,9 @@ private void hideSoftKeyboard() {
     public void sendMessage(View btn) {
         if (!TextUtils.isEmpty(textMessage.getText())) {
             btn.setEnabled(false);
-            messageClient.postToSpace(targetId, textMessage.getText().toString(), generateMentions(), generateLocalFiles(), rst -> {
+            messageClient.post(targetId, Message.draft(Message.Text.plain(textMessage.getText().toString()))
+                    .addMentions(generateMentions())
+                    .addAttachments(generateLocalFiles()), rst -> {
                 Ln.e("posted:" + rst);
                 selectedFile.clear();
                 btn.setEnabled(true);
diff --git a/app/src/main/res/layout/fragment_call.xml b/app/src/main/res/layout/fragment_call.xml
index c41b5b4..ec662fa 100644
--- a/app/src/main/res/layout/fragment_call.xml
+++ b/app/src/main/res/layout/fragment_call.xml
@@ -68,39 +68,36 @@
         android:id="@+id/view_bottom_bar"
         android:layout_width="match_parent"
         android:orientation="horizontal"
-        android:layout_height="55dp"
+        android:layout_height="wrap_content"
         android:padding="5dp"
         app:layout_constraintBottom_toBottomOf="parent">
 
         <TextView
             android:id="@+id/tab_callcontrol"
             android:layout_width="0dp"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="Call Control"
-            android:textSize="8sp"
-            android:gravity="center"
-            android:drawableTop="@drawable/ic_file_word" />
+            android:textSize="14sp"
+            android:gravity="center" />
 
         <TextView
             android:id="@+id/tab_aux_video"
             android:layout_width="0dp"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="Auxiliary Videos"
-            android:textSize="8sp"
-            android:gravity="center"
-            android:drawableTop="@drawable/ic_file_excel" />
+            android:textSize="14sp"
+            android:gravity="center" />
 
         <TextView
             android:id="@+id/tab_participants"
             android:layout_width="0dp"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="Participants"
-            android:textSize="8sp"
-            android:gravity="center"
-            android:drawableTop="@drawable/ic_file_zip"/>
+            android:textSize="14sp"
+            android:gravity="center"/>
     </LinearLayout>
 
     <ScrollView
diff --git a/build.gradle b/build.gradle
index d89830d..771d9cb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,9 +27,6 @@ allprojects {
     repositories {
         jcenter()
         google()
-        maven {
-            url 'https://devhub.cisco.com/artifactory/webexsdk-SNAPSHOT/'
-        }
         maven {
             url 'https://devhub.cisco.com/artifactory/webexsdk/'
         }