diff --git a/.idea/modules.xml b/.idea/modules.xml
index 3db61ae..fad4e0d 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,8 +2,11 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
+      <module fileurl="file://$PROJECT_DIR$/AwesomeImagePicker.iml" filepath="$PROJECT_DIR$/AwesomeImagePicker.iml" />
       <module fileurl="file://$PROJECT_DIR$/ImagePicker.iml" filepath="$PROJECT_DIR$/ImagePicker.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
+      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
+      <module fileurl="file://$PROJECT_DIR$/awesomeimagepicker/awesomeimagepicker.iml" filepath="$PROJECT_DIR$/awesomeimagepicker/awesomeimagepicker.iml" />
       <module fileurl="file://$PROJECT_DIR$/awesomeimagepicker/awesomeimagepicker.iml" filepath="$PROJECT_DIR$/awesomeimagepicker/awesomeimagepicker.iml" />
     </modules>
   </component>
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/src/main/java/in/myinnos/imagepicker/MainActivity.java b/app/src/main/java/in/myinnos/imagepicker/MainActivity.java
index 6ea10ab..d87d6e1 100644
--- a/app/src/main/java/in/myinnos/imagepicker/MainActivity.java
+++ b/app/src/main/java/in/myinnos/imagepicker/MainActivity.java
@@ -47,6 +47,10 @@ public void onClick(View v) {
                         intent.putExtra(ConstantsCustomGallery.INTENT_EXTRA_LIMIT, LIMIT);
                         startActivityForResult(intent, ConstantsCustomGallery.REQUEST_CODE);
                     }
+                }else{
+                    Intent intent = new Intent(MainActivity.this, AlbumSelectActivity.class);
+                    intent.putExtra(ConstantsCustomGallery.INTENT_EXTRA_LIMIT, LIMIT);
+                    startActivityForResult(intent, ConstantsCustomGallery.REQUEST_CODE);
                 }
             }
         });
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 02d6b64..5c7248b 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -32,5 +32,5 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_marginTop="10dp"
-        android:gravity="left" />
+        android:gravity="start" />
 </RelativeLayout>
diff --git a/awesomeimagepicker/src/main/res/layout/activity_album_select.xml b/awesomeimagepicker/src/main/res/layout/activity_album_select.xml
index 479b07f..59beef4 100644
--- a/awesomeimagepicker/src/main/res/layout/activity_album_select.xml
+++ b/awesomeimagepicker/src/main/res/layout/activity_album_select.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/layout_album_select"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -32,8 +31,8 @@
         android:layout_height="match_parent"
         android:layout_below="@id/toolbar"
         android:paddingBottom="1dp"
-        android:paddingLeft="1dp"
-        android:paddingRight="1dp"
+        android:paddingStart="1dp"
+        android:paddingEnd="1dp"
         android:paddingTop="1dp"
         android:stretchMode="columnWidth" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/awesomeimagepicker/src/main/res/layout/activity_image_select.xml b/awesomeimagepicker/src/main/res/layout/activity_image_select.xml
index 90c616f..004cb9f 100644
--- a/awesomeimagepicker/src/main/res/layout/activity_image_select.xml
+++ b/awesomeimagepicker/src/main/res/layout/activity_image_select.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/layout_image_select"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -32,8 +31,8 @@
         android:layout_height="match_parent"
         android:layout_below="@id/toolbar"
         android:paddingBottom="1dp"
-        android:paddingLeft="1dp"
-        android:paddingRight="1dp"
+        android:paddingStart="1dp"
+        android:paddingEnd="1dp"
         android:paddingTop="1dp"
         android:stretchMode="columnWidth" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/awesomeimagepicker/src/main/res/layout/custom_gallery_toolbar.xml b/awesomeimagepicker/src/main/res/layout/custom_gallery_toolbar.xml
index de69ae2..d6c6114 100644
--- a/awesomeimagepicker/src/main/res/layout/custom_gallery_toolbar.xml
+++ b/awesomeimagepicker/src/main/res/layout/custom_gallery_toolbar.xml
@@ -27,12 +27,14 @@
                 android:id="@+id/tvSelectCount"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
                 android:layout_centerInParent="true"
-                android:layout_marginLeft="45dp"
+                android:layout_marginStart="45dp"
                 android:textColor="#ffffff"
                 android:textSize="16sp"
-                android:visibility="gone" />
+                android:visibility="gone"
+                android:layout_alignParentLeft="true"
+                android:layout_marginLeft="45dp" />
 
             <TextView
                 android:id="@+id/tvProfile"
@@ -47,14 +49,16 @@
                 android:id="@+id/tvAdd"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
+                android:layout_alignParentEnd="true"
                 android:layout_centerInParent="true"
-                android:layout_marginRight="10dp"
+                android:layout_marginEnd="10dp"
                 android:padding="5dp"
                 android:text="@string/add"
                 android:textColor="#ffffff"
                 android:textSize="16sp"
-                android:visibility="gone" />
+                android:visibility="gone"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="10dp" />
 
             <LinearLayout
                 android:id="@+id/liFinish"
@@ -64,10 +68,12 @@
                 <ImageView
                     android:layout_width="26dp"
                     android:layout_height="26dp"
-                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
                     android:layout_gravity="center"
-                    android:layout_marginLeft="16dp"
-                    android:src="@drawable/ic_arrow_left" />
+                    android:layout_marginStart="16dp"
+                    android:src="@drawable/ic_arrow_left"
+                    android:layout_alignParentLeft="true"
+                    android:layout_marginLeft="16dp" />
             </LinearLayout>
         </RelativeLayout>
 
diff --git a/awesomeimagepicker/src/main/res/layout/grid_view_image_select.xml b/awesomeimagepicker/src/main/res/layout/grid_view_image_select.xml
index 3953dcc..b51e2bb 100644
--- a/awesomeimagepicker/src/main/res/layout/grid_view_image_select.xml
+++ b/awesomeimagepicker/src/main/res/layout/grid_view_image_select.xml
@@ -4,8 +4,8 @@
     android:layout_height="match_parent"
     android:foregroundGravity="center"
     android:paddingBottom="1dp"
-    android:paddingLeft="1dp"
-    android:paddingRight="1dp"
+    android:paddingStart="1dp"
+    android:paddingEnd="1dp"
     android:paddingTop="1dp">
 
     <ImageView
diff --git a/awesomeimagepicker/src/main/res/layout/grid_view_item_album_select.xml b/awesomeimagepicker/src/main/res/layout/grid_view_item_album_select.xml
index e84dd65..38d0960 100644
--- a/awesomeimagepicker/src/main/res/layout/grid_view_item_album_select.xml
+++ b/awesomeimagepicker/src/main/res/layout/grid_view_item_album_select.xml
@@ -6,7 +6,9 @@
     android:paddingBottom="1dp"
     android:paddingLeft="1dp"
     android:paddingRight="1dp"
-    android:paddingTop="1dp">
+    android:paddingTop="1dp"
+    android:paddingEnd="1dp"
+    android:paddingStart="1dp">
 
     <ImageView
         android:id="@+id/image_view_album_image"
diff --git a/awesomeimagepicker/src/main/res/values-ar/strings.xml b/awesomeimagepicker/src/main/res/values-ar/strings.xml
new file mode 100644
index 0000000..93d5aee
--- /dev/null
+++ b/awesomeimagepicker/src/main/res/values-ar/strings.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Awesome Image Picker</string>
+    <string name="add">إضافة</string>
+    <string name="album_view">إختر ألبوم الصور</string>
+    <string name="capture_photo">إلتقاط صورة</string>
+    <string name="error_null_cursor">لقد حصل خطأ</string>
+    <string name="image_view">أنقر لختيار صورةأ</string>
+    <string name="limit_exceeded">\"يمكنك إختيار %d صور \"</string>
+    <string name="permission_force">التطبيق يحتاج لذن فتح الملفات لمعاينة الصور . أنقر إعدادات لمنح الأذن .</string>
+    <string name="permission_info">التطبيق يحتاج لذن فتح الملفات لمعاينة الصور . .</string>
+    <string name="permission_ok">حسنا</string>
+    <string name="permission_package">المجلد</string>
+    <string name="permission_settings">الاعدادات</string>
+    <string name="selected">مختارة</string>
+</resources>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 77bc29a..5620364 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0'
+        classpath 'com.android.tools.build:gradle:2.2.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files