diff --git a/app/build.gradle b/app/build.gradle
index 82cde8e..cf9c8cd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,7 +26,6 @@ android {
 dependencies {
     implementation "com.android.support:appcompat-v7:27.1.1"
     implementation "com.android.support:design:27.1.1"
-    implementation "com.android.support:support-v13:27.1.1"
     implementation project(':libary')
     implementation project(':rxjava')
     implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index fd11350..4f168c0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="net.alhazmy13.mediapickerexample" >
-    <uses-permission android:name="android.permission.CAMERA"/>
+    package="net.alhazmy13.mediapickerexample">
+
+    <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <application
@@ -9,8 +10,10 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme" >
-        <activity android:name="net.alhazmy13.mediapickerexample.MainActivity" >
+        android:theme="@style/AppTheme">
+        <activity
+            android:name="net.alhazmy13.mediapickerexample.MainActivity"
+            android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/java/net/alhazmy13/mediapickerexample/ImageFragment.java b/app/src/main/java/net/alhazmy13/mediapickerexample/ImageFragment.java
index 9ed0032..205e3ba 100644
--- a/app/src/main/java/net/alhazmy13/mediapickerexample/ImageFragment.java
+++ b/app/src/main/java/net/alhazmy13/mediapickerexample/ImageFragment.java
@@ -1,8 +1,9 @@
 package net.alhazmy13.mediapickerexample;
 
-import android.app.Fragment;
+import android.content.Intent;
 import android.graphics.BitmapFactory;
 import android.os.Bundle;
+import android.support.v4.app.Fragment;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -11,13 +12,12 @@
 import android.widget.TextView;
 
 import net.alhazmy13.mediapicker.Image.ImagePicker;
-import net.alhazmy13.mediapicker.rxjava.image.ImagePickerHelper;
 
 import java.util.List;
 
 import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.disposables.Disposable;
+
+import static android.app.Activity.RESULT_OK;
 
 
 /**
@@ -38,8 +38,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         View view = inflater.inflate(R.layout.image_layout, container, false);
 
         // Find our View instances
-        imageView = (ImageView) view.findViewById(R.id.iv_image);
-        path = (TextView) view.findViewById(R.id.tv_path);
+        imageView = view.findViewById(R.id.iv_image);
+        path = view.findViewById(R.id.tv_path);
         view.findViewById(R.id.bt_pick).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -51,50 +51,36 @@ public void onClick(View v) {
 
 
     private void pickImage() {
-        Observable<List<String>> x = new ImagePickerHelper(
-                new ImagePicker.Builder(getActivity())
-                        .mode(ImagePicker.Mode.CAMERA_AND_GALLERY)
-                        .allowMultipleImages(true)
-                        .compressLevel(ImagePicker.ComperesLevel.MEDIUM)
-                        .directory(ImagePicker.Directory.DEFAULT)
-                        .extension(ImagePicker.Extension.PNG)
-                        .allowOnlineImages(false)
-                        .scale(600, 600)
-                        .allowMultipleImages(true)
-                        .enableDebuggingMode(true))
-                .getObservable();
-
-        x.subscribe(new Observer<List<String>>() {
-            @Override
-            public void onSubscribe(Disposable d) {
-
-            }
-
-            @Override
-            public void onNext(List<String> imagePath) {
-                Log.d(TAG, "onNext() called with: " + "imagePath = [" + imagePath + "]");
-                mPath = imagePath;
-                loadImage();
-            }
-
-            @Override
-            public void onError(Throwable e) {
-                Log.d(TAG, "onError() called with: " + "e = [" + e + "]");
-                e.printStackTrace();
-            }
-
-            @Override
-            public void onComplete() {
-
-            }
-        });
+        new ImagePicker.Builder(getActivity())
+                .mode(ImagePicker.Mode.CAMERA_AND_GALLERY)
+                .allowMultipleImages(true)
+                .compressLevel(ImagePicker.ComperesLevel.MEDIUM)
+                .directory(ImagePicker.Directory.DEFAULT)
+                .extension(ImagePicker.Extension.PNG)
+                .allowOnlineImages(false)
+                .scale(600, 600)
+                .allowMultipleImages(true)
+                .enableDebuggingMode(true)
+                .build();
+    }
 
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        Log.d(TAG, "onActivityResult() called with: requestCode = [" + requestCode + "], resultCode = [" + resultCode + "], data = [" + data + "]");
+        if (requestCode == ImagePicker.IMAGE_PICKER_REQUEST_CODE && resultCode == RESULT_OK) {
+            mPath = data.getStringArrayListExtra(ImagePicker.EXTRA_IMAGE_PATH);
+            Log.d(TAG, "onActivityResult: ");
+            loadImage();
+        }
     }
 
     private void loadImage() {
         Log.d(TAG, "loadImage: " + mPath.size());
-        path.setText(mPath.get(0));
-        imageView.setImageBitmap(BitmapFactory.decodeFile(mPath.get(0)));
+        if (mPath != null && mPath.size() > 0) {
+            path.setText(mPath.get(0));
+            imageView.setImageBitmap(BitmapFactory.decodeFile(mPath.get(0)));
+        }
     }
 
 }
diff --git a/app/src/main/java/net/alhazmy13/mediapickerexample/MainActivity.java b/app/src/main/java/net/alhazmy13/mediapickerexample/MainActivity.java
index 3ff31e6..e637eea 100644
--- a/app/src/main/java/net/alhazmy13/mediapickerexample/MainActivity.java
+++ b/app/src/main/java/net/alhazmy13/mediapickerexample/MainActivity.java
@@ -1,44 +1,42 @@
 package net.alhazmy13.mediapickerexample;
 
-import android.app.Fragment;
-import android.app.FragmentManager;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.VisibleForTesting;
 import android.support.design.widget.TabLayout;
-import android.support.v13.app.FragmentPagerAdapter;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentStatePagerAdapter;
+import android.support.v4.view.PagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 
 public class MainActivity extends AppCompatActivity {
-    private Fragment videoFragment;
-    private Fragment imageFragment;
+    private Fragment videoFragment = new VideoFragment();
+    private Fragment imageFragment = new ImageFragment();
+    private ViewPager mPager;
+    private PagerAdapter mPagerAdapter;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        PickerAdapter adapter = new PickerAdapter(getFragmentManager());
-        ViewPager viewPager = (ViewPager) findViewById(R.id.pager);
-        viewPager.setAdapter(adapter);
-
-        setSupportActionBar((Toolbar) findViewById(R.id.toolbar));
-        TabLayout tabLayout = (TabLayout) findViewById(R.id.tabs);
-        tabLayout.setupWithViewPager(viewPager);
-        for (int i = 0; i < adapter.getCount(); i++)
-            tabLayout.getTabAt(i).setText(adapter.getTitle(i));
+        mPager = findViewById(R.id.pager);
+        mPagerAdapter = new PickerAdapter(getSupportFragmentManager());
+        mPager.setAdapter(mPagerAdapter);
+        TabLayout tabLayout = findViewById(R.id.tabs);
+        tabLayout.setupWithViewPager(mPager);
+        for (int i = 0; i < mPagerAdapter.getCount(); i++)
+            tabLayout.getTabAt(i).setText(mPagerAdapter.getPageTitle(i));
     }
 
-    private class PickerAdapter extends FragmentPagerAdapter {
+    private class PickerAdapter extends FragmentStatePagerAdapter {
         private static final int NUM_PAGES = 2;
 
 
         PickerAdapter(FragmentManager fm) {
             super(fm);
-            videoFragment = new VideoFragment();
-            imageFragment = new ImageFragment();
         }
 
         @Override
@@ -58,12 +56,12 @@ public Fragment getItem(int position) {
         }
 
         @VisibleForTesting
-        int getTitle(int position) {
+        public String getPageTitle(int position) {
             switch (position) {
                 case 0:
-                    return R.string.tab_title_video;
+                    return getString(R.string.tab_title_video);
                 default:
-                    return R.string.tab_title_image;
+                    return getString(R.string.tab_title_image);
             }
         }
     }
diff --git a/app/src/main/java/net/alhazmy13/mediapickerexample/VideoFragment.java b/app/src/main/java/net/alhazmy13/mediapickerexample/VideoFragment.java
index f3fe546..32005b4 100644
--- a/app/src/main/java/net/alhazmy13/mediapickerexample/VideoFragment.java
+++ b/app/src/main/java/net/alhazmy13/mediapickerexample/VideoFragment.java
@@ -1,9 +1,10 @@
 package net.alhazmy13.mediapickerexample;
 
-import android.app.Fragment;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v4.app.Fragment;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -31,7 +32,7 @@ public class VideoFragment extends Fragment {
 
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.video_layout, container, false);
         init(view);
@@ -41,12 +42,11 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
 
     private void init(View view) {
         // Find our View instances
-        videoView = (VideoView) view.findViewById(R.id.iv_video);
+        videoView = view.findViewById(R.id.iv_video);
         MediaController mediaController = new MediaController(getActivity());
         mediaController.setAnchorView(videoView);
         videoView.setMediaController(mediaController);
-        videoView.start();
-        path = (TextView) view.findViewById(R.id.tv_path);
+        path = view.findViewById(R.id.tv_path);
         view.findViewById(R.id.bt_pick).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -71,14 +71,12 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         Log.d(TAG, "onActivityResult() called with: requestCode = [" + requestCode + "], resultCode = [" + resultCode + "], data = [" + data + "]");
         if (requestCode == VideoPicker.VIDEO_PICKER_REQUEST_CODE && resultCode == RESULT_OK) {
-            mPath = (List<String>) data.getSerializableExtra(VideoPicker.EXTRA_VIDEO_PATH);
-            Log.d(TAG, "onActivityResult: ");
+            mPath = data.getStringArrayListExtra(VideoPicker.EXTRA_VIDEO_PATH);
             loadVideo();
         }
     }
 
     private void loadVideo() {
-        Log.d(TAG, "loadVideo: "+ (mPath == null));
         if (mPath != null && mPath.size() > 0) {
             path.setText(mPath.get(0));
             videoView.setVideoURI(Uri.parse(mPath.get(0)));
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 5cfe331..a1d0a1c 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,31 +1,19 @@
-<android.support.design.widget.CoordinatorLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
-    <android.support.design.widget.AppBarLayout
-        android:layout_height="wrap_content"
+    <android.support.design.widget.TabLayout
+        android:id="@+id/tabs"
         android:layout_width="match_parent"
-        android:theme="@style/ThemeOverlay.AppCompat.Dark">
-
-        <android.support.v7.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_height="?attr/actionBarSize"
-            android:layout_width="match_parent"
-            app:layout_scrollFlags="scroll|enterAlways"/>
-
-        <android.support.design.widget.TabLayout
-            android:id="@+id/tabs"
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent" />
-
-    </android.support.design.widget.AppBarLayout>
+        android:layout_height="wrap_content"
+        android:background="@color/colorPrimary" />
 
     <android.support.v4.view.ViewPager
         android:id="@+id/pager"
-        android:layout_height="match_parent"
         android:layout_width="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/image_layout.xml b/app/src/main/res/layout/image_layout.xml
index 8e63d13..78a2848 100644
--- a/app/src/main/res/layout/image_layout.xml
+++ b/app/src/main/res/layout/image_layout.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
@@ -13,16 +13,18 @@
         <ImageView
             android:id="@+id/iv_image"
             android:layout_width="match_parent"
-            android:layout_height="400dp"/>
+            android:layout_height="400dp" />
+
         <Button
             android:id="@+id/bt_pick"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Pick" />
+
         <TextView
             android:id="@+id/tv_path"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="PATH: ..." />
     </LinearLayout>
-</android.support.v4.widget.NestedScrollView>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/video_layout.xml b/app/src/main/res/layout/video_layout.xml
index a4e8872..7c73a4d 100644
--- a/app/src/main/res/layout/video_layout.xml
+++ b/app/src/main/res/layout/video_layout.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
@@ -13,16 +13,18 @@
         <VideoView
             android:id="@+id/iv_video"
             android:layout_width="match_parent"
-            android:layout_height="400dp"/>
+            android:layout_height="400dp" />
+
         <Button
             android:id="@+id/bt_pick"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Pick" />
+
         <TextView
             android:id="@+id/tv_path"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="PATH: ..." />
     </LinearLayout>
-</android.support.v4.widget.NestedScrollView>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 0eb88fe..7d5f31b 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="AppTheme" parent="@style/Theme.AppCompat.Light.DarkActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
diff --git a/libary/src/main/java/net/alhazmy13/mediapicker/Image/ImageActivity.java b/libary/src/main/java/net/alhazmy13/mediapicker/Image/ImageActivity.java
index 28112da..b820c42 100644
--- a/libary/src/main/java/net/alhazmy13/mediapicker/Image/ImageActivity.java
+++ b/libary/src/main/java/net/alhazmy13/mediapicker/Image/ImageActivity.java
@@ -44,7 +44,6 @@
  */
 public class ImageActivity extends AppCompatActivity {
 
-
     private File destination;
     private Uri mImageUri;
     private ImageConfig mImgConfig;
@@ -74,10 +73,10 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
     @Override
-    protected void onPause() {
+    protected void onStop() {
         if (alertDialog != null)
             alertDialog.dismiss();
-        super.onPause();
+        super.onStop();
     }
 
     private void pickImage() {
@@ -180,6 +179,8 @@ protected void onSaveInstanceState(Bundle outState) {
             outState.putString(ImageTags.Tags.CAMERA_IMAGE_URI, mImageUri.toString());
             outState.putSerializable(ImageTags.Tags.IMG_CONFIG, mImgConfig);
         }
+        outState.putBoolean(ImageTags.Tags.IS_ALERT_SHOWING, alertDialog.isShowing());
+
     }
 
     @Override
@@ -190,6 +191,12 @@ protected void onRestoreInstanceState(Bundle savedInstanceState) {
             destination = new File(mImageUri.getPath());
             mImgConfig = (ImageConfig) savedInstanceState.getSerializable(ImageTags.Tags.IMG_CONFIG);
         }
+        if (savedInstanceState.getBoolean(ImageTags.Tags.IS_ALERT_SHOWING, false)) {
+            if (alertDialog == null)
+                pickImage();
+            else
+                alertDialog.show();
+        }
     }
 
     @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
@@ -252,8 +259,8 @@ private void processMutliPhoto(Intent data) {
     public void processOneImage(Intent data) {
         try {
             Uri selectedImage = data.getData();
-            String rawPath = selectedImage.toString();
-            if (rawPath != null) {
+            if (selectedImage != null) {
+                String rawPath = selectedImage.toString();
                 //For 'Select pic from Google Drive - app Crash' fix
                 if (rawPath.contains("com.google.android.apps.docs.storage")) {
                     String fileTempPath = getCacheDir().getPath();
@@ -290,10 +297,10 @@ private void pickImageWrapper() {
             if (permissionsList.size() > 0) {
                 if (permissionsNeeded.size() > 0) {
                     // Need Rationale
-                    String message = getString(R.string.media_picker_you_need_to_grant_access_to) + permissionsNeeded.get(0);
+                    StringBuilder message = new StringBuilder(getString(R.string.media_picker_you_need_to_grant_access_to) + permissionsNeeded.get(0));
                     for (int i = 1; i < permissionsNeeded.size(); i++)
-                        message = message + ", " + permissionsNeeded.get(i);
-                    showMessageOKCancel(message,
+                        message.append(", ").append(permissionsNeeded.get(i));
+                    showMessageOKCancel(message.toString(),
                             new DialogInterface.OnClickListener() {
                                 @Override
                                 public void onClick(DialogInterface dialog, int which) {
@@ -327,8 +334,7 @@ private boolean addPermission(List<String> permissionsList, String permission) {
         if (ActivityCompat.checkSelfPermission(ImageActivity.this, permission) != PackageManager.PERMISSION_GRANTED) {
             permissionsList.add(permission);
             // Check for Rationale Option
-            if (!ActivityCompat.shouldShowRequestPermissionRationale(ImageActivity.this, permission))
-                return false;
+            return ActivityCompat.shouldShowRequestPermissionRationale(ImageActivity.this, permission);
         }
         return true;
     }
diff --git a/libary/src/main/java/net/alhazmy13/mediapicker/Image/ImageTags.java b/libary/src/main/java/net/alhazmy13/mediapicker/Image/ImageTags.java
index f98516e..7671098 100644
--- a/libary/src/main/java/net/alhazmy13/mediapicker/Image/ImageTags.java
+++ b/libary/src/main/java/net/alhazmy13/mediapicker/Image/ImageTags.java
@@ -17,6 +17,7 @@ public static final class Tags{
         public static final String IMAGE_PICKER_DIR = "/mediapicker/images/";
         public static final String IMG_CONFIG = "IMG_CONFIG";
         public static final String PICK_ERROR = "PICK_ERROR";
+        public static final String IS_ALERT_SHOWING = "IS_ALERT_SHOWING";
     }
 
     public static final class Action{
diff --git a/libary/src/main/res/values/style.xml b/libary/src/main/res/values/style.xml
index 84604a6..9ddc3d8 100644
--- a/libary/src/main/res/values/style.xml
+++ b/libary/src/main/res/values/style.xml
@@ -4,6 +4,7 @@
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:colorBackgroundCacheHint">@null</item>
+        <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowAnimationStyle">@android:style/Animation</item>
     </style>