From 92b33ef71c35f5525498119af102f59f19aefdb2 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 23 Nov 2018 18:09:34 +0100
Subject: [PATCH] Improved code related to top bar in some views

---
 .../java/org/linphone/LinphoneActivity.java   |  17 +-
 .../org/linphone/fragments/AboutFragment.java |   6 -
 app/src/main/res/layout-land/about.xml        |  40 +-
 app/src/main/res/layout-land/main.xml         | 501 ++++++++---------
 app/src/main/res/layout-sw533dp-land/main.xml | 507 +++++++++---------
 app/src/main/res/layout-sw533dp/main.xml      | 506 ++++++++---------
 app/src/main/res/layout/about.xml             |  34 --
 app/src/main/res/layout/main.xml              | 483 +++++++++--------
 8 files changed, 1035 insertions(+), 1059 deletions(-)

diff --git a/app/src/main/java/org/linphone/LinphoneActivity.java b/app/src/main/java/org/linphone/LinphoneActivity.java
index e3b166639..0b3863395 100644
--- a/app/src/main/java/org/linphone/LinphoneActivity.java
+++ b/app/src/main/java/org/linphone/LinphoneActivity.java
@@ -136,7 +136,8 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
     private TextView missedCalls, missedChats;
     private RelativeLayout contacts, history, dialer, chat;
     private View contacts_selected, history_selected, dialer_selected, chat_selected;
-    private RelativeLayout mTopBar;
+    private LinearLayout mTopBar;
+    private TextView mTopBarTitle;
     private ImageView cancel;
     private FragmentsAvailable pendingFragmentTransaction, currentFragment, leftFragment;
     private Fragment fragment;
@@ -303,6 +304,7 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
     private void initButtons() {
         mTabBar = findViewById(R.id.footer);
         mTopBar = findViewById(R.id.top_bar);
+        mTopBarTitle = findViewById(R.id.top_bar_title);
 
         cancel = findViewById(R.id.cancel);
         cancel.setOnClickListener(this);
@@ -847,6 +849,16 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
 
     public void hideTopBar() {
         mTopBar.setVisibility(View.GONE);
+        mTopBarTitle.setText("");
+    }
+
+    public void showTopBar() {
+        mTopBar.setVisibility(View.VISIBLE);
+    }
+
+    public void showTopBarWithTitle(String title) {
+        showTopBar();
+        mTopBarTitle.setText(title);
     }
 
     @SuppressWarnings("incomplete-switch")
@@ -880,9 +892,10 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
             case SETTINGS:
             case ACCOUNT_SETTINGS:
                 hideTabBar(hideBottomBar);
-                mTopBar.setVisibility(View.VISIBLE);
+                showTopBarWithTitle(getString(R.string.settings));
                 break;
             case ABOUT:
+                showTopBarWithTitle(getString(R.string.about));
                 hideTabBar(hideBottomBar);
                 break;
             case CHAT_LIST:
diff --git a/app/src/main/java/org/linphone/fragments/AboutFragment.java b/app/src/main/java/org/linphone/fragments/AboutFragment.java
index b4bf6064e..3f5eb94ee 100644
--- a/app/src/main/java/org/linphone/fragments/AboutFragment.java
+++ b/app/src/main/java/org/linphone/fragments/AboutFragment.java
@@ -48,7 +48,6 @@ import org.linphone.mediastream.Log;
 public class AboutFragment extends Fragment implements OnClickListener {
     View sendLogButton = null;
     View resetLogButton = null;
-    ImageView cancel;
     CoreListenerStub mListener;
     private ProgressDialog progress;
     private boolean uploadInProgress;
@@ -62,9 +61,6 @@ public class AboutFragment extends Fragment implements OnClickListener {
         aboutLiblinphoneVersion.setText(String.format(getString(R.string.about_liblinphone_version), LinphoneManager.getLc().getVersion()));
         aboutVersion.setText(String.format(getString(R.string.about_version), BuildConfig.VERSION_NAME));
 
-        cancel = view.findViewById(R.id.cancel);
-        cancel.setOnClickListener(this);
-
         sendLogButton = view.findViewById(R.id.send_log);
         sendLogButton.setOnClickListener(this);
         sendLogButton.setVisibility(LinphonePreferences.instance().isDebugEnabled() ? View.VISIBLE : View.GONE);
@@ -162,8 +158,6 @@ public class AboutFragment extends Fragment implements OnClickListener {
                 if (lc != null) {
                     lc.resetLogCollection();
                 }
-            } else if (v == cancel) {
-                LinphoneActivity.instance().goToDialerFragment();
             }
         }
     }
diff --git a/app/src/main/res/layout-land/about.xml b/app/src/main/res/layout-land/about.xml
index aeda1db2c..05198177f 100644
--- a/app/src/main/res/layout-land/about.xml
+++ b/app/src/main/res/layout-land/about.xml
@@ -1,42 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:orientation="vertical">
-
-    <LinearLayout
-        android:id="@+id/top_bar"
-        android:orientation="horizontal"
-        android:background="@color/colorF"
-        android:layout_width="match_parent"
-        android:layout_height="60dp">
-
-        <View
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="0.2"/>
-
-        <TextView
-            android:id="@+id/menu_name"
-            android:text="@string/about"
-            style="@style/font1"
-            android:maxLines="1"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="0.4"
-            android:gravity="center"
-            android:padding="15dp"/>
-
-        <ImageView
-            android:id="@+id/cancel"
-            android:src="@drawable/dialer_back"
-            android:background="@drawable/toolbar_button"
-            android:contentDescription="@string/content_description_dialer_back"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="0.2"
-            android:padding="15dp"/>
-    </LinearLayout>
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
     <LinearLayout
         android:baselineAligned="false"
diff --git a/app/src/main/res/layout-land/main.xml b/app/src/main/res/layout-land/main.xml
index 0ea98532d..498154345 100644
--- a/app/src/main/res/layout-land/main.xml
+++ b/app/src/main/res/layout-land/main.xml
@@ -1,292 +1,301 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout
-	xmlns:tools="http://schemas.android.com/tools"
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
-	<fragment
-		android:id="@+id/status"
-		android:name="org.linphone.fragments.StatusFragment"
-		android:layout_width="match_parent"
-		android:layout_height="35dp"
-		tools:layout="@layout/status" />
+    <fragment
+        android:id="@+id/status"
+        android:name="org.linphone.fragments.StatusFragment"
+        android:layout_width="match_parent"
+        android:layout_height="35dp"
+        tools:layout="@layout/status" />
 
-	<android.support.v4.widget.DrawerLayout
-		android:id="@+id/side_menu"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:layout_below="@id/status">
+    <android.support.v4.widget.DrawerLayout
+        android:id="@+id/side_menu"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/status">
 
-		<RelativeLayout
-			android:layout_width="match_parent"
-			android:layout_height="match_parent">
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
 
-			<RelativeLayout
-				android:id="@+id/top_bar"
-				android:background="@color/colorF"
-				android:layout_width="match_parent"
-				android:layout_height="60dp"
-				android:visibility="gone"
-				android:layout_alignParentTop="true">
+            <LinearLayout
+                android:id="@+id/top_bar"
+                android:visibility="gone"
+                android:orientation="horizontal"
+                android:background="@color/colorF"
+                android:layout_width="match_parent"
+                android:layout_height="60dp">
 
-				<TextView
-					android:id="@+id/menu_name"
-					android:text="@string/settings"
-					style="@style/font1"
-					android:layout_width="wrap_content"
-					android:layout_height="match_parent"
-					android:layout_centerInParent="true"
-					android:gravity="center_vertical"/>
+                <ImageView
+                    android:id="@+id/cancel"
+                    android:src="@drawable/back"
+                    android:background="@drawable/toolbar_button"
+                    android:contentDescription="@string/content_description_dialer_back"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0.2"
+                    android:padding="15dp"/>
 
-				<ImageView
-					android:id="@+id/cancel"
-					android:src="@drawable/dialer_back"
-					android:contentDescription="@string/content_description_dialer_back"
-					android:layout_width="wrap_content"
-					android:layout_height="match_parent"
-					android:padding="15dp"
-					android:layout_centerInParent="true"
-					android:layout_alignParentRight="true"/>
+                <TextView
+                    android:id="@+id/top_bar_title"
+                    style="@style/font1"
+                    android:maxLines="1"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0.4"
+                    android:gravity="center"
+                    android:padding="15dp"/>
 
-			</RelativeLayout>
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0.2"/>
 
-			<LinearLayout
-				android:layout_width="match_parent"
-				android:layout_height="match_parent"
-				android:orientation="vertical"
-				android:layout_below="@id/top_bar"
-				android:layout_toRightOf="@+id/footer">
+            </LinearLayout>
 
-				<FrameLayout
-					android:layout_width="match_parent"
-					android:layout_height="match_parent"
-					android:layout_alignParentTop="true">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical"
+                android:layout_below="@id/top_bar"
+                android:layout_toRightOf="@+id/footer">
 
-					<LinearLayout
-						android:id="@+id/fragmentContainer"
-						android:layout_width="match_parent"
-						android:layout_height="match_parent"
-						android:orientation="horizontal" />
-				</FrameLayout>
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_alignParentTop="true">
 
-			</LinearLayout>
+                    <LinearLayout
+                        android:id="@+id/fragmentContainer"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:orientation="horizontal" />
+                </FrameLayout>
 
-			<LinearLayout
-				android:id="@+id/footer"
-				android:layout_width="60dp"
-				android:layout_height="match_parent"
-				android:layout_alignParentBottom="true"
-				android:orientation="vertical">
+            </LinearLayout>
 
-				<RelativeLayout
-					android:id="@+id/history"
-					android:background="@drawable/footer_button"
-					android:layout_weight="1"
-					android:layout_width="60dp"
-					android:layout_height="0dp">
+            <LinearLayout
+                android:id="@+id/footer"
+                android:layout_width="60dp"
+                android:layout_height="match_parent"
+                android:layout_alignParentBottom="true"
+                android:orientation="vertical">
 
-					<ImageView
-						android:src="@drawable/footer_history"
-						android:contentDescription="@string/content_description_history"
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"
-						android:padding="15dp"
-						android:layout_centerInParent="true"/>
+                <RelativeLayout
+                    android:id="@+id/history"
+                    android:background="@drawable/footer_button"
+                    android:layout_weight="1"
+                    android:layout_width="60dp"
+                    android:layout_height="0dp">
 
-					<View
-						android:id="@+id/history_select"
-						android:background="@color/colorA"
-						android:layout_width="5dp"
-						android:layout_height="match_parent"
-						android:layout_alignParentLeft="true"
-						android:visibility="gone"/>
+                    <ImageView
+                        android:src="@drawable/footer_history"
+                        android:contentDescription="@string/content_description_history"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:padding="15dp"
+                        android:layout_centerInParent="true"/>
 
-					<TextView
-						android:id="@+id/missed_calls"
-						android:background="@drawable/unread_message_count_bg"
-						style="@style/font18"
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"
-						android:gravity="center"
-						android:visibility="gone"
-						android:layout_marginTop="15dp"
-						android:layout_marginRight="5dp"
-						android:layout_alignParentRight="true"
-						android:layout_alignParentEnd="true"/>
+                    <View
+                        android:id="@+id/history_select"
+                        android:background="@color/colorA"
+                        android:layout_width="5dp"
+                        android:layout_height="match_parent"
+                        android:layout_alignParentLeft="true"
+                        android:visibility="gone"/>
 
-				</RelativeLayout>
+                    <TextView
+                        android:id="@+id/missed_calls"
+                        android:background="@drawable/unread_message_count_bg"
+                        style="@style/font18"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:gravity="center"
+                        android:visibility="gone"
+                        android:layout_marginTop="15dp"
+                        android:layout_marginRight="5dp"
+                        android:layout_alignParentRight="true"
+                        android:layout_alignParentEnd="true"/>
 
-				<RelativeLayout
-					android:id="@+id/contacts"
-					android:background="@drawable/footer_button"
-					android:layout_weight="1"
-					android:layout_width="60dp"
-					android:layout_height="0dp">
+                </RelativeLayout>
 
-					<ImageView
-						android:src="@drawable/footer_contacts"
-						android:contentDescription="@string/content_description_contacts"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:padding="15dp"
-						android:layout_centerInParent="true"/>
+                <RelativeLayout
+                    android:id="@+id/contacts"
+                    android:background="@drawable/footer_button"
+                    android:layout_weight="1"
+                    android:layout_width="60dp"
+                    android:layout_height="0dp">
 
-					<View
-						android:id="@+id/contacts_select"
-						android:background="@color/colorA"
-						android:layout_width="5dp"
-						android:layout_height="match_parent"
-						android:layout_alignParentLeft="true"
-						android:visibility="gone"/>
-				</RelativeLayout>
+                    <ImageView
+                        android:src="@drawable/footer_contacts"
+                        android:contentDescription="@string/content_description_contacts"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:padding="15dp"
+                        android:layout_centerInParent="true"/>
 
-				<RelativeLayout
-					android:id="@+id/dialer"
-					android:background="@drawable/footer_button"
-					android:layout_weight="1"
-					android:layout_width="60dp"
-					android:layout_height="0dp">
+                    <View
+                        android:id="@+id/contacts_select"
+                        android:background="@color/colorA"
+                        android:layout_width="5dp"
+                        android:layout_height="match_parent"
+                        android:layout_alignParentLeft="true"
+                        android:visibility="gone"/>
+                </RelativeLayout>
 
-					<ImageView
-						android:src="@drawable/footer_dialer"
-						android:contentDescription="@string/content_description_dialer"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:padding="15dp"
-						android:layout_centerInParent="true"/>
+                <RelativeLayout
+                    android:id="@+id/dialer"
+                    android:background="@drawable/footer_button"
+                    android:layout_weight="1"
+                    android:layout_width="60dp"
+                    android:layout_height="0dp">
 
-					<View
-						android:id="@+id/dialer_select"
-						android:background="@color/colorA"
-						android:layout_width="5dp"
-						android:layout_height="match_parent"
-						android:layout_alignParentLeft="true"/>
+                    <ImageView
+                        android:src="@drawable/footer_dialer"
+                        android:contentDescription="@string/content_description_dialer"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:padding="15dp"
+                        android:layout_centerInParent="true"/>
 
-				</RelativeLayout>
+                    <View
+                        android:id="@+id/dialer_select"
+                        android:background="@color/colorA"
+                        android:layout_width="5dp"
+                        android:layout_height="match_parent"
+                        android:layout_alignParentLeft="true"/>
 
-				<RelativeLayout
-					android:id="@+id/chat"
-					android:background="@drawable/footer_button"
-					android:layout_weight="1"
-					android:layout_width="60dp"
-					android:layout_height="0dp">
+                </RelativeLayout>
 
-					<ImageView
-						android:src="@drawable/footer_chat"
-						android:contentDescription="@string/content_description_chat_button"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:padding="15dp"
-						android:layout_centerInParent="true" />
+                <RelativeLayout
+                    android:id="@+id/chat"
+                    android:background="@drawable/footer_button"
+                    android:layout_weight="1"
+                    android:layout_width="60dp"
+                    android:layout_height="0dp">
 
-					<View
-						android:id="@+id/chat_select"
-						android:background="@color/colorA"
-						android:visibility="gone"
-						android:layout_width="5dp"
-						android:layout_height="match_parent"
-						android:layout_alignParentLeft="true"/>
+                    <ImageView
+                        android:src="@drawable/footer_chat"
+                        android:contentDescription="@string/content_description_chat_button"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:padding="15dp"
+                        android:layout_centerInParent="true" />
 
-					<TextView
-						android:id="@+id/missed_chats"
-						android:background="@drawable/unread_message_count_bg"
-						style="@style/font18"
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"
-						android:gravity="center"
-						android:visibility="gone"
-						android:layout_marginTop="15dp"
-						android:layout_marginRight="5dp"
-						android:layout_alignParentRight="true"
-						android:layout_alignParentEnd="true"/>
+                    <View
+                        android:id="@+id/chat_select"
+                        android:background="@color/colorA"
+                        android:visibility="gone"
+                        android:layout_width="5dp"
+                        android:layout_height="match_parent"
+                        android:layout_alignParentLeft="true"/>
 
-				</RelativeLayout>
-			</LinearLayout>
+                    <TextView
+                        android:id="@+id/missed_chats"
+                        android:background="@drawable/unread_message_count_bg"
+                        style="@style/font18"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:gravity="center"
+                        android:visibility="gone"
+                        android:layout_marginTop="15dp"
+                        android:layout_marginRight="5dp"
+                        android:layout_alignParentRight="true"
+                        android:layout_alignParentEnd="true"/>
 
-			<LinearLayout
-				android:id="@+id/fragmentContainer2"
-				android:visibility="gone"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:orientation="vertical">
+                </RelativeLayout>
 
-			</LinearLayout>
-		</RelativeLayout>
+            </LinearLayout>
 
-	<!-- Side Menu -->
-	<RelativeLayout
-		android:id="@+id/side_menu_content"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:layout_gravity="left">
+            <LinearLayout
+                android:id="@+id/fragmentContainer2"
+                android:visibility="gone"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
 
-		<RelativeLayout
-			android:id="@+id/side_menu_quit"
-			android:background="@color/colorA"
-			android:gravity="bottom"
-			android:layout_alignParentBottom="true"
-			android:layout_width="match_parent"
-			android:layout_height="50dp">
+            </LinearLayout>
 
-			<ImageView
-				android:id="@+id/quit_button"
-				android:src="@drawable/quit"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:padding="5dp"
-				android:layout_alignParentLeft="true"
-				android:layout_centerVertical="true" />
+        </RelativeLayout>
 
-			<TextView
-				android:id="@+id/quit"
-				android:text="@string/quit"
-				style="@style/font14"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_toRightOf="@id/quit_button"
-				android:gravity="center_vertical"
-				android:layout_centerInParent="true"/>
-		</RelativeLayout>
+        <!-- Side Menu -->
+        <RelativeLayout
+            android:id="@+id/side_menu_content"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="left">
 
-		<LinearLayout
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			android:background="@color/colorH"
-			android:layout_above="@id/side_menu_quit"
-			android:orientation="vertical">
+            <RelativeLayout
+                android:id="@+id/side_menu_quit"
+                android:background="@color/colorA"
+                android:gravity="bottom"
+                android:layout_alignParentBottom="true"
+                android:layout_width="match_parent"
+                android:layout_height="50dp">
 
-			<include layout="@layout/side_menu_main_account"/>
+                <ImageView
+                    android:id="@+id/quit_button"
+                    android:src="@drawable/quit"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="5dp"
+                    android:layout_alignParentLeft="true"
+                    android:layout_centerVertical="true" />
 
-			<ListView
-				android:id="@+id/accounts_list"
-				android:background="@color/colorH"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:choiceMode="singleChoice"
-				android:cacheColorHint="@color/transparent"
-				android:divider="@android:color/transparent"
-				android:dividerHeight="0dp"/>
+                <TextView
+                    android:id="@+id/quit"
+                    android:text="@string/quit"
+                    style="@style/font14"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_toRightOf="@id/quit_button"
+                    android:gravity="center_vertical"
+                    android:layout_centerInParent="true"/>
+            </RelativeLayout>
 
-			<ListView
-				android:id="@+id/item_list"
-				android:background="@color/colorH"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:choiceMode="singleChoice"
-				android:divider="@color/colorE"
-				android:listSelector="@color/colorH"
-				android:footerDividersEnabled="true"
-				android:dividerHeight="1dp"/>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@color/colorH"
+                android:layout_above="@id/side_menu_quit"
+                android:orientation="vertical">
 
-			<View
-				android:layout_width="match_parent"
-				android:layout_height="1dp"
-				android:background="@color/colorE"/>
+                <include layout="@layout/side_menu_main_account"/>
 
-		</LinearLayout>
-	</RelativeLayout>
+                <ListView
+                    android:id="@+id/accounts_list"
+                    android:background="@color/colorH"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:choiceMode="singleChoice"
+                    android:cacheColorHint="@color/transparent"
+                    android:divider="@android:color/transparent"
+                    android:dividerHeight="0dp"/>
 
-</android.support.v4.widget.DrawerLayout>
+                <ListView
+                    android:id="@+id/item_list"
+                    android:background="@color/colorH"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:choiceMode="singleChoice"
+                    android:divider="@color/colorE"
+                    android:listSelector="@color/colorH"
+                    android:footerDividersEnabled="true"
+                    android:dividerHeight="1dp"/>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="@color/colorE"/>
+
+            </LinearLayout>
+
+        </RelativeLayout>
+
+    </android.support.v4.widget.DrawerLayout>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw533dp-land/main.xml b/app/src/main/res/layout-sw533dp-land/main.xml
index 302ca4dc2..ae19b1f2d 100644
--- a/app/src/main/res/layout-sw533dp-land/main.xml
+++ b/app/src/main/res/layout-sw533dp-land/main.xml
@@ -1,297 +1,306 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout
-	xmlns:tools="http://schemas.android.com/tools"
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
-	<fragment
-		android:id="@+id/status"
-		android:name="org.linphone.fragments.StatusFragment"
-		android:layout_width="match_parent"
-		android:layout_height="35dp"
-		tools:layout="@layout/status" />
+    <fragment
+        android:id="@+id/status"
+        android:name="org.linphone.fragments.StatusFragment"
+        android:layout_width="match_parent"
+        android:layout_height="35dp"
+        tools:layout="@layout/status" />
 
-	<android.support.v4.widget.DrawerLayout
-		android:id="@+id/side_menu"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:layout_below="@id/status">
+    <android.support.v4.widget.DrawerLayout
+        android:id="@+id/side_menu"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/status">
 
-		<RelativeLayout
-			android:layout_width="match_parent"
-			android:layout_height="match_parent">
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
 
-			<RelativeLayout
-				android:id="@+id/top_bar"
-				android:background="@color/colorF"
-				android:layout_width="match_parent"
-				android:layout_height="60dp"
-				android:visibility="gone"
-				android:layout_alignParentTop="true">
+            <LinearLayout
+                android:id="@+id/top_bar"
+                android:visibility="gone"
+                android:orientation="horizontal"
+                android:background="@color/colorF"
+                android:layout_width="match_parent"
+                android:layout_height="60dp">
 
-				<TextView
-					android:id="@+id/menu_name"
-					android:text="@string/settings"
-					style="@style/font1"
-					android:layout_width="wrap_content"
-					android:layout_height="match_parent"
-					android:layout_centerInParent="true"
-					android:gravity="center_vertical"/>
+                <ImageView
+                    android:id="@+id/cancel"
+                    android:src="@drawable/back"
+                    android:background="@drawable/toolbar_button"
+                    android:contentDescription="@string/content_description_dialer_back"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0.2"
+                    android:padding="15dp"/>
 
-				<ImageView
-					android:id="@+id/cancel"
-					android:src="@drawable/dialer_back"
-					android:contentDescription="@string/content_description_dialer_back"
-					android:layout_width="wrap_content"
-					android:layout_height="match_parent"
-					android:padding="15dp"
-					android:layout_centerInParent="true"
-					android:layout_alignParentRight="true"/>
+                <TextView
+                    android:id="@+id/top_bar_title"
+                    style="@style/font1"
+                    android:maxLines="1"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0.4"
+                    android:gravity="center"
+                    android:padding="15dp"/>
 
-			</RelativeLayout>
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0.2"/>
 
-			<LinearLayout
-				android:layout_width="match_parent"
-				android:layout_height="match_parent"
-				android:orientation="vertical"
-				android:layout_below="@id/top_bar" android:layout_toRightOf="@+id/footer"
-				android:layout_toEndOf="@+id/footer">
+            </LinearLayout>
 
-				<FrameLayout
-					android:layout_width="match_parent"
-					android:layout_height="match_parent">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical"
+                android:layout_below="@id/top_bar" android:layout_toRightOf="@+id/footer"
+                android:layout_toEndOf="@+id/footer">
 
-					<LinearLayout
-						android:baselineAligned="false"
-						android:layout_width="match_parent"
-						android:layout_height="match_parent"
-						android:orientation="horizontal">
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
 
-						<LinearLayout
-							android:id="@+id/fragmentContainer"
-							android:layout_width="match_parent"
-							android:layout_height="match_parent"
-							android:layout_weight="1"
-							android:orientation="horizontal" />
+                    <LinearLayout
+                        android:baselineAligned="false"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:orientation="horizontal">
 
-						<LinearLayout
-							android:id="@+id/fragmentContainer2"
-							android:layout_width="match_parent"
-							android:layout_height="match_parent"
-							android:layout_weight="1"
-							android:orientation="horizontal">
+                        <LinearLayout
+                            android:id="@+id/fragmentContainer"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1"
+                            android:orientation="horizontal" />
 
-							<View
-								android:background="@color/colorE"
-								android:layout_width="1dp"
-								android:layout_height="match_parent"/>
-						</LinearLayout>
+                        <LinearLayout
+                            android:id="@+id/fragmentContainer2"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1"
+                            android:orientation="horizontal">
 
-					</LinearLayout>
-				</FrameLayout>
+                            <View
+                                android:background="@color/colorE"
+                                android:layout_width="1dp"
+                                android:layout_height="match_parent"/>
+                        </LinearLayout>
 
-			</LinearLayout>
+                    </LinearLayout>
 
-			<LinearLayout
-				android:id="@+id/footer"
-				android:layout_width="60dp"
-				android:layout_height="match_parent"
-				android:layout_alignParentBottom="true"
-				android:orientation="vertical">
+                </FrameLayout>
 
-				<RelativeLayout
-					android:id="@+id/history"
-					android:background="@drawable/footer_button"
-					android:layout_weight="1"
-					android:layout_width="60dp"
-					android:layout_height="0dp">
+            </LinearLayout>
 
-					<ImageView
-						android:src="@drawable/footer_history"
-						android:contentDescription="@string/content_description_history"
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"
-						android:padding="15dp"
-						android:layout_centerInParent="true"/>
+            <LinearLayout
+                android:id="@+id/footer"
+                android:layout_width="60dp"
+                android:layout_height="match_parent"
+                android:layout_alignParentBottom="true"
+                android:orientation="vertical">
 
-					<View
-						android:id="@+id/history_select"
-						android:background="@color/colorA"
-						android:layout_width="5dp"
-						android:layout_height="match_parent"
-						android:layout_alignParentLeft="true"
-						android:visibility="gone"/>
+                <RelativeLayout
+                    android:id="@+id/history"
+                    android:background="@drawable/footer_button"
+                    android:layout_weight="1"
+                    android:layout_width="60dp"
+                    android:layout_height="0dp">
 
-					<TextView
-						android:id="@+id/missed_calls"
-						android:background="@drawable/unread_message_count_bg"
-						style="@style/font18"
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"
-						android:gravity="center"
-						android:layout_marginRight="5dp"
-						android:visibility="gone"
-						android:layout_centerVertical="true"
-						android:layout_alignParentRight="true"
-						android:layout_alignParentEnd="true"/>
+                    <ImageView
+                        android:src="@drawable/footer_history"
+                        android:contentDescription="@string/content_description_history"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:padding="15dp"
+                        android:layout_centerInParent="true"/>
 
-				</RelativeLayout>
+                    <View
+                        android:id="@+id/history_select"
+                        android:background="@color/colorA"
+                        android:layout_width="5dp"
+                        android:layout_height="match_parent"
+                        android:layout_alignParentLeft="true"
+                        android:visibility="gone"/>
 
-				<RelativeLayout
-					android:id="@+id/contacts"
-					android:background="@drawable/footer_button"
-					android:layout_weight="1"
-					android:layout_width="60dp"
-					android:layout_height="0dp">
+                    <TextView
+                        android:id="@+id/missed_calls"
+                        android:background="@drawable/unread_message_count_bg"
+                        style="@style/font18"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:gravity="center"
+                        android:layout_marginRight="5dp"
+                        android:visibility="gone"
+                        android:layout_centerVertical="true"
+                        android:layout_alignParentRight="true"
+                        android:layout_alignParentEnd="true"/>
 
-					<ImageView
-						android:src="@drawable/footer_contacts"
-						android:contentDescription="@string/content_description_contacts"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:padding="15dp"
-						android:layout_centerInParent="true"/>
+                </RelativeLayout>
 
-					<View
-						android:id="@+id/contacts_select"
-						android:background="@color/colorA"
-						android:layout_width="5dp"
-						android:layout_height="match_parent"
-						android:layout_alignParentLeft="true"
-						android:visibility="gone"/>
-				</RelativeLayout>
+                <RelativeLayout
+                    android:id="@+id/contacts"
+                    android:background="@drawable/footer_button"
+                    android:layout_weight="1"
+                    android:layout_width="60dp"
+                    android:layout_height="0dp">
 
-				<RelativeLayout
-					android:id="@+id/dialer"
-					android:background="@drawable/footer_button"
-					android:layout_weight="1"
-					android:layout_width="60dp"
-					android:layout_height="0dp">
+                    <ImageView
+                        android:src="@drawable/footer_contacts"
+                        android:contentDescription="@string/content_description_contacts"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:padding="15dp"
+                        android:layout_centerInParent="true"/>
 
-					<ImageView
-						android:src="@drawable/footer_dialer"
-						android:contentDescription="@string/content_description_dialer"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:padding="15dp"
-						android:layout_centerInParent="true"/>
+                    <View
+                        android:id="@+id/contacts_select"
+                        android:background="@color/colorA"
+                        android:layout_width="5dp"
+                        android:layout_height="match_parent"
+                        android:layout_alignParentLeft="true"
+                        android:visibility="gone"/>
+                </RelativeLayout>
 
-					<View
-						android:id="@+id/dialer_select"
-						android:background="@color/colorA"
-						android:layout_width="5dp"
-						android:layout_height="match_parent"
-						android:layout_alignParentLeft="true"/>
+                <RelativeLayout
+                    android:id="@+id/dialer"
+                    android:background="@drawable/footer_button"
+                    android:layout_weight="1"
+                    android:layout_width="60dp"
+                    android:layout_height="0dp">
 
-				</RelativeLayout>
+                    <ImageView
+                        android:src="@drawable/footer_dialer"
+                        android:contentDescription="@string/content_description_dialer"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:padding="15dp"
+                        android:layout_centerInParent="true"/>
 
-				<RelativeLayout
-					android:id="@+id/chat"
-					android:background="@drawable/footer_button"
-					android:layout_weight="1"
-					android:layout_width="60dp"
-					android:layout_height="0dp">
+                    <View
+                        android:id="@+id/dialer_select"
+                        android:background="@color/colorA"
+                        android:layout_width="5dp"
+                        android:layout_height="match_parent"
+                        android:layout_alignParentLeft="true"/>
 
-					<ImageView
-						android:src="@drawable/footer_chat"
-						android:contentDescription="@string/content_description_chat_button"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:padding="15dp"
-						android:layout_centerInParent="true" />
+                </RelativeLayout>
 
-					<View
-						android:id="@+id/chat_select"
-						android:background="@color/colorA"
-						android:visibility="gone"
-						android:layout_width="5dp"
-						android:layout_height="match_parent"
-						android:layout_alignParentLeft="true"/>
+                <RelativeLayout
+                    android:id="@+id/chat"
+                    android:background="@drawable/footer_button"
+                    android:layout_weight="1"
+                    android:layout_width="60dp"
+                    android:layout_height="0dp">
 
-					<TextView
-						android:id="@+id/missed_chats"
-						android:background="@drawable/unread_message_count_bg"
-						style="@style/font18"
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"
-						android:gravity="center"
-						android:layout_marginRight="5dp"
-						android:visibility="gone"
-						android:layout_centerVertical="true"
-						android:layout_alignParentRight="true"
-						android:layout_alignParentEnd="true"/>
+                    <ImageView
+                        android:src="@drawable/footer_chat"
+                        android:contentDescription="@string/content_description_chat_button"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:padding="15dp"
+                        android:layout_centerInParent="true" />
 
-				</RelativeLayout>
-			</LinearLayout>
-		</RelativeLayout>
+                    <View
+                        android:id="@+id/chat_select"
+                        android:background="@color/colorA"
+                        android:visibility="gone"
+                        android:layout_width="5dp"
+                        android:layout_height="match_parent"
+                        android:layout_alignParentLeft="true"/>
 
-	<!-- Side Menu -->
-	<RelativeLayout
-		android:id="@+id/side_menu_content"
-		android:layout_width="400dp"
-		android:layout_height="match_parent"
-		android:layout_gravity="left">
+                    <TextView
+                        android:id="@+id/missed_chats"
+                        android:background="@drawable/unread_message_count_bg"
+                        style="@style/font18"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:gravity="center"
+                        android:layout_marginRight="5dp"
+                        android:visibility="gone"
+                        android:layout_centerVertical="true"
+                        android:layout_alignParentRight="true"
+                        android:layout_alignParentEnd="true"/>
 
-		<LinearLayout
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			android:orientation="vertical">
+                </RelativeLayout>
 
-			<include layout="@layout/side_menu_main_account"/>
+            </LinearLayout>
 
-			<ListView
-				android:id="@+id/accounts_list"
-				android:background="@color/colorB"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:choiceMode="singleChoice"
-				android:cacheColorHint="@color/transparent"
-				android:divider="@android:color/transparent"
-				android:dividerHeight="0dp"/>
+        </RelativeLayout>
 
-			<ListView
-				android:id="@+id/item_list"
-				android:background="@color/colorH"
-				android:layout_width="match_parent"
-				android:layout_height="match_parent"
-				android:choiceMode="singleChoice"
-				android:divider="@color/colorE"
-				android:listSelector="@color/colorH"
-				android:dividerHeight="1dp"/>
-		</LinearLayout>
+        <!-- Side Menu -->
+        <RelativeLayout
+            android:id="@+id/side_menu_content"
+            android:layout_width="400dp"
+            android:layout_height="match_parent"
+            android:layout_gravity="left">
 
-		<RelativeLayout
-			android:id="@+id/side_menu_quit"
-			android:background="@color/colorA"
-			android:gravity="bottom"
-			android:layout_alignParentBottom="true"
-			android:layout_width="match_parent"
-			android:layout_height="50dp">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
 
-			<ImageView
-				android:id="@+id/quit_button"
-				android:src="@drawable/quit"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:padding="5dp"
-				android:layout_alignParentLeft="true"
-				android:layout_centerVertical="true" />
+                <include layout="@layout/side_menu_main_account"/>
 
-			<TextView
-				android:id="@+id/quit"
-				android:text="@string/quit"
-				style="@style/font14"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_toRightOf="@id/quit_button"
-				android:gravity="center_vertical"
-				android:layout_centerInParent="true"/>
+                <ListView
+                    android:id="@+id/accounts_list"
+                    android:background="@color/colorB"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:choiceMode="singleChoice"
+                    android:cacheColorHint="@color/transparent"
+                    android:divider="@android:color/transparent"
+                    android:dividerHeight="0dp"/>
 
-		</RelativeLayout>
+                <ListView
+                    android:id="@+id/item_list"
+                    android:background="@color/colorH"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:choiceMode="singleChoice"
+                    android:divider="@color/colorE"
+                    android:listSelector="@color/colorH"
+                    android:dividerHeight="1dp"/>
+            </LinearLayout>
 
-	</RelativeLayout>
+            <RelativeLayout
+                android:id="@+id/side_menu_quit"
+                android:background="@color/colorA"
+                android:gravity="bottom"
+                android:layout_alignParentBottom="true"
+                android:layout_width="match_parent"
+                android:layout_height="50dp">
 
-</android.support.v4.widget.DrawerLayout>
+                <ImageView
+                    android:id="@+id/quit_button"
+                    android:src="@drawable/quit"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="5dp"
+                    android:layout_alignParentLeft="true"
+                    android:layout_centerVertical="true" />
+
+                <TextView
+                    android:id="@+id/quit"
+                    android:text="@string/quit"
+                    style="@style/font14"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_toRightOf="@id/quit_button"
+                    android:gravity="center_vertical"
+                    android:layout_centerInParent="true"/>
+
+            </RelativeLayout>
+
+        </RelativeLayout>
+
+    </android.support.v4.widget.DrawerLayout>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw533dp/main.xml b/app/src/main/res/layout-sw533dp/main.xml
index 83e455609..7a953c23f 100644
--- a/app/src/main/res/layout-sw533dp/main.xml
+++ b/app/src/main/res/layout-sw533dp/main.xml
@@ -1,296 +1,306 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout
-	xmlns:tools="http://schemas.android.com/tools"
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
-	<fragment
-		android:id="@+id/status"
-		android:name="org.linphone.fragments.StatusFragment"
-		android:layout_width="match_parent"
-		android:layout_height="40dp"
-		tools:layout="@layout/status" />
+    <fragment
+        android:id="@+id/status"
+        android:name="org.linphone.fragments.StatusFragment"
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        tools:layout="@layout/status" />
 
-	<android.support.v4.widget.DrawerLayout
-		android:id="@+id/side_menu"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:layout_below="@id/status">
+    <android.support.v4.widget.DrawerLayout
+        android:id="@+id/side_menu"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/status">
 
-		<RelativeLayout
-			android:layout_width="match_parent"
-			android:layout_height="match_parent">
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
 
-			<RelativeLayout
-				android:id="@+id/top_bar"
-				android:background="@color/colorF"
-				android:layout_width="match_parent"
-				android:layout_height="60dp"
-				android:visibility="gone"
-				android:layout_alignParentTop="true">
+            <LinearLayout
+                android:id="@+id/top_bar"
+                android:visibility="gone"
+                android:orientation="horizontal"
+                android:background="@color/colorF"
+                android:layout_width="match_parent"
+                android:layout_height="60dp">
 
-				<TextView
-					android:id="@+id/menu_name"
-					android:text="@string/settings"
-					style="@style/font1"
-					android:layout_width="wrap_content"
-					android:layout_height="match_parent"
-					android:layout_centerInParent="true"
-					android:gravity="center_vertical"/>
+                <ImageView
+                    android:id="@+id/cancel"
+                    android:src="@drawable/back"
+                    android:background="@drawable/toolbar_button"
+                    android:contentDescription="@string/content_description_dialer_back"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0.2"
+                    android:padding="15dp"/>
 
-				<ImageView
-					android:id="@+id/cancel"
-					android:src="@drawable/dialer_back"
-					android:contentDescription="@string/content_description_dialer_back"
-					android:layout_width="wrap_content"
-					android:layout_height="match_parent"
-					android:padding="15dp"
-					android:layout_centerInParent="true"
-					android:layout_alignParentRight="true"/>
+                <TextView
+                    android:id="@+id/top_bar_title"
+                    style="@style/font1"
+                    android:maxLines="1"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0.4"
+                    android:gravity="center"
+                    android:padding="15dp"/>
 
-			</RelativeLayout>
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0.2"/>
 
-			<LinearLayout
-				android:layout_width="match_parent"
-				android:layout_height="match_parent"
-				android:orientation="vertical"
-				android:layout_below="@id/top_bar"
-				android:layout_above="@id/footer">
+            </LinearLayout>
 
-				<FrameLayout
-					android:layout_width="match_parent"
-					android:layout_height="match_parent">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical"
+                android:layout_below="@id/top_bar"
+                android:layout_above="@id/footer">
 
-					<LinearLayout
-						android:baselineAligned="false"
-						android:layout_width="match_parent"
-						android:layout_height="match_parent"
-						android:orientation="horizontal">
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
 
-						<LinearLayout
-							android:id="@+id/fragmentContainer"
-							android:layout_width="match_parent"
-							android:layout_height="match_parent"
-							android:layout_weight="1"
-							android:orientation="horizontal" />
+                    <LinearLayout
+                        android:baselineAligned="false"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:orientation="horizontal">
 
-						<LinearLayout
-							android:id="@+id/fragmentContainer2"
-							android:layout_width="match_parent"
-							android:layout_height="match_parent"
-							android:layout_weight="1"
-							android:orientation="horizontal">
+                        <LinearLayout
+                            android:id="@+id/fragmentContainer"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1"
+                            android:orientation="horizontal" />
 
-							<View
-								android:background="@color/colorE"
-								android:layout_width="1dp"
-								android:layout_height="match_parent"/>
+                        <LinearLayout
+                            android:id="@+id/fragmentContainer2"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1"
+                            android:orientation="horizontal">
 
-						</LinearLayout>
-					</LinearLayout>
-				</FrameLayout>
+                            <View
+                                android:background="@color/colorE"
+                                android:layout_width="1dp"
+                                android:layout_height="match_parent"/>
 
-			</LinearLayout>
+                        </LinearLayout>
 
-			<LinearLayout
-				android:id="@+id/footer"
-				android:layout_width="match_parent"
-				android:layout_height="60dp"
-				android:layout_alignParentBottom="true"
-				android:orientation="horizontal">
+                    </LinearLayout>
 
-				<RelativeLayout
-					android:id="@+id/history"
-					android:background="@drawable/footer_button"
-					android:layout_weight="1"
-					android:layout_width="0dp"
-					android:layout_height="match_parent">
+                </FrameLayout>
 
-					<ImageView
-						android:id="@+id/footer_history"
-						android:src="@drawable/footer_history"
-						android:contentDescription="@string/content_description_history"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:padding="15dp"
-						android:layout_centerInParent="true"/>
+            </LinearLayout>
 
-					<View
-						android:id="@+id/history_select"
-						android:background="@color/colorA"
-						android:layout_width="match_parent"
-						android:layout_height="5dp"
-						android:layout_alignParentBottom="true"
-						android:visibility="gone"/>
+            <LinearLayout
+                android:id="@+id/footer"
+                android:layout_width="match_parent"
+                android:layout_height="60dp"
+                android:layout_alignParentBottom="true"
+                android:orientation="horizontal">
 
-					<TextView
-						android:id="@+id/missed_calls"
-						android:background="@drawable/unread_message_count_bg"
-						style="@style/font18"
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"
-						android:gravity="center"
-						android:layout_margin="20dp"
-						android:layout_alignParentTop="true"
-						android:layout_alignParentRight="true"
-						android:visibility="visible"/>
+                <RelativeLayout
+                    android:id="@+id/history"
+                    android:background="@drawable/footer_button"
+                    android:layout_weight="1"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent">
 
-				</RelativeLayout>
+                    <ImageView
+                        android:id="@+id/footer_history"
+                        android:src="@drawable/footer_history"
+                        android:contentDescription="@string/content_description_history"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:padding="15dp"
+                        android:layout_centerInParent="true"/>
 
-				<RelativeLayout
-					android:id="@+id/contacts"
-					android:background="@drawable/footer_button"
-					android:layout_weight="1"
-					android:layout_width="0dp"
-					android:layout_height="match_parent">
+                    <View
+                        android:id="@+id/history_select"
+                        android:background="@color/colorA"
+                        android:layout_width="match_parent"
+                        android:layout_height="5dp"
+                        android:layout_alignParentBottom="true"
+                        android:visibility="gone"/>
 
-					<ImageView
-						android:src="@drawable/footer_contacts"
-						android:contentDescription="@string/content_description_contacts"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:padding="15dp"
-						android:layout_centerInParent="true"/>
+                    <TextView
+                        android:id="@+id/missed_calls"
+                        android:background="@drawable/unread_message_count_bg"
+                        style="@style/font18"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:gravity="center"
+                        android:layout_margin="20dp"
+                        android:layout_alignParentTop="true"
+                        android:layout_alignParentRight="true"
+                        android:visibility="visible"/>
 
-					<View
-						android:id="@+id/contacts_select"
-						android:background="@color/colorA"
-						android:layout_width="match_parent"
-						android:layout_height="5dp"
-						android:layout_alignParentBottom="true"
-						android:visibility="gone"/>
-				</RelativeLayout>
+                </RelativeLayout>
 
-				<RelativeLayout
-					android:id="@+id/dialer"
-					android:background="@drawable/footer_button"
-					android:layout_weight="1"
-					android:layout_width="0dp"
-					android:layout_height="match_parent">
+                <RelativeLayout
+                    android:id="@+id/contacts"
+                    android:background="@drawable/footer_button"
+                    android:layout_weight="1"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent">
 
-					<ImageView
-						android:src="@drawable/footer_dialer"
-						android:contentDescription="@string/content_description_dialer"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:padding="15dp"
-						android:layout_centerInParent="true"/>
+                    <ImageView
+                        android:src="@drawable/footer_contacts"
+                        android:contentDescription="@string/content_description_contacts"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:padding="15dp"
+                        android:layout_centerInParent="true"/>
 
-					<View
-						android:id="@+id/dialer_select"
-						android:background="@color/colorA"
-						android:layout_width="match_parent"
-						android:layout_height="5dp"
-						android:layout_alignParentBottom="true"/>
+                    <View
+                        android:id="@+id/contacts_select"
+                        android:background="@color/colorA"
+                        android:layout_width="match_parent"
+                        android:layout_height="5dp"
+                        android:layout_alignParentBottom="true"
+                        android:visibility="gone"/>
+                </RelativeLayout>
 
-				</RelativeLayout>
+                <RelativeLayout
+                    android:id="@+id/dialer"
+                    android:background="@drawable/footer_button"
+                    android:layout_weight="1"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent">
 
-				<RelativeLayout
-					android:id="@+id/chat"
-					android:background="@drawable/footer_button"
-					android:layout_weight="1"
-					android:layout_width="0dp"
-					android:layout_height="match_parent">
+                    <ImageView
+                        android:src="@drawable/footer_dialer"
+                        android:contentDescription="@string/content_description_dialer"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:padding="15dp"
+                        android:layout_centerInParent="true"/>
 
-					<ImageView
-						android:src="@drawable/footer_chat"
-						android:contentDescription="@string/content_description_chat"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:padding="15dp"
-						android:layout_centerInParent="true" />
+                    <View
+                        android:id="@+id/dialer_select"
+                        android:background="@color/colorA"
+                        android:layout_width="match_parent"
+                        android:layout_height="5dp"
+                        android:layout_alignParentBottom="true"/>
 
-					<View
-						android:id="@+id/chat_select"
-						android:background="@color/colorA"
-						android:layout_width="match_parent"
-						android:layout_height="5dp"
-						android:layout_alignParentBottom="true"
-						android:visibility="gone"/>
+                </RelativeLayout>
 
-					<TextView
-						android:id="@+id/missed_chats"
-						android:background="@drawable/unread_message_count_bg"
-						style="@style/font18"
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"
-						android:layout_margin="20dp"
-						android:gravity="center"
-						android:layout_alignParentTop="true"
-						android:layout_alignParentRight="true"
-						android:visibility="gone"/>
+                <RelativeLayout
+                    android:id="@+id/chat"
+                    android:background="@drawable/footer_button"
+                    android:layout_weight="1"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent">
 
-				</RelativeLayout>
-			</LinearLayout>
-		</RelativeLayout>
+                    <ImageView
+                        android:src="@drawable/footer_chat"
+                        android:contentDescription="@string/content_description_chat"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:padding="15dp"
+                        android:layout_centerInParent="true" />
 
-	<!-- Side Menu -->
-	<RelativeLayout
-		android:id="@+id/side_menu_content"
-		android:layout_width="400dp"
-		android:layout_height="match_parent"
-		android:layout_gravity="left">
+                    <View
+                        android:id="@+id/chat_select"
+                        android:background="@color/colorA"
+                        android:layout_width="match_parent"
+                        android:layout_height="5dp"
+                        android:layout_alignParentBottom="true"
+                        android:visibility="gone"/>
 
-		<LinearLayout
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			android:orientation="vertical">
+                    <TextView
+                        android:id="@+id/missed_chats"
+                        android:background="@drawable/unread_message_count_bg"
+                        style="@style/font18"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="20dp"
+                        android:gravity="center"
+                        android:layout_alignParentTop="true"
+                        android:layout_alignParentRight="true"
+                        android:visibility="gone"/>
 
-			<include layout="@layout/side_menu_main_account"/>
+                </RelativeLayout>
 
-			<ListView
-				android:id="@+id/accounts_list"
-				android:background="@color/colorB"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:choiceMode="singleChoice"
-				android:cacheColorHint="@color/transparent"
-				android:divider="@android:color/transparent"
-				android:dividerHeight="0dp"/>
+            </LinearLayout>
 
-			<ListView
-				android:id="@+id/item_list"
-				android:background="@color/colorH"
-				android:layout_width="match_parent"
-				android:layout_height="match_parent"
-				android:choiceMode="singleChoice"
-				android:divider="@color/colorE"
-				android:listSelector="@color/colorH"
-				android:dividerHeight="1dp"/>
-		</LinearLayout>
+        </RelativeLayout>
 
-		<RelativeLayout
-			android:id="@+id/side_menu_quit"
-			android:background="@color/colorA"
-			android:gravity="bottom"
-			android:layout_alignParentBottom="true"
-			android:layout_width="match_parent"
-			android:layout_height="50dp">
+        <!-- Side Menu -->
+        <RelativeLayout
+            android:id="@+id/side_menu_content"
+            android:layout_width="400dp"
+            android:layout_height="match_parent"
+            android:layout_gravity="left">
 
-			<ImageView
-				android:id="@+id/quit_button"
-				android:src="@drawable/quit"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:padding="5dp"
-				android:layout_alignParentLeft="true"
-				android:layout_centerVertical="true" />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
 
-			<TextView
-				android:id="@+id/quit"
-				android:text="@string/quit"
-				style="@style/font14"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_toRightOf="@id/quit_button"
-				android:gravity="center_vertical"
-				android:layout_centerInParent="true"/>
+                <include layout="@layout/side_menu_main_account"/>
 
-		</RelativeLayout>
+                <ListView
+                    android:id="@+id/accounts_list"
+                    android:background="@color/colorB"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:choiceMode="singleChoice"
+                    android:cacheColorHint="@color/transparent"
+                    android:divider="@android:color/transparent"
+                    android:dividerHeight="0dp"/>
 
-	</RelativeLayout>
+                <ListView
+                    android:id="@+id/item_list"
+                    android:background="@color/colorH"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:choiceMode="singleChoice"
+                    android:divider="@color/colorE"
+                    android:listSelector="@color/colorH"
+                    android:dividerHeight="1dp"/>
+            </LinearLayout>
 
-</android.support.v4.widget.DrawerLayout>
+            <RelativeLayout
+                android:id="@+id/side_menu_quit"
+                android:background="@color/colorA"
+                android:gravity="bottom"
+                android:layout_alignParentBottom="true"
+                android:layout_width="match_parent"
+                android:layout_height="50dp">
+
+                <ImageView
+                    android:id="@+id/quit_button"
+                    android:src="@drawable/quit"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="5dp"
+                    android:layout_alignParentLeft="true"
+                    android:layout_centerVertical="true" />
+
+                <TextView
+                    android:id="@+id/quit"
+                    android:text="@string/quit"
+                    style="@style/font14"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_toRightOf="@id/quit_button"
+                    android:gravity="center_vertical"
+                    android:layout_centerInParent="true"/>
+
+            </RelativeLayout>
+
+        </RelativeLayout>
+
+    </android.support.v4.widget.DrawerLayout>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/about.xml b/app/src/main/res/layout/about.xml
index e46a2083a..149e30e98 100644
--- a/app/src/main/res/layout/about.xml
+++ b/app/src/main/res/layout/about.xml
@@ -5,40 +5,6 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <LinearLayout
-        android:id="@+id/top_bar"
-        android:orientation="horizontal"
-        android:background="@color/colorF"
-        android:layout_width="match_parent"
-        android:layout_height="60dp">
-
-        <View
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="0.2"/>
-
-        <TextView
-            android:id="@+id/menu_name"
-            android:text="@string/about"
-            style="@style/font1"
-            android:maxLines="1"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="0.4"
-            android:gravity="center"
-            android:padding="15dp"/>
-
-        <ImageView
-            android:id="@+id/cancel"
-            android:src="@drawable/dialer_back"
-            android:background="@drawable/toolbar_button"
-            android:contentDescription="@string/content_description_dialer_back"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="0.2"
-            android:padding="15dp"/>
-    </LinearLayout>
-
     <LinearLayout
         android:background="@color/colorC"
         android:orientation="vertical"
diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml
index 97d4e4c9d..d3082e0df 100644
--- a/app/src/main/res/layout/main.xml
+++ b/app/src/main/res/layout/main.xml
@@ -5,282 +5,291 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
-	<fragment
-		android:id="@+id/status"
-		android:name="org.linphone.fragments.StatusFragment"
-		android:layout_width="match_parent"
-		android:layout_height="40dp"
-		tools:layout="@layout/status" />
+    <fragment
+        android:id="@+id/status"
+        android:name="org.linphone.fragments.StatusFragment"
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        tools:layout="@layout/status" />
 
-	<android.support.v4.widget.DrawerLayout
-		android:id="@+id/side_menu"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:layout_below="@id/status">
+    <android.support.v4.widget.DrawerLayout
+        android:id="@+id/side_menu"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/status">
 
-		<RelativeLayout
-			android:layout_width="match_parent"
-			android:layout_height="match_parent">
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
 
-			<RelativeLayout
-				android:id="@+id/top_bar"
-				android:background="@color/colorF"
-				android:layout_width="match_parent"
-				android:layout_height="60dp"
-				android:visibility="gone"
-				android:layout_alignParentTop="true">
+            <LinearLayout
+                android:id="@+id/top_bar"
+                android:visibility="gone"
+                android:orientation="horizontal"
+                android:background="@color/colorF"
+                android:layout_width="match_parent"
+                android:layout_height="60dp">
 
-				<TextView
-					android:id="@+id/menu_name"
-					android:text="@string/settings"
-					style="@style/font1"
-					android:layout_width="wrap_content"
-					android:layout_height="match_parent"
-					android:layout_centerInParent="true"
-					android:gravity="center_vertical"/>
+                <ImageView
+                    android:id="@+id/cancel"
+                    android:src="@drawable/back"
+                    android:background="@drawable/toolbar_button"
+                    android:contentDescription="@string/content_description_dialer_back"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0.2"
+                    android:padding="15dp"/>
 
-				<ImageView
-					android:id="@+id/cancel"
-					android:src="@drawable/dialer_back"
-					android:contentDescription="@string/content_description_dialer_back"
-					android:layout_width="wrap_content"
-					android:layout_height="match_parent"
-					android:padding="15dp"
-					android:layout_centerInParent="true"
-					android:layout_alignParentRight="true"/>
+                <TextView
+                    android:id="@+id/top_bar_title"
+                    style="@style/font1"
+                    android:maxLines="1"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0.4"
+                    android:gravity="center"
+                    android:padding="15dp"/>
 
-			</RelativeLayout>
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0.2"/>
 
-			<LinearLayout
-				android:layout_width="match_parent"
-				android:layout_height="match_parent"
-				android:orientation="vertical"
-				android:layout_above="@id/footer"
-				android:layout_below="@id/top_bar">
+            </LinearLayout>
 
-				<FrameLayout
-					android:layout_width="match_parent"
-					android:layout_height="match_parent"
-					android:layout_alignParentTop="true">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical"
+                android:layout_above="@id/footer"
+                android:layout_below="@id/top_bar">
 
-					<LinearLayout
-						android:id="@+id/fragmentContainer"
-						android:layout_width="match_parent"
-						android:layout_height="match_parent"
-						android:orientation="horizontal" />
-				</FrameLayout>
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_alignParentTop="true">
 
-			</LinearLayout>
+                    <LinearLayout
+                        android:id="@+id/fragmentContainer"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:orientation="horizontal" />
+                </FrameLayout>
 
-			<LinearLayout
-				android:id="@+id/footer"
-				android:layout_width="match_parent"
-				android:layout_height="60dp"
-				android:layout_alignParentBottom="true"
-				android:orientation="horizontal">
+            </LinearLayout>
 
-				<RelativeLayout
-					android:id="@+id/history"
-					android:background="@drawable/footer_button"
-					android:layout_weight="1"
-					android:layout_width="0dp"
-					android:layout_height="match_parent">
+            <LinearLayout
+                android:id="@+id/footer"
+                android:layout_width="match_parent"
+                android:layout_height="60dp"
+                android:layout_alignParentBottom="true"
+                android:orientation="horizontal">
 
-					<ImageView
-						android:src="@drawable/footer_history"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:contentDescription="@string/content_description_history"
-						android:padding="15dp"
-						android:layout_centerInParent="true"/>
+                <RelativeLayout
+                    android:id="@+id/history"
+                    android:background="@drawable/footer_button"
+                    android:layout_weight="1"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent">
 
-					<View
-						android:id="@+id/history_select"
-						android:background="@color/colorA"
-						android:layout_width="match_parent"
-						android:layout_height="5dp"
-						android:layout_alignParentBottom="true"
-						android:visibility="gone"/>
+                    <ImageView
+                        android:src="@drawable/footer_history"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:contentDescription="@string/content_description_history"
+                        android:padding="15dp"
+                        android:layout_centerInParent="true"/>
 
-					<TextView
-						android:id="@+id/missed_calls"
-						android:background="@drawable/unread_message_count_bg"
-						style="@style/font18"
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"
-						android:layout_margin="15dp"
-						android:gravity="center"
-						android:visibility="gone"/>
+                    <View
+                        android:id="@+id/history_select"
+                        android:background="@color/colorA"
+                        android:layout_width="match_parent"
+                        android:layout_height="5dp"
+                        android:layout_alignParentBottom="true"
+                        android:visibility="gone"/>
 
-				</RelativeLayout>
+                    <TextView
+                        android:id="@+id/missed_calls"
+                        android:background="@drawable/unread_message_count_bg"
+                        style="@style/font18"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="15dp"
+                        android:gravity="center"
+                        android:visibility="gone"/>
 
-				<RelativeLayout
-					android:id="@+id/contacts"
-					android:background="@drawable/footer_button"
-					android:layout_weight="1"
-					android:layout_width="0dp"
-					android:layout_height="match_parent">
+                </RelativeLayout>
 
-					<ImageView
-						android:src="@drawable/footer_contacts"
-						android:contentDescription="@string/content_description_contacts"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:padding="15dp"
-						android:layout_centerInParent="true"/>
+                <RelativeLayout
+                    android:id="@+id/contacts"
+                    android:background="@drawable/footer_button"
+                    android:layout_weight="1"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent">
 
-					<View
-						android:id="@+id/contacts_select"
-						android:background="@color/colorA"
-						android:layout_width="match_parent"
-						android:layout_height="5dp"
-						android:layout_alignParentBottom="true"
-						android:visibility="gone"/>
-				</RelativeLayout>
+                    <ImageView
+                        android:src="@drawable/footer_contacts"
+                        android:contentDescription="@string/content_description_contacts"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:padding="15dp"
+                        android:layout_centerInParent="true"/>
 
-				<RelativeLayout
-					android:id="@+id/dialer"
-					android:background="@drawable/footer_button"
-					android:layout_weight="1"
-					android:layout_width="0dp"
-					android:layout_height="match_parent">
+                    <View
+                        android:id="@+id/contacts_select"
+                        android:background="@color/colorA"
+                        android:layout_width="match_parent"
+                        android:layout_height="5dp"
+                        android:layout_alignParentBottom="true"
+                        android:visibility="gone"/>
+                </RelativeLayout>
 
-					<ImageView
-						android:src="@drawable/footer_dialer"
-						android:contentDescription="@string/content_description_dialer"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:padding="15dp"
-						android:layout_centerInParent="true"/>
+                <RelativeLayout
+                    android:id="@+id/dialer"
+                    android:background="@drawable/footer_button"
+                    android:layout_weight="1"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent">
 
-					<View
-						android:id="@+id/dialer_select"
-						android:background="@color/colorA"
-						android:layout_width="match_parent"
-						android:layout_height="5dp"
-						android:layout_alignParentBottom="true"/>
+                    <ImageView
+                        android:src="@drawable/footer_dialer"
+                        android:contentDescription="@string/content_description_dialer"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:padding="15dp"
+                        android:layout_centerInParent="true"/>
 
-				</RelativeLayout>
+                    <View
+                        android:id="@+id/dialer_select"
+                        android:background="@color/colorA"
+                        android:layout_width="match_parent"
+                        android:layout_height="5dp"
+                        android:layout_alignParentBottom="true"/>
 
-				<RelativeLayout
-					android:id="@+id/chat"
-					android:background="@drawable/footer_button"
-					android:layout_weight="1"
-					android:layout_width="0dp"
-					android:layout_height="match_parent">
+                </RelativeLayout>
 
-					<ImageView
-						android:src="@drawable/footer_chat"
-						android:contentDescription="@string/content_description_chat_button"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:padding="15dp"
-						android:layout_centerInParent="true" />
+                <RelativeLayout
+                    android:id="@+id/chat"
+                    android:background="@drawable/footer_button"
+                    android:layout_weight="1"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent">
 
-					<View
-						android:id="@+id/chat_select"
-						android:background="@color/colorA"
-						android:layout_width="match_parent"
-						android:layout_height="5dp"
-						android:layout_alignParentBottom="true"
-						android:visibility="gone"/>
+                    <ImageView
+                        android:src="@drawable/footer_chat"
+                        android:contentDescription="@string/content_description_chat_button"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:padding="15dp"
+                        android:layout_centerInParent="true" />
 
-					<TextView
-						android:id="@+id/missed_chats"
-						android:background="@drawable/unread_message_count_bg"
-						style="@style/font18"
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"
-						android:layout_margin="15dp"
-						android:gravity="center"
-						android:visibility="gone"/>
+                    <View
+                        android:id="@+id/chat_select"
+                        android:background="@color/colorA"
+                        android:layout_width="match_parent"
+                        android:layout_height="5dp"
+                        android:layout_alignParentBottom="true"
+                        android:visibility="gone"/>
 
-				</RelativeLayout>
-			</LinearLayout>
+                    <TextView
+                        android:id="@+id/missed_chats"
+                        android:background="@drawable/unread_message_count_bg"
+                        style="@style/font18"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="15dp"
+                        android:gravity="center"
+                        android:visibility="gone"/>
 
-			<LinearLayout
-				android:id="@+id/fragmentContainer2"
-				android:visibility="gone"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:orientation="vertical">
+                </RelativeLayout>
 
-			</LinearLayout>
-		</RelativeLayout>
+            </LinearLayout>
 
-	<!-- Side Menu -->
-	<RelativeLayout
-		android:id="@+id/side_menu_content"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:layout_gravity="left">
+            <LinearLayout
+                android:id="@+id/fragmentContainer2"
+                android:visibility="gone"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
 
-		<RelativeLayout
-			android:id="@+id/side_menu_quit"
-			android:background="@color/colorA"
-			android:gravity="bottom"
-			android:layout_alignParentBottom="true"
-			android:layout_width="match_parent"
-			android:layout_height="50dp">
+            </LinearLayout>
 
-			<ImageView
-				android:id="@+id/quit_button"
-				android:src="@drawable/quit"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:padding="5dp"
-				android:layout_alignParentLeft="true"
-				android:layout_centerVertical="true" />
+        </RelativeLayout>
 
-			<TextView
-				android:id="@+id/quit"
-				android:text="@string/quit"
-				style="@style/font14"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_toRightOf="@id/quit_button"
-				android:gravity="center_vertical"
-				android:layout_centerInParent="true"/>
-		</RelativeLayout>
+        <!-- Side Menu -->
+        <RelativeLayout
+            android:id="@+id/side_menu_content"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="left">
 
-		<LinearLayout
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			android:background="@color/colorH"
-			android:layout_above="@id/side_menu_quit"
-			android:orientation="vertical">
+            <RelativeLayout
+                android:id="@+id/side_menu_quit"
+                android:background="@color/colorA"
+                android:gravity="bottom"
+                android:layout_alignParentBottom="true"
+                android:layout_width="match_parent"
+                android:layout_height="50dp">
 
-			<include layout="@layout/side_menu_main_account"/>
+                <ImageView
+                    android:id="@+id/quit_button"
+                    android:src="@drawable/quit"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="5dp"
+                    android:layout_alignParentLeft="true"
+                    android:layout_centerVertical="true" />
 
-			<ListView
-				android:id="@+id/accounts_list"
-				android:background="@color/colorH"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:choiceMode="singleChoice"
-				android:cacheColorHint="@color/transparent"
-				android:divider="@android:color/transparent"
-				android:dividerHeight="0dp"/>
+                <TextView
+                    android:id="@+id/quit"
+                    android:text="@string/quit"
+                    style="@style/font14"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_toRightOf="@id/quit_button"
+                    android:gravity="center_vertical"
+                    android:layout_centerInParent="true"/>
+            </RelativeLayout>
 
-			<ListView
-				android:id="@+id/item_list"
-				android:background="@color/colorH"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:choiceMode="singleChoice"
-				android:divider="@color/colorE"
-				android:listSelector="@color/colorH"
-				android:footerDividersEnabled="true"
-				android:dividerHeight="1dp"/>
-			
-			<View
-				android:layout_width="match_parent"
-				android:layout_height="1dp"
-				android:background="@color/colorE"/>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@color/colorH"
+                android:layout_above="@id/side_menu_quit"
+                android:orientation="vertical">
 
-		</LinearLayout>
-	</RelativeLayout>
+                <include layout="@layout/side_menu_main_account"/>
 
-</android.support.v4.widget.DrawerLayout>
+                <ListView
+                    android:id="@+id/accounts_list"
+                    android:background="@color/colorH"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:choiceMode="singleChoice"
+                    android:cacheColorHint="@color/transparent"
+                    android:divider="@android:color/transparent"
+                    android:dividerHeight="0dp"/>
+
+                <ListView
+                    android:id="@+id/item_list"
+                    android:background="@color/colorH"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:choiceMode="singleChoice"
+                    android:divider="@color/colorE"
+                    android:listSelector="@color/colorH"
+                    android:footerDividersEnabled="true"
+                    android:dividerHeight="1dp"/>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="@color/colorE"/>
+
+            </LinearLayout>
+
+        </RelativeLayout>
+
+    </android.support.v4.widget.DrawerLayout>
 
 </RelativeLayout>
\ No newline at end of file