diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index c3bf4f7..508b3d9 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,7 +5,6 @@
       <GradleProjectSettings>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="1.8" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/app/build.gradle b/app/build.gradle
index 324d086..14fd5f0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    buildToolsVersion "23.0.3"
 /*
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -18,7 +18,7 @@ android {
     }
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
@@ -31,9 +31,6 @@ repositories {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
-
-
-
     compile 'com.google.code.gson:gson:2.6.2'
     compile 'com.squareup.retrofit2:retrofit:2.0.1'
     compile 'com.squareup.retrofit2:converter-gson:2.0.1'
@@ -44,4 +41,6 @@ dependencies {
     compile 'com.android.support:design:23.3.0'
     compile 'com.android.support:cardview-v7:23.3.0'
     compile 'com.facebook.android:facebook-android-sdk:4.11.0'
+    compile files('libs/socialauth-4.4.jar')
+    compile files('libs/socialauth-android-3.2.jar')
 }
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index d12463f..33f1c17 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -15,3 +15,35 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
+-keep public class java.nio.file.* { public *; }
+-dontwarn java.nio.file.**
+
+-keep public class org.codehaus.mojo.animal_sniffer.* { public *; }
+-dontwarn org.codehaus.mojo.animal_sniffer.**
+
+-keep public class org.openid4java.consumer.* { public *; }
+-dontwarn org.openid4java.consumer.**
+
+-keep public class org.openid4java.message.* { public *; }
+-dontwarn org.openid4java.message.**
+
+-keep public class org.openid4java.OpenIDException { public *; }
+-dontwarn org.openid4java.OpenIDException
+
+-keep public class org.openid4java.discovery.Identifier { public *; }
+-dontwarn org.openid4java.discovery.Identifier
+
+-keep public class javax.servlet.http.HttpServletRequest { public *; }
+-dontwarn javax.servlet.http.HttpServletRequest
+
+-keep public class java.lang.invoke.* { public *; }
+-dontwarn java.lang.invoke.**
+
+-keep public class org.openid4java.discovery.DiscoveryInformation { public *; }
+-dontwarn org.openid4java.discovery.DiscoveryInformation
+
+-dontwarn retrofit2.Platform$Java8
+
+
+
+
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index dc7c65f..60dd98a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,7 +14,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <meta-data android:name="com.facebook.sdk.ApplicationId" android:value="@string/facebook_app_id"/>
-        <activity android:name="com.hikapro.backpack.MainActivity">
+        <activity android:name="com.hikapro.backpack.MainActivity" android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/assets/jsons/sharing_photos.json b/app/src/main/assets/jsons/sharing_photos.json
new file mode 100644
index 0000000..eca6ed6
--- /dev/null
+++ b/app/src/main/assets/jsons/sharing_photos.json
@@ -0,0 +1 @@
+[{"id":2,"photo":"http://hikapro.com/system/backpack/sharing_photos/photos/000/000/002/large/thumb_IMG_2899_1024.jpg?1449590757","photo_thumb":"http://hikapro.com/system/backpack/sharing_photos/photos/000/000/002/thumb/thumb_IMG_2899_1024.jpg?1449590757"}]
\ No newline at end of file
diff --git a/app/src/main/assets/oauth_consumer.properties b/app/src/main/assets/oauth_consumer.properties
new file mode 100644
index 0000000..4122420
--- /dev/null
+++ b/app/src/main/assets/oauth_consumer.properties
@@ -0,0 +1,51 @@
+#google
+www.google.com.consumer_key = socialauth.in
+www.google.com.consumer_secret = Mlt6oDI0iIoOiylfiqgnCkrS
+
+#yahoo 
+api.login.yahoo.com.consumer_key = dj0yJmk9Nlpqd0pIMENnb1N4JmQ9WVdrOWJqbEhURXA0TTJVbWNHbzlNVEk0TXpNeE5EYzJNZy0tJnM9Y29uc3VtZXJzZWNyZXQmeD0yOA--
+api.login.yahoo.com.consumer_secret = c04675a9274fb556f9e817b1ad23f0c91c2c0500
+
+#twitter
+twitter.com.consumer_key = RbtJOnWBSf9hLYKiw6R5qa2g4
+twitter.com.consumer_secret = dyd9Kv7ITZhpYL0FpK9ozUNSgjvHM4lDBg7K2domssdc3p6iPv
+
+#facebook
+graph.facebook.com.consumer_key = 297841130364674
+graph.facebook.com.consumer_secret = dc9c59d0c72d4f2533580e80ba4c2a59
+
+#LinkedIn
+api.linkedin.com.consumer_key = bh82t52rdos6
+api.linkedin.com.consumer_secret = zQ1LLrGbhDZ36fH8
+
+#FourSquare
+foursquare.com.consumer_key = VJT0YKBEQAQOMPWZPTGF1V5WOHZQMWNNJEBBQBSDNU3COOMQ
+foursquare.com.consumer_secret = HCVBO1W5MNWIPAOJABI3LILMLTHTPR52RU3P0GJ3TYTYVBWU
+
+#MySpace
+api.myspace.com.consumer_key = 67cc035edf0f4387a2488a0fb0b490ab
+api.myspace.com.consumer_secret = 80b58c4873ac4d2e8edb6257d85c79e71692c39d5f0f4b3a90acc1dffaf58cda
+
+#Runkeeper
+runkeeper.com.consumer_key=b1320c16082d48e2a7a94f5bfa2ce58b
+runkeeper.com.consumer_secret=7cbf7688519d4e8cb5343a4c939ac1a6
+
+#Yammer
+www.yammer.com.consumer_key=wLR96V3qBPHPcYLkrLvgg
+www.yammer.com.consumer_secret=4hhUOP6tYiHNOUz6dMhWBVHgcsFq3MUZpI8IkA
+
+#Salesforce
+login.salesforce.com.consumer_key = 3MVG9Y6d_Btp4xp4yFMR0tPSndvoapjV0sIbnVSNLg_l1vkeDgLelQhr6iYwlTgCL98VSBjU_XvQZYGfSmW_D
+login.salesforce.com.consumer_secret = 4962202263932085201
+
+#Google Plus
+googleapis.com.consumer_key=505071246058-6i3hf3rhd1s0qst492e23g9sq5t9koiv.apps.googleusercontent.com
+googleapis.com.consumer_secret=xrNQTx9ELsxmyUBfh35ntpfR
+
+#Flickr
+www.flickr.com.consumer_key = c519f64dbddc50f3e25e8cc73744602b
+www.flickr.com.consumer_secret = bf1a181c42bef4ea
+
+#Instagram
+api.instagram.com.consumer_key = c28ba7d08da64462a0db848c366ea43e
+api.instagram.com.consumer_secret = c5063d4e5f1248a19d2fa3e8bf3d8d6e
\ No newline at end of file
diff --git a/app/src/main/java/com/hikapro/backpack/MainActivity.java b/app/src/main/java/com/hikapro/backpack/MainActivity.java
index a30de4c..3077877 100644
--- a/app/src/main/java/com/hikapro/backpack/MainActivity.java
+++ b/app/src/main/java/com/hikapro/backpack/MainActivity.java
@@ -40,9 +40,6 @@ public class MainActivity extends Activity implements View.ActivityCallback {
     private final StateMaintainer stateMaintainer =
             new StateMaintainer(getFragmentManager(), MainActivity.class.getName());
 
-    // life cycle -->
-
-
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         boolean ret;
@@ -179,8 +176,6 @@ public class MainActivity extends Activity implements View.ActivityCallback {
         super.onDestroy();
         Log.i("onDestroy", "Activity");
     }
-    // life cycle <--
-
 
     @Override
     public void startSetListFragment() {
diff --git a/app/src/main/java/com/hikapro/backpack/StateMaintainer.java b/app/src/main/java/com/hikapro/backpack/StateMaintainer.java
index c830f36..4e626d6 100644
--- a/app/src/main/java/com/hikapro/backpack/StateMaintainer.java
+++ b/app/src/main/java/com/hikapro/backpack/StateMaintainer.java
@@ -13,7 +13,6 @@ import java.util.HashMap;
  */
 public class StateMaintainer {
 
-    protected final String TAG = getClass().getSimpleName();
     private final String stateMaintainerTag;
     private final WeakReference<FragmentManager> fragmentManager;
     private StateMngFragment stateMngFragment;
@@ -72,7 +71,6 @@ public class StateMaintainer {
         @Override
         public void onCreate(Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);
-            // Grants that the fragment will be preserved
             setRetainInstance(true);
         }
 
@@ -89,7 +87,6 @@ public class StateMaintainer {
 
         @SuppressWarnings("unchecked")
         public <T> T get(String key) {
-            Log.i(this.toString(), String.format("Get object %s Total count %d", key, data.size()));
             return (T) data.get(key);
         }
     }
diff --git a/app/src/main/java/com/hikapro/backpack/model/AddModel.java b/app/src/main/java/com/hikapro/backpack/model/AddModel.java
index 48d61ce..5422cab 100644
--- a/app/src/main/java/com/hikapro/backpack/model/AddModel.java
+++ b/app/src/main/java/com/hikapro/backpack/model/AddModel.java
@@ -29,7 +29,6 @@ public class AddModel implements Model.Add {
         this.filteredItems      = new ArrayList<>(256);
         this.categoriesCache    = new ArrayList<>(20);
         this.dao = DAO.getInstance();
-        dao.registerObserver(this);
     }
 
     @Override
@@ -72,11 +71,13 @@ public class AddModel implements Model.Add {
         if ( !isConfigurationChanging ) {
             presenter = null;
         }
+        dao.unregisterObserver(this);
     }
 
     @Override
     public void executeQuery() {
         Message command;
+        dao.registerObserver(this);
         if (categoriesCache.isEmpty()) {
             command = Message.obtain();
             command.what = Command.ITEM_GET_CATEGORIES;
diff --git a/app/src/main/java/com/hikapro/backpack/model/Api.java b/app/src/main/java/com/hikapro/backpack/model/Api.java
index 218f39d..7f9d1b8 100644
--- a/app/src/main/java/com/hikapro/backpack/model/Api.java
+++ b/app/src/main/java/com/hikapro/backpack/model/Api.java
@@ -2,10 +2,12 @@ package com.hikapro.backpack.model;
 
 import java.util.List;
 
+import com.hikapro.backpack.model.dao.Db;
 import com.hikapro.backpack.model.entities.Category;
 import com.hikapro.backpack.model.entities.Item;
 import com.hikapro.backpack.model.entities.Set;
 
+import com.hikapro.backpack.model.entities.SharingPicture;
 import com.hikapro.backpack.model.entities.Timestamp;
 import com.hikapro.backpack.model.entities.Updates;
 import retrofit2.Call;
@@ -32,5 +34,6 @@ public interface Api {
     @GET("api/v1/backpack/updates/all")
     Call<Updates> getUpdates(@Query("timestamp") long timestamp);
 
-
+    @GET("api/v1/backpack/sharing_photos")
+    Call<List<SharingPicture>> getSharingPicture();
 }
diff --git a/app/src/main/java/com/hikapro/backpack/model/ItemModel.java b/app/src/main/java/com/hikapro/backpack/model/ItemModel.java
index b437c46..ae066cb 100644
--- a/app/src/main/java/com/hikapro/backpack/model/ItemModel.java
+++ b/app/src/main/java/com/hikapro/backpack/model/ItemModel.java
@@ -10,12 +10,14 @@ import java.util.Hashtable;
 import java.util.List;
 
 import com.hikapro.backpack.App;
+import com.hikapro.backpack.R;
 import com.hikapro.backpack.model.dao.Command;
 import com.hikapro.backpack.model.dao.DAO;
 import com.hikapro.backpack.model.dao.Event;
 import com.hikapro.backpack.model.entities.Category;
 import com.hikapro.backpack.model.entities.Item;
 import com.hikapro.backpack.presenter.Presenter;
+import com.hikapro.backpack.presenter.adapters.helper.AppRater;
 
 /**
  * Created by tariel on 22/04/16.
@@ -32,6 +34,7 @@ public class ItemModel implements Model.Item {
     protected List<Item>        itemsCache;
 
     protected Hashtable<Category, List<Item>> items;
+    protected int lastVisiblePosition;
 
     public ItemModel() {
         this.categoriesCache    = new Hashtable<>(20, 0.9f);
@@ -126,7 +129,11 @@ public class ItemModel implements Model.Item {
                 break;
             case Event.SET_RESTORE_COMPLETED:
                 executeQuery();
-                Toast.makeText(App.getAppContext(), "Restore completed", Toast.LENGTH_SHORT).show();
+                Toast.makeText(App.getAppContext(), R.string.restore_completed, Toast.LENGTH_SHORT).show();
+                break;
+            case Event.NEED_TO_RATE_NOW:
+                if (presenter != null)
+                    presenter.showRateDialog();
                 break;
         }
     }
@@ -141,7 +148,7 @@ public class ItemModel implements Model.Item {
         command.arg1 = currentSet;
         dao.executeCommand(command);
 
-        if (categoriesCache.isEmpty()) {
+        if (categoriesCache == null || categoriesCache.isEmpty()) {
             command = Message.obtain();
             command.what = Command.ITEM_GET_CATEGORIES;
             dao.executeCommand(command);
@@ -157,8 +164,6 @@ public class ItemModel implements Model.Item {
         dao.executeCommand(command);
     }
 
-    // categories -->
-
     @Override
     public Category getCategoryByPosition(int position) {
         Category ret = null;
@@ -166,21 +171,15 @@ public class ItemModel implements Model.Item {
         return ret;
 
     }
-    // categories <--
 
-    // items -->
-
-    @Override
-    public Item findItem(int id) {
-        Item item = null;
-        for (Item i : itemsCache) {
-            if (i.getId() == id) {
-                item = i;
-                break;
-            }
-        }
-        return item;
+    public int getLastVisiblePosition() {
+        return lastVisiblePosition < 0 ? 0 : lastVisiblePosition;
     }
+
+    public void setLastVisiblePosition(int lastVisiblePosition) {
+        this.lastVisiblePosition = lastVisiblePosition;
+    }
+
     @Override
     public Item getItemByPosition(int position) {
         Item ret = null;
@@ -217,7 +216,7 @@ public class ItemModel implements Model.Item {
 
     @Override
     public int getItemsCount() {
-        return  itemsCache.size();
+        return  itemsCache == null ? 0 : itemsCache.size();
     }
 
     @Override
@@ -229,9 +228,6 @@ public class ItemModel implements Model.Item {
     public int getPackedQty() {
         return packedQty;
     }
-    // items <--
-
-    // events -->
 
     @Override
     public void notifyDataSetChanged() {
@@ -243,12 +239,11 @@ public class ItemModel implements Model.Item {
     public void onDestroy(boolean isConfigurationChanging) {
         if ( !isConfigurationChanging ) {
             presenter = null;
+            categoriesCache = null;
+            itemsCache = null;
         }
         dao.unregisterObserver(this);
     }
-    // events <--
-
-    // process -->
 
     @Override
     public void pendingRemove(Item item) {
@@ -258,7 +253,6 @@ public class ItemModel implements Model.Item {
             command.arg1 = currentSet;
             command.arg2 = item.getId();
             dao.executeCommand(command);
-            //itemsCache.remove(item);// TODO  check nn
         }
     }
 
@@ -270,7 +264,6 @@ public class ItemModel implements Model.Item {
             command.arg1 = currentSet;
             command.arg2 = item.getId();
             dao.executeCommand(command);
-            //itemsCache.remove(item);
         }
     }
 
@@ -282,7 +275,6 @@ public class ItemModel implements Model.Item {
             command.arg1 = currentSet;
             command.arg2 = item.getId();
             dao.executeCommand(command);
-            //itemsCache.remove(item);
         }
     }
     @Override
@@ -320,17 +312,12 @@ public class ItemModel implements Model.Item {
         dao.executeCommand(command);
     }
 
-    // process <--
-
-    // other -->
-
 
     @Override
     public void setPresenter(Presenter.ItemList presenter) {
         this.presenter      = presenter;
         this.currentSet     = presenter.getCurrentSet().getId();
         this.currentSetActiveItemsQty = presenter.getCurrentSet().getActiveQty();
-        //dao.registerObserver(this);
     }
 
     @Override
@@ -338,5 +325,4 @@ public class ItemModel implements Model.Item {
         return presenter;
     }
 
-    // other <--
 }
diff --git a/app/src/main/java/com/hikapro/backpack/model/Model.java b/app/src/main/java/com/hikapro/backpack/model/Model.java
index c61dcaf..162bc99 100644
--- a/app/src/main/java/com/hikapro/backpack/model/Model.java
+++ b/app/src/main/java/com/hikapro/backpack/model/Model.java
@@ -27,16 +27,17 @@ public interface Model {
         int getSetsCount();
         void setPresenter(Presenter.SetList presenter);
         Presenter.SetList getPresenter();
-        //GLM
-        List<com.hikapro.backpack.model.entities.Set> getSets(); // tag renamed
+        int getLastVisiblePosition();
+        void setLastVisiblePosition(int position);
+        List<com.hikapro.backpack.model.entities.Set> getSets();
 
         void setsReorderNotify();
     }
 
     interface Item extends Base {
         void filter(String query);
-        int getHeaderId(int position);//TODO review
-        int getItemId(int position);//TODO review
+        int getHeaderId(int position);
+        int getItemId(int position);
         // leave at home
         void pendingRemove(com.hikapro.backpack.model.entities.Item item);
         void pendingRemoveCancel(com.hikapro.backpack.model.entities.Item item);
@@ -45,7 +46,9 @@ public interface Model {
         int getActiveItemsCount();
         int getPackedQty();
 
-        com.hikapro.backpack.model.entities.Item findItem(int id);
+        int getLastVisiblePosition();
+        void setLastVisiblePosition(int position);
+
         com.hikapro.backpack.model.entities.Item getItemByPosition(int position);
 
         com.hikapro.backpack.model.entities.Category getCategoryByPosition(int position);
@@ -74,6 +77,7 @@ public interface Model {
     interface Share extends Base {
         void setPresenter(Presenter.Share presenter);
         Presenter.Share getPresenter();
+        Bitmap[] getSharingPics();
 
     }
 
diff --git a/app/src/main/java/com/hikapro/backpack/model/NetworkUtil.java b/app/src/main/java/com/hikapro/backpack/model/NetworkUtil.java
index 10d2728..23c76c2 100644
--- a/app/src/main/java/com/hikapro/backpack/model/NetworkUtil.java
+++ b/app/src/main/java/com/hikapro/backpack/model/NetworkUtil.java
@@ -1,6 +1,8 @@
 package com.hikapro.backpack.model;
 
+import android.Manifest;
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 
@@ -40,4 +42,16 @@ public class NetworkUtil {
         return  activeNetwork.getType();
         //ConnectivityManager.TYPE_WIFI;
     }
+
+
+    public static boolean isNetworkAvailable(Context context) {
+        if (context.checkCallingOrSelfPermission(Manifest.permission.INTERNET) != PackageManager.PERMISSION_GRANTED) {
+            return false;
+        }
+
+        ConnectivityManager connMgr = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+
+        NetworkInfo netInfo = connMgr.getActiveNetworkInfo();
+        return netInfo != null && netInfo.isConnected();
+    }
 }
diff --git a/app/src/main/java/com/hikapro/backpack/model/PackedModel.java b/app/src/main/java/com/hikapro/backpack/model/PackedModel.java
index 62f8beb..7cd6259 100644
--- a/app/src/main/java/com/hikapro/backpack/model/PackedModel.java
+++ b/app/src/main/java/com/hikapro/backpack/model/PackedModel.java
@@ -8,10 +8,12 @@ import java.util.Hashtable;
 import java.util.List;
 
 import com.hikapro.backpack.App;
+import com.hikapro.backpack.R;
 import com.hikapro.backpack.model.dao.Command;
 import com.hikapro.backpack.model.dao.Event;
 import com.hikapro.backpack.model.entities.Category;
 import com.hikapro.backpack.model.entities.Item;
+import com.hikapro.backpack.presenter.adapters.helper.AppRater;
 
 /**
  * Created by tariel on 12/05/16.
@@ -26,7 +28,7 @@ public class PackedModel extends ItemModel {
     public void executeQuery() {
         Message command;
         dao.registerObserver(this);
-        if (categoriesCache.isEmpty()) {
+        if (categoriesCache == null || categoriesCache.isEmpty()) {
             command = Message.obtain();
             command.what = Command.ITEM_GET_CATEGORIES;
             dao.executeCommand(command);
@@ -128,7 +130,11 @@ public class PackedModel extends ItemModel {
                 break;
             case Event.SET_RESTORE_COMPLETED:
                 executeQuery();
-                Toast.makeText(App.getAppContext(), "Restore completed", Toast.LENGTH_SHORT).show();
+                Toast.makeText(App.getAppContext(), R.string.restore_completed, Toast.LENGTH_SHORT).show();
+                break;
+            case Event.NEED_TO_RATE_NOW:
+                if (presenter != null)
+                    presenter.showRateDialog();
                 break;
         }
     }
diff --git a/app/src/main/java/com/hikapro/backpack/model/SetModel.java b/app/src/main/java/com/hikapro/backpack/model/SetModel.java
index 53f62df..223c615 100644
--- a/app/src/main/java/com/hikapro/backpack/model/SetModel.java
+++ b/app/src/main/java/com/hikapro/backpack/model/SetModel.java
@@ -23,15 +23,21 @@ public class SetModel implements Model.Set {
     private List<com.hikapro.backpack.model.entities.Set> cache;
     private Presenter.SetList   presenter;
     private DAO dao;
+    private int lastVisiblePosition;
 
 
     public SetModel() {
         this.cache = new ArrayList<>();
         this.dao   = DAO.getInstance();
-        dao.registerObserver(this);
     }
 
-    //region sets
+    public int getLastVisiblePosition() {
+        return lastVisiblePosition < 0 ? 0 : lastVisiblePosition;
+    }
+
+    public void setLastVisiblePosition(int lastVisiblePosition) {
+        this.lastVisiblePosition = lastVisiblePosition;
+    }
 
     @Override
     public com.hikapro.backpack.model.entities.Set getSetByPosition(int position) {
@@ -54,28 +60,21 @@ public class SetModel implements Model.Set {
         return cache.size();
     }
 
-    //endregion
-
-    //region events
-
     @Override
     public void onDestroy(boolean isConfigurationChanging) {
         if ( !isConfigurationChanging ) {
             presenter = null;
         }
+        dao.unregisterObserver(this);
     }
     @Override
     public void notifyDataSetChanged() {
         presenter.notifyDataSetChanged();
     }
 
-
-    //endregion
-
-    //region process
-
     @Override
     public void executeQuery() {
+        dao.registerObserver(this);
         if (presenter != null)
             presenter.startProgress();
         Message command = Message.obtain();
@@ -136,9 +135,6 @@ public class SetModel implements Model.Set {
         command.obj = cache;
         dao.executeCommand(command);
     }
-    //endregion
-
-    //region other
 
     @Override
     public void setPresenter(Presenter.SetList presenter) {
@@ -150,11 +146,6 @@ public class SetModel implements Model.Set {
         return presenter;
     }
 
-    //endregion
-
-
-    //GLM
-
     @Override
     public List<com.hikapro.backpack.model.entities.Set> getSets()
     {
diff --git a/app/src/main/java/com/hikapro/backpack/model/ShareModel.java b/app/src/main/java/com/hikapro/backpack/model/ShareModel.java
index 4ba48fd..59634f5 100644
--- a/app/src/main/java/com/hikapro/backpack/model/ShareModel.java
+++ b/app/src/main/java/com/hikapro/backpack/model/ShareModel.java
@@ -1,10 +1,22 @@
 package com.hikapro.backpack.model;
 
+import android.graphics.Bitmap;
 import android.os.Message;
+import android.widget.Toast;
 
+import com.hikapro.backpack.App;
+import com.hikapro.backpack.R;
+import com.hikapro.backpack.model.dao.Command;
 import com.hikapro.backpack.model.dao.DAO;
+import com.hikapro.backpack.model.dao.Event;
+import com.hikapro.backpack.model.entities.Category;
+import com.hikapro.backpack.model.entities.Item;
 import com.hikapro.backpack.presenter.Presenter;
 
+import java.util.Collections;
+import java.util.Hashtable;
+import java.util.List;
+
 /**
  * Created by tariel on 16/05/16.
  */
@@ -12,30 +24,56 @@ public class ShareModel implements Model.Share {
 
     private Presenter.Share   presenter;
     private DAO dao;
+    private Bitmap[] picCache;
 
     public ShareModel() {
         this.dao   = DAO.getInstance();
-        dao.registerObserver(this);
+
     }
 
     @Override
     public void onDestroy(boolean isConfigurationChanging) {
-
+        if ( !isConfigurationChanging ) {
+            presenter = null;
+        }
+        dao.unregisterObserver(this);
     }
 
     @Override
     public void executeQuery() {
-
+        if (picCache == null) {
+            Message command;
+            dao.registerObserver(this);
+            command = Message.obtain();
+            command.what = Command.SHARING_GET_PIC;
+            dao.executeCommand(command);
+        } else
+            notifyDataSetChanged();
     }
 
     @Override
     public void notifyDataSetChanged() {
-
+        if (presenter != null)
+            presenter.notifyDataSetChanged();
     }
 
     @Override
     public void onEvent(Message event) {
 
+        switch (event.what) {
+            case Event.SHARING_GET_PIC_ERROR:
+                if (!NetworkUtil.isInternetAvailable()) {
+                    Toast.makeText(App.getAppContext(), R.string.no_connection, Toast.LENGTH_SHORT).show();
+                }
+                notifyDataSetChanged();
+                break;
+
+            case Event.SHARING_PIC_LOADED:
+                picCache = (Bitmap[]) event.obj;
+                notifyDataSetChanged();
+                break;
+        }
+
     }
 
     @Override
@@ -47,4 +85,8 @@ public class ShareModel implements Model.Share {
     public Presenter.Share getPresenter() {
         return presenter;
     }
+
+    public Bitmap[] getSharingPics() {
+        return picCache;
+    }
 }
diff --git a/app/src/main/java/com/hikapro/backpack/model/dao/Command.java b/app/src/main/java/com/hikapro/backpack/model/dao/Command.java
index 71ee94a..f094b71 100644
--- a/app/src/main/java/com/hikapro/backpack/model/dao/Command.java
+++ b/app/src/main/java/com/hikapro/backpack/model/dao/Command.java
@@ -5,11 +5,6 @@ package com.hikapro.backpack.model.dao;
  */
 public interface Command {
 
-    int SET_SCOPE_END           = 0x77;
-    int ITEM_SCOPE_END          = 0x8B;
-    int MY_LIST_SCOPE_END       = 0x9F;
-
-
     int SET_GET_ALL             = 0x64;
     int SET_REORDER             = 0x65;
     int SET_GET_ITEMS           = 0x66;
@@ -32,15 +27,10 @@ public interface Command {
     int ITEM_REMOVAL_CANCEL     = 0x80;
     int ITEM_READ               = 0x81;
 
-    int MY_LIST_POST            = 0x8C;
-    int MY_LIST_ITEM_ADD        = 0x8D;
-    int MY_LIST_ITEM_DELETE     = 0x8E;
-    int MY_LIST_CLEAR           = 0x8F;
+    int SHARING_GET_PIC         = 0x8C;
 
     int SYNC                    = 0xA0;
     int SYNC_IF_NOT_EXISTS      = 0xA1;
     int SYNC_READ_FROM_FILE     = 0xA2;
 
-    int TEST                    = 0xC8;
-
 }
diff --git a/app/src/main/java/com/hikapro/backpack/model/dao/DAO.java b/app/src/main/java/com/hikapro/backpack/model/dao/DAO.java
index 3eb79c0..94d15bc 100644
--- a/app/src/main/java/com/hikapro/backpack/model/dao/DAO.java
+++ b/app/src/main/java/com/hikapro/backpack/model/dao/DAO.java
@@ -32,6 +32,7 @@ import java.util.concurrent.TimeUnit;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.hikapro.backpack.App;
+import com.hikapro.backpack.R;
 import com.hikapro.backpack.model.Api;
 import com.hikapro.backpack.model.Model;
 import com.hikapro.backpack.model.NetworkUtil;
@@ -40,8 +41,10 @@ import com.hikapro.backpack.model.SetModel;
 import com.hikapro.backpack.model.entities.Category;
 import com.hikapro.backpack.model.entities.Item;
 import com.hikapro.backpack.model.entities.Set;
+import com.hikapro.backpack.model.entities.SharingPicture;
 import com.hikapro.backpack.model.entities.Timestamp;
 import com.hikapro.backpack.model.entities.UpdateLog;
+import com.hikapro.backpack.presenter.adapters.helper.AppRater;
 
 import retrofit2.Response;
 
@@ -55,15 +58,12 @@ public class DAO {
 
     private static final int KEEP_ALIVE_TIME = 1;
     private static final TimeUnit KEEP_ALIVE_TIME_UNIT = TimeUnit.SECONDS;
-
-    private static final int MY_LIST_ID = 15;
     //endregion
 
     private static DAO instance;
 
     private final ThreadPoolExecutor threadPool;
     private final Handler   handler;
-    private SetModel        setModel;
     private final Api       api;
     private Context         context;
     private DbHelper        helper;
@@ -278,16 +278,10 @@ public class DAO {
                     threadPool.execute(itemTask);
                     break;
 
-                case Command.MY_LIST_ITEM_ADD :
-                    break;
-
-                case Command.MY_LIST_ITEM_DELETE :
-                    break;
-
-                case Command.MY_LIST_POST :
-                    break;
-
-                case Command.MY_LIST_CLEAR :
+                case Command.SHARING_GET_PIC:
+                    imageProviderTask = new ImageProviderTask(Command.SHARING_GET_PIC,
+                            Process.THREAD_PRIORITY_MORE_FAVORABLE);
+                    threadPool.execute(imageProviderTask);
                     break;
 
                 case Command.SYNC:
@@ -329,6 +323,26 @@ public class DAO {
                 values = Db.LogTable.toContentValues(timestamp);
                 db.insert(Db.LogTable.TABLE_NAME, null, values);
                 db.setTransactionSuccessful();
+            } catch (Exception ex) {
+                Log.e("Insert Timestamp", ex.getMessage());
+            } finally {
+                db.endTransaction();
+                db.close();
+            }
+        }
+    }
+
+    private void insertSharingPic(SharingPicture sharingPicture) {
+        if (sharingPicture != null) {
+            ContentValues values;
+            SQLiteDatabase db = getWriteDB();
+            try {
+                db.beginTransaction();
+                values = Db.SharingPicsTable.toContentValues(sharingPicture);
+                db.insert(Db.SharingPicsTable.TABLE_NAME, null, values);
+                db.setTransactionSuccessful();
+            } catch (Exception ex) {
+                Log.e("Inserting sharing photo", ex.getMessage());
             } finally {
                 db.endTransaction();
                 db.close();
@@ -347,6 +361,8 @@ public class DAO {
                     db.insert(Db.ItemsTable.TABLE_NAME, null, values);
                 }
                 db.setTransactionSuccessful();
+            } catch (Exception ex) {
+                Log.e("Insert Items", ex.getMessage());
             } finally {
                 db.endTransaction();
                 db.close();
@@ -390,6 +406,8 @@ public class DAO {
                 } else {
                     ret = item.getId();
                 }
+            } catch (Exception ex) {
+                Log.e("Insert Item", ex.getMessage());
             } finally {
                 if (cursor != null)
                     cursor.close();
@@ -414,6 +432,8 @@ public class DAO {
                     db.insert(Db.CategoriesTable.TABLE_NAME, null, values);
                 }
                 db.setTransactionSuccessful();
+            } catch (Exception ex) {
+                Log.e("Insert Categories", ex.getMessage());
             } finally {
                 db.endTransaction();
                 db.close();
@@ -436,6 +456,8 @@ public class DAO {
                     ++i;
                 }
                 db.setTransactionSuccessful();
+            } catch (Exception ex) {
+                Log.e("Insert Sets", ex.getMessage());
             } finally {
                 db.endTransaction();
                 db.close();
@@ -455,6 +477,8 @@ public class DAO {
                         db.insert(Db.SetItemsTable.TABLE_NAME, null, values);
                     }
                     db.setTransactionSuccessful();
+                } catch (Exception ex) {
+                    Log.e("Insert Set Items", ex.getMessage());
                 } finally {
                     db.endTransaction();
                 }
@@ -471,6 +495,8 @@ public class DAO {
             values = Db.SetItemsTable.toContentValues(setId, itemId, userDefined);
             ret = db.insert(Db.SetItemsTable.TABLE_NAME, null, values);
             db.setTransactionSuccessful();
+        } catch (Exception ex) {
+            Log.e("Insert Set Item", ex.getMessage());
         } finally {
             db.endTransaction();
             db.close();
@@ -501,6 +527,30 @@ public class DAO {
             cursor = db.rawQuery(q,null);
             if (cursor.moveToNext())
                 ret = Db.LogTable.parseCursor(cursor);
+        } catch (Exception ex) {
+            Log.e("Update Log", ex.getMessage());
+        } finally {
+            if (cursor != null)
+                cursor.close();
+            if (db != null)
+                db.close();
+        }
+        return ret;
+    }
+
+    private SharingPicture readLastSharingPic() {
+        SharingPicture ret = null;
+        SQLiteDatabase db = null;
+        Cursor cursor = null;
+        try {
+            db = getReadDB();
+            String q = String.format("SELECT * FROM %s ORDER BY %s DESC LIMIT 1",
+                    Db.SharingPicsTable.TABLE_NAME, Db.SharingPicsTable.COLUMN_ID);
+            cursor = db.rawQuery(q,null);
+            if (cursor.moveToNext())
+                ret = Db.SharingPicsTable.parseCursor(cursor);
+        } catch (Exception e) {
+            Log.e("Reading sharing pic", e.getMessage());
         } finally {
             if (cursor != null)
                 cursor.close();
@@ -523,7 +573,7 @@ public class DAO {
                 ret = Db.ItemsTable.parseCursor(cursor);
             }
         } catch (Exception e) {
-        //TODO write to log here
+            Log.e("Find item", e.getMessage());
         } finally {
             if (cursor != null)
                 cursor.close();
@@ -564,12 +614,8 @@ public class DAO {
             if (cursor.moveToNext()) {
                 ret = Db.ItemsTable.parseCursor(cursor);
             }
-        } catch (SQLiteException e) {
-            //TODO write to log here
-
         } catch (Exception e) {
-
-            //TODO write to log here
+            Log.e("Read item", e.getMessage());
         } finally {
             if (cursor != null)
                 cursor.close();
@@ -610,12 +656,8 @@ public class DAO {
             if (cursor.moveToNext()) {
                 ret = Db.ItemsTable.parseCursor(cursor);
             }
-        } catch (SQLiteException e) {
-            //TODO write to log here
-
         } catch (Exception e) {
-
-            //TODO write to log here
+            Log.e("Read item", e.getMessage());
         } finally {
             if (cursor != null)
                 cursor.close();
@@ -659,16 +701,10 @@ public class DAO {
             cursor = db.rawQuery(query, new String[]{String.valueOf(setId)});
             while (cursor.moveToNext()) {
                 item = Db.ItemsTable.parseCursor(cursor);
-//                if (!packed && item.isPendingRemoval())
-//                    continue;
                 ret.add(item);
             }
-        } catch (SQLiteException e) {
-            //TODO write to log here
-            ret = null;
-
         } catch (Exception e) {
-            //TODO write to log here
+            Log.e("Read items", e.getMessage());
             ret = null;
         } finally {
             if (cursor != null)
@@ -679,37 +715,6 @@ public class DAO {
         return ret;
     }
 
-    private List<Item> readItemsLike(String like) {
-        List<Item> ret = new ArrayList<>(256);
-        Cursor cursor = null;
-        SQLiteDatabase db = null;
-        Item item;
-        String query = String.format("SELECT * FROM %s WHERE %s LIKE %s",
-                Db.ItemsTable.TABLE_NAME,
-                Db.ItemsTable.COLUMN_NAME,
-                '\''+like+'%'+'\'');
-        try {
-            db = getReadDB();
-            cursor = db.rawQuery(query, null);
-            while (cursor.moveToNext()) {
-                item = Db.ItemsTable.parseCursor(cursor);
-                ret.add(item);
-            }
-        } catch (SQLiteException e) {
-            e.toString();
-            //TODO write to log here
-
-        } catch (Exception e) {
-            //TODO write to log here
-        } finally {
-            if (cursor != null)
-                cursor.close();
-            if (db != null)
-                db.close();
-        }
-        return ret;
-    }
-
     private List<Item> readItemsLike(String like, int setId, boolean packed) {
         List<Item> ret = new ArrayList<>(256);
         Cursor cursor = null;
@@ -746,15 +751,10 @@ public class DAO {
             cursor = db.rawQuery(query, new String[]{String.valueOf(setId)});
             while (cursor.moveToNext()) {
                 item = Db.ItemsTable.parseCursor(cursor);
-//                if (!packed && item.isPendingRemoval())
-//                    continue;
                 ret.add(item);
             }
-        } catch (SQLiteException e) {
-            //TODO write to log here
-            ret = null;
         } catch (Exception e) {
-            //TODO write to log here
+            Log.e("Read items like", e.getMessage());
             ret = null;
         } finally {
             if (cursor != null)
@@ -792,11 +792,8 @@ public class DAO {
                     item.InList = true;
                 ret.add(item);
             }
-        } catch (SQLiteException e) {
-            e.toString();
-            //TODO write to log here
         } catch (Exception e) {
-            //TODO write to log here
+            Log.e("Read items like", e.getMessage());
         } finally {
             if (cursor != null)
                 cursor.close();
@@ -823,11 +820,8 @@ public class DAO {
                 category = Db.CategoriesTable.parseCursor(cursor);
                 ret.put(category.getId(), category);
             }
-        } catch (SQLiteException e) {
-            //TODO write to log here
-
         } catch (Exception e) {
-            //TODO write to log here
+            Log.e("Read categories", e.getMessage());
         } finally {
             if (cursor != null)
                 cursor.close();
@@ -861,6 +855,8 @@ public class DAO {
             cursor = db.rawQuery(query, null);
             if (cursor.moveToNext())
                 ret = Db.SetsTable.parseCursor(cursor);
+        } catch (Exception e) {
+            Log.e("Read set", e.getMessage());
         } finally {
             if (cursor != null)
                 cursor.close();
@@ -884,11 +880,8 @@ public class DAO {
                 ret.add(set);
             }
             Collections.sort(ret);
-        } catch (SQLiteException e) {
-            //TODO write to log here
-
         } catch (Exception e) {
-            //TODO write to log here
+            Log.e("Read sets", e.getMessage());
         } finally {
             if (cursor != null)
                 cursor.close();
@@ -911,11 +904,37 @@ public class DAO {
             ret = db.update(Db.ItemsTable.TABLE_NAME, values, "_id = ?",
                     new String[]{String.valueOf(id)});
             db.setTransactionSuccessful();
-        } catch (SQLiteException e) {
-            //TODO write to log here
-
         } catch (Exception e) {
-            //TODO write to log here
+            Log.e("Update local pic", e.getMessage());
+        } finally {
+            if (db != null) {
+                db.endTransaction();
+                db.close();
+            }
+        }
+        return ret;
+    }
+
+    private int updateSharingPicLocal(int id, String picPath, String picThumbPath) {
+        int ret = 0;
+        SQLiteDatabase db = null;
+        ContentValues values;
+        if (picPath == null && picThumbPath == null)
+            return ret;
+        try {
+            db = getWriteDB();
+            db.beginTransaction();
+            values = new ContentValues();
+            if (picPath != null)
+                values.put(Db.SharingPicsTable.COLUMN_PHOTO_LOCAL, picPath);
+            if (picThumbPath != null)
+                values.put(Db.SharingPicsTable.COLUMN_PHOTO_THUMB_LOCAL, picThumbPath);
+            ret = db.update(Db.SharingPicsTable.TABLE_NAME, values, "_id = ?",
+                    new String[]{String.valueOf(id)});
+            db.setTransactionSuccessful();
+        } catch (Exception e) {
+            Log.e("Update sharing pic path", e.getMessage());
+            ret = -1;
         } finally {
             if (db != null) {
                 db.endTransaction();
@@ -940,11 +959,8 @@ public class DAO {
                         new String[]{String.valueOf(set.getId())});
             }
             db.setTransactionSuccessful();
-        } catch (SQLiteException e) {
-            //TODO write to log here
-
         } catch (Exception e) {
-            //TODO write to log here
+            Log.e("Update sets order", e.getMessage());
         } finally {
             if (db != null) {
                 db.endTransaction();
@@ -986,10 +1002,8 @@ public class DAO {
             }
             db.setTransactionSuccessful();
 
-        } catch (SQLiteException e) {
-            //TODO write to log here
         } catch (Exception e) {
-            //TODO write to log here
+            Log.e("Update pending removal", e.getMessage());
         } finally {
             if (db != null) {
                 db.endTransaction();
@@ -1032,10 +1046,8 @@ public class DAO {
                         new String[]{String.valueOf(setId)});
             }
             db.setTransactionSuccessful();
-        } catch (SQLiteException e) {
-            //TODO write to log here
         } catch (Exception e) {
-            //TODO write to log here
+            Log.e("Update item deleted", e.getMessage());
         } finally {
             if (db != null) {
                 db.endTransaction();
@@ -1064,11 +1076,8 @@ public class DAO {
                         new String[]{String.valueOf(setId)});
             }
             db.setTransactionSuccessful();
-        } catch (SQLiteException e) {
-            //TODO write to log here
-            ret = -1;
         } catch (Exception e) {
-            //TODO write to log here
+            Log.e("Update set active", e.getMessage());
             ret = -1;
         } finally {
             if (db != null) {
@@ -1093,12 +1102,9 @@ public class DAO {
                     Db.SetItemsTable.COLUMN_PENDING_REMOVAL),
                     new String[]{String.valueOf(setId), "1"});
             db.setTransactionSuccessful();
-        } catch (SQLiteException e) {
-            ret = -1;
-            //TODO write to log here
         } catch (Exception e) {
             ret = -1;
-            //TODO write to log here
+            Log.e("Clean packed", e.getMessage());
         } finally {
             if (db != null) {
                 db.endTransaction();
@@ -1131,12 +1137,8 @@ public class DAO {
                         new String[]{String.valueOf(setId)});
             }
             db.setTransactionSuccessful();
-        } catch (SQLiteException e) {
-            //TODO write to log here
-            ret = -1;
-
         } catch (Exception e) {
-            //TODO write to log here
+            Log.e("Update item packed", e.getMessage());
             ret = -1;
         } finally {
             if (db != null) {
@@ -1184,10 +1186,8 @@ public class DAO {
                         new String[]{String.valueOf(setId)});
             }
             db.setTransactionSuccessful();
-        } catch (SQLiteException e) {
-            //TODO write to log here
         } catch (Exception e) {
-            //TODO write to log here
+            Log.e("Update item packed", e.getMessage());
         } finally {
             if (db != null) {
                 db.endTransaction();
@@ -1228,11 +1228,8 @@ public class DAO {
                     String.format("%s = ? AND %s = ?", Db.SetItemsTable.COLUMN_SET, Db.SetItemsTable.COLUMN_USER_DEFINED),
                     new String[]{String.valueOf(setId), String.valueOf(1)});
             db.setTransactionSuccessful();
-        } catch (SQLiteException e) {
-            //TODO write to log here
-            ret = -1;
         } catch (Exception e) {
-            //TODO write to log here
+            Log.e("Restore defaults", e.getMessage());
             ret = -1;
         } finally {
             if (db != null) {
@@ -1259,11 +1256,8 @@ public class DAO {
                         new String[]{String.valueOf(set.getId())});
             }
             db.setTransactionSuccessful();
-        } catch (SQLiteException e) {
-            //TODO write to log here
-
         } catch (Exception e) {
-            //TODO write to log here
+            Log.e("Update set names", e.getMessage());
         } finally {
             if (db != null) {
                 db.endTransaction();
@@ -1289,11 +1283,8 @@ public class DAO {
                         new String[]{String.valueOf(category.getId())});
             }
             db.setTransactionSuccessful();
-        } catch (SQLiteException e) {
-            //TODO write to log here
-
         } catch (Exception e) {
-            //TODO write to log here
+            Log.e("Update category names", e.getMessage());
         } finally {
             if (db != null) {
                 db.endTransaction();
@@ -1320,11 +1311,8 @@ public class DAO {
                         new String[]{String.valueOf(item.getId())});
             }
             db.setTransactionSuccessful();
-        } catch (SQLiteException e) {
-            //TODO write to log here
-
         } catch (Exception e) {
-            //TODO write to log here
+            Log.e("Update item names", e.getMessage());
         } finally {
             if (db != null) {
                 db.endTransaction();
@@ -1351,11 +1339,8 @@ public class DAO {
                     new String[]{String.valueOf(id)});
 
             db.setTransactionSuccessful();
-        } catch (SQLiteException e) {
-            //TODO write to log here
-
         } catch (Exception e) {
-            //TODO write to log here
+            Log.e("Update log locale", e.getMessage());
         } finally {
             if (db != null) {
                 db.endTransaction();
@@ -1370,27 +1355,6 @@ public class DAO {
 
     //region Task classes
 
-    // MY LIST CLASS
-    private class MyListTask implements Runnable {
-        int currentCommand;
-        int priority;
-
-
-        public MyListTask(int command, int priority) {
-            this.currentCommand = command;
-            this.priority       = priority;
-        }
-
-        @Override
-        public void run() {
-            android.os.Process.setThreadPriority(priority);
-            Message message = Message.obtain();
-            switch (currentCommand) {
-
-            }
-            handler.sendMessage(message);
-        }
-    }
     // ITEM CLASS
     private class ItemTask implements Runnable {
         int currentCommand;
@@ -1458,6 +1422,12 @@ public class DAO {
                             message.what = Event.ITEM_INSERTED;
                             message.arg1 = setId;
                             message.arg2 = item.getId();
+                            AppRater.updateSharedPreferences(1);
+                            if (AppRater.checkRatePrompt()) {
+                                Message rateEvent = Message.obtain();
+                                rateEvent.what = Event.NEED_TO_RATE_NOW;
+                                handler.sendMessage(rateEvent);
+                            }
                         }
                     } else {
                         message.what = Event.ITEM_INSERT_ERROR;
@@ -1689,6 +1659,10 @@ public class DAO {
                                 Response<Timestamp> response3 = api.getTimestamp().execute();
                                 insertTimestamp(response3.body());
                                 statusCode = response3.code();
+                                Response<List<SharingPicture>> response4 = api.getSharingPicture().execute();
+                                insertSharingPic(response4.body().get(0));
+                                statusCode = response4.code();
+
                                 message.what = Event.SYNC_COMPLETED;
                             }
                         }
@@ -1703,13 +1677,13 @@ public class DAO {
                     break;
 
                 case Command.SYNC_READ_FROM_FILE:
-
                     try {
                         String sets = readSetsFromFile();
                         String categories = readCategoriesFromFile();
                         String items = readItemsFromFile();
+                        String pic = readSharingPicFromFile();
 
-                        if (sets != null && categories != null && items != null) {
+                        if (sets != null && categories != null && items != null && pic != null) {
                             Gson gson = new Gson();
                             Type type = new TypeToken<List<Set>>() {
                             }.getType();
@@ -1724,6 +1698,14 @@ public class DAO {
                             List<Item> itemsFromJson = gson.fromJson(items, type);
                             insertItems(itemsFromJson);
                             insertTimestamp(new Timestamp(1456083374));
+                            type = new TypeToken<List<SharingPicture>>() {
+                            }.getType();
+                            List<SharingPicture> picFromJson = gson.fromJson(pic, type);
+                            if (picFromJson != null) {
+                                for (SharingPicture sharingPicture : picFromJson) {
+                                    insertSharingPic(sharingPicture);
+                                }
+                            }
                             message.what = Event.SYNC_COMPLETED;
                         } else {
                             message.what = Event.SYNC_FAILED;
@@ -1801,13 +1783,38 @@ public class DAO {
                         message.what = Event.ITEM_IMAGE_LOAD_ERROR;
                     }
                     break;
+
+                case Command.SHARING_GET_PIC:
+                    try {
+                        SharingPicture sharingPicture = readLastSharingPic();
+                        if (sharingPicture != null) {
+                            Bitmap[] ret = null;
+                            Bitmap bitmap1 = loadSharingImage(sharingPicture);
+                            Bitmap bitmap2 = loadSharingThumbImage(sharingPicture);
+
+                            if (bitmap1 != null || bitmap2 != null) {
+                                ret = new Bitmap[2];
+                                ret[0] = bitmap1;
+                                ret[1] = bitmap2;
+                                message.obj = ret;
+                                message.what = Event.SHARING_PIC_LOADED;
+                            } else
+                                message.what = Event.SHARING_GET_PIC_ERROR;
+
+                        } else
+                            message.what = Event.SHARING_GET_PIC_ERROR;
+
+                    } catch (Exception e) {
+                        message.what = Event.SHARING_GET_PIC_ERROR;
+                    }
+                    break;
             }
             handler.sendMessage(message);
         }
     }
     //endregion
 
-    private Bitmap loadItemImage(Item item){
+    private Bitmap loadItemImage(Item item) {
         ImageDownloadHelper downloadHelper = new ImageDownloadHelper();
         Bitmap bitmap   = null;
         String filename = null;
@@ -1833,6 +1840,62 @@ public class DAO {
         return bitmap;
     }
 
+    private Bitmap loadSharingImage(SharingPicture sharingPicture) {
+        ImageDownloadHelper downloadHelper = new ImageDownloadHelper();
+        Bitmap bitmap   = null;
+        String filename = null;
+
+        if (sharingPicture != null) {
+            if (!TextUtils.isEmpty(sharingPicture.getPhotoLocal()))
+                bitmap = BitmapFactory.decodeFile(sharingPicture.getPhotoLocal());
+            // cannot retrieve, download and save then
+            if (bitmap == null) { // return it
+                bitmap = downloadHelper.loadImage(sharingPicture.getPhotoUrl());
+                if (bitmap != null) {
+                    if (downloadHelper.isExternalStorageWritable()) {
+                        filename = downloadHelper.saveImageExternal("sharing_pic", bitmap);
+                    } else {
+                        filename = downloadHelper.saveImageInternal("sharing_pic", bitmap);
+                    }
+                    updateSharingPicLocal(sharingPicture.getId(), filename, null);
+                }
+            }
+            if (bitmap == null) {
+                bitmap = BitmapFactory.decodeResource(context.getResources(),
+                        R.drawable.sharing_pic_default);
+            }
+        }
+        return bitmap;
+    }
+
+    private Bitmap loadSharingThumbImage(SharingPicture sharingPicture) {
+        ImageDownloadHelper downloadHelper = new ImageDownloadHelper();
+        Bitmap bitmap   = null;
+        String filename = null;
+
+        if (sharingPicture != null) {
+            if (!TextUtils.isEmpty(sharingPicture.getPhotoThumbLocal()))
+                bitmap = BitmapFactory.decodeFile(sharingPicture.getPhotoThumbLocal());
+            // cannot retrieve, download and save then
+            if (bitmap == null) { // return it
+                bitmap = downloadHelper.loadImage(sharingPicture.getPhotoThumbUrl());
+                if (bitmap != null) {
+                    if (downloadHelper.isExternalStorageWritable()) {
+                        filename = downloadHelper.saveImageExternal("sharing_pic_thumb", bitmap);
+                    } else {
+                        filename = downloadHelper.saveImageInternal("sharing_pic_thumb", bitmap);
+                    }
+                    updateSharingPicLocal(sharingPicture.getId(), null, filename);
+                }
+            }
+            if (bitmap == null) {
+                bitmap = BitmapFactory.decodeResource(context.getResources(),
+                        R.drawable.sharing_pic_thumb_default);
+            }
+        }
+        return bitmap;
+    }
+
     private String readSetsFromFile() {
         String sets = null;
         try {
@@ -1877,4 +1940,19 @@ public class DAO {
         }
         return items;
     }
+
+    private String readSharingPicFromFile() {
+        String sharingPic = null;
+        try {
+            InputStream is = App.getAppContext().getAssets().open("jsons/sharing_photos.json");
+            int size = is.available();
+            byte[] buffer = new byte[size];
+            is.read(buffer);
+            is.close();
+            sharingPic = new String(buffer, "UTF-8");
+        } catch (IOException ex) {
+            Log.e("Reading json", ex.getMessage());
+        }
+        return sharingPic;
+    }
 }
diff --git a/app/src/main/java/com/hikapro/backpack/model/dao/Db.java b/app/src/main/java/com/hikapro/backpack/model/dao/Db.java
index cd72bfa..c53e84b 100644
--- a/app/src/main/java/com/hikapro/backpack/model/dao/Db.java
+++ b/app/src/main/java/com/hikapro/backpack/model/dao/Db.java
@@ -13,6 +13,7 @@ import java.util.Locale;
 import com.hikapro.backpack.model.entities.Category;
 import com.hikapro.backpack.model.entities.Item;
 import com.hikapro.backpack.model.entities.Set;
+import com.hikapro.backpack.model.entities.SharingPicture;
 import com.hikapro.backpack.model.entities.Timestamp;
 import com.hikapro.backpack.model.entities.UpdateLog;
 
@@ -53,6 +54,51 @@ public class Db {
 
     }
 
+    public abstract static class SharingPicsTable {
+
+        public static final String TABLE_NAME = "sharing_pics";
+
+        public static final String COLUMN_ID = "_id";
+        public static final String COLUMN_PHOTO_URL = "photo_url";
+        public static final String COLUMN_PHOTO_THUMB_URL = "photo_thumb_url";
+        public static final String COLUMN_PHOTO_LOCAL = "photo_local";
+        public static final String COLUMN_PHOTO_THUMB_LOCAL = "photo_thumb_local";
+
+        public static final String CREATE =
+                "CREATE TABLE " + TABLE_NAME + " (" +
+                        COLUMN_ID + " INTEGER PRIMARY KEY, " +
+                        COLUMN_PHOTO_URL + " TEXT, " +
+                        COLUMN_PHOTO_THUMB_URL + " TEXT, " +
+                        COLUMN_PHOTO_LOCAL + " TEXT, " +
+                        COLUMN_PHOTO_THUMB_LOCAL + " TEXT" +
+                        " ); ";
+
+        public static ContentValues toContentValues(SharingPicture sharingPicture) {
+            ContentValues values = new ContentValues();
+            values.put(COLUMN_ID, sharingPicture.getId());
+            if (sharingPicture.getPhotoUrl() != null)
+                values.put(COLUMN_PHOTO_URL, sharingPicture.getPhotoUrl());
+            if (sharingPicture.getPhotoThumbUrl() != null)
+                values.put(COLUMN_PHOTO_THUMB_URL, sharingPicture.getPhotoThumbUrl());
+            if (sharingPicture.getPhotoLocal() != null)
+                values.put(COLUMN_PHOTO_LOCAL, sharingPicture.getPhotoLocal());
+            if (sharingPicture.getPhotoThumbLocal() != null)
+                values.put(COLUMN_PHOTO_THUMB_LOCAL, sharingPicture.getPhotoThumbLocal());
+
+            return values;
+        }
+
+        public static SharingPicture parseCursor(Cursor cursor) {
+            SharingPicture sharingPicture = new SharingPicture();
+            sharingPicture.setId(cursor.getInt(cursor.getColumnIndexOrThrow(COLUMN_ID)));
+            sharingPicture.setPhotoUrl(cursor.getString(cursor.getColumnIndexOrThrow(COLUMN_PHOTO_URL)));
+            sharingPicture.setPhotoThumbUrl(cursor.getString(cursor.getColumnIndexOrThrow(COLUMN_PHOTO_THUMB_URL)));
+            sharingPicture.setPhotoLocal(cursor.getString(cursor.getColumnIndexOrThrow(COLUMN_PHOTO_LOCAL)));
+            sharingPicture.setPhotoThumbLocal(cursor.getString(cursor.getColumnIndexOrThrow(COLUMN_PHOTO_THUMB_LOCAL)));
+            return sharingPicture;
+        }
+    }
+
     public abstract static class ItemsTable {
         public static final String TABLE_NAME = "items";
 
@@ -103,9 +149,7 @@ public class Db {
                 values.put(COLUMN_PHOTO_LOCAL, item.getPhotoLocal());
 
             values.put(COLUMN_USER_DEFINED, item.isUserDefined());
-            /*
-            values.put(COLUMN_PHOTO_THUMB_LOCAL, item.getName());
-            */
+
             return values;
         }
 
@@ -194,11 +238,7 @@ public class Db {
             values.put(COLUMN_PHOTO_THUMBNAIL_URL, set.getPhotoThumbnail());
             values.put(COLUMN_LINE_NUMBER, lineNumber);
             values.put(COLUMN_ACTIVE_QTY, items.size());
-            /*
-            values.put(COLUMN_PHOTO_LOCAL, "");
-            values.put(COLUMN_PHOTO_THUMB_LOCAL, "");
-            values.put(COLUMN_PHOTO_THUMBNAIL_LOCAL, "");
-            */
+
             return values;
         }
 
diff --git a/app/src/main/java/com/hikapro/backpack/model/dao/DbHelper.java b/app/src/main/java/com/hikapro/backpack/model/dao/DbHelper.java
index 0eb60f8..dcac968 100644
--- a/app/src/main/java/com/hikapro/backpack/model/dao/DbHelper.java
+++ b/app/src/main/java/com/hikapro/backpack/model/dao/DbHelper.java
@@ -40,6 +40,7 @@ public class DbHelper extends SQLiteOpenHelper {
         db.execSQL(Db.SetsTable.CREATE);
         db.execSQL(Db.LogTable.CREATE);
         db.execSQL(Db.SetItemsTable.CREATE);
+        db.execSQL(Db.SharingPicsTable.CREATE);
 
         if (oldVersion < 2) {
             // place the logic here
diff --git a/app/src/main/java/com/hikapro/backpack/model/dao/Event.java b/app/src/main/java/com/hikapro/backpack/model/dao/Event.java
index 99490a2..d913f1d 100644
--- a/app/src/main/java/com/hikapro/backpack/model/dao/Event.java
+++ b/app/src/main/java/com/hikapro/backpack/model/dao/Event.java
@@ -52,15 +52,9 @@ public interface Event {
     int ITEM_REMOVAL_CANCELED       = 0x1D;
     int ITEM_READ_COMPLETED         = 0x1E;
 
-    int MY_LIST_POST_ERROR          = -0x28;
-    int MY_LIST_ITEM_ADD_ERROR      = -0x29;
-    int MY_LIST_ITEM_DELETE_ERROR   = -0x2A;
-    int MY_LIST_CLEAR_ERROR         = -0x2B;
+    int SHARING_GET_PIC_ERROR       = -0x28;
 
-    int MY_LIST_POSTED              = 0x28;
-    int MY_LIST_ITEM_ADDED          = 0x29;
-    int MY_LIST_ITEM_DELETED        = 0x2A;
-    int MY_LIST_CLEARED             = 0x2B;
+    int SHARING_PIC_LOADED          = 0x28;
 
     int SYNC_FAILED                 = -0x3C;
     int SYNC_NO_CONNECTION          = -0x3D;
@@ -68,6 +62,7 @@ public interface Event {
 
     int NOT_IMPLEMENTED             = 0x50;
     int NOT_UNDERSTAND              = 0x51;
+    int NEED_TO_RATE_NOW            = 0x52;
 
 
 }
diff --git a/app/src/main/java/com/hikapro/backpack/model/dao/ImageDownloadHelper.java b/app/src/main/java/com/hikapro/backpack/model/dao/ImageDownloadHelper.java
index 5a7c075..5a8b4f6 100644
--- a/app/src/main/java/com/hikapro/backpack/model/dao/ImageDownloadHelper.java
+++ b/app/src/main/java/com/hikapro/backpack/model/dao/ImageDownloadHelper.java
@@ -7,6 +7,7 @@ import android.net.Uri;
 import android.os.Environment;
 import android.support.v4.content.ContextCompat;
 import android.util.Log;
+import android.widget.Toast;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -16,6 +17,8 @@ import java.net.URL;
 import java.net.URLConnection;
 
 import com.hikapro.backpack.App;
+import com.hikapro.backpack.R;
+import com.hikapro.backpack.model.NetworkUtil;
 
 /**
  * Created by tariel on 04/05/16.
@@ -32,16 +35,18 @@ public class ImageDownloadHelper {
 
     public Bitmap loadImage(String netPath) {
         Bitmap bitmap = null;
-        try {
-            URL url = new URL(netPath);
-            URLConnection conn = url.openConnection();
-            conn.setReadTimeout(4000);
-            bitmap = BitmapFactory.decodeStream(conn.getInputStream());
-        } catch (SocketTimeoutException ex) {
-            bitmap = null;
-            Log.e(IMAGE_DOWNLOAD_TAG, " Timeout elapsed.");
-        } catch (Exception ex) {
-            Log.e(IMAGE_DOWNLOAD_TAG, " File cannot be downloaded due to exception.");
+        if (NetworkUtil.isInternetAvailable()) {
+            try {
+                URL url = new URL(netPath);
+                URLConnection conn = url.openConnection();
+                conn.setReadTimeout(4000);
+                bitmap = BitmapFactory.decodeStream(conn.getInputStream());
+            } catch (SocketTimeoutException ex) {
+                bitmap = null;
+                Log.e(IMAGE_DOWNLOAD_TAG, " Timeout elapsed.");
+            } catch (Exception ex) {
+                Log.e(IMAGE_DOWNLOAD_TAG, " File cannot be downloaded due to exception.");
+            }
         }
 
         return bitmap;
diff --git a/app/src/main/java/com/hikapro/backpack/model/dao/Test.java b/app/src/main/java/com/hikapro/backpack/model/dao/Test.java
deleted file mode 100644
index e9e5484..0000000
--- a/app/src/main/java/com/hikapro/backpack/model/dao/Test.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.hikapro.backpack.model.dao;
-
-/**
- * Created by tariel on 27/04/16.
- */
-public class Test {
-    private static Test ourInstance = new Test();
-
-    public static Test getInstance() {
-        return ourInstance;
-    }
-
-    private Test() {
-    }
-}
diff --git a/app/src/main/java/com/hikapro/backpack/model/entities/Item.java b/app/src/main/java/com/hikapro/backpack/model/entities/Item.java
index 851f595..591cd71 100644
--- a/app/src/main/java/com/hikapro/backpack/model/entities/Item.java
+++ b/app/src/main/java/com/hikapro/backpack/model/entities/Item.java
@@ -174,10 +174,6 @@ public class Item implements Comparable<Item>, Serializable {
 
     @Override
     public int compareTo(Item another) {
-        /*
-        int cmp = Integer.valueOf(category).compareTo(Integer.valueOf(another.category));
-        return (cmp != 0 ? cmp : name.compareTo(another.name));
-        */
         int cmp = Integer.valueOf(category).compareTo(Integer.valueOf(another.category));
         if (cmp != 0)
             return cmp;
diff --git a/app/src/main/java/com/hikapro/backpack/model/entities/SharingPicture.java b/app/src/main/java/com/hikapro/backpack/model/entities/SharingPicture.java
new file mode 100644
index 0000000..68b6f6f
--- /dev/null
+++ b/app/src/main/java/com/hikapro/backpack/model/entities/SharingPicture.java
@@ -0,0 +1,83 @@
+package com.hikapro.backpack.model.entities;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+/**
+ * Created by tariel on 24/07/16.
+ */
+public class SharingPicture {
+
+    @SerializedName("id")
+    @Expose
+    private int id;
+
+    @SerializedName("photo")
+    @Expose
+    private String photoUrl;
+
+    @SerializedName("photo_thumb")
+    @Expose
+    private String photoThumbUrl;
+
+    private String photoLocal;
+
+    private String photoThumbLocal;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getPhotoUrl() {
+        return photoUrl;
+    }
+
+    public void setPhotoUrl(String photoUrl) {
+        this.photoUrl = photoUrl;
+    }
+
+    public String getPhotoThumbUrl() {
+        return photoThumbUrl;
+    }
+
+    public void setPhotoThumbUrl(String photoThumbUrl) {
+        this.photoThumbUrl = photoThumbUrl;
+    }
+
+    public String getPhotoLocal() {
+        return photoLocal;
+    }
+
+    public void setPhotoLocal(String photoLocal) {
+        this.photoLocal = photoLocal;
+    }
+
+    public String getPhotoThumbLocal() {
+        return photoThumbLocal;
+    }
+
+    public void setPhotoThumbLocal(String photoThumbLocal) {
+        this.photoThumbLocal = photoThumbLocal;
+    }
+
+    @Override
+    public int hashCode() {
+        return 31 * id;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        SharingPicture that = (SharingPicture) o;
+
+        if (id != that.id)
+            return false;
+        return true;
+    }
+
+}
diff --git a/app/src/main/java/com/hikapro/backpack/model/entities/Timestamp.java b/app/src/main/java/com/hikapro/backpack/model/entities/Timestamp.java
index bccb418..9e812a7 100644
--- a/app/src/main/java/com/hikapro/backpack/model/entities/Timestamp.java
+++ b/app/src/main/java/com/hikapro/backpack/model/entities/Timestamp.java
@@ -19,6 +19,4 @@ public class Timestamp {
         this.timestamp = value;
     }
 
-
-
 }
diff --git a/app/src/main/java/com/hikapro/backpack/presenter/AddPresenter.java b/app/src/main/java/com/hikapro/backpack/presenter/AddPresenter.java
index 2e9c1f6..e363fca 100644
--- a/app/src/main/java/com/hikapro/backpack/presenter/AddPresenter.java
+++ b/app/src/main/java/com/hikapro/backpack/presenter/AddPresenter.java
@@ -118,34 +118,24 @@ public class AddPresenter implements Presenter.Add {
 
                 cancelButton    = (Button) custActionBarView.findViewById(R.id.action_add_cancel);
                 saveButton      = (Button) custActionBarView.findViewById(R.id.action_add_save);
-                cancelButton.setOnClickListener(new ActionBarButtonClickListener());
-                saveButton.setOnClickListener(new ActionBarButtonClickListener());
+                android.view.View.OnClickListener listener = new ActionBarButtonClickListener();
+                cancelButton.setOnClickListener(listener);
+                saveButton.setOnClickListener(listener);
             }
         }
 
         searchView = (SearchView) view.findViewById(R.id.add_search);
         searchView.setIconified(false);
         searchView.setIconifiedByDefault(false);
-        searchView.setQueryHint("Enter a new item name");
+        searchView.setQueryHint(getActivityContext().getResources().getString(R.string.search_hint_add));
         searchView.setSubmitButtonEnabled(false);
         searchView.setBottom(20);
-        /*
-        Drawable d = getActivityContext().getResources().getDrawable( R.drawable.search_divider );
-        searchView.setDividerDrawable(d);*/
 
         int magId = searchView.getContext().getResources().getIdentifier("android:id/search_mag_icon", null, null);
         ImageView magImage = (ImageView) searchView.findViewById(magId);
         magImage.setLayoutParams(new LinearLayout.LayoutParams(0, 0));
         searchView.setMinimumHeight(40);
         searchView.setOnQueryTextListener(new SearchTextListener());
-/*
-        int searchPlateId = searchView.getContext().getResources().getIdentifier("android:id/search_plate", null, null);
-        // Getting the 'search_plate' LinearLayout.
-        android.view.View searchPlate = searchView.findViewById(searchPlateId);
-        // Setting background of 'search_plate' to earlier defined drawable.
-        searchPlate.setBackgroundResource(R.drawable.search_divider);
-
-*/
 
         return view;
     }
@@ -207,11 +197,11 @@ public class AddPresenter implements Presenter.Add {
     private boolean checkUserInput() {
         if (!canSave) {
             if (searchView.getQuery().length() == 0)
-                Toast.makeText(getActivityContext(), "Please, enter a name", Toast.LENGTH_SHORT).show();
+                Toast.makeText(getActivityContext(), R.string.enter_name, Toast.LENGTH_SHORT).show();
             else if (categoryContainerMain.getVisibility() == android.view.View.VISIBLE)
-                Toast.makeText(getActivityContext(), "Please, select a category", Toast.LENGTH_SHORT).show();
+                Toast.makeText(getActivityContext(), R.string.select_category, Toast.LENGTH_SHORT).show();
             else
-                Toast.makeText(getActivityContext(), "Already in List!", Toast.LENGTH_SHORT).show();
+                Toast.makeText(getActivityContext(), R.string.already_in_list2, Toast.LENGTH_SHORT).show();
             return false;
         }
         return true;
@@ -269,7 +259,6 @@ public class AddPresenter implements Presenter.Add {
             }
 
             currentCategoryButton = (Button) v;
-            Toast.makeText(getActivityContext(), "Id " + currentCategoryButton.getId(), Toast.LENGTH_SHORT).show();
             setSaveButtonAccess();
         }
     }
@@ -281,7 +270,6 @@ public class AddPresenter implements Presenter.Add {
             switch (v.getId())
             {
                 case R.id.action_add_cancel :
-                    Toast.makeText(getActivityContext(), "Cancel", Toast.LENGTH_SHORT).show();
                     searchView.clearFocus();
                     if (fragment != null)
                         fragment.getFragmentManager().popBackStack();
diff --git a/app/src/main/java/com/hikapro/backpack/presenter/ItemListPresenter.java b/app/src/main/java/com/hikapro/backpack/presenter/ItemListPresenter.java
index 2126992..ba9be4a 100644
--- a/app/src/main/java/com/hikapro/backpack/presenter/ItemListPresenter.java
+++ b/app/src/main/java/com/hikapro/backpack/presenter/ItemListPresenter.java
@@ -2,15 +2,19 @@ package com.hikapro.backpack.presenter;
 
 import android.app.ActionBar;
 import android.app.Activity;
-import android.app.AlertDialog;
+import android.app.Dialog;
 import android.content.Context;
-import android.content.DialogInterface;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.helper.ItemTouchHelper;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
+import android.view.Window;
+import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -19,13 +23,11 @@ import java.lang.ref.WeakReference;
 
 import com.hikapro.backpack.R;
 import com.hikapro.backpack.model.Model;
-import com.hikapro.backpack.model.entities.Item;
 import com.hikapro.backpack.model.entities.Set;
+import com.hikapro.backpack.presenter.adapters.helper.AppRater;
 import com.hikapro.backpack.presenter.adapters.helper.Util;
-import com.hikapro.backpack.presenter.adapters.helper.items.DividerDecoration;
 import com.hikapro.backpack.presenter.adapters.ItemListAdapter;
 import com.hikapro.backpack.presenter.adapters.helper.items.DividerDecoration2;
-import com.hikapro.backpack.presenter.adapters.helper.items.ItemSwipeCallback;
 import com.hikapro.backpack.presenter.adapters.helper.items.StickyHeaderDecoration;
 import com.hikapro.backpack.view.View;
 
@@ -51,8 +53,6 @@ public class ItemListPresenter implements Presenter.ItemList {
         adapter.setHasStableIds(true);
     }
 
-    // life cycle -->
-
     @Override
     public void onDestroy(boolean isChangingConfiguration) {
         view = null;
@@ -64,12 +64,12 @@ public class ItemListPresenter implements Presenter.ItemList {
 
     @Override
     public android.view.View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-// TODO check nn
         if (savedInstanceState != null)
             set = (Set) savedInstanceState.getSerializable(BUNDLE_SET_LIST_KEY);
         else
             set = getView().getSet();
         android.view.View view = inflater.inflate(R.layout.fragment_item_list, container, false);
+
         LinearLayoutManager llm = new LinearLayoutManager(getActivityContext());
         recycler = (RecyclerView) view.findViewById(R.id.items_recycler);
         recycler.setLayoutManager(llm);
@@ -88,6 +88,7 @@ public class ItemListPresenter implements Presenter.ItemList {
         });
         recycler.setHasFixedSize(true);
         model.executeQuery();
+
         footer      = (LinearLayout) view.findViewById(R.id.item_list_footer);
         packedCount = (TextView) footer.findViewById(R.id.footer_packed_count);
         showPacked  = (TextView) footer.findViewById(R.id.open_packed);
@@ -97,6 +98,15 @@ public class ItemListPresenter implements Presenter.ItemList {
                 showPackedItems();
             }
         });
+
+        if (set != null) {
+            android.view.View con = view.findViewById(R.id.item_list_container);
+            applyBackground(con, set.getId());
+        }
+        return view;
+    }
+
+    private void setupActionBar() {
         Activity activity = (Activity) getActivityContext();
         if (activity != null) {
             activity.invalidateOptionsMenu();
@@ -110,19 +120,14 @@ public class ItemListPresenter implements Presenter.ItemList {
                 actionBar.setDisplayHomeAsUpEnabled(true);
             }
         }
-
-        return view;
     }
+
     @Override
     public void onSaveInstanceState(Bundle outState) {
         if (set != null)
             outState.putSerializable(BUNDLE_SET_LIST_KEY, set);
     }
 
-    // life cycle <--
-
-    // process -->
-
     @Override
     public void notifyDataSetChanged() {
         adapter.notifyDataSetChanged();
@@ -152,20 +157,25 @@ public class ItemListPresenter implements Presenter.ItemList {
         } else {
             footer.setVisibility(android.view.View.GONE);
         }
-
     }
 
     private void showPackedItems () {
         getView().showPackedItems(set);
+        rememberPosition();
+    }
+
+    private void rememberPosition() {
+        LinearLayoutManager llm = (LinearLayoutManager)recycler.getLayoutManager();
+        int pos = llm.findFirstVisibleItemPosition();
+        model.setLastVisiblePosition(pos);
+        Log.i("Last position remember", String.valueOf(pos));
     }
 
     @Override
     public void showDetails(int position) {
         getView().showItemDetail(getCurrentSet().getId(), model, position);
+        rememberPosition();
     }
-    // process <--
-
-    // other impl -->
 
     @Override
     public void setView(View.ItemList view) {
@@ -205,8 +215,6 @@ public class ItemListPresenter implements Presenter.ItemList {
         Toast.makeText(getView().getAppContext(), message, Toast.LENGTH_SHORT).show();
     }
 
-    // other impl <--
-
     protected View.ItemList getView() throws NullPointerException {
         if ( view != null )
             return view.get();
@@ -232,37 +240,102 @@ public class ItemListPresenter implements Presenter.ItemList {
 
     @Override
     public void restore(final int setId) {
-        AlertDialog.Builder builder = new AlertDialog.Builder(getActivityContext(), AlertDialog.THEME_HOLO_DARK);
 
-        builder.setMessage(R.string.dlg_restore_txt)
-                .setTitle(R.string.dlg_restore_header);
+        final Dialog dialog = new Dialog(getActivityContext());
 
-        builder.setPositiveButton(R.string.ok_button, new DialogInterface.OnClickListener() {
-            public void onClick(DialogInterface dialog, int id) {
+        dialog.getWindow().requestFeature(Window.FEATURE_NO_TITLE);
+        dialog.setContentView(R.layout.dialog_confirm);
+        dialog.getWindow().setBackgroundDrawable(new ColorDrawable(android.graphics.Color.TRANSPARENT));
+
+        Button cancel = (Button) dialog.findViewById(R.id.button_cancel);
+        Button ok = (Button) dialog.findViewById(R.id.button_ok);
+
+        cancel.setOnClickListener(new android.view.View.OnClickListener() {
+            @Override
+            public void onClick(android.view.View v) {
+                try {
+                    dialog.dismiss();
+                } catch (Exception e) {
+
+                }
+            }
+        });
+        ok.setOnClickListener(new android.view.View.OnClickListener() {
+            @Override
+            public void onClick(android.view.View v) {
                 model.restoreSet(setId);
+                dialog.dismiss();
             }
         });
-        builder.setNegativeButton(R.string.cancel_button, new DialogInterface.OnClickListener() {
-            public void onClick(DialogInterface dialog, int id) {
-                // User cancelled the dialog
-            }
-        });
-        AlertDialog dialog = builder.create();
+
         dialog.show();
+    }
 
-        //Button button = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
-        //button.setBackgroundColor(Color.GREEN);
-        /*
-        Drawable d = button.getBackground();
-        PorterDuffColorFilter filter = new PorterDuffColorFilter(Color.GREEN, PorterDuff.Mode.SRC_ATOP);
-        d.setColorFilter(filter);*/
-        //button = dialog.getButton(DialogInterface.BUTTON_NEGATIVE);
-        //button.setBackgroundColor(Color.GRAY);
-        /*
-        d = button.getBackground();
-        filter = new PorterDuffColorFilter(Color.GRAY, PorterDuff.Mode.SRC_ATOP);
-        d.setColorFilter(filter);*/
+    public void applyBackground(android.view.View view, int setId) {
 
+        Drawable drawable = null;
+
+        switch (setId) {
+            case 1:
+                drawable = ContextCompat.getDrawable(view.getContext(), R.drawable.ic_item_list_1);
+                break;
+            case 2:
+                drawable = ContextCompat.getDrawable(view.getContext(), R.drawable.ic_item_list_2);
+                break;
+            case 3:
+                drawable = ContextCompat.getDrawable(view.getContext(), R.drawable.ic_item_list_3);
+                break;
+            case 4:
+                drawable = ContextCompat.getDrawable(view.getContext(), R.drawable.ic_item_list_4);
+                break;
+            case 5:
+                drawable = ContextCompat.getDrawable(view.getContext(), R.drawable.ic_item_list_5);
+                break;
+            case 6:
+                drawable = ContextCompat.getDrawable(view.getContext(), R.drawable.ic_item_list_6);
+                break;
+            case 7:
+                // nothing
+                break;
+            case 8:
+                drawable = ContextCompat.getDrawable(view.getContext(), R.drawable.ic_item_list_8);
+                break;
+            case 9:
+                // nothing
+                break;
+            case 10:
+                drawable = ContextCompat.getDrawable(view.getContext(), R.drawable.ic_item_list_10);
+                break;
+            case 11:
+                // nothing
+                break;
+            case 12:
+                // nothing
+                break;
+            case 13:
+                // nothing
+                break;
+            case 14:
+                drawable = ContextCompat.getDrawable(view.getContext(), R.drawable.ic_item_list_14);
+                break;
+            default:
+
+        }
+        if (drawable != null)
+            view.setBackground(drawable);
+        else
+            view.setBackgroundColor(ContextCompat.getColor(view.getContext(), R.color.colorListBackground));
 
     }
+
+    @Override
+    public void onResume() {
+        recycler.scrollToPosition(model.getLastVisiblePosition());
+        setupActionBar();
+    }
+
+    @Override
+    public void showRateDialog() {
+        AppRater.showRateDialog(getActivityContext());
+    }
 }
diff --git a/app/src/main/java/com/hikapro/backpack/presenter/PackedListPresenter.java b/app/src/main/java/com/hikapro/backpack/presenter/PackedListPresenter.java
index e21d8e2..ab07ae9 100644
--- a/app/src/main/java/com/hikapro/backpack/presenter/PackedListPresenter.java
+++ b/app/src/main/java/com/hikapro/backpack/presenter/PackedListPresenter.java
@@ -60,9 +60,8 @@ public class PackedListPresenter extends ItemListPresenter {
             }
         });
         recycler.setHasFixedSize(true);
-
         model.executeQuery();
-
+        recycler.scrollToPosition(model.getLastVisiblePosition());
         backToList      = (TextView) view.findViewById(R.id.back_to_list);
         packedCount     = (TextView) view.findViewById(R.id.header_packed_count);
         unpackButton    = (Button) view.findViewById(R.id.unpack_button);
diff --git a/app/src/main/java/com/hikapro/backpack/presenter/Presenter.java b/app/src/main/java/com/hikapro/backpack/presenter/Presenter.java
index 8790d13..443ee71 100644
--- a/app/src/main/java/com/hikapro/backpack/presenter/Presenter.java
+++ b/app/src/main/java/com/hikapro/backpack/presenter/Presenter.java
@@ -60,6 +60,8 @@ public interface Presenter {
         void filter(String query);
         void unpack(int setId);
         void restore(int setId);
+        void onResume();
+        void showRateDialog();
     }
 
     interface ItemDetail extends Base {
@@ -78,6 +80,7 @@ public interface Presenter {
     interface Share extends Base {
         void setView(View.Share view);
         void setModel(Model.Share model);
+        void notifyDataSetChanged();
         Model.Share getModel();
         void onDestroy(boolean isChangingConfiguration);
         android.view.View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState);
diff --git a/app/src/main/java/com/hikapro/backpack/presenter/SetListPresenter.java b/app/src/main/java/com/hikapro/backpack/presenter/SetListPresenter.java
index 482560e..62c9e55 100644
--- a/app/src/main/java/com/hikapro/backpack/presenter/SetListPresenter.java
+++ b/app/src/main/java/com/hikapro/backpack/presenter/SetListPresenter.java
@@ -45,9 +45,6 @@ public class SetListPresenter implements Presenter.SetList {
         this.adapter    = new SetListAdapter(this);
     }
 
-    // life cycle -->
-
-
     //GLM_add_resources_SetList
     @Override
     public void onItemDismiss(int position) {
@@ -85,7 +82,9 @@ public class SetListPresenter implements Presenter.SetList {
         setRecycler.setLayoutManager(llm);
         setRecycler.setAdapter(adapter);
         setRecycler.setItemAnimator(new DefaultItemAnimator());
+        setRecycler.setHasFixedSize(true);
         model.executeQuery();
+        setRecycler.scrollToPosition(model.getLastVisiblePosition());
 
         //GLM_add_resources_SetList
         ItemTouchHelper.Callback callback = new SimpleItemTouchHelperCallback(adapter);
@@ -98,19 +97,11 @@ public class SetListPresenter implements Presenter.SetList {
         return view;
     }
 
-    // life cycle <--
-
-    // process -->
-
     @Override
     public void notifyDataSetChanged() {
         adapter.notifyDataSetChanged();
     }
 
-    // process <--
-
-    // other impl -->
-
     @Override
     public Context getAppContext() {
         try {
@@ -142,8 +133,6 @@ public class SetListPresenter implements Presenter.SetList {
         return model;
     }
 
-    // other impl <--
-
     private View.SetList getView() throws NullPointerException {
         if ( view != null )
             return view.get();
@@ -170,8 +159,11 @@ public class SetListPresenter implements Presenter.SetList {
     }
 
     public void showItemList(Set set) {
-        if (getView() != null)
+        if (getView() != null) {
             getView().showItemList(set);
+            LinearLayoutManager llm = (LinearLayoutManager)setRecycler.getLayoutManager();
+            model.setLastVisiblePosition(llm.findFirstVisibleItemPosition());
+        }
         else
             Toast.makeText(getActivityContext(), "There is no view in presenter", Toast.LENGTH_SHORT).show();
     }
diff --git a/app/src/main/java/com/hikapro/backpack/presenter/SharePresenter.java b/app/src/main/java/com/hikapro/backpack/presenter/SharePresenter.java
index 56fb14e..9e2ba5d 100644
--- a/app/src/main/java/com/hikapro/backpack/presenter/SharePresenter.java
+++ b/app/src/main/java/com/hikapro/backpack/presenter/SharePresenter.java
@@ -1,19 +1,32 @@
 package com.hikapro.backpack.presenter;
 
+import android.app.ActionBar;
 import android.app.Activity;
+import android.app.Dialog;
+import android.app.Fragment;
+import android.content.ContentResolver;
 import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.ColorDrawable;
 import android.net.Uri;
 import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
+import android.view.Window;
 import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import com.facebook.CallbackManager;
 import com.facebook.FacebookCallback;
 import com.facebook.FacebookException;
 import com.facebook.FacebookSdk;
-import com.facebook.appevents.AppEventsLogger;
 import com.facebook.share.Sharer;
 import com.facebook.share.model.ShareHashtag;
 import com.facebook.share.model.ShareLinkContent;
@@ -22,6 +35,13 @@ import com.hikapro.backpack.R;
 import com.hikapro.backpack.model.Model;
 import com.hikapro.backpack.view.View;
 
+import org.brickred.socialauth.Profile;
+import org.brickred.socialauth.android.DialogListener;
+import org.brickred.socialauth.android.SocialAuthAdapter;
+import org.brickred.socialauth.android.SocialAuthError;
+import org.brickred.socialauth.android.SocialAuthListener;
+
+import java.io.File;
 import java.lang.ref.WeakReference;
 
 /**
@@ -34,6 +54,16 @@ public class SharePresenter implements Presenter.Share {
 
     private Button facebookButton;
     private Button twitterButton;
+    private Button cancelButton;
+    private ImageView sharingImage;
+
+    private TextView twitterLogin;
+    private Profile twitterProfile;
+    private ViewGroup progress;
+    private boolean canPost;
+    private boolean showError;
+
+    protected SocialAuthAdapter socialAuthAdapter;
 
     private WeakReference<View.Share>   view;
     private Model.Share                 model;
@@ -67,6 +97,19 @@ public class SharePresenter implements Presenter.Share {
         this.model = model;
     }
 
+    @Override
+    public void notifyDataSetChanged() {
+        Bitmap [] pics = model.getSharingPics();
+        if (pics != null && pics[1] != null && pics[0] != null) {
+            canPost = true;
+            sharingImage.setImageBitmap(pics[0]);
+        } else {
+            showError = true;
+            canPost = true;
+        }
+        setVisibility();
+    }
+
     @Override
     public Model.Share getModel() {
         return model;
@@ -92,44 +135,95 @@ public class SharePresenter implements Presenter.Share {
         shareDialog = new ShareDialog((Activity) getActivityContext());
         facebookButton = (Button) v.findViewById(R.id.facebook_share_button);
         twitterButton = (Button) v.findViewById(R.id.twitter_share_button);
+        progress = (ViewGroup) v.findViewById(R.id.share_progress_container);
+
+        sharingImage = (ImageView) v.findViewById(R.id.share_image_view);
+        model.executeQuery();
         shareDialog.registerCallback(callbackManager, new
 
                 FacebookCallback<Sharer.Result>() {
                     @Override
-                    public void onSuccess(Sharer.Result result) {}
+                    public void onSuccess(Sharer.Result result) {
+                        Toast.makeText(getActivityContext(), R.string.fb_posted,
+                                Toast.LENGTH_SHORT).show();
+                    }
 
                     @Override
                     public void onCancel() {}
 
                     @Override
-                    public void onError(FacebookException error) {}
+                    public void onError(FacebookException error) {
+                        Toast.makeText(getActivityContext(), R.string.fb_error,
+                                Toast.LENGTH_SHORT).show();
+                        Log.e("Share", "Facebook error", error);
+                    }
                 });
         facebookButton.setOnClickListener(new android.view.View.OnClickListener() {
             @Override
             public void onClick(android.view.View v) {
                 if (ShareDialog.canShow(ShareLinkContent.class)) {
 
+                    try {
+                        Context context  = getAppContext();
 
-                    ShareLinkContent linkContent = new ShareLinkContent.Builder()
-                            .setContentTitle("Test Pack With Me app")
-                            .setContentDescription("Test of facebook integration")
-                            .setContentUrl(Uri.parse("http://developers.facebook.com/android"))
-                            .setShareHashtag(new ShareHashtag.Builder()
-                                    .setHashtag("#PackWithMe")
-                                    .build())
-                            .build();
+                        ShareLinkContent linkContent = new ShareLinkContent.Builder()
+                                .setContentTitle(context.getString(R.string.facebook_sharing_header))
+                                .setContentDescription(context.getString(R.string.facebook_sharing_txt))
+                                .setContentUrl(Uri.parse(context.getString(R.string.facebook_url)))
 
-                    shareDialog.show(linkContent);
+                                .setShareHashtag(new ShareHashtag.Builder()
+                                        .setHashtag("#PackWithMe")
+                                        .build())
+                                .build();
+
+                        shareDialog.show(linkContent);
+
+                    } catch (Exception e) {
+                        Toast.makeText(getActivityContext(), R.string.fb_error,
+                                Toast.LENGTH_SHORT).show();
+                        Log.e("Sharing", "Facebook error", e);
+                    }
                 }
             }
         });
+
         twitterButton.setOnClickListener(new android.view.View.OnClickListener() {
             @Override
             public void onClick(android.view.View v) {
-                Toast.makeText(getActivityContext(), "Not implemented!", Toast.LENGTH_SHORT).show();
+                if (! canPost )
+                    Toast.makeText(getActivityContext(), R.string.please_wait, Toast.LENGTH_SHORT).show();
+                else if (showError)
+                    Toast.makeText(getActivityContext(), R.string.cannot_post, Toast.LENGTH_SHORT).show();
+                else
+                    postToTwitter();
             }
         });
 
+        Activity activity = (Activity) getActivityContext();
+        if (activity != null) {
+            ActionBar actionBar = activity.getActionBar();
+            if (actionBar != null) {
+                ViewGroup custActionBarView = (ViewGroup) inflater.inflate(R.layout.share_cust_actionbar, null);
+                actionBar.setDisplayShowHomeEnabled(false);
+                actionBar.setDisplayShowTitleEnabled(false);
+                actionBar.setDisplayShowCustomEnabled(true);
+                actionBar.setDisplayHomeAsUpEnabled(false);
+                actionBar.setCustomView(custActionBarView);
+
+                cancelButton    = (Button) custActionBarView.findViewById(R.id.action_share_cancel);
+                cancelButton.setOnClickListener(new android.view.View.OnClickListener() {
+                    @Override
+                    public void onClick(android.view.View v) {
+                        Fragment fragment = (Fragment) getView();
+                        if (fragment != null)
+                            fragment.getFragmentManager().popBackStack();
+
+                    }
+                });
+            }
+        }
+        twitterLogin = (TextView) v.findViewById(R.id.twitter_login);
+        setVisibility();
         return v;
     }
 
@@ -139,4 +233,171 @@ public class SharePresenter implements Presenter.Share {
         else
             throw new NullPointerException("View is unavailable");
     }
-}
+
+
+
+    private class ResponseListener implements DialogListener {
+        Bitmap bitmap;
+        String message;
+
+        public ResponseListener(Bitmap bitmap, String message) {
+            this.bitmap = bitmap;
+            this.message = message;
+        }
+        @Override
+        public void onComplete(final Bundle values) {
+            try {
+                socialAuthAdapter.getUserProfileAsync(new ProfileDataListener());
+                socialAuthAdapter.uploadImageAsync(message, "PackWithMe.png",
+                        bitmap, 0, new UploadImageListener());
+            } catch (Exception e) {
+                Log.e("ShareTwitter", e.getMessage());
+            }
+        }
+        @Override
+        public void onError(SocialAuthError error) {
+            Log.d("ShareTwitter", "Authentication Error: " + error.getMessage());
+        }
+
+        @Override
+        public void onCancel() {
+            Log.d("ShareTwitter", "Authentication Cancelled");
+        }
+
+        @Override
+        public void onBack() {
+            Log.d("ShareTwitter", "Dialog Closed by pressing Back Key");
+        }
+    }
+
+    private final class UploadImageListener implements SocialAuthListener {
+        @Override
+        public void onExecute(String s, Object o) {
+            Integer status = (Integer) o;
+            try {
+                if (status.intValue() == 200 || status.intValue() == 201
+                        || status.intValue() == 204) {
+                    Toast.makeText(getActivityContext(), R.string.twitter_posted,
+                            Toast.LENGTH_SHORT).show();
+                    Log.d("ShareTwitter", "Posting completed");
+                } else {
+                    Toast.makeText(getActivityContext(), R.string.twitter_error2,
+                            Toast.LENGTH_SHORT).show();
+                    Log.d("ShareTwitter", "Posting failed");
+                }
+            } catch (NullPointerException e) {
+                Toast.makeText(getActivityContext(), R.string.twitter_error2,
+                        Toast.LENGTH_SHORT).show();
+                Log.e("ShareTwitter", e.getMessage());
+            }
+        }
+
+        @Override
+        public void onError(SocialAuthError e) {
+            Toast.makeText(getActivityContext(), "Posting to twitter failed!",
+                    Toast.LENGTH_SHORT).show();
+            Log.e("ShareTwitter", e.getMessage());
+        }
+
+    }
+
+    private final class ProfileDataListener implements SocialAuthListener<Profile> {
+
+
+        @Override
+        public void onExecute(String s, Profile profile) {
+            twitterProfile = profile;
+            if (twitterProfile != null && twitterLogin != null) {
+                twitterLogin.setText(twitterProfile.getDisplayName());
+            }
+        }
+
+
+        @Override
+        public void onError(SocialAuthError socialAuthError) {
+
+        }
+    }
+
+    private void setVisibility() {
+        if (showError) {
+            progress.setVisibility(android.view.View.GONE);
+            sharingImage.setVisibility(android.view.View.VISIBLE);
+        }
+        else {
+            progress.setVisibility(canPost ? android.view.View.GONE : android.view.View.VISIBLE);
+            sharingImage.setVisibility(canPost ? android.view.View.VISIBLE : android.view.View.GONE);
+        }
+
+    }
+
+    private void postToTwitter() {
+        final Dialog dialog = new Dialog(getActivityContext());
+
+        dialog.getWindow().requestFeature(Window.FEATURE_NO_TITLE);
+        dialog.setContentView(R.layout.dialog_twitter);
+        dialog.getWindow().setBackgroundDrawable(new ColorDrawable(android.graphics.Color.TRANSPARENT));
+
+        Button cancel = (Button) dialog.findViewById(R.id.button_cancel);
+        Button post = (Button) dialog.findViewById(R.id.button_post);
+        final EditText editText = (EditText) dialog.findViewById(R.id.message);
+        final ImageView imageView = (ImageView) dialog.findViewById(R.id.image_to_post);
+        final TextView textView = (TextView) dialog.findViewById(R.id.chars_left);
+
+        textView.setText(String.valueOf(140 - editText.getText().length()));
+
+        if (model.getSharingPics() != null) {
+            Bitmap sharingBitmap = model.getSharingPics()[1];
+            if (sharingBitmap != null) {
+                imageView.setImageBitmap(sharingBitmap);
+            } else {
+                Toast.makeText(getActivityContext(), R.string.twitter_error, Toast.LENGTH_SHORT).show();
+            }
+
+        }
+
+        editText.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                int left = 140 - s.length();
+                textView.setText(String.valueOf(left));
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+
+            }
+        });
+
+        cancel.setOnClickListener(new android.view.View.OnClickListener() {
+            @Override
+            public void onClick(android.view.View v) {
+                try {
+                    dialog.dismiss();
+                } catch (Exception e) {
+
+                }
+            }
+        });
+
+        post.setOnClickListener(new android.view.View.OnClickListener() {
+            @Override
+            public void onClick(android.view.View v) {
+
+                socialAuthAdapter = new SocialAuthAdapter(new ResponseListener(((BitmapDrawable)imageView.getDrawable()).getBitmap(),
+                        editText.getText().toString()));
+                socialAuthAdapter.addProvider(SocialAuthAdapter.Provider.TWITTER, R.drawable.ic_twitter_icon);
+                socialAuthAdapter.authorize(getActivityContext(), SocialAuthAdapter.Provider.TWITTER);
+                dialog.dismiss();
+            }
+        });
+
+        dialog.show();
+    }
+
+    }
diff --git a/app/src/main/java/com/hikapro/backpack/presenter/adapters/ItemDetailAdapter.java b/app/src/main/java/com/hikapro/backpack/presenter/adapters/ItemDetailAdapter.java
index bdd65f0..2087d92 100644
--- a/app/src/main/java/com/hikapro/backpack/presenter/adapters/ItemDetailAdapter.java
+++ b/app/src/main/java/com/hikapro/backpack/presenter/adapters/ItemDetailAdapter.java
@@ -41,7 +41,7 @@ public class ItemDetailAdapter extends RecyclerView.Adapter<ItemViewHolder> {
     public void onBindViewHolder(final ItemViewHolder holder, final int position) {
         final Item item = presenter.getModel().getCurrentItem();
         holder.cb_item.setChecked(item.isPacked());
-        holder.tv_text.setText(item.getName() + " " + item.getId() + " pos " + position);
+        holder.tv_text.setText(item.getName());
         holder.im_info.setVisibility(View.GONE);
         if (item.isPendingRemoval()) {
             holder.tv_text.setPaintFlags(holder.tv_text.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
diff --git a/app/src/main/java/com/hikapro/backpack/presenter/adapters/ItemListAdapter.java b/app/src/main/java/com/hikapro/backpack/presenter/adapters/ItemListAdapter.java
index 86ecd6d..861b848 100644
--- a/app/src/main/java/com/hikapro/backpack/presenter/adapters/ItemListAdapter.java
+++ b/app/src/main/java/com/hikapro/backpack/presenter/adapters/ItemListAdapter.java
@@ -58,7 +58,7 @@ public class ItemListAdapter extends RecyclerView.Adapter<ItemViewHolder> implem
 
         final Item item = presenter.getModel().getItemByPosition(position);
         holder.cb_item.setChecked(checkAll);
-        holder.tv_text.setText(item.getName() + " " + item.getId() + " pos " + position);
+        holder.tv_text.setText(item.getName());
         //holder.tv_text.setTypeface(mainFace);
         if (item.isPendingRemoval()) {
             holder.tv_text.setPaintFlags(holder.tv_text.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
diff --git a/app/src/main/java/com/hikapro/backpack/presenter/adapters/PackedListAdapter.java b/app/src/main/java/com/hikapro/backpack/presenter/adapters/PackedListAdapter.java
index 935bbe6..ebeb18c 100644
--- a/app/src/main/java/com/hikapro/backpack/presenter/adapters/PackedListAdapter.java
+++ b/app/src/main/java/com/hikapro/backpack/presenter/adapters/PackedListAdapter.java
@@ -28,7 +28,7 @@ public class PackedListAdapter extends ItemListAdapter {
 
         final Item item = presenter.getModel().getItemByPosition(position);
         holder.cb_item.setChecked(checkAll);
-        holder.tv_text.setText(item.getName() + " " + item.getId() + " pos " + position);
+        holder.tv_text.setText(item.getName());
         if (item.isPendingRemoval()) {
             holder.tv_text.setPaintFlags(holder.tv_text.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
             holder.cb_item.setVisibility(View.GONE);
@@ -156,12 +156,9 @@ public class PackedListAdapter extends ItemListAdapter {
 
     @Override
     public void remove(Item item) {
-        if (item.isPendingRemoval()) {
-            presenter.getModel().unpackItem(item);
-            presenter.getModel().remove(item);
-        }
-        else
-            presenter.getModel().pendingRemove(item);
+        presenter.getModel().unpackItem(item);
+        presenter.getModel().remove(item);
+         presenter.getModel().pendingRemove(item);
     }
 
     @Override
@@ -169,4 +166,9 @@ public class PackedListAdapter extends ItemListAdapter {
         presenter.getModel().pendingRemove(item);
     }
 
+    @Override
+    public void pack(Item item) {
+        item.setPacked(false);
+        super.pack(item);
+    }
 }
diff --git a/app/src/main/java/com/hikapro/backpack/presenter/adapters/SetListAdapter.java b/app/src/main/java/com/hikapro/backpack/presenter/adapters/SetListAdapter.java
index c0c26d1..bc9aa5f 100644
--- a/app/src/main/java/com/hikapro/backpack/presenter/adapters/SetListAdapter.java
+++ b/app/src/main/java/com/hikapro/backpack/presenter/adapters/SetListAdapter.java
@@ -1,6 +1,8 @@
 package com.hikapro.backpack.presenter.adapters;
 
 import android.graphics.Typeface;
+import android.graphics.drawable.Drawable;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -37,7 +39,6 @@ public class SetListAdapter extends  RecyclerView.Adapter<SetViewHolder> impleme
             else
                 this.rightBracket = "";
         }
-
         holder.textView.setText(set.getName() + " " + rightBracket);
         holder.textView.setTypeface(App.getMainFace());
         String info = String.format("%s %d / %d",
@@ -58,6 +59,9 @@ public class SetListAdapter extends  RecyclerView.Adapter<SetViewHolder> impleme
                 return false;
             }
         });
+        holder.applyBackground(presenter.getAppContext(), set.getId());
+
+
     }
 
     @Override
diff --git a/app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/AppRater.java b/app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/AppRater.java
new file mode 100644
index 0000000..40964a2
--- /dev/null
+++ b/app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/AppRater.java
@@ -0,0 +1,104 @@
+package com.hikapro.backpack.presenter.adapters.helper;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.graphics.drawable.ColorDrawable;
+import android.net.Uri;
+import android.util.Log;
+import android.view.Window;
+import android.widget.Button;
+import android.widget.Toast;
+
+import com.hikapro.backpack.App;
+import com.hikapro.backpack.R;
+
+/**
+ * Created by tariel on 26/08/16.
+ */
+public class AppRater {
+
+    private final static String APP_PNAME = "com.hikapro.backpack";
+    private final static String APP_PREFERENCES = "backpack";
+    private final static String DO_NOT_SHOW = "notshow";
+    private final static String COUNT = "count";
+    private final static String TRIGGER_COUNT = "triggercount";
+    private final static int COUNT_UNTIL_FIRST_PROMPT = 2;
+
+
+    public static boolean checkRatePrompt() {
+        boolean ret = false;
+        SharedPreferences preferences = App.getAppContext().getSharedPreferences(APP_PREFERENCES, Context.MODE_PRIVATE);
+            if (preferences.getBoolean(DO_NOT_SHOW, false))
+                ret = false;
+            else if (preferences.getInt(COUNT, 1) == preferences.getInt(TRIGGER_COUNT, COUNT_UNTIL_FIRST_PROMPT))
+                ret = true;
+        return ret;
+    }
+
+    public static void updateSharedPreferences(int countToAdd) {
+        SharedPreferences preferences = App.getAppContext().getSharedPreferences(APP_PREFERENCES, Context.MODE_PRIVATE);
+        SharedPreferences.Editor editor = preferences.edit();
+        int count = preferences.getInt(COUNT, 0) + countToAdd;
+        editor.putInt(COUNT, count);
+        editor.apply();
+
+    }
+
+    private static void later() {
+        SharedPreferences preferences = App.getAppContext().getSharedPreferences(APP_PREFERENCES, Context.MODE_PRIVATE);
+        SharedPreferences.Editor editor = preferences.edit();
+        int triggerCount = preferences.getInt(TRIGGER_COUNT, COUNT_UNTIL_FIRST_PROMPT);
+        triggerCount = triggerCount * 2 + triggerCount;
+        editor.putInt(TRIGGER_COUNT, triggerCount);
+        editor.apply();
+    }
+
+    private static void sure() {
+        SharedPreferences preferences = App.getAppContext().getSharedPreferences(APP_PREFERENCES, Context.MODE_PRIVATE);
+        SharedPreferences.Editor editor = preferences.edit();
+        editor.putBoolean(DO_NOT_SHOW, true);
+        editor.apply();
+    }
+
+    public static void showRateDialog(final Context context) {
+
+        final Dialog dialog = new Dialog(context);
+
+        dialog.getWindow().requestFeature(Window.FEATURE_NO_TITLE);
+        dialog.setContentView(R.layout.dialog_rate);
+        dialog.getWindow().setBackgroundDrawable(new ColorDrawable(android.graphics.Color.TRANSPARENT));
+
+        final Button later = (Button) dialog.findViewById(R.id.button_later);
+        Button rate = (Button) dialog.findViewById(R.id.button_rate);
+
+        later.setOnClickListener(new android.view.View.OnClickListener() {
+            @Override
+            public void onClick(android.view.View v) {
+                try {
+                    later();
+                    dialog.dismiss();
+                } catch (Exception e) {
+                    Log.e("Rate dialog", "Error while closing", e);
+                }
+            }
+        });
+        rate.setOnClickListener(new android.view.View.OnClickListener() {
+            @Override
+            public void onClick(android.view.View v) {
+                try {
+                    context.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + APP_PNAME)));
+                    sure();
+                    dialog.dismiss();
+                } catch (Exception e) {
+                    Log.e("Rate dialog", "Error while rating", e);
+                }
+
+            }
+        });
+
+        dialog.show();
+    }
+
+}
diff --git a/app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/items/HeaderViewCache.java b/app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/items/HeaderViewCache.java
index de5f7dd..0660c84 100644
--- a/app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/items/HeaderViewCache.java
+++ b/app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/items/HeaderViewCache.java
@@ -23,7 +23,6 @@ public class HeaderViewCache implements HeaderProvider {
 
         View header = headerViews.get(headerId);
         if (header == null) {
-            //TODO - recycle views
             RecyclerView.ViewHolder viewHolder = adapter.onCreateHeaderViewHolder(parent);
             adapter.onBindHeaderViewHolder(viewHolder, position);
             header = viewHolder.itemView;
diff --git a/app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/items/ItemSwipeCallback.java b/app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/items/ItemSwipeCallback.java
index d5aa47f..ef3da59 100644
--- a/app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/items/ItemSwipeCallback.java
+++ b/app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/items/ItemSwipeCallback.java
@@ -62,13 +62,6 @@ public class ItemSwipeCallback extends ItemTouchHelper.SimpleCallback {
     @Override
     public void onSwiped(RecyclerView.ViewHolder viewHolder, int swipeDir) {
         int swipedPosition = viewHolder.getAdapterPosition();
-/*
-        boolean undoOn = adapter.isUndoOn();
-        if (undoOn) {
-            adapter.pendingRemoval(swipedPosition);
-        } else {
-            adapter.remove(swipedPosition);
-        }*/
     }
 
     @Override
diff --git a/app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/sets/SimpleItemTouchHelperCallback.java b/app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/sets/SimpleItemTouchHelperCallback.java
index 6afddfb..d88e4a8 100644
--- a/app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/sets/SimpleItemTouchHelperCallback.java
+++ b/app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/sets/SimpleItemTouchHelperCallback.java
@@ -74,7 +74,6 @@ public class SimpleItemTouchHelperCallback extends ItemTouchHelper.Callback {
                 itemViewHolder.onItemSelected();
             }
         }
-
         super.onSelectedChanged(viewHolder, actionState);
     }
 
diff --git a/app/src/main/java/com/hikapro/backpack/view/fragments/AddFragment.java b/app/src/main/java/com/hikapro/backpack/view/fragments/AddFragment.java
index 8d79497..933d47b 100644
--- a/app/src/main/java/com/hikapro/backpack/view/fragments/AddFragment.java
+++ b/app/src/main/java/com/hikapro/backpack/view/fragments/AddFragment.java
@@ -45,7 +45,6 @@ public class AddFragment extends Fragment implements com.hikapro.backpack.view.V
         // Required empty public constructor
     }
 
-    // life cycle -->
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
@@ -149,12 +148,5 @@ public class AddFragment extends Fragment implements com.hikapro.backpack.view.V
     public Set getSet() {
         return (Set) getArguments().getSerializable(BUNDLE_SET_KEY);
     }
-/*
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        inflater.inflate(R.menu.menu_add, menu);
-        super.onCreateOptionsMenu(menu, inflater);
-    }
 
-*/
 }
diff --git a/app/src/main/java/com/hikapro/backpack/view/fragments/ItemDetailFragment.java b/app/src/main/java/com/hikapro/backpack/view/fragments/ItemDetailFragment.java
index 71bccb6..7a88f67 100644
--- a/app/src/main/java/com/hikapro/backpack/view/fragments/ItemDetailFragment.java
+++ b/app/src/main/java/com/hikapro/backpack/view/fragments/ItemDetailFragment.java
@@ -74,7 +74,6 @@ public class ItemDetailFragment extends Fragment implements com.hikapro.backpack
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
-        // Inflate the layout for this fragment
         presenter.setView(this);
         View view = presenter.onCreateView(inflater, container, savedInstanceState);
         Log.i(this.toString(), " onCreateView");
@@ -103,13 +102,13 @@ public class ItemDetailFragment extends Fragment implements com.hikapro.backpack
     @Override
     public void onDestroyView() {
         super.onDestroyView();
-        presenter.onDestroy(true); // TODO isChangingConfigurations
+        presenter.onDestroy(true);
         Log.i(this.toString(), " onDestroyView");
     }
     @Override
     public void onDestroy() {
         super.onDestroy();
-        presenter.onDestroy(false); // TODO isChangingConfigurations
+        presenter.onDestroy(false);
         Log.i(this.toString(), " onDestroy");
     }
     @Override
@@ -123,8 +122,6 @@ public class ItemDetailFragment extends Fragment implements com.hikapro.backpack
         Log.i(this.toString(), " onSaveInstanceState");
     }
 
-    // life cycle <--
-
     @Override
     public void setPresenter(Presenter.ItemDetail presenter) {
         this.presenter = presenter;
diff --git a/app/src/main/java/com/hikapro/backpack/view/fragments/ItemListFragment.java b/app/src/main/java/com/hikapro/backpack/view/fragments/ItemListFragment.java
index d2fe483..9235b19 100644
--- a/app/src/main/java/com/hikapro/backpack/view/fragments/ItemListFragment.java
+++ b/app/src/main/java/com/hikapro/backpack/view/fragments/ItemListFragment.java
@@ -29,6 +29,7 @@ public class ItemListFragment extends Fragment implements com.hikapro.backpack.v
     protected static final String BUNDLE_SET_KEY = "BUNDLE_SET_KEY";
     private com.hikapro.backpack.view.View.ActivityCallback activityCallback;
     private Presenter.ItemList  presenter;
+    private boolean hz;
 
     public ItemListFragment() {
         // Required empty public constructor
@@ -50,12 +51,11 @@ public class ItemListFragment extends Fragment implements com.hikapro.backpack.v
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
 
         inflater.inflate(R.menu.menu_main, menu);
-
-        final MenuItem item = menu.findItem(R.id.action_search);
-        final SearchView searchView = (SearchView) item.getActionView();
-        searchView.setOnQueryTextListener(this);
         super.onCreateOptionsMenu(menu, inflater);
-
+        final MenuItem item = menu.findItem(R.id.action_search);
+        SearchView searchView = (SearchView) item.getActionView();
+        searchView.setOnQueryTextListener(this);
+        Log.i(this.getClass().getName(), " onCreateOptionsMenu");
     }
 
     @Override
@@ -65,8 +65,11 @@ public class ItemListFragment extends Fragment implements com.hikapro.backpack.v
 
     @Override
     public boolean onQueryTextChange(String newText) {
-        presenter.filter(newText);
-        return true;
+        if (hz)
+            presenter.filter(newText);
+        if (!hz)
+            hz = true;
+        return hz;
     }
 
     @Override
@@ -90,13 +93,13 @@ public class ItemListFragment extends Fragment implements com.hikapro.backpack.v
             case R.id.action_add :
                 activityCallback.startAddFragment(getSet());
                 ret = true;
+                break;
             default:
                 ret = super.onOptionsItemSelected(item);
         }
         return ret;
     }
 
-    // life cycle -->
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
@@ -127,7 +130,6 @@ public class ItemListFragment extends Fragment implements com.hikapro.backpack.v
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
-        // Inflate the layout for this fragment
         presenter.setView(this);
         View view = presenter.onCreateView(inflater, container, savedInstanceState);
         Log.i(this.getClass().getName(), " onCreateView");
@@ -146,6 +148,7 @@ public class ItemListFragment extends Fragment implements com.hikapro.backpack.v
     @Override
     public void onResume() {
         super.onResume();
+        presenter.onResume();
         Log.i(this.getClass().getName(), " onResume");
     }
     @Override
@@ -157,6 +160,7 @@ public class ItemListFragment extends Fragment implements com.hikapro.backpack.v
     public void onDestroyView() {
         super.onDestroyView();
         presenter.onDestroy(true); // TODO isChangingConfigurations
+        hz = false;
         Log.i(this.getClass().getName(), " onDestroyView");
     }
     @Override
@@ -177,9 +181,6 @@ public class ItemListFragment extends Fragment implements com.hikapro.backpack.v
         Log.i(this.getClass().getName(), " onSaveInstanceState");
     }
 
-    // life cycle <--
-
-
     @Override
     public void showItemDetail(int setId, Model.Item baseModel, int position) {
         activityCallback.startItemDetailFragment(setId, baseModel, position);
diff --git a/app/src/main/java/com/hikapro/backpack/view/fragments/SetListFragment.java b/app/src/main/java/com/hikapro/backpack/view/fragments/SetListFragment.java
index 4605eea..af8e622 100644
--- a/app/src/main/java/com/hikapro/backpack/view/fragments/SetListFragment.java
+++ b/app/src/main/java/com/hikapro/backpack/view/fragments/SetListFragment.java
@@ -29,7 +29,6 @@ public class SetListFragment extends Fragment implements com.hikapro.backpack.vi
         return ret;
     }
 
-    // life cycle -->
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
@@ -60,7 +59,6 @@ public class SetListFragment extends Fragment implements com.hikapro.backpack.vi
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         Log.i(this.toString(), "onCreateView");
-        // Inflate the layout for this fragment
         presenter.setView(this);
         View view = presenter.onCreateView(inflater, container, savedInstanceState);
 
@@ -109,7 +107,6 @@ public class SetListFragment extends Fragment implements com.hikapro.backpack.vi
         super.onDetach();
         Log.i(this.toString(), "onDetach");
     }
-    // life cycle <--
 
     @Override
     public void showItemList(Set set) {
diff --git a/app/src/main/java/com/hikapro/backpack/view/recycler/SetViewHolder.java b/app/src/main/java/com/hikapro/backpack/view/recycler/SetViewHolder.java
index e0bce7b..47c5a0e 100644
--- a/app/src/main/java/com/hikapro/backpack/view/recycler/SetViewHolder.java
+++ b/app/src/main/java/com/hikapro/backpack/view/recycler/SetViewHolder.java
@@ -1,10 +1,14 @@
 package com.hikapro.backpack.view.recycler;
 
+import android.content.Context;
 import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.CardView;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.TextView;
 
 import com.hikapro.backpack.R;
@@ -19,8 +23,7 @@ public class SetViewHolder extends RecyclerView.ViewHolder implements ItemTouchH
     public TextView textView;
     public TextView setInfo;
 
-    //GLM_add_resources_SetList
-    private View view;
+    private ViewGroup cardContent;
     private Drawable drawable;
 
     public SetViewHolder(View v) {
@@ -32,20 +35,81 @@ public class SetViewHolder extends RecyclerView.ViewHolder implements ItemTouchH
         cardView    = (CardView) view.findViewById(R.id.card_view_set);
         textView    = (TextView) view.findViewById(R.id.set_text);
         setInfo     = (TextView) view.findViewById(R.id.set_info);
-
-        this.view = view;
-        drawable = view.getBackground();
+        cardContent = (ViewGroup) view.findViewById(R.id.card_content);
     }
 
     //GLM_add_resources_SetList
     @Override
     public void onItemClear() {
-        view.setBackground(drawable);
+        cardContent.setBackgroundColor(cardView.getResources().getColor(R.color.colorListBackground));
+        if (drawable != null) {
+            cardContent.setBackground(drawable);
+        }
+        drawable = null;
     }
 
     //GLM_add_resources_SetList
     @Override
     public void onItemSelected() {
-        view.setBackgroundColor(Color.GRAY);
+        this.drawable = cardContent.getBackground();
+        cardContent.setBackgroundColor(Color.GRAY);
+    }
+
+    public void applyBackground(Context context, int setId) {
+
+        Drawable drawable = null;
+
+        switch (setId) {
+            case 1:
+                drawable = ContextCompat.getDrawable(context, R.drawable.ic_card_1);
+                break;
+            case 2:
+                drawable = ContextCompat.getDrawable(context, R.drawable.ic_card_2);
+                break;
+            case 3:
+                drawable = ContextCompat.getDrawable(context, R.drawable.ic_card_3);
+                break;
+            case 4:
+                drawable = ContextCompat.getDrawable(context, R.drawable.ic_card_4);
+                break;
+            case 5:
+                drawable = ContextCompat.getDrawable(context, R.drawable.ic_card_5);
+                break;
+            case 6:
+                drawable = ContextCompat.getDrawable(context, R.drawable.ic_card_6);
+                break;
+            case 7:
+                // nothing
+                break;
+            case 8:
+                drawable = ContextCompat.getDrawable(context, R.drawable.ic_card_8);
+                break;
+            case 9:
+                // nothing
+                break;
+            case 10:
+                drawable = ContextCompat.getDrawable(context, R.drawable.ic_card_10);
+                break;
+            case 11:
+                // nothing
+                break;
+            case 12:
+                // nothing
+                break;
+            case 13:
+                // nothing
+                break;
+            case 14:
+                drawable = ContextCompat.getDrawable(context, R.drawable.ic_card_14);
+                break;
+            default:
+                drawable = new ColorDrawable(ContextCompat.getColor(context, R.color.colorListBackground));
+
+        }
+        if (drawable != null)
+            cardContent.setBackground(drawable);
+        else
+            cardContent.setBackgroundColor(cardView.getResources().getColor(R.color.colorFullTransparent));
+
     }
 }
diff --git a/app/src/main/res/animator/slide_in_bottom_y.xml b/app/src/main/res/animator/slide_in_bottom_y.xml
index 53ea453..162cc56 100644
--- a/app/src/main/res/animator/slide_in_bottom_y.xml
+++ b/app/src/main/res/animator/slide_in_bottom_y.xml
@@ -3,10 +3,10 @@
 
     <objectAnimator
         xmlns:android="http://schemas.android.com/apk/res/android"
-        android:duration="500"
+        android:duration="@integer/duration"
         android:propertyName="y"
-        android:valueFrom="-1000"
-        android:valueTo="0"
+        android:valueFrom="@integer/valueTransitionYminus"
+        android:valueTo="@integer/valueTo"
         android:valueType="floatType" />
 
 </set>
\ No newline at end of file
diff --git a/app/src/main/res/animator/slide_in_left_x.xml b/app/src/main/res/animator/slide_in_left_x.xml
index f8c7553..3f96264 100644
--- a/app/src/main/res/animator/slide_in_left_x.xml
+++ b/app/src/main/res/animator/slide_in_left_x.xml
@@ -3,10 +3,10 @@
 
     <objectAnimator
         xmlns:android="http://schemas.android.com/apk/res/android"
-        android:duration="500"
+        android:duration="@integer/duration"
         android:propertyName="x"
-        android:valueFrom="1000"
-        android:valueTo="0"
+        android:valueFrom="@integer/valueTransitionXplus"
+        android:valueTo="@integer/valueTo"
         android:valueType="floatType" />
 
 </set>
\ No newline at end of file
diff --git a/app/src/main/res/animator/slide_in_right_x.xml b/app/src/main/res/animator/slide_in_right_x.xml
index 05199a6..e7404fa 100644
--- a/app/src/main/res/animator/slide_in_right_x.xml
+++ b/app/src/main/res/animator/slide_in_right_x.xml
@@ -3,10 +3,10 @@
 
     <objectAnimator
         xmlns:android="http://schemas.android.com/apk/res/android"
-        android:duration="500"
+        android:duration="@integer/duration"
         android:propertyName="x"
-        android:valueFrom="-1000"
-        android:valueTo="0"
+        android:valueFrom="@integer/valueTransitionXminus"
+        android:valueTo="@integer/valueTo"
         android:valueType="floatType" />
 
 </set>
\ No newline at end of file
diff --git a/app/src/main/res/animator/slide_in_top_y.xml b/app/src/main/res/animator/slide_in_top_y.xml
index 7fd641f..2ff0acd 100644
--- a/app/src/main/res/animator/slide_in_top_y.xml
+++ b/app/src/main/res/animator/slide_in_top_y.xml
@@ -3,10 +3,10 @@
 
     <objectAnimator
         xmlns:android="http://schemas.android.com/apk/res/android"
-        android:duration="500"
+        android:duration="@integer/duration"
         android:propertyName="y"
-        android:valueFrom="1000"
-        android:valueTo="0"
+        android:valueFrom="@integer/valueTransitionYplus"
+        android:valueTo="@integer/valueTo"
         android:valueType="floatType" />
 
 </set>
\ No newline at end of file
diff --git a/app/src/main/res/animator/slide_out_bottom_y.xml b/app/src/main/res/animator/slide_out_bottom_y.xml
index 5fc7d09..dd65e3f 100644
--- a/app/src/main/res/animator/slide_out_bottom_y.xml
+++ b/app/src/main/res/animator/slide_out_bottom_y.xml
@@ -3,10 +3,10 @@
 
     <objectAnimator
         xmlns:android="http://schemas.android.com/apk/res/android"
-        android:duration="500"
+        android:duration="@integer/duration"
         android:propertyName="y"
-        android:valueFrom="0"
-        android:valueTo="-1000"
+        android:valueFrom="@integer/valueTo"
+        android:valueTo="@integer/valueTransitionYminus"
         android:valueType="floatType" />
 
 </set>
\ No newline at end of file
diff --git a/app/src/main/res/animator/slide_out_left_x.xml b/app/src/main/res/animator/slide_out_left_x.xml
index a13ab18..d79834e 100644
--- a/app/src/main/res/animator/slide_out_left_x.xml
+++ b/app/src/main/res/animator/slide_out_left_x.xml
@@ -3,10 +3,10 @@
 
     <objectAnimator
         xmlns:android="http://schemas.android.com/apk/res/android"
-        android:duration="500"
+        android:duration="@integer/duration"
         android:propertyName="x"
-        android:valueFrom="0"
-        android:valueTo="1000"
+        android:valueFrom="@integer/valueTo"
+        android:valueTo="@integer/valueTransitionXplus"
         android:valueType="floatType" />
 
 </set>
\ No newline at end of file
diff --git a/app/src/main/res/animator/slide_out_right_x.xml b/app/src/main/res/animator/slide_out_right_x.xml
index 184d522..88e5688 100644
--- a/app/src/main/res/animator/slide_out_right_x.xml
+++ b/app/src/main/res/animator/slide_out_right_x.xml
@@ -3,10 +3,10 @@
 
     <objectAnimator
         xmlns:android="http://schemas.android.com/apk/res/android"
-        android:duration="500"
+        android:duration="@integer/duration"
         android:propertyName="x"
-        android:valueFrom="0"
-        android:valueTo="-1000"
+        android:valueFrom="@integer/valueTo"
+        android:valueTo="@integer/valueTransitionXminus"
         android:valueType="floatType" />
 
 </set>
\ No newline at end of file
diff --git a/app/src/main/res/animator/slide_out_top_y.xml b/app/src/main/res/animator/slide_out_top_y.xml
index 64894c7..eceea86 100644
--- a/app/src/main/res/animator/slide_out_top_y.xml
+++ b/app/src/main/res/animator/slide_out_top_y.xml
@@ -3,10 +3,10 @@
 
     <objectAnimator
         xmlns:android="http://schemas.android.com/apk/res/android"
-        android:duration="500"
+        android:duration="@integer/duration"
         android:propertyName="y"
-        android:valueFrom="0"
-        android:valueTo="1000"
+        android:valueFrom="@integer/valueTo"
+        android:valueTo="@integer/valueTransitionYplus"
         android:valueType="floatType" />
 
 </set>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-hdpi/ic_check_box_outline_blank_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_check_box_outline_blank_white_24dp.png
deleted file mode 100644
index 443e73f..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_check_box_outline_blank_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_check_box_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_check_box_white_24dp.png
deleted file mode 100644
index 9f3bc73..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_check_box_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_info_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_info_black_24dp.png
deleted file mode 100644
index da56077..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_info_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_info_white.png b/app/src/main/res/drawable-hdpi/ic_info_white.png
deleted file mode 100644
index 2d316a3..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_info_white.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_info_white.png b/app/src/main/res/drawable-mdpi/ic_info_white.png
index 2d316a3..336426e 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_info_white.png and b/app/src/main/res/drawable-mdpi/ic_info_white.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_info_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_info_black_24dp.png
deleted file mode 100644
index 46ed12a..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_info_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_info_white.png b/app/src/main/res/drawable-xhdpi/ic_info_white.png
index 88acdc2..2c3bf64 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_info_white.png and b/app/src/main/res/drawable-xhdpi/ic_info_white.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_info_white.png b/app/src/main/res/drawable-xxhdpi/ic_info_white.png
index 9ed5c04..bd1249b 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_info_white.png and b/app/src/main/res/drawable-xxhdpi/ic_info_white.png differ
diff --git a/app/src/main/res/drawable/facebook_48.png b/app/src/main/res/drawable/facebook_48.png
deleted file mode 100644
index eb0a202..0000000
Binary files a/app/src/main/res/drawable/facebook_48.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_card_1.png b/app/src/main/res/drawable/ic_card_1.png
new file mode 100644
index 0000000..e0bf6b1
Binary files /dev/null and b/app/src/main/res/drawable/ic_card_1.png differ
diff --git a/app/src/main/res/drawable/ic_card_10.png b/app/src/main/res/drawable/ic_card_10.png
new file mode 100644
index 0000000..f1cc9eb
Binary files /dev/null and b/app/src/main/res/drawable/ic_card_10.png differ
diff --git a/app/src/main/res/drawable/ic_card_14.png b/app/src/main/res/drawable/ic_card_14.png
new file mode 100644
index 0000000..b4c0442
Binary files /dev/null and b/app/src/main/res/drawable/ic_card_14.png differ
diff --git a/app/src/main/res/drawable/ic_card_2.png b/app/src/main/res/drawable/ic_card_2.png
new file mode 100644
index 0000000..c79b074
Binary files /dev/null and b/app/src/main/res/drawable/ic_card_2.png differ
diff --git a/app/src/main/res/drawable/ic_card_3.png b/app/src/main/res/drawable/ic_card_3.png
new file mode 100644
index 0000000..1191fee
Binary files /dev/null and b/app/src/main/res/drawable/ic_card_3.png differ
diff --git a/app/src/main/res/drawable/ic_card_4.png b/app/src/main/res/drawable/ic_card_4.png
new file mode 100644
index 0000000..295f27b
Binary files /dev/null and b/app/src/main/res/drawable/ic_card_4.png differ
diff --git a/app/src/main/res/drawable/ic_card_5.png b/app/src/main/res/drawable/ic_card_5.png
new file mode 100644
index 0000000..7dce5af
Binary files /dev/null and b/app/src/main/res/drawable/ic_card_5.png differ
diff --git a/app/src/main/res/drawable/ic_card_6.png b/app/src/main/res/drawable/ic_card_6.png
new file mode 100644
index 0000000..e14def7
Binary files /dev/null and b/app/src/main/res/drawable/ic_card_6.png differ
diff --git a/app/src/main/res/drawable/ic_card_8.png b/app/src/main/res/drawable/ic_card_8.png
new file mode 100644
index 0000000..c46c4b5
Binary files /dev/null and b/app/src/main/res/drawable/ic_card_8.png differ
diff --git a/app/src/main/res/drawable/ic_facebook_icon.png b/app/src/main/res/drawable/ic_facebook_icon.png
new file mode 100644
index 0000000..4b0a2a5
Binary files /dev/null and b/app/src/main/res/drawable/ic_facebook_icon.png differ
diff --git a/app/src/main/res/drawable/ic_info_black_24dp.png b/app/src/main/res/drawable/ic_info_black_24dp.png
deleted file mode 100644
index da56077..0000000
Binary files a/app/src/main/res/drawable/ic_info_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_info_white.png b/app/src/main/res/drawable/ic_info_white.png
index 2d316a3..634579f 100644
Binary files a/app/src/main/res/drawable/ic_info_white.png and b/app/src/main/res/drawable/ic_info_white.png differ
diff --git a/app/src/main/res/drawable/ic_item_list_1.png b/app/src/main/res/drawable/ic_item_list_1.png
new file mode 100644
index 0000000..8d82f2f
Binary files /dev/null and b/app/src/main/res/drawable/ic_item_list_1.png differ
diff --git a/app/src/main/res/drawable/ic_item_list_10.png b/app/src/main/res/drawable/ic_item_list_10.png
new file mode 100644
index 0000000..8ba6ba5
Binary files /dev/null and b/app/src/main/res/drawable/ic_item_list_10.png differ
diff --git a/app/src/main/res/drawable/ic_item_list_14.png b/app/src/main/res/drawable/ic_item_list_14.png
new file mode 100644
index 0000000..e8a4cd3
Binary files /dev/null and b/app/src/main/res/drawable/ic_item_list_14.png differ
diff --git a/app/src/main/res/drawable/ic_item_list_2.png b/app/src/main/res/drawable/ic_item_list_2.png
new file mode 100644
index 0000000..33459be
Binary files /dev/null and b/app/src/main/res/drawable/ic_item_list_2.png differ
diff --git a/app/src/main/res/drawable/ic_item_list_3.png b/app/src/main/res/drawable/ic_item_list_3.png
new file mode 100644
index 0000000..f8baa19
Binary files /dev/null and b/app/src/main/res/drawable/ic_item_list_3.png differ
diff --git a/app/src/main/res/drawable/ic_item_list_4.png b/app/src/main/res/drawable/ic_item_list_4.png
new file mode 100644
index 0000000..5c042d0
Binary files /dev/null and b/app/src/main/res/drawable/ic_item_list_4.png differ
diff --git a/app/src/main/res/drawable/ic_item_list_5.png b/app/src/main/res/drawable/ic_item_list_5.png
new file mode 100644
index 0000000..0054d24
Binary files /dev/null and b/app/src/main/res/drawable/ic_item_list_5.png differ
diff --git a/app/src/main/res/drawable/ic_item_list_6.png b/app/src/main/res/drawable/ic_item_list_6.png
new file mode 100644
index 0000000..1957c64
Binary files /dev/null and b/app/src/main/res/drawable/ic_item_list_6.png differ
diff --git a/app/src/main/res/drawable/ic_item_list_8.png b/app/src/main/res/drawable/ic_item_list_8.png
new file mode 100644
index 0000000..0678143
Binary files /dev/null and b/app/src/main/res/drawable/ic_item_list_8.png differ
diff --git a/app/src/main/res/drawable/ic_twitter_icon.png b/app/src/main/res/drawable/ic_twitter_icon.png
new file mode 100644
index 0000000..65d57f7
Binary files /dev/null and b/app/src/main/res/drawable/ic_twitter_icon.png differ
diff --git a/app/src/main/res/drawable/pic.png b/app/src/main/res/drawable/pic.png
deleted file mode 100644
index 7ab8b3a..0000000
Binary files a/app/src/main/res/drawable/pic.png and /dev/null differ
diff --git a/app/src/main/res/drawable/share_btn_bg.xml b/app/src/main/res/drawable/share_btn_bg.xml
new file mode 100644
index 0000000..d7d20f1
--- /dev/null
+++ b/app/src/main/res/drawable/share_btn_bg.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/colorShareBtnBackground" />
+    <corners android:radius="5dp" />
+    <stroke android:width="2px" android:color="#FFFFFF" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/sharing_pic_default.jpg b/app/src/main/res/drawable/sharing_pic_default.jpg
new file mode 100755
index 0000000..5e2e513
Binary files /dev/null and b/app/src/main/res/drawable/sharing_pic_default.jpg differ
diff --git a/app/src/main/res/drawable/sharing_pic_thumb_default.jpg b/app/src/main/res/drawable/sharing_pic_thumb_default.jpg
new file mode 100755
index 0000000..35ccacc
Binary files /dev/null and b/app/src/main/res/drawable/sharing_pic_thumb_default.jpg differ
diff --git a/app/src/main/res/drawable/start_img.png b/app/src/main/res/drawable/start_img.png
new file mode 100644
index 0000000..905ce84
Binary files /dev/null and b/app/src/main/res/drawable/start_img.png differ
diff --git a/app/src/main/res/drawable/tweeter_button.xml b/app/src/main/res/drawable/tweeter_button.xml
new file mode 100644
index 0000000..7964159
--- /dev/null
+++ b/app/src/main/res/drawable/tweeter_button.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"
+    android:padding="10dp">
+    <solid android:color="#e0f2ff"/>
+    <corners android:topLeftRadius="10dip"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/tweeter_button2.xml b/app/src/main/res/drawable/tweeter_button2.xml
new file mode 100644
index 0000000..9223701
--- /dev/null
+++ b/app/src/main/res/drawable/tweeter_button2.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"
+    android:padding="10dp">
+    <solid android:color="#e0f2ff"/>
+    <corners android:topRightRadius="10dip"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/twitter.png b/app/src/main/res/drawable/twitter.png
new file mode 100644
index 0000000..65d57f7
Binary files /dev/null and b/app/src/main/res/drawable/twitter.png differ
diff --git a/app/src/main/res/drawable/twitter_dlg.xml b/app/src/main/res/drawable/twitter_dlg.xml
new file mode 100644
index 0000000..40cd704
--- /dev/null
+++ b/app/src/main/res/drawable/twitter_dlg.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#e0f2ff"/>
+    <stroke android:width="1dip" android:color="#FFe0f2ff" />
+    <corners android:radius="10dip"/>
+    <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/add_cust_actionbar.xml b/app/src/main/res/layout/add_cust_actionbar.xml
index a1b7ebd..fe89ccb 100644
--- a/app/src/main/res/layout/add_cust_actionbar.xml
+++ b/app/src/main/res/layout/add_cust_actionbar.xml
@@ -2,33 +2,37 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:enabled="false"
-    android:paddingLeft="@dimen/margin_standard"
-    android:paddingRight="@dimen/margin_standard">
+    android:enabled="false" >
 
     <Button
         android:id="@+id/action_add_cancel"
-        style="@style/ActionBarButtonWhite"
+        style="@style/ActionBarButtonWhiteStart"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:text="@string/cancel_button"
-        android:layout_alignParentStart="true"/>
+        android:layout_alignParentStart="true"
+        android:layout_centerVertical="true"
+        />
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:text="ADD AN ITEM"
-        android:textSize="@dimen/text_size_medium"
         android:layout_centerInParent="true"
         android:gravity="center"
+
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:text="@string/add_an_item"
+        android:textAllCaps="true"
+        android:textSize="@dimen/text_action_bar_header"
         android:textColor="@color/white"
         android:textStyle="bold"/>
 
     <Button
         android:id="@+id/action_add_save"
-        style="@style/ActionBarButtonWhite"
+        style="@style/ActionBarButtonWhiteEnd"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:text="@string/save_button"
-        android:layout_alignParentEnd="true"/>
+        android:layout_alignParentEnd="true"
+        android:layout_centerVertical="true"
+        />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_confirm.xml b/app/src/main/res/layout/dialog_confirm.xml
new file mode 100644
index 0000000..4807b8b
--- /dev/null
+++ b/app/src/main/res/layout/dialog_confirm.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="@dimen/dlg_restore_width"
+    android:layout_height="@dimen/dlg_restore_height">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:orientation="vertical"
+        android:background="@android:color/black" >
+
+        <TextView
+            android:id="@+id/txt_header"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:paddingTop="16dp"
+            android:paddingBottom="16dp"
+            android:text="@string/dlg_restore_header"
+            android:textSize="@dimen/dlg_restore_header"
+            android:textColor="@color/colorText"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <com.hikapro.backpack.presenter.adapters.helper.AutoResizeTextView
+            android:id="@+id/txt_content"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:paddingTop="16dp"
+            android:paddingBottom="16dp"
+            android:paddingStart="16dp"
+            android:paddingEnd="16dp"
+            android:text="@string/dlg_restore_txt"
+            android:textSize="@dimen/dlg_restore_txt"
+            android:textColor="@color/colorRestoreDialogTxt"
+            android:textAppearance="?android:attr/textAppearanceMedium"/>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dlg_restore_btn_height"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:layout_height="match_parent"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:background="@color/colorRestoreBtnBackground">
+
+            <Button
+                android:id="@+id/button_ok"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:text="@string/dlg_restore_btn"
+                android:textColor="@color/colorText"
+                android:textSize="@dimen/dlg_restore_txt"
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:background="?android:attr/selectableItemBackground"  />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_height="match_parent"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:background="@color/colorCancelBtnBackground" >
+
+            <Button
+                android:id="@+id/button_cancel"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:text="@string/dlg_cancel_btn"
+                android:textColor="@color/colorText"
+                android:textSize="@dimen/dlg_restore_txt"
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:background="?android:attr/selectableItemBackground" />
+
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_rate.xml b/app/src/main/res/layout/dialog_rate.xml
new file mode 100644
index 0000000..de1383c
--- /dev/null
+++ b/app/src/main/res/layout/dialog_rate.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="@dimen/dlg_restore_width"
+    android:layout_height="@dimen/dlg_restore_height">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:orientation="vertical"
+        android:background="@android:color/black" >
+
+        <TextView
+            android:id="@+id/txt_header"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:paddingTop="16dp"
+            android:paddingBottom="16dp"
+            android:text="@string/dlg_rate_header"
+            android:textSize="@dimen/dlg_restore_header"
+            android:textColor="@color/colorText"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <com.hikapro.backpack.presenter.adapters.helper.AutoResizeTextView
+            android:id="@+id/txt_content"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:paddingTop="16dp"
+            android:paddingBottom="16dp"
+            android:paddingStart="16dp"
+            android:paddingEnd="16dp"
+            android:text="@string/dlg_rate_txt"
+            android:textSize="@dimen/dlg_restore_txt"
+            android:textColor="@color/colorRestoreDialogTxt"
+            android:textAppearance="?android:attr/textAppearanceMedium"/>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dlg_restore_btn_height"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:layout_height="match_parent"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:background="@color/colorRestoreBtnBackground">
+
+            <Button
+                android:id="@+id/button_rate"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:text="@string/dlg_rate_btn"
+                android:textColor="@color/colorText"
+                android:textSize="@dimen/dlg_restore_txt"
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:background="?android:attr/selectableItemBackground"  />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_height="match_parent"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:background="@color/colorCancelBtnBackground" >
+
+            <Button
+                android:id="@+id/button_later"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:text="@string/dlg_later_btn"
+                android:textColor="@color/colorText"
+                android:textSize="@dimen/dlg_restore_txt"
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:background="?android:attr/selectableItemBackground" />
+
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_twitter.xml b/app/src/main/res/layout/dialog_twitter.xml
new file mode 100644
index 0000000..2663594
--- /dev/null
+++ b/app/src/main/res/layout/dialog_twitter.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="320dp"
+    android:layout_height="230dp"
+    android:background="@drawable/twitter_dlg">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="66dp"
+        android:orientation="horizontal" >
+
+        <Button
+            android:id="@+id/button_cancel"
+            android:layout_width="100dp"
+            android:layout_height="match_parent"
+            android:text="Cancel"
+            android:gravity="start|center_vertical"
+            android:textColor="#3333cc"
+            android:textSize="18sp"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:paddingStart="16dp"
+            android:background="@drawable/tweeter_button"
+            style="@style/Widget.AppCompat.Button.Borderless.Colored"/>
+
+        <TextView
+            android:id="@+id/txt_header"
+            android:layout_width="120dp"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:paddingTop="16dp"
+            android:text="Twitter"
+            android:textSize="22sp"
+            android:textStyle="bold"
+            android:textColor="@android:color/black"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <Button
+            android:id="@+id/button_post"
+            android:layout_width="100dp"
+            android:layout_height="match_parent"
+            android:text="Post"
+            android:gravity="end|center_vertical"
+            android:paddingEnd="16dp"
+            android:textColor="#3333cc"
+            android:textSize="18sp"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:background="@drawable/tweeter_button2"
+            style="@style/Widget.AppCompat.Button.Borderless.Colored"/>
+    </LinearLayout>
+    <View
+        android:layout_marginTop="0dp"
+        android:layout_width="match_parent"
+        android:layout_height="1dip"
+        android:background="#666699">
+    </View>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:paddingTop="4dp"
+        android:orientation="horizontal">
+
+        <EditText
+            android:id="@+id/message"
+            android:layout_width="220dp"
+            android:gravity="top"
+            android:paddingStart="16dp"
+            android:text="PACK WITH ME - ready-to-go travel checklists"
+            android:layout_height="match_parent"
+            android:maxLength="140"
+            android:background="@null"/>
+
+        <ImageView
+            android:id="@+id/image_to_post"
+            android:layout_width="84dp"
+            android:layout_height="84dp"
+            android:contentDescription="Sharing image."/>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="16dp"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/chars_left"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:text="74"
+            android:paddingStart="16dp"/>
+
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_add.xml b/app/src/main/res/layout/fragment_add.xml
index 770709d..10bf630 100644
--- a/app/src/main/res/layout/fragment_add.xml
+++ b/app/src/main/res/layout/fragment_add.xml
@@ -1,34 +1,34 @@
-<ScrollView
+<LinearLayout
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:android="http://schemas.android.com/apk/res/android"
     tools:context="com.hikapro.backpack.view.fragments.AddFragment"
+    android:id="@+id/fragment_add_main_layout"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
     android:background="@color/colorListBackground">
 
-    <LinearLayout
-        android:id="@+id/fragment_add_main_layout"
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:layout_height="wrap_content">
 
-        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+    <android.widget.SearchView
+        android:id="@+id/add_search"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:theme="@style/ThemeOverlay.AppCompat.Dark"/>
+    </LinearLayout>
 
-        <android.widget.SearchView
-            android:id="@+id/add_search"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:textColor="@color/colorText"/>
-        </LinearLayout>
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/add_item_recycler"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+    </android.support.v7.widget.RecyclerView>
 
-        <android.support.v7.widget.RecyclerView
-            android:id="@+id/add_item_recycler"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-        </android.support.v7.widget.RecyclerView>
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
         <RelativeLayout
             android:id="@+id/add_item_category_container"
@@ -54,5 +54,8 @@
             </com.hikapro.backpack.presenter.adapters.helper.FlowLayout>
 
         </RelativeLayout>
-    </LinearLayout>
-</ScrollView>
+
+    </ScrollView>
+
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_item_detail.xml b/app/src/main/res/layout/fragment_item_detail.xml
index c987dc9..9cafe73 100644
--- a/app/src/main/res/layout/fragment_item_detail.xml
+++ b/app/src/main/res/layout/fragment_item_detail.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:animateLayoutChanges="true"
-    android:background="@color/colorUiMainbackground2">
+    android:background="@color/colorListBackground">
 
 <ScrollView
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_item_list.xml b/app/src/main/res/layout/fragment_item_list.xml
index 32757ea..4789ef4 100644
--- a/app/src/main/res/layout/fragment_item_list.xml
+++ b/app/src/main/res/layout/fragment_item_list.xml
@@ -9,7 +9,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        android:background="@color/colorListBackground">
+        android:id="@+id/item_list_container">
 
         <com.hikapro.backpack.presenter.adapters.helper.items.swipe2.SwipableRecycler
             android:id="@+id/items_recycler"
diff --git a/app/src/main/res/layout/fragment_set_list.xml b/app/src/main/res/layout/fragment_set_list.xml
index cd63072..07c128e 100644
--- a/app/src/main/res/layout/fragment_set_list.xml
+++ b/app/src/main/res/layout/fragment_set_list.xml
@@ -4,7 +4,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:background="@color/colorMainBackground">
+    android:background="@color/colorMainBackground"
+    android:animateLayoutChanges="true">
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/set_recycler"
@@ -18,20 +19,13 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:visibility="gone">
-        <ProgressBar
-            android:id="@+id/set_progress"
+        <ImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            style="@android:style/Widget.ProgressBar.Large"
+            android:id="@+id/start_loading"
             android:layout_centerInParent="true"
-            android:layout_marginRight="5dp" />
-        <TextView
-            android:layout_below="@id/set_progress"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:gravity="center_horizontal"
-            android:text="@string/loading" />
+            android:src="@drawable/start_img"
+            android:contentDescription="@string/loading"/>
     </RelativeLayout>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_share.xml b/app/src/main/res/layout/fragment_share.xml
index 24882f2..93993d6 100644
--- a/app/src/main/res/layout/fragment_share.xml
+++ b/app/src/main/res/layout/fragment_share.xml
@@ -1,95 +1,206 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:context="com.hikapro.backpack.view.fragments.ShareFragment"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.hikapro.backpack.view.fragments.ShareFragment"
-    android:background="@color/colorListBackground">
+    android:background="@color/colorListBackground"
+    android:animateLayoutChanges="true">
 
-    <ImageView
-        android:id="@+id/share_image_view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/pic"
-        android:contentDescription="Share picture"
-        android:layout_alignParentTop="true"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="@dimen/margin_standard_plus"/>
-
-    <LinearLayout
-        android:id="@+id/share_buttons_layout"
-        android:orientation="vertical"
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-
-        android:layout_alignParentBottom="true"
-        android:layout_below="@id/share_image_view"
-        android:layout_marginTop="@dimen/margin_standard_plus">
+        android:layout_height="wrap_content">
 
         <LinearLayout
-            android:id="@+id/facebook_container"
-            android:orientation="horizontal"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_standard_minus">
-            <ImageView
-                android:id="@+id/facebook_icon_view"
-                android:layout_width="wrap_content"
+            android:orientation="vertical"
+            android:gravity="top"
+            android:layout_gravity="top">
+
+            <LinearLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:src="@drawable/facebook_48"
-                android:contentDescription="@string/cd_facebook"
-                android:layout_marginLeft="@dimen/margin_standard_minus"/>
-            <TextView
-                android:id="@+id/facebook_txt"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:gravity="center_vertical"
-                android:layout_weight="1"
-                android:layout_marginLeft="@dimen/margin_standard_minus"
-                android:text="@string/facebook"/>
-            <Button
-                android:id="@+id/facebook_share_button"
-                android:layout_width="wrap_content"
+                android:orientation="vertical"
+                android:gravity="top">
+
+                <ImageView
+                    android:id="@+id/share_image_view"
+                    android:layout_width="300dp"
+                    android:layout_height="300dp"
+                    android:layout_gravity="center_horizontal|center_vertical"
+                    android:contentDescription="Sharing picture" />
+
+                <RelativeLayout
+                    android:id="@+id/share_progress_container"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal|center_vertical"
+                    android:visibility="gone">
+                    <ProgressBar
+                        android:id="@+id/share_progress"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:paddingStart="32dp"
+                        android:paddingEnd="32dp"
+                        android:paddingBottom="32dp"
+                        android:paddingTop="20dp"
+                        style="@android:style/Widget.ProgressBar.Large"
+                        android:layout_centerInParent="true"
+                        android:layout_marginEnd="5dp" />
+                </RelativeLayout>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/share_buttons_layout"
+                android:orientation="vertical"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/share_button"
-                android:layout_alignParentRight="true"
-                android:layout_gravity="right"
-                android:background="@color/colorShareBtnBackground"
-                android:layout_marginRight="@dimen/margin_standard_minus"/>
+
+                android:layout_marginTop="16dp">
+
+                <View
+                    android:layout_marginTop="0dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="2dip"
+                    android:background="@color/colorShareSeparatorBackground">
+                </View>
+
+                <LinearLayout
+                    android:id="@+id/facebook_container"
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="70dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginTop="4dp"
+                    android:gravity="center_horizontal|center_vertical">
+
+                    <ImageView
+                        android:id="@+id/facebook_icon_view"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_facebook_icon"
+                        android:contentDescription="@string/cd_facebook" />
+
+                    <TextView
+                        android:id="@+id/facebook_txt"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:gravity="center_vertical"
+                        android:layout_weight="1"
+                        android:layout_marginStart="16dp"
+                        android:textColor="@color/colorText"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:textSize="@dimen/share_option_txt"
+                        android:text="@string/facebook"/>
+
+                    <LinearLayout
+                        android:layout_width="80dp"
+                        android:layout_height="32dp"
+                        android:orientation="horizontal"
+                        android:background="@color/colorShareBtnBackground">
+
+                    <Button
+                        android:id="@+id/facebook_share_button"
+                        style="@style/ActionBarButtonWhite"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:text="@string/share_button"
+                        android:textSize="@dimen/share_btn_text_size" />
+                    </LinearLayout>
+                </LinearLayout>
+
+                <View
+                    android:layout_marginTop="4dp"
+                    android:layout_marginBottom="4dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="2dip"
+                    android:background="@color/colorShareSeparatorBackground">
+                </View>
+
+                <LinearLayout
+                    android:id="@+id/twitter_container"
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="70dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginBottom="4dp"
+                    android:gravity="center_horizontal|center_vertical">
+
+                    <ImageView
+                        android:id="@+id/twitter_icon_view"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_twitter_icon"
+                        android:contentDescription="@string/cd_twitter" />
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:layout_height="match_parent"
+                        android:orientation="vertical"
+                        android:layout_marginStart="16dp">
+
+                        <TextView
+                            android:id="@+id/twitter_txt"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="16dp"
+                            android:layout_gravity="center_vertical"
+                            android:background="@color/colorFullTransparent"
+
+                            android:gravity="center_vertical"
+                            android:textColor="@color/colorText"
+                            android:textAppearance="?android:attr/textAppearanceMedium"
+                            android:textSize="@dimen/share_option_txt"
+                            android:text="@string/twitter"/>
+
+                        <TextView
+                            android:id="@+id/twitter_login"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:background="@color/colorFullTransparent"
+
+                            android:gravity="center_vertical"
+                            android:textColor="@color/colorText"
+                            android:textAppearance="?android:attr/textAppearanceSmall"
+                            android:textSize="@dimen/share_option_login_txt" />
+
+                    </LinearLayout>
+
+
+                    <LinearLayout
+                        android:layout_width="80dp"
+                        android:layout_height="32dp"
+                        android:orientation="horizontal"
+                        android:background="@color/colorShareBtnBackground">
+
+                        <Button
+                            android:id="@+id/twitter_share_button"
+                            style="@style/ActionBarButtonWhite"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:text="@string/share_button"
+                            android:textSize="@dimen/share_btn_text_size" />
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <View
+                    android:layout_marginTop="0dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="2dip"
+                    android:background="@color/colorShareSeparatorBackground">
+                </View>
+
+            </LinearLayout>
         </LinearLayout>
+    </ScrollView>
+</FrameLayout>
 
-        <LinearLayout
-            android:id="@+id/twitter_container"
-            android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_standard_minus">
 
-            <ImageView
-                android:id="@+id/twitter_icon_view"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/twitter_48"
-                android:contentDescription="@string/cd_twitter"
-                android:layout_marginLeft="@dimen/margin_standard_minus"/>
-            <TextView
-                android:id="@+id/twitter_txt"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="match_parent"
-                android:gravity="center_vertical"
-                android:layout_marginLeft="@dimen/margin_standard_minus"
-                android:text="@string/twitter"/>
-            <Button
-                android:id="@+id/twitter_share_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/share_button"
-                android:layout_alignParentRight="true"
-                android:layout_gravity="right"
-                android:background="@color/colorShareBtnBackground"
-                android:layout_marginRight="@dimen/margin_standard_minus"/>
-        </LinearLayout>
-
-    </LinearLayout>
-
-</RelativeLayout>
diff --git a/app/src/main/res/layout/item_element.xml b/app/src/main/res/layout/item_element.xml
index 7aa8f5b..a769951 100644
--- a/app/src/main/res/layout/item_element.xml
+++ b/app/src/main/res/layout/item_element.xml
@@ -17,19 +17,7 @@
         android:button="@drawable/checkbox_selector"
         android:layout_marginStart="@dimen/margin_standard"
         android:textColor="@color/white"/>
-<!--
-    <TextView
-        android:layout_width="0dp"
-        android:layout_weight="1"
-        android:layout_height="match_parent"
-        android:id="@+id/item_text"
-        android:gravity="center_vertical"
-        android:layout_gravity="center"
-        android:layout_marginStart="@dimen/margin_standard"
-        android:layout_marginEnd="@dimen/margin_standard"
-        android:textSize="@dimen/text_item_name"
-        android:textColor="@color/colorText" />
-        -->
+
     <com.hikapro.backpack.presenter.adapters.helper.AutoResizeTextView
         android:layout_width="0dp"
         android:layout_weight="1"
diff --git a/app/src/main/res/layout/set_card.xml b/app/src/main/res/layout/set_card.xml
index bbfaf68..1e899e4 100644
--- a/app/src/main/res/layout/set_card.xml
+++ b/app/src/main/res/layout/set_card.xml
@@ -5,31 +5,34 @@
     android:id="@+id/card_view_set"
     android:layout_width="match_parent"
     android:layout_height="@dimen/card_height"
-    android:layout_margin="@dimen/margin_min"
+    android:layout_margin="@dimen/card_margin"
+    android:background="@color/colorFullTransparent"
     card_view:cardCornerRadius="@dimen/card_corner_radius">
 
     <LinearLayout
+        android:id="@+id/card_content"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        android:background="@color/colorUiMainbackground2">
+        >
 
         <TextView
             android:id="@+id/set_text"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/margin_min"
-            android:layout_marginBottom="@dimen/margin_min"
+            android:layout_marginStart="@dimen/card_margin_txt"
+            android:layout_marginTop="@dimen/card_margin_txt"
             android:textSize="@dimen/size_set_name"
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:textStyle="bold"
-            android:textColor="@color/colorUiMainFont"/>
+            android:textColor="@color/colorText"/>
         <TextView
             android:id="@+id/set_info"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:textColor="@color/colorUiMainFont"/>
+            android:layout_marginTop="@dimen/card_margin_packed_top"
+            android:layout_marginStart="@dimen/card_margin_txt"
+            android:textColor="@color/colorText"/>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/share_cust_actionbar.xml b/app/src/main/res/layout/share_cust_actionbar.xml
new file mode 100644
index 0000000..a7577ff
--- /dev/null
+++ b/app/src/main/res/layout/share_cust_actionbar.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:enabled="false" >
+
+    <Button
+        android:id="@+id/action_share_cancel"
+        style="@style/ActionBarButtonWhiteStart"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:text="@string/cancel_button"
+        android:layout_alignParentStart="true"
+        android:layout_centerVertical="true" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_centerHorizontal="true"
+        android:gravity="center_horizontal|center_vertical"
+
+        android:textAllCaps="true"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:text="@string/yipee"
+        android:textSize="@dimen/text_action_bar_header"
+        android:textColor="@color/colorText"
+        android:textStyle="bold" />
+
+    <Button
+        style="@style/ActionBarButtonWhiteEnd"
+        android:layout_alignParentEnd="true"
+        android:background="@color/colorFullTransparent">
+    </Button>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/test.xml b/app/src/main/res/layout/test.xml
deleted file mode 100644
index 9d33454..0000000
--- a/app/src/main/res/layout/test.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.hikapro.backpack.presenter.adapters.helper.FlowLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:scrollbars="vertical">
-
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Text 1"
-        android:paddingLeft="15dp"
-        android:paddingTop="15dp"/>
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Text 1"
-        android:paddingLeft="15dp"
-        android:paddingTop="15dp"/>
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Text 1"
-        android:paddingLeft="15dp"
-        android:paddingTop="15dp"/>
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Text 1"
-        android:paddingLeft="15dp"
-        android:paddingTop="15dp"/>
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Text 1"
-        android:paddingLeft="15dp"
-        android:paddingTop="15dp"/>
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Text 1"
-        android:paddingLeft="15dp"
-        android:paddingTop="15dp"/>
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Text 1"
-        android:paddingLeft="15dp"
-        android:paddingTop="15dp"/>
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Text 1"
-        android:paddingLeft="15dp"
-        android:paddingTop="15dp"/>
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Text 1"
-        android:paddingLeft="15dp"
-        android:paddingTop="15dp"/>
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Text 1"
-        android:paddingLeft="15dp"
-        android:paddingTop="15dp"/>
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Text 1"
-        android:paddingLeft="15dp"
-        android:paddingTop="15dp"/>
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Text 1"
-        android:paddingLeft="15dp"
-        android:paddingTop="15dp"/>
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Text 1"
-        android:paddingLeft="150dp"
-        android:paddingTop="150dp"/>
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Text 1"
-        android:paddingLeft="15dp"
-        android:paddingTop="15dp"/>
-
-</com.hikapro.backpack.presenter.adapters.helper.FlowLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_add.xml b/app/src/main/res/menu/menu_add.xml
deleted file mode 100644
index cba5472..0000000
--- a/app/src/main/res/menu/menu_add.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".MainActivity">
-
-    <item
-        android:id="@+id/action_add_cancel"
-        android:orderInCategory="1"
-        android:title="CANCEL"
-        android:showAsAction="always"
-        app:showAsAction="always|withText" />
-
-    <item
-        android:id="@+id/action_add_add"
-        android:orderInCategory="2"
-        android:title="ADD"
-        android:showAsAction="always"
-        app:showAsAction="always|withText" />
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 746d0dc..0291e14 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -7,20 +7,20 @@
     <item
         android:id="@+id/action_share"
         android:orderInCategory="1"
-        android:title="Share"
+        android:title="@string/menu_share"
         android:showAsAction="never"
         app:showAsAction="never" />
 
     <item
         android:id="@+id/action_unpack_my_bag"
         android:orderInCategory="2"
-        android:title="Unpack my bag"
+        android:title="@string/menu_unpack_bag"
         android:showAsAction="never"
         app:showAsAction="never" />
     <item
         android:id="@+id/action_restore_to_default"
         android:orderInCategory="3"
-        android:title="Restore to default"
+        android:title="@string/menu_restore_to_default"
         android:showAsAction="never"
         app:showAsAction="never" />
     <item
@@ -30,13 +30,13 @@
         app:showAsAction="always|collapseActionView"
         android:actionViewClass="android.widget.SearchView"
         android:visible="true"
-        android:title="Search"/>
+        android:title="@string/menu_search"/>
     <item
         android:id="@+id/action_add"
         android:icon="@drawable/ic_add_white_36dp"
         android:showAsAction="always|collapseActionView"
         app:showAsAction="always|collapseActionView"
         android:visible="true"
-        android:title="Add"/>
+        android:title="@string/menu_add"/>
 
 </menu>
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
index b4045b4..0ec3e62 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
index 393d422..7946b51 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index b1f55f7..58cf4da 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index 09d9a61..36ca5be 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index 905ce84..737554f 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/values-ru/locale.xml b/app/src/main/res/values-ru/locale.xml
new file mode 100644
index 0000000..bc20a26
--- /dev/null
+++ b/app/src/main/res/values-ru/locale.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="packed">Собрано</string>
+    <string name="what_in_bag">Показать вещи в рюкзаке &#x2193;</string>
+
+    <string name="choose_category">Выберите категорию:</string>
+    <string name="continue_packing">Собираться дальше &#x2191;</string>
+    <string name="already_in_list">&#x2713; Уже в списке</string>
+    <string name="what_is_it">ЧТО ЭТО?</string>
+    <string name="more">Подробнее о предмете &#x276D;</string>
+
+    <string name="unpack_button">Распаковать рюкзак</string>
+    <string name="share_button">Поделиться</string>
+    <string name="delete_button">УДАЛИТЬ</string>
+    <string name="leave_at_home_button">НЕ БРАТЬ</string>
+    <string name="add_to_bag_button">ВЗАТЬ С СОБОЙ</string>
+    <string name="return_to_list_button">ВЕРНУТЬ В СПИСОК</string>
+    <string name="restore_completed">Список восстановлен!</string>
+    <string name="twitter_error">Невозможно запостить в Твиттер!</string>
+    <string name="twitter_error2">Ошибка при постинге в Твиттер!</string>
+    <string name="twitter_posted">Запощено в Твиттер!</string>
+    <string name="fb_posted">Запощено в Фэйсбук!</string>
+    <string name="fb_error">Невозможно запостить в Фэйсбук!</string>
+
+    <string name="save_button">сохранить</string>
+    <string name="cancel_button">отмена</string>
+
+    <string name="ok_button">OK</string>
+
+    <string name="cd_facebook">Фэйсбук</string>
+    <string name="cd_twitter">Твиттер</string>
+    <string name="cd_item_image">Фото предмета</string>
+
+    <string name="facebook">Facebook</string>
+    <string name="twitter">Twitter</string>
+
+    <string name="yipee">ура!</string>
+    <string name="add_an_item">добавить предмет</string>
+
+    <string name="no_connection">Отсутствует соединение с Интернетом!</string>
+    <string name="please_wait">Пожалуйста, подождите</string>
+    <string name="cannot_post">Постинг недоступен. Пожалуйста, проверьте Ваше соединение с Интернетом.</string>
+    <string name="loading">Загрузка...</string>
+
+    <string name="dlg_restore_header">Восстановить список</string>
+    <string name="dlg_restore_txt">Уверены, что хотите восстановить список? Удалённые Вами предметы будут восстановлены, а добавленные удалены.</string>
+    <string name="dlg_restore_btn">Восстановить</string>
+    <string name="dlg_cancel_btn">Отмена</string>
+    <string name="dlg_rate_header">Нравится Pack With Me?</string>
+    <string name="dlg_rate_txt">Если так, оцените нас на Google Play, чтобы мы могли совершенствоваться дальше</string>
+    <string name="dlg_rate_btn">Хорошо</string>
+    <string name="dlg_later_btn">Позже</string>
+
+    <string name="twitter_sharing_txt">PACK WITH ME - ready-to-go travel checklists</string>
+    <string name="facebook_sharing_txt">ready-to-go travel checklists</string>
+    <string name="facebook_sharing_header">PACK WITH ME</string>
+
+    <string name="enter_name">Пожалуйста, введите имя предмета</string>
+    <string name="select_category">Пожалуйста, выберите категорию</string>
+    <string name="already_in_list2">Уже в списке!</string>
+
+    <string name="search_hint_add">Введите имя предмета</string>
+    <string name="menu_restore_to_default">Восстановить список</string>
+    <string name="menu_unpack_bag">Распаковать рюкзак</string>
+    <string name="menu_share">Поделиться</string>
+    <string name="menu_search">Поиск</string>
+    <string name="menu_add">Добавить</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sw1080dp/dimens.xml b/app/src/main/res/values-sw1080dp/dimens.xml
new file mode 100644
index 0000000..5fd2080
--- /dev/null
+++ b/app/src/main/res/values-sw1080dp/dimens.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="card_height">300px</dimen>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sw1080dp/params.xml b/app/src/main/res/values-sw1080dp/params.xml
new file mode 100644
index 0000000..d84bab0
--- /dev/null
+++ b/app/src/main/res/values-sw1080dp/params.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <integer name="duration">300</integer>
+    <integer name="valueTransitionXplus">1080</integer>
+    <integer name="valueTransitionXminus">-1080</integer>
+
+    <integer name="valueTransitionYplus">1920</integer>
+    <integer name="valueTransitionYminus">-1920</integer>
+    <integer name="valueTo">0</integer>
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sw480dp/dimens.xml b/app/src/main/res/values-sw480dp/dimens.xml
new file mode 100644
index 0000000..e342f0e
--- /dev/null
+++ b/app/src/main/res/values-sw480dp/dimens.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="card_height">133px</dimen>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sw480dp/params.xml b/app/src/main/res/values-sw480dp/params.xml
new file mode 100644
index 0000000..a828e28
--- /dev/null
+++ b/app/src/main/res/values-sw480dp/params.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <integer name="duration">200</integer>
+    <integer name="valueTransitionXplus">480</integer>
+    <integer name="valueTransitionXminus">-480</integer>
+
+    <integer name="valueTransitionYplus">800</integer>
+    <integer name="valueTransitionYminus">-800</integer>
+    <integer name="valueTo">0</integer>
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sw540dp/dimens.xml b/app/src/main/res/values-sw540dp/dimens.xml
new file mode 100644
index 0000000..09f8459
--- /dev/null
+++ b/app/src/main/res/values-sw540dp/dimens.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="card_height">150px</dimen>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sw540dp/params.xml b/app/src/main/res/values-sw540dp/params.xml
new file mode 100644
index 0000000..fd5b78b
--- /dev/null
+++ b/app/src/main/res/values-sw540dp/params.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <integer name="duration">200</integer>
+    <integer name="valueTransitionXplus">540</integer>
+    <integer name="valueTransitionXminus">-540</integer>
+
+    <integer name="valueTransitionYplus">960</integer>
+    <integer name="valueTransitionYminus">-960</integer>
+    <integer name="valueTo">0</integer>
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sw720dp/dimens.xml b/app/src/main/res/values-sw720dp/dimens.xml
new file mode 100644
index 0000000..20eac75
--- /dev/null
+++ b/app/src/main/res/values-sw720dp/dimens.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="card_height">220px</dimen>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sw720dp/params.xml b/app/src/main/res/values-sw720dp/params.xml
new file mode 100644
index 0000000..0c74678
--- /dev/null
+++ b/app/src/main/res/values-sw720dp/params.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <integer name="duration">300</integer>
+    <integer name="valueTransitionXplus">720</integer>
+    <integer name="valueTransitionXminus">-720</integer>
+
+    <integer name="valueTransitionYplus">1280</integer>
+    <integer name="valueTransitionYminus">-1280</integer>
+    <integer name="valueTo">0</integer>
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-sw820dp/dimens.xml
similarity index 100%
rename from app/src/main/res/values-w820dp/dimens.xml
rename to app/src/main/res/values-sw820dp/dimens.xml
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index 6d6acbc..5473a3a 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -12,10 +12,21 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:ellipsize">end</item>
         <item name="android:singleLine">true</item>
-        <item name="android:textSize">@dimen/text_size_small</item>
+        <item name="android:textSize">@dimen/text_action_bar_btn</item>
         <item name="android:theme">@android:style/ThemeOverlay.Material.Dark</item>
         <item name="android:background">?android:attr/selectableItemBackgroundBorderless</item>
-        <item name="android:gravity">center</item>
+        <item name="android:textAllCaps">true</item>
+
+    </style>
+
+    <style name="ActionBarButtonWhiteEnd" parent="@style/ActionBarButton">
+        <item name="android:textColor">@color/white</item>
+        <item name="android:gravity">end|center_vertical</item>
+    </style>
+
+    <style name="ActionBarButtonWhiteStart" parent="@style/ActionBarButton">
+        <item name="android:textColor">@color/white</item>
+        <item name="android:gravity">start|center_vertical</item>
     </style>
 
 </resources>
diff --git a/app/src/main/res/values/colors_background.xml b/app/src/main/res/values/colors_background.xml
index 46299a0..aa174fc 100644
--- a/app/src/main/res/values/colors_background.xml
+++ b/app/src/main/res/values/colors_background.xml
@@ -2,7 +2,7 @@
 <resources>
     <color name="colorUiMainbackground">#323232</color>
     <color name="colorUiMainbackground2">#7F7F7F</color>
-    <color name="colorShareBtnBackground">#76EE00</color>
+
     <color name="colorStickyHeaderBackground">#001F3F</color>
     <color name="colorCategoryBtnBackground">#76EE00</color>
     <color name="colorDeleteBtnBackground">#F93F25</color>
@@ -26,4 +26,12 @@
     <color name="colorDescriptionText">#9C9C9C</color>
     <color name="colorLinkText">#76EE00</color>
 
+    <color name="colorShareBtnBackground">#76EE00</color>
+    <color name="colorShareSeparatorBackground">#DCDCDC</color>
+    <color name="colorRestoreDialogTxt">#DFDFDF</color>
+    <color name="colorRestoreBtnBackground">#76EE00</color>
+    <color name="colorCancelBtnBackground">#7F7F7F</color>
+
+    <color name="colorFullTransparent">#00000000</color>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index cb89298..921c891 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -9,8 +9,7 @@
     <dimen name="margin_standard_minus">10dp</dimen>
     <dimen name="margin_min">5dp</dimen>
     <dimen name="card_corner_radius">4dp</dimen>
-    <dimen name="card_height">200dp</dimen>
-    <dimen name="item_height">56dp</dimen>
+
     <dimen name="item_checkbox_padding">8dp</dimen>
     <!-- ActionBar color strip -->
     <dimen name="colorstrip">5dp</dimen>
diff --git a/app/src/main/res/values/dimens_text.xml b/app/src/main/res/values/dimens_text.xml
index f977c80..35f6136 100644
--- a/app/src/main/res/values/dimens_text.xml
+++ b/app/src/main/res/values/dimens_text.xml
@@ -12,7 +12,8 @@
     <dimen name="text_size_small">14sp</dimen>
     <dimen name="text_size_medium">16sp</dimen>
 
-    <dimen name="text_action_bar_header">14sp</dimen>
+    <dimen name="text_action_bar_header">20sp</dimen>
+
     <dimen name="text_item_header">12sp</dimen>
     <dimen name="text_item_name">18sp</dimen>
     <dimen name="text_category_name">22sp</dimen>
@@ -21,4 +22,27 @@
     <dimen name="text_category_btn">13sp</dimen>
     <dimen name="text_action_bar_btn">12sp</dimen>
     <dimen name="text_item_description">17sp</dimen>
+
+    <dimen name="card_height">150dp</dimen>
+    <dimen name="item_height">56dp</dimen>
+    <dimen name="card_margin">2dp</dimen>
+    <dimen name="card_margin_txt">24dp</dimen>
+    <dimen name="card_margin_packed_top">16dp</dimen>
+
+
+    <dimen name="dlg_restore_height">300dp</dimen>
+    <dimen name="dlg_restore_width">300dp</dimen>
+    <dimen name="dlg_restore_btn_height">70dp</dimen>
+    <dimen name="dlg_restore_txt">20sp</dimen>
+    <dimen name="dlg_restore_header">24sp</dimen>
+
+
+    <dimen name="share_option_txt">16sp</dimen>
+    <dimen name="share_option_login_txt">12sp</dimen>
+
+    <dimen name="share_btn_text_size">12sp</dimen>
+
+
+
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/locale.xml b/app/src/main/res/values/locale.xml
new file mode 100644
index 0000000..7646673
--- /dev/null
+++ b/app/src/main/res/values/locale.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="packed">Packed</string>
+    <string name="what_in_bag">Show what\'s in my bag &#x2193;</string>
+
+    <string name="choose_category">Choose item category:</string>
+    <string name="continue_packing">Continue with my packing &#x2191;</string>
+    <string name="already_in_list">&#x2713; Already in list</string>
+    <string name="what_is_it">WHAT IS IT?</string>
+    <string name="more">More about this item &#x276D;</string>
+
+    <string name="unpack_button">UNPACK MY BAG</string>
+    <string name="share_button">Share</string>
+    <string name="delete_button">DELETE</string>
+    <string name="leave_at_home_button">LEAVE AT HOME</string>
+    <string name="add_to_bag_button">ADD TO BAG</string>
+    <string name="return_to_list_button">RETURN TO LIST</string>
+    <string name="restore_completed">Restore completed</string>
+    <string name="twitter_error">Cannot post to twitter!</string>
+    <string name="twitter_error2">Posting to twitter failed!</string>
+    <string name="twitter_posted">Posted to twitter!</string>
+    <string name="fb_posted">Posted to Facebook!</string>
+    <string name="fb_error">Cannot post to Facebook!</string>
+
+    <string name="save_button">save</string>
+    <string name="cancel_button">cancel</string>
+
+    <string name="ok_button">OKAY</string>
+
+    <string name="cd_facebook">Facebook</string>
+    <string name="cd_twitter">Twitter</string>
+    <string name="cd_item_image">Item photo</string>
+
+    <string name="facebook">Facebook</string>
+    <string name="twitter">Twitter</string>
+
+    <string name="yipee">yippee!</string>
+    <string name="add_an_item">add an item</string>
+
+    <string name="no_connection">No internet connection</string>
+    <string name="please_wait">Please, wait for a while</string>
+    <string name="cannot_post">Posting is not available. Please, check your internet connection.</string>
+    <string name="loading">Loading...</string>
+
+    <string name="dlg_restore_header">Restore To Default</string>
+    <string name="dlg_restore_txt">Do you want to restore this list? Items you have added will be removed, while deleted items will be added back.</string>
+    <string name="dlg_restore_btn">Restore</string>
+    <string name="dlg_cancel_btn">Cancel</string>
+    <string name="dlg_rate_header">Enjoying Pack With Me?</string>
+    <string name="dlg_rate_txt">If so, please rate this application to help us get better</string>
+    <string name="dlg_rate_btn">Sure</string>
+    <string name="dlg_later_btn">Later</string>
+
+    <string name="twitter_sharing_txt">PACK WITH ME - ready-to-go travel checklists</string>
+    <string name="facebook_sharing_txt">ready-to-go travel checklists</string>
+    <string name="facebook_sharing_header">PACK WITH ME</string>
+
+    <string name="enter_name">Please, enter a name</string>
+    <string name="select_category">Please, select a category</string>
+    <string name="already_in_list2">Already in list!</string>
+
+    <string name="search_hint_add">Enter a new item name</string>
+    <string name="menu_restore_to_default">Restore to default</string>
+    <string name="menu_unpack_bag">Unpack my bag</string>
+    <string name="menu_share">Share</string>
+    <string name="menu_search">Search</string>
+    <string name="menu_add">Add</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/params.xml b/app/src/main/res/values/params.xml
new file mode 100644
index 0000000..f465715
--- /dev/null
+++ b/app/src/main/res/values/params.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <integer name="duration">200</integer>
+    <integer name="valueTransitionXplus">768</integer>
+    <integer name="valueTransitionXminus">-768</integer>
+
+    <integer name="valueTransitionYplus">1024</integer>
+    <integer name="valueTransitionYminus">-1024</integer>
+    <integer name="valueTo">0</integer>
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6bee91c..4005633 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,39 +1,6 @@
 <resources>
-    <string name="app_name">Back Pack</string>
-    <string name="packed">Packed</string>
+    <string name="app_name">Pack With Me</string>
     <string name="right_angle_bracket">&#x276D;</string>
-
     <string name="facebook_app_id">117849588616149</string>
-
-    <string name="what_in_bag">Show what\'s in my bag &#x2193;</string>
-    <string name="choose_category">Choose item category:</string>
-    <string name="continue_packing">Continue with my packing &#x2191;</string>
-    <string name="already_in_list">&#x2713; Already in list</string>
-    <string name="what_is_it">WHAT IS IT?</string>
-    <string name="more">More about this item &#x276D;</string>
-
-    <string name="unpack_button">UNPACK MY BAG</string>
-    <string name="share_button">Share</string>
-    <string name="undo_button">undo</string>
-    <string name="delete_button">DELETE</string>
-    <string name="leave_at_home_button">LEAVE AT HOME</string>
-    <string name="add_to_bag_button">ADD TO BAG</string>
-    <string name="return_to_list_button">RETURN TO LIST</string>
-    <string name="save_button">SAVE</string>
-    <string name="cancel_button">CANCEL</string>
-    <string name="ok_button">OKAY</string>
-
-    <string name="cd_facebook">Facebook</string>
-    <string name="cd_twitter">Twitter</string>
-    <string name="cd_item_image">Item photo</string>
-
-    <string name="facebook">Facebook</string>
-    <string name="twitter">Twitter</string>
-
-    <string name="no_connection">No internet connection</string>
-    <string name="loading">Loading...</string>
-
-    <string name="dlg_restore_header">Restore To Default</string>
-    <string name="dlg_restore_txt">Do you want to restore this list? Items you have added will be removed, while deleted items will be added back</string>
-
+    <string name="facebook_url">http://goatapp.net/</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a526f6d..79781d8 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -17,9 +17,12 @@
         <item name="android:singleLine">true</item>
         <item name="android:textSize">@dimen/text_action_bar_btn</item>
         <item name="android:theme">@style/ThemeOverlay.AppCompat.Dark</item>
-        <item name="android:gravity">center</item>
 
         <item name="android:background">@null</item>
+        <item name="android:textAllCaps">true</item>
+        <!--
+        <item name="android:paddingStart">@dimen/activity_horizontal_margin</item>
+        -->
 
         <!--<item name="android:background">@drawable/ripple</item>-->
         <!-- <item name="android:background">?android:attr/selectableItemBackground</item> -->
@@ -36,6 +39,19 @@
 
     <style name="ActionBarButtonWhite" parent="@style/ActionBarButton">
         <item name="android:textColor">@color/white</item>
+        <item name="android:gravity">center</item>
+    </style>
+
+    <style name="ActionBarButtonWhiteEnd" parent="@style/ActionBarButton">
+        <item name="android:textColor">@color/white</item>
+        <item name="android:gravity">end|center_vertical</item>
+        <item name="android:layout_marginEnd">@dimen/activity_horizontal_margin</item>
+    </style>
+
+    <style name="ActionBarButtonWhiteStart" parent="@style/ActionBarButton">
+        <item name="android:textColor">@color/white</item>
+        <item name="android:gravity">start|center_vertical</item>
+        <item name="android:layout_marginStart">@dimen/activity_horizontal_margin</item>
     </style>
 
     <style name="ActionBarButtonOffWhite" parent="@style/ActionBarButton">
diff --git a/build.gradle b/build.gradle
index 168f129..aff4f41 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.0.0'
+        classpath 'com.android.tools.build:gradle:2.1.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files