diff --git a/app/build.gradle b/app/build.gradle
index c5cf75a..8f062fc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,10 +16,11 @@ android {
         minSdkVersion 24
         targetSdkVersion 29
 
-        versionCode 62
-        versionName "1.7.0"
+        versionCode 63
+        versionName "1.7.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        vectorDrawables.useSupportLibrary = true
 
         ndk {
             //根据需要 自行选择添加的对应cpu类型的.so库。
diff --git a/app/src/main/java/com/uiui/zyos/activity/main/MainActivity.java b/app/src/main/java/com/uiui/zyos/activity/main/MainActivity.java
index e54df1f..1e6c9f0 100644
--- a/app/src/main/java/com/uiui/zyos/activity/main/MainActivity.java
+++ b/app/src/main/java/com/uiui/zyos/activity/main/MainActivity.java
@@ -10,7 +10,6 @@ import android.content.res.Configuration;
 import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.Debug;
 import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.Log;
@@ -26,13 +25,9 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.viewpager.widget.ViewPager;
 
-import com.alibaba.sdk.android.push.CloudPushService;
-import com.alibaba.sdk.android.push.noonesdk.PushServiceFactory;
-import com.arialyy.aria.core.Aria;
 import com.hjq.permissions.OnPermissionCallback;
 import com.hjq.permissions.Permission;
 import com.hjq.permissions.XXPermissions;
-import com.tencent.bugly.crashreport.CrashReport;
 import com.tencent.mmkv.MMKV;
 import com.uiui.zyos.BuildConfig;
 import com.uiui.zyos.R;
diff --git a/app/src/main/java/com/uiui/zyos/base/BaseApplication.java b/app/src/main/java/com/uiui/zyos/base/BaseApplication.java
index 1086afc..3a94a2e 100644
--- a/app/src/main/java/com/uiui/zyos/base/BaseApplication.java
+++ b/app/src/main/java/com/uiui/zyos/base/BaseApplication.java
@@ -83,8 +83,9 @@ public class BaseApplication extends Application {
         Aria.init(this);
 //            Aria.get(this).getDownloadConfig().setMaxTaskNum(1);
 //            Aria.get(this).getDownloadConfig().setConvertSpeed(true);
-        aliyunPushInit();
         CrashReport.initCrashReport(getApplicationContext(), "d1cd982951", false);
+
+        aliyunPushInit();
     }
 
     public void aliyunPushInit() {
diff --git a/app/src/main/java/com/uiui/zyos/bean/DesktopIcon.java b/app/src/main/java/com/uiui/zyos/bean/DesktopIcon.java
index 44290d7..54197f5 100644
--- a/app/src/main/java/com/uiui/zyos/bean/DesktopIcon.java
+++ b/app/src/main/java/com/uiui/zyos/bean/DesktopIcon.java
@@ -3,7 +3,12 @@ package com.uiui.zyos.bean;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.PixelFormat;
+import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
+import android.graphics.drawable.VectorDrawable;
 import android.os.Parcel;
 import android.os.Parcelable;
 
@@ -99,7 +104,18 @@ public class DesktopIcon implements Serializable, Parcelable {
         DesktopIcon desktopIcon = new DesktopIcon();
         desktopIcon.setPackageName(resolveInfo.activityInfo.packageName);
         desktopIcon.setClassName(resolveInfo.activityInfo.name);
-        desktopIcon.setIcon(resolveInfo.loadIcon(pm));
+        Drawable drawable = resolveInfo.loadIcon(pm);
+        if (drawable instanceof VectorDrawable) {
+            Bitmap bitmap = Bitmap.createBitmap(drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight(),
+                    drawable.getOpacity() != PixelFormat.OPAQUE ? Bitmap.Config.ARGB_8888 : Bitmap.Config.RGB_565);
+            Canvas canvas = new Canvas(bitmap);
+            drawable.setBounds(0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight());
+            drawable.draw(canvas);
+            Drawable d = new BitmapDrawable(context.getResources(), bitmap);
+            desktopIcon.setIcon(d);
+        } else {
+            desktopIcon.setIcon(drawable);
+        }
         desktopIcon.setLable(resolveInfo.loadLabel(pm).toString());
         desktopIcon.setPosition(0);
         return desktopIcon;
diff --git a/app/src/main/java/com/uiui/zyos/fragment/app/AppContact.java b/app/src/main/java/com/uiui/zyos/fragment/app/AppContact.java
new file mode 100644
index 0000000..7856cbc
--- /dev/null
+++ b/app/src/main/java/com/uiui/zyos/fragment/app/AppContact.java
@@ -0,0 +1,17 @@
+package com.uiui.zyos.fragment.app;
+
+import com.uiui.zyos.base.BasePresenter;
+import com.uiui.zyos.base.BaseView;
+import com.uiui.zyos.bean.DesktopIcon;
+
+import java.util.ArrayList;
+
+public class AppContact {
+    public interface AppPresenter extends BasePresenter<AppView> {
+        void getInstalledApp();
+    }
+
+    public interface AppView extends BaseView {
+        void setInstalledApp( ArrayList<DesktopIcon> desktopIcons);
+    }
+}
diff --git a/app/src/main/java/com/uiui/zyos/fragment/app/AppFragment.java b/app/src/main/java/com/uiui/zyos/fragment/app/AppFragment.java
new file mode 100644
index 0000000..5b715a6
--- /dev/null
+++ b/app/src/main/java/com/uiui/zyos/fragment/app/AppFragment.java
@@ -0,0 +1,260 @@
+package com.uiui.zyos.fragment.app;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.widget.ImageView;
+
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.uiui.zyos.R;
+import com.uiui.zyos.activity.more.MoreAppActivity;
+import com.uiui.zyos.adapter.AppAdapter;
+import com.uiui.zyos.base.BaseFragment;
+import com.uiui.zyos.bean.DesktopIcon;
+import com.uiui.zyos.view.RecyclerViewSpacesItemDecoration;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+/**
+ * A simple {@link Fragment} subclass.
+ * Use the {@link AppFragment#newInstance} factory method to
+ * create an instance of this fragment.
+ */
+public class AppFragment extends BaseFragment implements AppContact.AppView {
+    private static final String TAG = AppFragment.class.getSimpleName();
+
+    @BindView(R.id.rv_app)
+    RecyclerView rv_app;
+    @BindView(R.id.iv_nodata)
+    ImageView iv_nodata;
+
+    private AppPresenter mPresenter;
+    private View rootView;
+    private FragmentActivity mContext;
+    private AppAdapter mAppAdapter;
+
+
+    // TODO: Rename parameter arguments, choose names that match
+    // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
+    private static final String ARG_PARAM1 = "param1";
+    private static final String ARG_PARAM2 = "param2";
+
+    // TODO: Rename and change types of parameters
+    private String mParam1;
+    private String mParam2;
+
+    public AppFragment() {
+        // Required empty public constructor
+        Log.e(TAG, "AppFragment: ");
+    }
+
+    /**
+     * Use this factory method to create a new instance of
+     * this fragment using the provided parameters.
+     *
+     * @param param1 Parameter 1.
+     * @param param2 Parameter 2.
+     * @return A new instance of fragment AppFragment.
+     */
+    // TODO: Rename and change types and number of parameters
+    public static AppFragment newInstance(String param1, String param2) {
+        AppFragment fragment = new AppFragment();
+        Bundle args = new Bundle();
+        args.putString(ARG_PARAM1, param1);
+        args.putString(ARG_PARAM2, param2);
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (getArguments() != null) {
+            mParam1 = getArguments().getString(ARG_PARAM1);
+            mParam2 = getArguments().getString(ARG_PARAM2);
+        }
+        Log.e(TAG, "onCreate: ");
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        // Inflate the layout for this fragment
+        Log.e(TAG, "onCreateView: ");
+        if (null != rootView) {
+            ViewGroup parent = (ViewGroup) rootView.getParent();
+            if (null != parent) {
+                parent.removeView(rootView);
+            }
+        } else {  // 如ongoing果rootView为空 ，就实例化该视图
+            rootView = inflater.inflate(R.layout.fragment_app, container, false);
+            mContext = (FragmentActivity) rootView.getContext();
+            mPresenter = new AppPresenter(mContext);
+            mPresenter.attachView(this);
+            mPresenter.setLifecycle(lifecycleSubject);
+            ButterKnife.bind(this, rootView);
+            initView();
+        }
+        return rootView;
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        rootView = null;
+    }
+
+    @Override
+    public void fetchData() {
+        Log.e(TAG, "fetchData: ");
+        initData();
+    }
+
+    private void initView() {
+        rv_app.setLayoutManager(new GridLayoutManager(mContext, 6));
+        HashMap<String, Integer> stringIntegerHashMap = new HashMap<>();
+        WindowManager wm = (WindowManager) mContext.getSystemService(Context.WINDOW_SERVICE);
+        DisplayMetrics dm = new DisplayMetrics();
+        wm.getDefaultDisplay().getRealMetrics(dm);
+        float density = dm.density;         // 屏幕密度（0.75 / 1.0 / 1.5）
+        stringIntegerHashMap.put(RecyclerViewSpacesItemDecoration.TOP_DECORATION, (int) (density * 1));//top间距
+        stringIntegerHashMap.put(RecyclerViewSpacesItemDecoration.BOTTOM_DECORATION, (int) (density * 1));//底部间距
+        stringIntegerHashMap.put(RecyclerViewSpacesItemDecoration.LEFT_DECORATION, (int) (density * 20));//左间距
+        stringIntegerHashMap.put(RecyclerViewSpacesItemDecoration.RIGHT_DECORATION, (int) (density * 20));//右间距
+        rv_app.addItemDecoration(new RecyclerViewSpacesItemDecoration(stringIntegerHashMap));
+        mAppAdapter = new AppAdapter();
+        rv_app.setAdapter(mAppAdapter);
+        registerOwnReceiver();
+    }
+
+    private void initData() {
+
+    }
+
+    @Override
+    public void setUserVisibleHint(boolean isVisibleToUser) {
+        super.setUserVisibleHint(isVisibleToUser);
+        Log.e(TAG, "setUserVisibleHint: " + isVisibleToUser);
+        if (isVisibleToUser && isViewInitiated) {
+            mPresenter.getInstalledApp();
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        Log.e(TAG, "onResume: ");
+        mPresenter.getInstalledApp();
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        Log.e(TAG, "onDestroy: ");
+        unregisterOwnReceiver();
+    }
+
+    private void registerOwnReceiver() {
+        registerUpdateDesktopReceiver();
+        registerAppChangedReceiver();
+    }
+
+    private void unregisterOwnReceiver() {
+        if (updateDesktopReceiver != null) {
+            mContext.unregisterReceiver(updateDesktopReceiver);
+        }
+        if (mAppChangedReceiver != null) {
+            mContext.unregisterReceiver(mAppChangedReceiver);
+        }
+    }
+
+    private UpdateDesktopReceiver updateDesktopReceiver;
+
+    public static final String UPDATE_DESKTOP_ICON_ACTION = "UPDATE_DESKTOP_ICON";
+
+    private void registerUpdateDesktopReceiver() {
+        if (updateDesktopReceiver == null) {
+            updateDesktopReceiver = new UpdateDesktopReceiver();
+        }
+        IntentFilter filter = new IntentFilter();
+        filter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY);
+        filter.addAction(UPDATE_DESKTOP_ICON_ACTION);
+        mContext.registerReceiver(updateDesktopReceiver, filter);
+    }
+
+    class UpdateDesktopReceiver extends BroadcastReceiver {
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            Log.e("UpdateDesktopReceiver", "onReceive: " + action);
+            if (TextUtils.isEmpty(action)) {
+                return;
+            }
+            if (UPDATE_DESKTOP_ICON_ACTION.equals(action)) {
+                mPresenter.getInstalledApp();
+            }
+        }
+    }
+
+    private AppChangedReceiver mAppChangedReceiver;
+
+    private void registerAppChangedReceiver() {
+        if (mAppChangedReceiver == null) {
+            mAppChangedReceiver = new AppChangedReceiver();
+        }
+        IntentFilter filter = new IntentFilter();
+        filter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY);
+        filter.addAction(Intent.ACTION_PACKAGE_ADDED);
+        filter.addAction(Intent.ACTION_PACKAGE_CHANGED);
+        filter.addAction(Intent.ACTION_PACKAGE_REPLACED);
+        filter.addAction(Intent.ACTION_PACKAGE_REMOVED);
+        filter.addDataScheme("package");
+        mContext.registerReceiver(mAppChangedReceiver, filter);
+    }
+
+    class AppChangedReceiver extends BroadcastReceiver {
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            Log.e("AppChangedReceiver", "onReceive: " + action);
+            if (TextUtils.isEmpty(action)) {
+                return;
+            }
+            mPresenter.getInstalledApp();
+        }
+    }
+
+
+    @Override
+    public void setInstalledApp(ArrayList<DesktopIcon> desktopIcons) {
+        Log.e(TAG, "setInstalledApp: " + desktopIcons);
+        if (desktopIcons == null || desktopIcons.size() == 0) {
+            iv_nodata.setVisibility(View.VISIBLE);
+            rv_app.setVisibility(View.INVISIBLE);
+        } else {
+            iv_nodata.setVisibility(View.GONE);
+            rv_app.setVisibility(View.VISIBLE);
+            mAppAdapter.setDesktopIcons(desktopIcons);
+        }
+    }
+}
diff --git a/app/src/main/java/com/uiui/zyos/fragment/app/AppPresenter.java b/app/src/main/java/com/uiui/zyos/fragment/app/AppPresenter.java
new file mode 100644
index 0000000..f7ddb05
--- /dev/null
+++ b/app/src/main/java/com/uiui/zyos/fragment/app/AppPresenter.java
@@ -0,0 +1,61 @@
+package com.uiui.zyos.fragment.app;
+
+import android.content.Context;
+
+import com.trello.rxlifecycle4.android.FragmentEvent;
+import com.uiui.zyos.R;
+import com.uiui.zyos.bean.DesktopIcon;
+import com.uiui.zyos.manager.AppManager;
+
+import java.util.ArrayList;
+
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.subjects.BehaviorSubject;
+
+public class AppPresenter implements AppContact.AppPresenter {
+    private static final String TAG = AppPresenter.class.getSimpleName();
+    private Context mContext;
+    private AppContact.AppView mView;
+
+    public AppPresenter(Context context) {
+        this.mContext = context;
+    }
+
+    private BehaviorSubject<FragmentEvent> lifecycle;
+
+    void setLifecycle(BehaviorSubject<FragmentEvent> lifecycle) {
+        this.lifecycle = lifecycle;
+    }
+
+    public BehaviorSubject<FragmentEvent> getLifecycle() {
+        return lifecycle;
+    }
+
+    @Override
+    public void attachView(@NonNull AppContact.AppView view) {
+        this.mView = view;
+    }
+
+    @Override
+    public void detachView() {
+        this.mView = null;
+    }
+
+    @Override
+    public void getInstalledApp() {
+        ArrayList<DesktopIcon> desktopIcons = AppManager.getInstance().getFilterAppList();
+        DesktopIcon updateDesktopIcon = new DesktopIcon();
+        updateDesktopIcon.setLable("应用更新");
+        updateDesktopIcon.setPackageName(AppManager.UPDATE_NAME);
+        updateDesktopIcon.setIcon(mContext.getDrawable(R.drawable.icon_update));
+        desktopIcons.add(desktopIcons.size(), updateDesktopIcon);
+
+        DesktopIcon desktopIcon = new DesktopIcon();
+        desktopIcon.setLable("添加应用");
+        desktopIcon.setPackageName(AppManager.ADD_NAME);
+        desktopIcon.setIcon(mContext.getDrawable(R.drawable.icon_add));
+        desktopIcons.add(desktopIcons.size(), desktopIcon);
+
+        mView.setInstalledApp(desktopIcons);
+    }
+}
diff --git a/app/src/main/java/com/uiui/zyos/fragment/subject/SubjectFragment.java b/app/src/main/java/com/uiui/zyos/fragment/subject/SubjectFragment.java
index 6565bc7..1268f84 100644
--- a/app/src/main/java/com/uiui/zyos/fragment/subject/SubjectFragment.java
+++ b/app/src/main/java/com/uiui/zyos/fragment/subject/SubjectFragment.java
@@ -16,6 +16,7 @@ import com.flyco.tablayout.SlidingTabLayout;
 import com.uiui.zyos.R;
 import com.uiui.zyos.base.BaseFragment;
 import com.uiui.zyos.base.viewpager.BaseFragmentPagerAdapter;
+import com.uiui.zyos.fragment.app.AppFragment;
 import com.uiui.zyos.fragment.ar.ARStudyFragment;
 import com.uiui.zyos.fragment.biology.BiologyFragment;
 import com.uiui.zyos.fragment.chemical.ChemicalFragment;
@@ -47,11 +48,11 @@ public class SubjectFragment extends BaseFragment {
 
     private String[] title = new String[]{
 //            "AR自主学",
-            "精准学", "语文", "数学", "英语", "物理", "化学", "生物", "综合",};
+            "精准学", "语文", "数学", "英语", "物理", "化学", "生物", "综合", "应用"};
 
     private View rootView;
     private FragmentActivity mContext;
-//    private ARStudyFragment mARStudyFragment;
+    //    private ARStudyFragment mARStudyFragment;
     private PrecisionFragment mPrecisionFragment;
     private ChineseFragment mChineseFragment;
     private MathFragment mMathFragment;
@@ -60,6 +61,7 @@ public class SubjectFragment extends BaseFragment {
     private ChemicalFragment mChemicalFragment;
     private BiologyFragment mBiologyFragment;
     private ComplexFragment mComplexFragment;
+    private AppFragment mAppFragment;
 
     private List<Fragment> mFragments;
     private FragmentManager mFragmentManager;
@@ -119,6 +121,7 @@ public class SubjectFragment extends BaseFragment {
         mChemicalFragment = new ChemicalFragment();
         mBiologyFragment = new BiologyFragment();
         mComplexFragment = new ComplexFragment();
+        mAppFragment = new AppFragment();
 //        mFragments.add(mARStudyFragment);
         mFragments.add(mPrecisionFragment);
         mFragments.add(mChineseFragment);
@@ -128,6 +131,7 @@ public class SubjectFragment extends BaseFragment {
         mFragments.add(mChemicalFragment);
         mFragments.add(mBiologyFragment);
         mFragments.add(mComplexFragment);
+        mFragments.add(mAppFragment);
         Log.e(TAG, "SubjectFragment: end = " + (System.currentTimeMillis() - time));
     }
 
diff --git a/app/src/main/java/com/uiui/zyos/fragment/user/UserFragment.java b/app/src/main/java/com/uiui/zyos/fragment/user/UserFragment.java
index 37cb426..5059f0e 100644
--- a/app/src/main/java/com/uiui/zyos/fragment/user/UserFragment.java
+++ b/app/src/main/java/com/uiui/zyos/fragment/user/UserFragment.java
@@ -85,16 +85,14 @@ public class UserFragment extends BaseFragment implements UserContact.UserView {
     TextView tv_applet;
     @BindView(R.id.tv_duration)
     TextView tv_duration;
-    //    @BindView(R.id.cl_activation)
-//    ConstraintLayout cl_activation;
     @BindView(R.id.tv_date1)
     TextView tv_date1;
     @BindView(R.id.iv_applet_qrcode)
     NiceImageView iv_applet_qrcode;
     @BindView(R.id.iv_device_qrcode)
     NiceImageView iv_device_qrcode;
-    //    @BindView(R.id.cl_app)
-//    ConstraintLayout cl_app;
+    @BindView(R.id.cl_app)
+    ConstraintLayout cl_app;
     @BindView(R.id.tv_date2)
     TextView tv_date2;
     @BindView(R.id.cl_more)
@@ -106,7 +104,6 @@ public class UserFragment extends BaseFragment implements UserContact.UserView {
     @BindView(R.id.tv_activation)
     TextView tv_activation;
 
-
     private AppAdapter mAppAdapter;
 
     private UserPresenter mPresenter;
@@ -231,8 +228,6 @@ public class UserFragment extends BaseFragment implements UserContact.UserView {
         if (logined == 1) {
             cl_nodata.setVisibility(View.GONE);
             cl_usedata.setVisibility(View.VISIBLE);
-//            cl_activation.setVisibility(View.GONE);
-//            cl_app.setVisibility(View.VISIBLE);
         }
         setButtonVisibility();
         tv_exit.setOnClickListener(new View.OnClickListener() {
@@ -395,8 +390,6 @@ public class UserFragment extends BaseFragment implements UserContact.UserView {
 
                     cl_nodata.setVisibility(View.GONE);
                     cl_usedata.setVisibility(View.VISIBLE);
-//                    cl_activation.setVisibility(View.GONE);
-//                    cl_app.setVisibility(View.VISIBLE);
                     break;
                 case 300: //设备没有绑定
                 case 400://没有授权的设备
@@ -406,8 +399,6 @@ public class UserFragment extends BaseFragment implements UserContact.UserView {
                     tv_grade.setText(getString(R.string.notset));
                     cl_nodata.setVisibility(View.VISIBLE);
                     cl_usedata.setVisibility(View.GONE);
-//                    cl_activation.setVisibility(View.VISIBLE);
-//                    cl_app.setVisibility(View.GONE);
                     break;
 //                    ToastUtil.show(getString(R.string.device_unauthorized));
 //                    Log.e(TAG, "setSnInfo: " + getString(R.string.device_unauthorized));
@@ -415,8 +406,6 @@ public class UserFragment extends BaseFragment implements UserContact.UserView {
 //                    tv_grade.setText(getString(R.string.device_unauthorized));
 //                    cl_nodata.setVisibility(View.GONE);
 //                    cl_usedata.setVisibility(View.GONE);
-//                    cl_activation.setVisibility(View.GONE);
-//                    cl_app.setVisibility(View.GONE);
 //                    break;
                 default:
             }
@@ -425,7 +414,6 @@ public class UserFragment extends BaseFragment implements UserContact.UserView {
 
         mPresenter.getStudyStat();
         mPresenter.getQrCode();
-//        cl_app.setVisibility(View.VISIBLE);
     }
 
     @Override
diff --git a/app/src/main/java/com/uiui/zyos/manager/AppManager.java b/app/src/main/java/com/uiui/zyos/manager/AppManager.java
index 58d2f85..eb8a18f 100644
--- a/app/src/main/java/com/uiui/zyos/manager/AppManager.java
+++ b/app/src/main/java/com/uiui/zyos/manager/AppManager.java
@@ -247,8 +247,8 @@ public class AppManager {
             }
         });
         ArrayList<DesktopIcon> desktopIcons = new ArrayList<>();
-        for (ResolveInfo applicationInfo : resolveInfos) {
-            desktopIcons.add(DesktopIcon.creatDesktopIcon(mContext, applicationInfo));
+        for (ResolveInfo resolveInfo : resolveInfos) {
+            desktopIcons.add(DesktopIcon.creatDesktopIcon(mContext, resolveInfo));
         }
         return desktopIcons;
     }
diff --git a/app/src/main/java/com/uiui/zyos/manager/RemoteManager.java b/app/src/main/java/com/uiui/zyos/manager/RemoteManager.java
index abd99de..310e2b8 100644
--- a/app/src/main/java/com/uiui/zyos/manager/RemoteManager.java
+++ b/app/src/main/java/com/uiui/zyos/manager/RemoteManager.java
@@ -141,6 +141,7 @@ public class RemoteManager {
             Log.e(TAG, "aliyunPushInit: empty");
             return;
         }
+        PushServiceFactory.init(mContext);
         CloudPushService pushService = PushServiceFactory.getCloudPushService();
         pushService.register(mContext, new CommonCallback() {
             @Override
diff --git a/app/src/main/res/drawable-hdpi/icon_update.png b/app/src/main/res/drawable-hdpi/icon_update.png
index b5d5e73..df52354 100644
Binary files a/app/src/main/res/drawable-hdpi/icon_update.png and b/app/src/main/res/drawable-hdpi/icon_update.png differ
diff --git a/app/src/main/res/drawable-xhdpi/chinese_character.png b/app/src/main/res/drawable-xhdpi/chinese_character.png
index 0c438f2..03aaee4 100644
Binary files a/app/src/main/res/drawable-xhdpi/chinese_character.png and b/app/src/main/res/drawable-xhdpi/chinese_character.png differ
diff --git a/app/src/main/res/drawable-xhdpi/chinese_classical.png b/app/src/main/res/drawable-xhdpi/chinese_classical.png
index 292a890..1f7be21 100644
Binary files a/app/src/main/res/drawable-xhdpi/chinese_classical.png and b/app/src/main/res/drawable-xhdpi/chinese_classical.png differ
diff --git a/app/src/main/res/drawable-xhdpi/chinese_featured_reading.png b/app/src/main/res/drawable-xhdpi/chinese_featured_reading.png
index 715ebad..6a7552b 100644
Binary files a/app/src/main/res/drawable-xhdpi/chinese_featured_reading.png and b/app/src/main/res/drawable-xhdpi/chinese_featured_reading.png differ
diff --git a/app/src/main/res/drawable-xhdpi/chinese_near_antonyms.png b/app/src/main/res/drawable-xhdpi/chinese_near_antonyms.png
index 5660533..526c736 100644
Binary files a/app/src/main/res/drawable-xhdpi/chinese_near_antonyms.png and b/app/src/main/res/drawable-xhdpi/chinese_near_antonyms.png differ
diff --git a/app/src/main/res/drawable-xhdpi/chinese_order_rules.png b/app/src/main/res/drawable-xhdpi/chinese_order_rules.png
index 36065b9..40fb0cf 100644
Binary files a/app/src/main/res/drawable-xhdpi/chinese_order_rules.png and b/app/src/main/res/drawable-xhdpi/chinese_order_rules.png differ
diff --git a/app/src/main/res/drawable-xhdpi/chinese_pinyin_learning.png b/app/src/main/res/drawable-xhdpi/chinese_pinyin_learning.png
index 3c110e5..8e36b87 100644
Binary files a/app/src/main/res/drawable-xhdpi/chinese_pinyin_learning.png and b/app/src/main/res/drawable-xhdpi/chinese_pinyin_learning.png differ
diff --git a/app/src/main/res/drawable-xhdpi/chinese_punctuation.png b/app/src/main/res/drawable-xhdpi/chinese_punctuation.png
index a564952..9000c77 100644
Binary files a/app/src/main/res/drawable-xhdpi/chinese_punctuation.png and b/app/src/main/res/drawable-xhdpi/chinese_punctuation.png differ
diff --git a/app/src/main/res/drawable-xhdpi/chinese_radicals.png b/app/src/main/res/drawable-xhdpi/chinese_radicals.png
index f6e9501..2d14be3 100644
Binary files a/app/src/main/res/drawable-xhdpi/chinese_radicals.png and b/app/src/main/res/drawable-xhdpi/chinese_radicals.png differ
diff --git a/app/src/main/res/drawable-xhdpi/chinese_read_composition.png b/app/src/main/res/drawable-xhdpi/chinese_read_composition.png
index 25df66b..9c5c1d0 100644
Binary files a/app/src/main/res/drawable-xhdpi/chinese_read_composition.png and b/app/src/main/res/drawable-xhdpi/chinese_read_composition.png differ
diff --git a/app/src/main/res/drawable-xhdpi/chinese_rhetoric.png b/app/src/main/res/drawable-xhdpi/chinese_rhetoric.png
index 5fc19b7..c9c7c63 100644
Binary files a/app/src/main/res/drawable-xhdpi/chinese_rhetoric.png and b/app/src/main/res/drawable-xhdpi/chinese_rhetoric.png differ
diff --git a/app/src/main/res/drawable-xhdpi/chinese_stroke_name.png b/app/src/main/res/drawable-xhdpi/chinese_stroke_name.png
index 1f2ff9e..9a83582 100644
Binary files a/app/src/main/res/drawable-xhdpi/chinese_stroke_name.png and b/app/src/main/res/drawable-xhdpi/chinese_stroke_name.png differ
diff --git a/app/src/main/res/drawable-xhdpi/chinese_synchronous_tutoring.png b/app/src/main/res/drawable-xhdpi/chinese_synchronous_tutoring.png
index 9cdd598..59a79ac 100644
Binary files a/app/src/main/res/drawable-xhdpi/chinese_synchronous_tutoring.png and b/app/src/main/res/drawable-xhdpi/chinese_synchronous_tutoring.png differ
diff --git a/app/src/main/res/drawable-xhdpi/chinese_treasure.png b/app/src/main/res/drawable-xhdpi/chinese_treasure.png
index b26c989..de59ac8 100644
Binary files a/app/src/main/res/drawable-xhdpi/chinese_treasure.png and b/app/src/main/res/drawable-xhdpi/chinese_treasure.png differ
diff --git a/app/src/main/res/drawable-xhdpi/complex_book.png b/app/src/main/res/drawable-xhdpi/complex_book.png
index 74e950f..55062d7 100644
Binary files a/app/src/main/res/drawable-xhdpi/complex_book.png and b/app/src/main/res/drawable-xhdpi/complex_book.png differ
diff --git a/app/src/main/res/drawable-xhdpi/complex_geography_box.png b/app/src/main/res/drawable-xhdpi/complex_geography_box.png
index 1be6158..7ef3a42 100644
Binary files a/app/src/main/res/drawable-xhdpi/complex_geography_box.png and b/app/src/main/res/drawable-xhdpi/complex_geography_box.png differ
diff --git a/app/src/main/res/drawable-xhdpi/complex_history_box.png b/app/src/main/res/drawable-xhdpi/complex_history_box.png
index edfeaf8..2f06e8d 100644
Binary files a/app/src/main/res/drawable-xhdpi/complex_history_box.png and b/app/src/main/res/drawable-xhdpi/complex_history_box.png differ
diff --git a/app/src/main/res/drawable-xhdpi/complex_politics_box.png b/app/src/main/res/drawable-xhdpi/complex_politics_box.png
index b43d2b6..c284500 100644
Binary files a/app/src/main/res/drawable-xhdpi/complex_politics_box.png and b/app/src/main/res/drawable-xhdpi/complex_politics_box.png differ
diff --git a/app/src/main/res/drawable-xhdpi/complex_science_box.png b/app/src/main/res/drawable-xhdpi/complex_science_box.png
index 268c848..7f0314e 100644
Binary files a/app/src/main/res/drawable-xhdpi/complex_science_box.png and b/app/src/main/res/drawable-xhdpi/complex_science_box.png differ
diff --git a/app/src/main/res/drawable-xhdpi/complex_video.png b/app/src/main/res/drawable-xhdpi/complex_video.png
index 157b2b6..b6213be 100644
Binary files a/app/src/main/res/drawable-xhdpi/complex_video.png and b/app/src/main/res/drawable-xhdpi/complex_video.png differ
diff --git a/app/src/main/res/drawable-xhdpi/custom_bg_ai.png b/app/src/main/res/drawable-xhdpi/custom_bg_ai.png
new file mode 100644
index 0000000..af8f0c0
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/custom_bg_ai.png differ
diff --git a/app/src/main/res/drawable-xhdpi/endlish_jcxx_ywzm.png b/app/src/main/res/drawable-xhdpi/endlish_jcxx_ywzm.png
index dd36c29..c6b12d2 100644
Binary files a/app/src/main/res/drawable-xhdpi/endlish_jcxx_ywzm.png and b/app/src/main/res/drawable-xhdpi/endlish_jcxx_ywzm.png differ
diff --git a/app/src/main/res/drawable-xhdpi/english_ice_grammar.png b/app/src/main/res/drawable-xhdpi/english_ice_grammar.png
index f2e1259..233733e 100644
Binary files a/app/src/main/res/drawable-xhdpi/english_ice_grammar.png and b/app/src/main/res/drawable-xhdpi/english_ice_grammar.png differ
diff --git a/app/src/main/res/drawable-xhdpi/english_into_sentence.png b/app/src/main/res/drawable-xhdpi/english_into_sentence.png
index 418c326..7c36f7c 100644
Binary files a/app/src/main/res/drawable-xhdpi/english_into_sentence.png and b/app/src/main/res/drawable-xhdpi/english_into_sentence.png differ
diff --git a/app/src/main/res/drawable-xhdpi/english_jcxx_yych.png b/app/src/main/res/drawable-xhdpi/english_jcxx_yych.png
index 3f12eea..086b053 100644
Binary files a/app/src/main/res/drawable-xhdpi/english_jcxx_yych.png and b/app/src/main/res/drawable-xhdpi/english_jcxx_yych.png differ
diff --git a/app/src/main/res/drawable-xhdpi/english_jcyy_jcyy.png b/app/src/main/res/drawable-xhdpi/english_jcyy_jcyy.png
index 1bd2ff0..ad250f7 100644
Binary files a/app/src/main/res/drawable-xhdpi/english_jcyy_jcyy.png and b/app/src/main/res/drawable-xhdpi/english_jcyy_jcyy.png differ
diff --git a/app/src/main/res/drawable-xhdpi/english_phonetic_alphabet.png b/app/src/main/res/drawable-xhdpi/english_phonetic_alphabet.png
index 6cfa528..ec4d2bf 100644
Binary files a/app/src/main/res/drawable-xhdpi/english_phonetic_alphabet.png and b/app/src/main/res/drawable-xhdpi/english_phonetic_alphabet.png differ
diff --git a/app/src/main/res/drawable-xhdpi/english_sentence_patterns.png b/app/src/main/res/drawable-xhdpi/english_sentence_patterns.png
index 01c01d4..29b8462 100644
Binary files a/app/src/main/res/drawable-xhdpi/english_sentence_patterns.png and b/app/src/main/res/drawable-xhdpi/english_sentence_patterns.png differ
diff --git a/app/src/main/res/drawable-xhdpi/english_writing.png b/app/src/main/res/drawable-xhdpi/english_writing.png
index 402d97a..808f125 100644
Binary files a/app/src/main/res/drawable-xhdpi/english_writing.png and b/app/src/main/res/drawable-xhdpi/english_writing.png differ
diff --git a/app/src/main/res/drawable-xhdpi/math_arithmetic.png b/app/src/main/res/drawable-xhdpi/math_arithmetic.png
index 0c8f464..6d4402c 100644
Binary files a/app/src/main/res/drawable-xhdpi/math_arithmetic.png and b/app/src/main/res/drawable-xhdpi/math_arithmetic.png differ
diff --git a/app/src/main/res/drawable-xhdpi/math_encyclopedia.png b/app/src/main/res/drawable-xhdpi/math_encyclopedia.png
index c01e8c5..6764cef 100644
Binary files a/app/src/main/res/drawable-xhdpi/math_encyclopedia.png and b/app/src/main/res/drawable-xhdpi/math_encyclopedia.png differ
diff --git a/app/src/main/res/drawable-xhdpi/math_equation_solution.png b/app/src/main/res/drawable-xhdpi/math_equation_solution.png
index 71951b2..e786601 100644
Binary files a/app/src/main/res/drawable-xhdpi/math_equation_solution.png and b/app/src/main/res/drawable-xhdpi/math_equation_solution.png differ
diff --git a/app/src/main/res/drawable-xhdpi/math_formula.png b/app/src/main/res/drawable-xhdpi/math_formula.png
index 695b82d..0efdba8 100644
Binary files a/app/src/main/res/drawable-xhdpi/math_formula.png and b/app/src/main/res/drawable-xhdpi/math_formula.png differ
diff --git a/app/src/main/res/drawable-xhdpi/math_number.png b/app/src/main/res/drawable-xhdpi/math_number.png
index 7b5e821..1e21acb 100644
Binary files a/app/src/main/res/drawable-xhdpi/math_number.png and b/app/src/main/res/drawable-xhdpi/math_number.png differ
diff --git a/app/src/main/res/drawable-xhdpi/math_olympiad_training.png b/app/src/main/res/drawable-xhdpi/math_olympiad_training.png
index 7f5fb2b..2274251 100644
Binary files a/app/src/main/res/drawable-xhdpi/math_olympiad_training.png and b/app/src/main/res/drawable-xhdpi/math_olympiad_training.png differ
diff --git a/app/src/main/res/drawable-xhdpi/math_problem_training.png b/app/src/main/res/drawable-xhdpi/math_problem_training.png
index a2256ad..8541b0b 100644
Binary files a/app/src/main/res/drawable-xhdpi/math_problem_training.png and b/app/src/main/res/drawable-xhdpi/math_problem_training.png differ
diff --git a/app/src/main/res/drawable-xhdpi/math_synchronous_tutoring.png b/app/src/main/res/drawable-xhdpi/math_synchronous_tutoring.png
index b94afac..e10ecd2 100644
Binary files a/app/src/main/res/drawable-xhdpi/math_synchronous_tutoring.png and b/app/src/main/res/drawable-xhdpi/math_synchronous_tutoring.png differ
diff --git a/app/src/main/res/drawable-xhdpi/mathematical_basis.png b/app/src/main/res/drawable-xhdpi/mathematical_basis.png
index 5d09919..1a68219 100644
Binary files a/app/src/main/res/drawable-xhdpi/mathematical_basis.png and b/app/src/main/res/drawable-xhdpi/mathematical_basis.png differ
diff --git a/app/src/main/res/drawable/custom_bg_ai.xml b/app/src/main/res/drawable/custom_bg_ai.xml
deleted file mode 100644
index 0889185..0000000
--- a/app/src/main/res/drawable/custom_bg_ai.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- 内部颜色 -->
-    <solid
-        android:color="@color/color_icon_background" />
-    <!-- 圆角的幅度 -->
-    <corners
-        android:topLeftRadius="@dimen/dp_8"
-        android:topRightRadius="@dimen/dp_8"
-        android:bottomLeftRadius="@dimen/dp_8"
-        android:bottomRightRadius="@dimen/dp_8" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/fragment_app.xml b/app/src/main/res/layout-land/fragment_app.xml
new file mode 100644
index 0000000..e5486c8
--- /dev/null
+++ b/app/src/main/res/layout-land/fragment_app.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout 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"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".fragment.app.AppFragment">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="@dimen/dp_510"
+            android:layout_height="@dimen/dp_210"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.35">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/rv_app"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:fadeScrollbars="false"
+                android:scrollbars="vertical"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <ImageView
+                android:id="@+id/iv_nodata"
+                android:layout_width="@dimen/dp_64"
+                android:layout_height="@dimen/dp_64"
+                android:adjustViewBounds="true"
+                android:scaleType="centerCrop"
+                android:src="@drawable/nodata"
+                android:visibility="gone"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="@+id/rv_app" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/fragment_chinese.xml b/app/src/main/res/layout-land/fragment_chinese.xml
index ed0e5f8..38e3800 100644
--- a/app/src/main/res/layout-land/fragment_chinese.xml
+++ b/app/src/main/res/layout-land/fragment_chinese.xml
@@ -151,8 +151,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView4"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
+                                                android:layout_width="@dimen/dp_40"
+                                                android:layout_height="@dimen/dp_40"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/chinese_synchronous_tutoring"
@@ -160,16 +160,6 @@
                                                 app:layout_constraintStart_toStartOf="parent"
                                                 app:layout_constraintTop_toTopOf="parent" />
 
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="同步辅导"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView4" />
                                         </androidx.constraintlayout.widget.ConstraintLayout>
                                     </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -189,8 +179,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView5"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
+                                                android:layout_width="@dimen/dp_40"
+                                                android:layout_height="@dimen/dp_40"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/chinese_near_antonyms"
@@ -198,16 +188,6 @@
                                                 app:layout_constraintStart_toStartOf="parent"
                                                 app:layout_constraintTop_toTopOf="parent" />
 
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="近反义词"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView5" />
                                         </androidx.constraintlayout.widget.ConstraintLayout>
                                     </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -227,8 +207,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView6"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
+                                                android:layout_width="@dimen/dp_40"
+                                                android:layout_height="@dimen/dp_40"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/chinese_read_composition"
@@ -236,16 +216,6 @@
                                                 app:layout_constraintStart_toStartOf="parent"
                                                 app:layout_constraintTop_toTopOf="parent" />
 
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="阅读写作"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView6" />
                                         </androidx.constraintlayout.widget.ConstraintLayout>
                                     </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -275,8 +245,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView7"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
+                                                android:layout_width="@dimen/dp_40"
+                                                android:layout_height="@dimen/dp_40"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/chinese_featured_reading"
@@ -284,17 +254,6 @@
                                                 app:layout_constraintStart_toStartOf="parent"
                                                 app:layout_constraintTop_toTopOf="parent" />
 
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="精选阅读"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView7" />
-
                                         </androidx.constraintlayout.widget.ConstraintLayout>
 
                                     </androidx.constraintlayout.widget.ConstraintLayout>
@@ -315,8 +274,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView8"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
+                                                android:layout_width="@dimen/dp_40"
+                                                android:layout_height="@dimen/dp_40"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/chinese_character"
@@ -324,16 +283,6 @@
                                                 app:layout_constraintStart_toStartOf="parent"
                                                 app:layout_constraintTop_toTopOf="parent" />
 
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="汉字学习"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView8" />
                                         </androidx.constraintlayout.widget.ConstraintLayout>
                                     </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -354,8 +303,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView9"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
+                                                android:layout_width="@dimen/dp_40"
+                                                android:layout_height="@dimen/dp_40"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/chinese_classical"
@@ -363,16 +312,6 @@
                                                 app:layout_constraintStart_toStartOf="parent"
                                                 app:layout_constraintTop_toTopOf="parent" />
 
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="文言文"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView9" />
                                         </androidx.constraintlayout.widget.ConstraintLayout>
                                     </androidx.constraintlayout.widget.ConstraintLayout>
                                 </LinearLayout>
@@ -401,8 +340,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView10"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
+                                                android:layout_width="@dimen/dp_40"
+                                                android:layout_height="@dimen/dp_40"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/chinese_rhetoric"
@@ -410,17 +349,6 @@
                                                 app:layout_constraintStart_toStartOf="parent"
                                                 app:layout_constraintTop_toTopOf="parent" />
 
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="修辞手法"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView10" />
-
                                         </androidx.constraintlayout.widget.ConstraintLayout>
 
                                     </androidx.constraintlayout.widget.ConstraintLayout>
@@ -441,8 +369,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView11"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
+                                                android:layout_width="@dimen/dp_40"
+                                                android:layout_height="@dimen/dp_40"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/chinese_treasure"
@@ -450,16 +378,6 @@
                                                 app:layout_constraintStart_toStartOf="parent"
                                                 app:layout_constraintTop_toTopOf="parent" />
 
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="中华宝典"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView11" />
                                         </androidx.constraintlayout.widget.ConstraintLayout>
                                     </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -477,11 +395,10 @@
                                             app:layout_constraintStart_toStartOf="parent"
                                             app:layout_constraintTop_toTopOf="parent">
 
-
                                             <ImageView
                                                 android:id="@+id/imageView12"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
+                                                android:layout_width="@dimen/dp_40"
+                                                android:layout_height="@dimen/dp_40"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/chinese_punctuation"
@@ -489,16 +406,6 @@
                                                 app:layout_constraintStart_toStartOf="parent"
                                                 app:layout_constraintTop_toTopOf="parent" />
 
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="标点符号"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView12" />
                                         </androidx.constraintlayout.widget.ConstraintLayout>
                                     </androidx.constraintlayout.widget.ConstraintLayout>
                                 </LinearLayout>
diff --git a/app/src/main/res/layout-land/fragment_complex.xml b/app/src/main/res/layout-land/fragment_complex.xml
index 6dd2bce..6d4a89e 100644
--- a/app/src/main/res/layout-land/fragment_complex.xml
+++ b/app/src/main/res/layout-land/fragment_complex.xml
@@ -105,23 +105,13 @@
 
                                                     <ImageView
                                                         android:id="@+id/imageView14"
-                                                        android:layout_width="@dimen/dp_32"
-                                                        android:layout_height="@dimen/dp_32"
+                                                        android:layout_width="@dimen/dp_36"
+                                                        android:layout_height="@dimen/dp_36"
                                                         android:src="@drawable/complex_video"
-                                                        app:layout_constraintEnd_toEndOf="parent"
-                                                        app:layout_constraintStart_toStartOf="parent"
-                                                        app:layout_constraintTop_toTopOf="parent" />
-
-                                                    <TextView
-                                                        android:layout_width="wrap_content"
-                                                        android:layout_height="wrap_content"
-                                                        android:text="同步视频"
-                                                        android:textColor="@color/colorAccent"
-                                                        android:textSize="@dimen/sp_8"
                                                         app:layout_constraintBottom_toBottomOf="parent"
                                                         app:layout_constraintEnd_toEndOf="parent"
                                                         app:layout_constraintStart_toStartOf="parent"
-                                                        app:layout_constraintTop_toBottomOf="@+id/imageView14" />
+                                                        app:layout_constraintTop_toTopOf="parent" />
 
 
                                                 </androidx.constraintlayout.widget.ConstraintLayout>
@@ -140,23 +130,14 @@
 
                                                     <ImageView
                                                         android:id="@+id/imageView15"
-                                                        android:layout_width="@dimen/dp_32"
-                                                        android:layout_height="@dimen/dp_32"
+                                                        android:layout_width="@dimen/dp_40"
+                                                        android:layout_height="@dimen/dp_40"
                                                         android:src="@drawable/complex_book"
+                                                        app:layout_constraintBottom_toBottomOf="parent"
                                                         app:layout_constraintEnd_toEndOf="parent"
                                                         app:layout_constraintStart_toStartOf="parent"
                                                         app:layout_constraintTop_toTopOf="parent" />
 
-                                                    <TextView
-                                                        android:layout_width="wrap_content"
-                                                        android:layout_height="wrap_content"
-                                                        android:text="同步辅导"
-                                                        android:textColor="@color/colorAccent"
-                                                        android:textSize="@dimen/sp_8"
-                                                        app:layout_constraintBottom_toBottomOf="parent"
-                                                        app:layout_constraintEnd_toEndOf="parent"
-                                                        app:layout_constraintStart_toStartOf="parent"
-                                                        app:layout_constraintTop_toBottomOf="@+id/imageView15" />
                                                 </androidx.constraintlayout.widget.ConstraintLayout>
                                             </androidx.constraintlayout.widget.ConstraintLayout>
                                         </LinearLayout>
@@ -206,23 +187,13 @@
 
                                                     <ImageView
                                                         android:id="@+id/imageView16"
-                                                        android:layout_width="@dimen/dp_32"
-                                                        android:layout_height="@dimen/dp_32"
+                                                        android:layout_width="@dimen/dp_40"
+                                                        android:layout_height="@dimen/dp_40"
                                                         android:src="@drawable/complex_video"
-                                                        app:layout_constraintEnd_toEndOf="parent"
-                                                        app:layout_constraintStart_toStartOf="parent"
-                                                        app:layout_constraintTop_toTopOf="parent" />
-
-                                                    <TextView
-                                                        android:layout_width="wrap_content"
-                                                        android:layout_height="wrap_content"
-                                                        android:text="同步视频"
-                                                        android:textColor="@color/colorAccent"
-                                                        android:textSize="@dimen/sp_8"
                                                         app:layout_constraintBottom_toBottomOf="parent"
                                                         app:layout_constraintEnd_toEndOf="parent"
                                                         app:layout_constraintStart_toStartOf="parent"
-                                                        app:layout_constraintTop_toBottomOf="@+id/imageView16" />
+                                                        app:layout_constraintTop_toTopOf="parent" />
 
 
                                                 </androidx.constraintlayout.widget.ConstraintLayout>
@@ -241,23 +212,14 @@
 
                                                     <ImageView
                                                         android:id="@+id/imageView17"
-                                                        android:layout_width="@dimen/dp_32"
-                                                        android:layout_height="@dimen/dp_32"
+                                                        android:layout_width="@dimen/dp_40"
+                                                        android:layout_height="@dimen/dp_40"
                                                         android:src="@drawable/complex_book"
+                                                        app:layout_constraintBottom_toBottomOf="parent"
                                                         app:layout_constraintEnd_toEndOf="parent"
                                                         app:layout_constraintStart_toStartOf="parent"
                                                         app:layout_constraintTop_toTopOf="parent" />
 
-                                                    <TextView
-                                                        android:layout_width="wrap_content"
-                                                        android:layout_height="wrap_content"
-                                                        android:text="同步辅导"
-                                                        android:textColor="@color/colorAccent"
-                                                        android:textSize="@dimen/sp_8"
-                                                        app:layout_constraintBottom_toBottomOf="parent"
-                                                        app:layout_constraintEnd_toEndOf="parent"
-                                                        app:layout_constraintStart_toStartOf="parent"
-                                                        app:layout_constraintTop_toBottomOf="@+id/imageView17" />
                                                 </androidx.constraintlayout.widget.ConstraintLayout>
                                             </androidx.constraintlayout.widget.ConstraintLayout>
                                         </LinearLayout>
@@ -316,23 +278,13 @@
 
                                                     <ImageView
                                                         android:id="@+id/imageView18"
-                                                        android:layout_width="@dimen/dp_32"
-                                                        android:layout_height="@dimen/dp_32"
+                                                        android:layout_width="@dimen/dp_40"
+                                                        android:layout_height="@dimen/dp_40"
                                                         android:src="@drawable/complex_video"
-                                                        app:layout_constraintEnd_toEndOf="parent"
-                                                        app:layout_constraintStart_toStartOf="parent"
-                                                        app:layout_constraintTop_toTopOf="parent" />
-
-                                                    <TextView
-                                                        android:layout_width="wrap_content"
-                                                        android:layout_height="wrap_content"
-                                                        android:text="同步视频"
-                                                        android:textColor="@color/colorAccent"
-                                                        android:textSize="@dimen/sp_8"
                                                         app:layout_constraintBottom_toBottomOf="parent"
                                                         app:layout_constraintEnd_toEndOf="parent"
                                                         app:layout_constraintStart_toStartOf="parent"
-                                                        app:layout_constraintTop_toBottomOf="@+id/imageView18" />
+                                                        app:layout_constraintTop_toTopOf="parent" />
 
 
                                                 </androidx.constraintlayout.widget.ConstraintLayout>
@@ -351,23 +303,14 @@
 
                                                     <ImageView
                                                         android:id="@+id/imageView19"
-                                                        android:layout_width="@dimen/dp_32"
-                                                        android:layout_height="@dimen/dp_32"
+                                                        android:layout_width="@dimen/dp_40"
+                                                        android:layout_height="@dimen/dp_40"
                                                         android:src="@drawable/complex_book"
+                                                        app:layout_constraintBottom_toBottomOf="parent"
                                                         app:layout_constraintEnd_toEndOf="parent"
                                                         app:layout_constraintStart_toStartOf="parent"
                                                         app:layout_constraintTop_toTopOf="parent" />
 
-                                                    <TextView
-                                                        android:layout_width="wrap_content"
-                                                        android:layout_height="wrap_content"
-                                                        android:text="同步辅导"
-                                                        android:textColor="@color/colorAccent"
-                                                        android:textSize="@dimen/sp_8"
-                                                        app:layout_constraintBottom_toBottomOf="parent"
-                                                        app:layout_constraintEnd_toEndOf="parent"
-                                                        app:layout_constraintStart_toStartOf="parent"
-                                                        app:layout_constraintTop_toBottomOf="@+id/imageView19" />
                                                 </androidx.constraintlayout.widget.ConstraintLayout>
                                             </androidx.constraintlayout.widget.ConstraintLayout>
                                         </LinearLayout>
@@ -419,23 +362,13 @@
 
                                                     <ImageView
                                                         android:id="@+id/imageView20"
-                                                        android:layout_width="@dimen/dp_32"
-                                                        android:layout_height="@dimen/dp_32"
+                                                        android:layout_width="@dimen/dp_40"
+                                                        android:layout_height="@dimen/dp_40"
                                                         android:src="@drawable/complex_video"
-                                                        app:layout_constraintEnd_toEndOf="parent"
-                                                        app:layout_constraintStart_toStartOf="parent"
-                                                        app:layout_constraintTop_toTopOf="parent" />
-
-                                                    <TextView
-                                                        android:layout_width="wrap_content"
-                                                        android:layout_height="wrap_content"
-                                                        android:text="同步视频"
-                                                        android:textColor="@color/colorAccent"
-                                                        android:textSize="@dimen/sp_8"
                                                         app:layout_constraintBottom_toBottomOf="parent"
                                                         app:layout_constraintEnd_toEndOf="parent"
                                                         app:layout_constraintStart_toStartOf="parent"
-                                                        app:layout_constraintTop_toBottomOf="@+id/imageView20" />
+                                                        app:layout_constraintTop_toTopOf="parent" />
 
 
                                                 </androidx.constraintlayout.widget.ConstraintLayout>
@@ -454,23 +387,14 @@
 
                                                     <ImageView
                                                         android:id="@+id/imageView21"
-                                                        android:layout_width="@dimen/dp_32"
-                                                        android:layout_height="@dimen/dp_32"
+                                                        android:layout_width="@dimen/dp_40"
+                                                        android:layout_height="@dimen/dp_40"
                                                         android:src="@drawable/complex_book"
+                                                        app:layout_constraintBottom_toBottomOf="parent"
                                                         app:layout_constraintEnd_toEndOf="parent"
                                                         app:layout_constraintStart_toStartOf="parent"
                                                         app:layout_constraintTop_toTopOf="parent" />
 
-                                                    <TextView
-                                                        android:layout_width="wrap_content"
-                                                        android:layout_height="wrap_content"
-                                                        android:text="同步辅导"
-                                                        android:textColor="@color/colorAccent"
-                                                        android:textSize="@dimen/sp_8"
-                                                        app:layout_constraintBottom_toBottomOf="parent"
-                                                        app:layout_constraintEnd_toEndOf="parent"
-                                                        app:layout_constraintStart_toStartOf="parent"
-                                                        app:layout_constraintTop_toBottomOf="@+id/imageView21" />
                                                 </androidx.constraintlayout.widget.ConstraintLayout>
                                             </androidx.constraintlayout.widget.ConstraintLayout>
                                         </LinearLayout>
diff --git a/app/src/main/res/layout-land/fragment_math.xml b/app/src/main/res/layout-land/fragment_math.xml
index 4535e0f..1058cfe 100644
--- a/app/src/main/res/layout-land/fragment_math.xml
+++ b/app/src/main/res/layout-land/fragment_math.xml
@@ -126,8 +126,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView4"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
+                                                android:layout_width="@dimen/dp_40"
+                                                android:layout_height="@dimen/dp_40"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/math_synchronous_tutoring"
@@ -135,16 +135,6 @@
                                                 app:layout_constraintStart_toStartOf="parent"
                                                 app:layout_constraintTop_toTopOf="parent" />
 
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="同步辅导"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView4" />
                                         </androidx.constraintlayout.widget.ConstraintLayout>
                                     </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -164,8 +154,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView5"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
+                                                android:layout_width="@dimen/dp_40"
+                                                android:layout_height="@dimen/dp_40"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/math_problem_training"
@@ -173,16 +163,6 @@
                                                 app:layout_constraintStart_toStartOf="parent"
                                                 app:layout_constraintTop_toTopOf="parent" />
 
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="应用题训练"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView5" />
                                         </androidx.constraintlayout.widget.ConstraintLayout>
                                     </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -202,8 +182,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView6"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
+                                                android:layout_width="@dimen/dp_40"
+                                                android:layout_height="@dimen/dp_40"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/math_olympiad_training"
@@ -211,16 +191,6 @@
                                                 app:layout_constraintStart_toStartOf="parent"
                                                 app:layout_constraintTop_toTopOf="parent" />
 
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="奥数训练"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView6" />
                                         </androidx.constraintlayout.widget.ConstraintLayout>
                                     </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -250,8 +220,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView7"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
+                                                android:layout_width="@dimen/dp_40"
+                                                android:layout_height="@dimen/dp_40"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/math_equation_solution"
@@ -259,17 +229,6 @@
                                                 app:layout_constraintStart_toStartOf="parent"
                                                 app:layout_constraintTop_toTopOf="parent" />
 
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="方程精解"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView7" />
-
                                         </androidx.constraintlayout.widget.ConstraintLayout>
 
                                     </androidx.constraintlayout.widget.ConstraintLayout>
@@ -290,8 +249,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView8"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
+                                                android:layout_width="@dimen/dp_40"
+                                                android:layout_height="@dimen/dp_40"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/mathematical_basis"
@@ -299,16 +258,6 @@
                                                 app:layout_constraintStart_toStartOf="parent"
                                                 app:layout_constraintTop_toTopOf="parent" />
 
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="数学基础"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView8" />
                                         </androidx.constraintlayout.widget.ConstraintLayout>
                                     </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -329,8 +278,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView9"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
+                                                android:layout_width="@dimen/dp_40"
+                                                android:layout_height="@dimen/dp_40"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/math_arithmetic"
@@ -338,16 +287,6 @@
                                                 app:layout_constraintStart_toStartOf="parent"
                                                 app:layout_constraintTop_toTopOf="parent" />
 
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="四则运算"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView9" />
                                         </androidx.constraintlayout.widget.ConstraintLayout>
                                     </androidx.constraintlayout.widget.ConstraintLayout>
                                 </LinearLayout>
@@ -376,8 +315,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView10"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
+                                                android:layout_width="@dimen/dp_40"
+                                                android:layout_height="@dimen/dp_40"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/math_encyclopedia"
@@ -385,17 +324,6 @@
                                                 app:layout_constraintStart_toStartOf="parent"
                                                 app:layout_constraintTop_toTopOf="parent" />
 
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="公式大全"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView10" />
-
                                         </androidx.constraintlayout.widget.ConstraintLayout>
 
                                     </androidx.constraintlayout.widget.ConstraintLayout>
@@ -416,8 +344,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView11"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
+                                                android:layout_width="@dimen/dp_40"
+                                                android:layout_height="@dimen/dp_40"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/math_number"
@@ -425,16 +353,6 @@
                                                 app:layout_constraintStart_toStartOf="parent"
                                                 app:layout_constraintTop_toTopOf="parent" />
 
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="认识数字"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView11" />
                                         </androidx.constraintlayout.widget.ConstraintLayout>
                                     </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -455,8 +373,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView12"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
+                                                android:layout_width="@dimen/dp_40"
+                                                android:layout_height="@dimen/dp_40"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/math_formula"
@@ -464,16 +382,6 @@
                                                 app:layout_constraintStart_toStartOf="parent"
                                                 app:layout_constraintTop_toTopOf="parent" />
 
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="数学公式"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView12" />
                                         </androidx.constraintlayout.widget.ConstraintLayout>
                                     </androidx.constraintlayout.widget.ConstraintLayout>
                                 </LinearLayout>
diff --git a/app/src/main/res/layout-land/fragment_user.xml b/app/src/main/res/layout-land/fragment_user.xml
index 32f97c7..383b62e 100644
--- a/app/src/main/res/layout-land/fragment_user.xml
+++ b/app/src/main/res/layout-land/fragment_user.xml
@@ -306,7 +306,7 @@
                         android:id="@+id/cl_activation"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:visibility="gone">
+                        android:visibility="visible">
 
                         <TextView
                             android:id="@+id/tv_date1"
@@ -423,7 +423,7 @@
                         android:id="@+id/cl_app"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:visibility="visible">
+                        android:visibility="gone">
 
                         <TextView
                             android:id="@+id/tv_date2"
diff --git a/app/src/main/res/layout-sw800dp/activity_main.xml b/app/src/main/res/layout-sw800dp/activity_main.xml
index d3e5a69..0256130 100644
--- a/app/src/main/res/layout-sw800dp/activity_main.xml
+++ b/app/src/main/res/layout-sw800dp/activity_main.xml
@@ -68,7 +68,9 @@
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/cl_0"
                     android:layout_width="wrap_content"
-                    android:layout_height="match_parent">
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="@dimen/dp_4"
+                    android:layout_marginEnd="@dimen/dp_4">
 
                     <ImageView
                         android:id="@+id/iv_icon0"
@@ -129,7 +131,9 @@
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/cl_2"
                     android:layout_width="wrap_content"
-                    android:layout_height="match_parent">
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="@dimen/dp_4"
+                    android:layout_marginEnd="@dimen/dp_4">
 
                     <ImageView
                         android:id="@+id/iv_icon2"
@@ -252,7 +256,9 @@
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/cl_6"
                     android:layout_width="wrap_content"
-                    android:layout_height="match_parent">
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="@dimen/dp_4"
+                    android:layout_marginEnd="@dimen/dp_4">
 
                     <ImageView
                         android:id="@+id/iv_icon6"
@@ -282,7 +288,9 @@
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/cl_7"
                     android:layout_width="wrap_content"
-                    android:layout_height="match_parent">
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="@dimen/dp_4"
+                    android:layout_marginEnd="@dimen/dp_4">
 
                     <ImageView
                         android:id="@+id/iv_icon7"
@@ -311,9 +319,11 @@
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/cl_9"
-                    android:visibility="visible"
                     android:layout_width="wrap_content"
-                    android:layout_height="match_parent">
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="@dimen/dp_4"
+                    android:layout_marginEnd="@dimen/dp_4"
+                    android:visibility="visible">
 
                     <ImageView
                         android:id="@+id/iv_icon9"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 761bca7..adeacc6 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -34,9 +34,9 @@
             android:id="@+id/iv_robot"
             android:layout_width="@dimen/dp_40"
             android:layout_height="@dimen/dp_40"
+            android:layout_marginEnd="@dimen/dp_12"
             android:adjustViewBounds="true"
             android:scaleType="centerCrop"
-            android:layout_marginEnd="@dimen/dp_8"
             android:src="@drawable/robot"
             app:layout_constraintBottom_toBottomOf="@+id/constraintLayout2"
             app:layout_constraintEnd_toStartOf="@+id/constraintLayout2"
@@ -47,17 +47,18 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/dp_2"
-            android:background="@drawable/custom_bg_ai"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
+            android:background="@drawable/custom_bg_ai"
             app:layout_constraintStart_toStartOf="parent">
 
             <LinearLayout
+                android:id="@+id/linearLayout7"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginTop="@dimen/dp_4"
-                android:layout_marginEnd="@dimen/dp_4"
                 android:layout_marginStart="@dimen/dp_4"
+                android:layout_marginEnd="@dimen/dp_4"
+                android:layout_marginBottom="@dimen/dp_2"
                 android:orientation="horizontal"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -67,6 +68,8 @@
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/cl_0"
                     android:layout_width="wrap_content"
+                    android:layout_marginStart="@dimen/dp_4"
+                    android:layout_marginEnd="@dimen/dp_4"
                     android:layout_height="match_parent">
 
                     <ImageView
@@ -96,9 +99,9 @@
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/cl_1"
-                    android:visibility="gone"
                     android:layout_width="wrap_content"
-                    android:layout_height="match_parent">
+                    android:layout_height="match_parent"
+                    android:visibility="gone">
 
                     <ImageView
                         android:id="@+id/iv_icon1"
@@ -128,6 +131,8 @@
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/cl_2"
                     android:layout_width="wrap_content"
+                    android:layout_marginStart="@dimen/dp_4"
+                    android:layout_marginEnd="@dimen/dp_4"
                     android:layout_height="match_parent">
 
                     <ImageView
@@ -157,9 +162,9 @@
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/cl_3"
-                    android:visibility="gone"
                     android:layout_width="wrap_content"
-                    android:layout_height="match_parent">
+                    android:layout_height="match_parent"
+                    android:visibility="gone">
 
                     <ImageView
                         android:id="@+id/iv_icon3"
@@ -188,9 +193,11 @@
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/cl_4"
-                    android:visibility="visible"
                     android:layout_width="wrap_content"
-                    android:layout_height="match_parent">
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="@dimen/dp_4"
+                    android:layout_marginEnd="@dimen/dp_4"
+                    android:visibility="visible">
 
                     <ImageView
                         android:id="@+id/iv_icon4"
@@ -220,6 +227,8 @@
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/cl_6"
                     android:layout_width="wrap_content"
+                    android:layout_marginStart="@dimen/dp_4"
+                    android:layout_marginEnd="@dimen/dp_4"
                     android:layout_height="match_parent">
 
                     <ImageView
@@ -250,6 +259,8 @@
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/cl_7"
                     android:layout_width="wrap_content"
+                    android:layout_marginStart="@dimen/dp_4"
+                    android:layout_marginEnd="@dimen/dp_4"
                     android:layout_height="match_parent">
 
                     <ImageView
@@ -280,6 +291,8 @@
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/cl_8"
                     android:layout_width="wrap_content"
+                    android:layout_marginStart="@dimen/dp_4"
+                    android:layout_marginEnd="@dimen/dp_4"
                     android:layout_height="match_parent">
 
                     <ImageView
@@ -309,9 +322,11 @@
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/cl_5"
-                    android:visibility="visible"
                     android:layout_width="wrap_content"
-                    android:layout_height="match_parent">
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="@dimen/dp_4"
+                    android:layout_marginEnd="@dimen/dp_4"
+                    android:visibility="visible">
 
                     <ImageView
                         android:id="@+id/iv_icon5"
@@ -340,9 +355,11 @@
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/cl_9"
-                    android:visibility="visible"
                     android:layout_width="wrap_content"
-                    android:layout_height="match_parent">
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="@dimen/dp_4"
+                    android:layout_marginEnd="@dimen/dp_4"
+                    android:visibility="visible">
 
                     <ImageView
                         android:id="@+id/iv_icon9"
diff --git a/app/src/main/res/values-sw1024dp/dimens.xml b/app/src/main/res/values-sw1024dp/dimens.xml
index 16f08b9..d25ecba 100644
--- a/app/src/main/res/values-sw1024dp/dimens.xml
+++ b/app/src/main/res/values-sw1024dp/dimens.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-	<dimen name="activity_horizontal_margin">45.5111dp</dimen>
-	<dimen name="activity_vertical_margin">45.5111dp</dimen>
-	<dimen name="actions_item_font">51.2000sp</dimen>
-	<dimen name="actions_item_drawablePaddding">28.4444dp</dimen>
 	<dimen name="dp_m_60">-170.6667dp</dimen>
 	<dimen name="dp_m_30">-85.3333dp</dimen>
 	<dimen name="dp_m_20">-56.8889dp</dimen>
@@ -520,9 +516,206 @@
 	<dimen name="dp_498">1416.5333dp</dimen>
 	<dimen name="dp_499">1419.3778dp</dimen>
 	<dimen name="dp_500">1422.2222dp</dimen>
+	<dimen name="dp_501">1425.0667dp</dimen>
+	<dimen name="dp_502">1427.9111dp</dimen>
+	<dimen name="dp_503">1430.7556dp</dimen>
+	<dimen name="dp_504">1433.6000dp</dimen>
+	<dimen name="dp_505">1436.4444dp</dimen>
+	<dimen name="dp_506">1439.2889dp</dimen>
+	<dimen name="dp_507">1442.1333dp</dimen>
+	<dimen name="dp_508">1444.9778dp</dimen>
+	<dimen name="dp_509">1447.8222dp</dimen>
+	<dimen name="dp_510">1450.6667dp</dimen>
+	<dimen name="dp_511">1453.5111dp</dimen>
+	<dimen name="dp_512">1456.3556dp</dimen>
+	<dimen name="dp_513">1459.2000dp</dimen>
+	<dimen name="dp_514">1462.0444dp</dimen>
+	<dimen name="dp_515">1464.8889dp</dimen>
+	<dimen name="dp_516">1467.7333dp</dimen>
+	<dimen name="dp_517">1470.5778dp</dimen>
+	<dimen name="dp_518">1473.4222dp</dimen>
+	<dimen name="dp_519">1476.2667dp</dimen>
+	<dimen name="dp_520">1479.1111dp</dimen>
+	<dimen name="dp_521">1481.9556dp</dimen>
+	<dimen name="dp_522">1484.8000dp</dimen>
+	<dimen name="dp_523">1487.6444dp</dimen>
+	<dimen name="dp_524">1490.4889dp</dimen>
+	<dimen name="dp_525">1493.3333dp</dimen>
+	<dimen name="dp_526">1496.1778dp</dimen>
+	<dimen name="dp_527">1499.0222dp</dimen>
+	<dimen name="dp_528">1501.8667dp</dimen>
+	<dimen name="dp_529">1504.7111dp</dimen>
+	<dimen name="dp_530">1507.5556dp</dimen>
+	<dimen name="dp_531">1510.4000dp</dimen>
+	<dimen name="dp_532">1513.2444dp</dimen>
+	<dimen name="dp_533">1516.0889dp</dimen>
+	<dimen name="dp_534">1518.9333dp</dimen>
+	<dimen name="dp_535">1521.7778dp</dimen>
+	<dimen name="dp_536">1524.6222dp</dimen>
+	<dimen name="dp_537">1527.4667dp</dimen>
+	<dimen name="dp_538">1530.3111dp</dimen>
+	<dimen name="dp_539">1533.1556dp</dimen>
+	<dimen name="dp_540">1536.0000dp</dimen>
+	<dimen name="dp_541">1538.8444dp</dimen>
+	<dimen name="dp_542">1541.6889dp</dimen>
+	<dimen name="dp_543">1544.5333dp</dimen>
+	<dimen name="dp_544">1547.3778dp</dimen>
+	<dimen name="dp_545">1550.2222dp</dimen>
+	<dimen name="dp_546">1553.0667dp</dimen>
+	<dimen name="dp_547">1555.9111dp</dimen>
+	<dimen name="dp_548">1558.7556dp</dimen>
+	<dimen name="dp_549">1561.6000dp</dimen>
+	<dimen name="dp_550">1564.4444dp</dimen>
+	<dimen name="dp_551">1567.2889dp</dimen>
+	<dimen name="dp_552">1570.1333dp</dimen>
+	<dimen name="dp_553">1572.9778dp</dimen>
+	<dimen name="dp_554">1575.8222dp</dimen>
+	<dimen name="dp_555">1578.6667dp</dimen>
+	<dimen name="dp_556">1581.5111dp</dimen>
+	<dimen name="dp_557">1584.3556dp</dimen>
+	<dimen name="dp_558">1587.2000dp</dimen>
+	<dimen name="dp_559">1590.0444dp</dimen>
+	<dimen name="dp_560">1592.8889dp</dimen>
+	<dimen name="dp_561">1595.7333dp</dimen>
+	<dimen name="dp_562">1598.5778dp</dimen>
+	<dimen name="dp_563">1601.4222dp</dimen>
+	<dimen name="dp_564">1604.2667dp</dimen>
+	<dimen name="dp_565">1607.1111dp</dimen>
+	<dimen name="dp_566">1609.9556dp</dimen>
+	<dimen name="dp_567">1612.8000dp</dimen>
+	<dimen name="dp_568">1615.6444dp</dimen>
+	<dimen name="dp_569">1618.4889dp</dimen>
+	<dimen name="dp_570">1621.3333dp</dimen>
+	<dimen name="dp_571">1624.1778dp</dimen>
+	<dimen name="dp_572">1627.0222dp</dimen>
+	<dimen name="dp_573">1629.8667dp</dimen>
+	<dimen name="dp_574">1632.7111dp</dimen>
+	<dimen name="dp_575">1635.5556dp</dimen>
+	<dimen name="dp_576">1638.4000dp</dimen>
+	<dimen name="dp_577">1641.2444dp</dimen>
+	<dimen name="dp_578">1644.0889dp</dimen>
+	<dimen name="dp_579">1646.9333dp</dimen>
+	<dimen name="dp_580">1649.7778dp</dimen>
+	<dimen name="dp_581">1652.6222dp</dimen>
+	<dimen name="dp_582">1655.4667dp</dimen>
+	<dimen name="dp_583">1658.3111dp</dimen>
+	<dimen name="dp_584">1661.1556dp</dimen>
+	<dimen name="dp_585">1664.0000dp</dimen>
+	<dimen name="dp_586">1666.8444dp</dimen>
+	<dimen name="dp_587">1669.6889dp</dimen>
+	<dimen name="dp_588">1672.5333dp</dimen>
+	<dimen name="dp_589">1675.3778dp</dimen>
+	<dimen name="dp_590">1678.2222dp</dimen>
+	<dimen name="dp_591">1681.0667dp</dimen>
+	<dimen name="dp_592">1683.9111dp</dimen>
+	<dimen name="dp_593">1686.7556dp</dimen>
+	<dimen name="dp_594">1689.6000dp</dimen>
+	<dimen name="dp_595">1692.4444dp</dimen>
+	<dimen name="dp_596">1695.2889dp</dimen>
+	<dimen name="dp_597">1698.1333dp</dimen>
+	<dimen name="dp_598">1700.9778dp</dimen>
+	<dimen name="dp_599">1703.8222dp</dimen>
 	<dimen name="dp_600">1706.6667dp</dimen>
+	<dimen name="dp_601">1709.5111dp</dimen>
+	<dimen name="dp_602">1712.3556dp</dimen>
+	<dimen name="dp_603">1715.2000dp</dimen>
+	<dimen name="dp_604">1718.0444dp</dimen>
+	<dimen name="dp_605">1720.8889dp</dimen>
+	<dimen name="dp_606">1723.7333dp</dimen>
+	<dimen name="dp_607">1726.5778dp</dimen>
+	<dimen name="dp_608">1729.4222dp</dimen>
+	<dimen name="dp_609">1732.2667dp</dimen>
+	<dimen name="dp_610">1735.1111dp</dimen>
+	<dimen name="dp_611">1737.9556dp</dimen>
+	<dimen name="dp_612">1740.8000dp</dimen>
+	<dimen name="dp_613">1743.6444dp</dimen>
+	<dimen name="dp_614">1746.4889dp</dimen>
+	<dimen name="dp_615">1749.3333dp</dimen>
+	<dimen name="dp_616">1752.1778dp</dimen>
+	<dimen name="dp_617">1755.0222dp</dimen>
+	<dimen name="dp_618">1757.8667dp</dimen>
+	<dimen name="dp_619">1760.7111dp</dimen>
+	<dimen name="dp_620">1763.5556dp</dimen>
+	<dimen name="dp_621">1766.4000dp</dimen>
+	<dimen name="dp_622">1769.2444dp</dimen>
+	<dimen name="dp_623">1772.0889dp</dimen>
+	<dimen name="dp_624">1774.9333dp</dimen>
+	<dimen name="dp_625">1777.7778dp</dimen>
+	<dimen name="dp_626">1780.6222dp</dimen>
+	<dimen name="dp_627">1783.4667dp</dimen>
+	<dimen name="dp_628">1786.3111dp</dimen>
+	<dimen name="dp_629">1789.1556dp</dimen>
+	<dimen name="dp_630">1792.0000dp</dimen>
+	<dimen name="dp_631">1794.8444dp</dimen>
+	<dimen name="dp_632">1797.6889dp</dimen>
+	<dimen name="dp_633">1800.5333dp</dimen>
+	<dimen name="dp_634">1803.3778dp</dimen>
+	<dimen name="dp_635">1806.2222dp</dimen>
+	<dimen name="dp_636">1809.0667dp</dimen>
+	<dimen name="dp_637">1811.9111dp</dimen>
+	<dimen name="dp_638">1814.7556dp</dimen>
+	<dimen name="dp_639">1817.6000dp</dimen>
 	<dimen name="dp_640">1820.4444dp</dimen>
-	<dimen name="dp_720">2048.0000dp</dimen>
+	<dimen name="dp_641">1823.2889dp</dimen>
+	<dimen name="dp_642">1826.1333dp</dimen>
+	<dimen name="dp_643">1828.9778dp</dimen>
+	<dimen name="dp_644">1831.8222dp</dimen>
+	<dimen name="dp_645">1834.6667dp</dimen>
+	<dimen name="dp_646">1837.5111dp</dimen>
+	<dimen name="dp_647">1840.3556dp</dimen>
+	<dimen name="dp_648">1843.2000dp</dimen>
+	<dimen name="dp_649">1846.0444dp</dimen>
+	<dimen name="dp_650">1848.8889dp</dimen>
+	<dimen name="dp_651">1851.7333dp</dimen>
+	<dimen name="dp_652">1854.5778dp</dimen>
+	<dimen name="dp_653">1857.4222dp</dimen>
+	<dimen name="dp_654">1860.2667dp</dimen>
+	<dimen name="dp_655">1863.1111dp</dimen>
+	<dimen name="dp_656">1865.9556dp</dimen>
+	<dimen name="dp_657">1868.8000dp</dimen>
+	<dimen name="dp_658">1871.6444dp</dimen>
+	<dimen name="dp_659">1874.4889dp</dimen>
+	<dimen name="dp_660">1877.3333dp</dimen>
+	<dimen name="dp_661">1880.1778dp</dimen>
+	<dimen name="dp_662">1883.0222dp</dimen>
+	<dimen name="dp_663">1885.8667dp</dimen>
+	<dimen name="dp_664">1888.7111dp</dimen>
+	<dimen name="dp_665">1891.5556dp</dimen>
+	<dimen name="dp_666">1894.4000dp</dimen>
+	<dimen name="dp_667">1897.2444dp</dimen>
+	<dimen name="dp_668">1900.0889dp</dimen>
+	<dimen name="dp_669">1902.9333dp</dimen>
+	<dimen name="dp_670">1905.7778dp</dimen>
+	<dimen name="dp_671">1908.6222dp</dimen>
+	<dimen name="dp_672">1911.4667dp</dimen>
+	<dimen name="dp_673">1914.3111dp</dimen>
+	<dimen name="dp_674">1917.1556dp</dimen>
+	<dimen name="dp_675">1920.0000dp</dimen>
+	<dimen name="dp_676">1922.8444dp</dimen>
+	<dimen name="dp_677">1925.6889dp</dimen>
+	<dimen name="dp_678">1928.5333dp</dimen>
+	<dimen name="dp_679">1931.3778dp</dimen>
+	<dimen name="dp_680">1934.2222dp</dimen>
+	<dimen name="dp_681">1937.0667dp</dimen>
+	<dimen name="dp_682">1939.9111dp</dimen>
+	<dimen name="dp_683">1942.7556dp</dimen>
+	<dimen name="dp_684">1945.6000dp</dimen>
+	<dimen name="dp_685">1948.4444dp</dimen>
+	<dimen name="dp_686">1951.2889dp</dimen>
+	<dimen name="dp_687">1954.1333dp</dimen>
+	<dimen name="dp_688">1956.9778dp</dimen>
+	<dimen name="dp_689">1959.8222dp</dimen>
+	<dimen name="dp_690">1962.6667dp</dimen>
+	<dimen name="dp_691">1965.5111dp</dimen>
+	<dimen name="dp_692">1968.3556dp</dimen>
+	<dimen name="dp_693">1971.2000dp</dimen>
+	<dimen name="dp_694">1974.0444dp</dimen>
+	<dimen name="dp_695">1976.8889dp</dimen>
+	<dimen name="dp_696">1979.7333dp</dimen>
+	<dimen name="dp_697">1982.5778dp</dimen>
+	<dimen name="dp_698">1985.4222dp</dimen>
+	<dimen name="dp_699">1988.2667dp</dimen>
+	<dimen name="dp_700">1991.1111dp</dimen>
 	<dimen name="sp_1">2.8444sp</dimen>
 	<dimen name="sp_2">5.6889sp</dimen>
 	<dimen name="sp_3">8.5333sp</dimen>
@@ -573,4 +766,54 @@
 	<dimen name="sp_48">136.5333sp</dimen>
 	<dimen name="sp_49">139.3778sp</dimen>
 	<dimen name="sp_50">142.2222sp</dimen>
+	<dimen name="sp_51">145.0667sp</dimen>
+	<dimen name="sp_52">147.9111sp</dimen>
+	<dimen name="sp_53">150.7556sp</dimen>
+	<dimen name="sp_54">153.6000sp</dimen>
+	<dimen name="sp_55">156.4444sp</dimen>
+	<dimen name="sp_56">159.2889sp</dimen>
+	<dimen name="sp_57">162.1333sp</dimen>
+	<dimen name="sp_58">164.9778sp</dimen>
+	<dimen name="sp_59">167.8222sp</dimen>
+	<dimen name="sp_60">170.6667sp</dimen>
+	<dimen name="sp_61">173.5111sp</dimen>
+	<dimen name="sp_62">176.3556sp</dimen>
+	<dimen name="sp_63">179.2000sp</dimen>
+	<dimen name="sp_64">182.0444sp</dimen>
+	<dimen name="sp_65">184.8889sp</dimen>
+	<dimen name="sp_66">187.7333sp</dimen>
+	<dimen name="sp_67">190.5778sp</dimen>
+	<dimen name="sp_68">193.4222sp</dimen>
+	<dimen name="sp_69">196.2667sp</dimen>
+	<dimen name="sp_70">199.1111sp</dimen>
+	<dimen name="sp_71">201.9556sp</dimen>
+	<dimen name="sp_72">204.8000sp</dimen>
+	<dimen name="sp_73">207.6444sp</dimen>
+	<dimen name="sp_74">210.4889sp</dimen>
+	<dimen name="sp_75">213.3333sp</dimen>
+	<dimen name="sp_76">216.1778sp</dimen>
+	<dimen name="sp_77">219.0222sp</dimen>
+	<dimen name="sp_78">221.8667sp</dimen>
+	<dimen name="sp_79">224.7111sp</dimen>
+	<dimen name="sp_80">227.5556sp</dimen>
+	<dimen name="sp_81">230.4000sp</dimen>
+	<dimen name="sp_82">233.2444sp</dimen>
+	<dimen name="sp_83">236.0889sp</dimen>
+	<dimen name="sp_84">238.9333sp</dimen>
+	<dimen name="sp_85">241.7778sp</dimen>
+	<dimen name="sp_86">244.6222sp</dimen>
+	<dimen name="sp_87">247.4667sp</dimen>
+	<dimen name="sp_88">250.3111sp</dimen>
+	<dimen name="sp_89">253.1556sp</dimen>
+	<dimen name="sp_90">256.0000sp</dimen>
+	<dimen name="sp_91">258.8444sp</dimen>
+	<dimen name="sp_92">261.6889sp</dimen>
+	<dimen name="sp_93">264.5333sp</dimen>
+	<dimen name="sp_94">267.3778sp</dimen>
+	<dimen name="sp_95">270.2222sp</dimen>
+	<dimen name="sp_96">273.0667sp</dimen>
+	<dimen name="sp_97">275.9111sp</dimen>
+	<dimen name="sp_98">278.7556sp</dimen>
+	<dimen name="sp_99">281.6000sp</dimen>
+	<dimen name="sp_100">284.4444sp</dimen>
 </resources>
diff --git a/app/src/main/res/values-sw1280dp/dimens.xml b/app/src/main/res/values-sw1280dp/dimens.xml
index ec79065..003ac06 100644
--- a/app/src/main/res/values-sw1280dp/dimens.xml
+++ b/app/src/main/res/values-sw1280dp/dimens.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-	<dimen name="activity_horizontal_margin">56.8889dp</dimen>
-	<dimen name="activity_vertical_margin">56.8889dp</dimen>
-	<dimen name="actions_item_font">64.0000sp</dimen>
-	<dimen name="actions_item_drawablePaddding">35.5556dp</dimen>
 	<dimen name="dp_m_60">-213.3333dp</dimen>
 	<dimen name="dp_m_30">-106.6667dp</dimen>
 	<dimen name="dp_m_20">-71.1111dp</dimen>
@@ -520,9 +516,206 @@
 	<dimen name="dp_498">1770.6667dp</dimen>
 	<dimen name="dp_499">1774.2222dp</dimen>
 	<dimen name="dp_500">1777.7778dp</dimen>
+	<dimen name="dp_501">1781.3333dp</dimen>
+	<dimen name="dp_502">1784.8889dp</dimen>
+	<dimen name="dp_503">1788.4444dp</dimen>
+	<dimen name="dp_504">1792.0000dp</dimen>
+	<dimen name="dp_505">1795.5556dp</dimen>
+	<dimen name="dp_506">1799.1111dp</dimen>
+	<dimen name="dp_507">1802.6667dp</dimen>
+	<dimen name="dp_508">1806.2222dp</dimen>
+	<dimen name="dp_509">1809.7778dp</dimen>
+	<dimen name="dp_510">1813.3333dp</dimen>
+	<dimen name="dp_511">1816.8889dp</dimen>
+	<dimen name="dp_512">1820.4444dp</dimen>
+	<dimen name="dp_513">1824.0000dp</dimen>
+	<dimen name="dp_514">1827.5556dp</dimen>
+	<dimen name="dp_515">1831.1111dp</dimen>
+	<dimen name="dp_516">1834.6667dp</dimen>
+	<dimen name="dp_517">1838.2222dp</dimen>
+	<dimen name="dp_518">1841.7778dp</dimen>
+	<dimen name="dp_519">1845.3333dp</dimen>
+	<dimen name="dp_520">1848.8889dp</dimen>
+	<dimen name="dp_521">1852.4444dp</dimen>
+	<dimen name="dp_522">1856.0000dp</dimen>
+	<dimen name="dp_523">1859.5556dp</dimen>
+	<dimen name="dp_524">1863.1111dp</dimen>
+	<dimen name="dp_525">1866.6667dp</dimen>
+	<dimen name="dp_526">1870.2222dp</dimen>
+	<dimen name="dp_527">1873.7778dp</dimen>
+	<dimen name="dp_528">1877.3333dp</dimen>
+	<dimen name="dp_529">1880.8889dp</dimen>
+	<dimen name="dp_530">1884.4444dp</dimen>
+	<dimen name="dp_531">1888.0000dp</dimen>
+	<dimen name="dp_532">1891.5556dp</dimen>
+	<dimen name="dp_533">1895.1111dp</dimen>
+	<dimen name="dp_534">1898.6667dp</dimen>
+	<dimen name="dp_535">1902.2222dp</dimen>
+	<dimen name="dp_536">1905.7778dp</dimen>
+	<dimen name="dp_537">1909.3333dp</dimen>
+	<dimen name="dp_538">1912.8889dp</dimen>
+	<dimen name="dp_539">1916.4444dp</dimen>
+	<dimen name="dp_540">1920.0000dp</dimen>
+	<dimen name="dp_541">1923.5556dp</dimen>
+	<dimen name="dp_542">1927.1111dp</dimen>
+	<dimen name="dp_543">1930.6667dp</dimen>
+	<dimen name="dp_544">1934.2222dp</dimen>
+	<dimen name="dp_545">1937.7778dp</dimen>
+	<dimen name="dp_546">1941.3333dp</dimen>
+	<dimen name="dp_547">1944.8889dp</dimen>
+	<dimen name="dp_548">1948.4444dp</dimen>
+	<dimen name="dp_549">1952.0000dp</dimen>
+	<dimen name="dp_550">1955.5556dp</dimen>
+	<dimen name="dp_551">1959.1111dp</dimen>
+	<dimen name="dp_552">1962.6667dp</dimen>
+	<dimen name="dp_553">1966.2222dp</dimen>
+	<dimen name="dp_554">1969.7778dp</dimen>
+	<dimen name="dp_555">1973.3333dp</dimen>
+	<dimen name="dp_556">1976.8889dp</dimen>
+	<dimen name="dp_557">1980.4444dp</dimen>
+	<dimen name="dp_558">1984.0000dp</dimen>
+	<dimen name="dp_559">1987.5556dp</dimen>
+	<dimen name="dp_560">1991.1111dp</dimen>
+	<dimen name="dp_561">1994.6667dp</dimen>
+	<dimen name="dp_562">1998.2222dp</dimen>
+	<dimen name="dp_563">2001.7778dp</dimen>
+	<dimen name="dp_564">2005.3333dp</dimen>
+	<dimen name="dp_565">2008.8889dp</dimen>
+	<dimen name="dp_566">2012.4444dp</dimen>
+	<dimen name="dp_567">2016.0000dp</dimen>
+	<dimen name="dp_568">2019.5556dp</dimen>
+	<dimen name="dp_569">2023.1111dp</dimen>
+	<dimen name="dp_570">2026.6667dp</dimen>
+	<dimen name="dp_571">2030.2222dp</dimen>
+	<dimen name="dp_572">2033.7778dp</dimen>
+	<dimen name="dp_573">2037.3333dp</dimen>
+	<dimen name="dp_574">2040.8889dp</dimen>
+	<dimen name="dp_575">2044.4444dp</dimen>
+	<dimen name="dp_576">2048.0000dp</dimen>
+	<dimen name="dp_577">2051.5556dp</dimen>
+	<dimen name="dp_578">2055.1111dp</dimen>
+	<dimen name="dp_579">2058.6667dp</dimen>
+	<dimen name="dp_580">2062.2222dp</dimen>
+	<dimen name="dp_581">2065.7778dp</dimen>
+	<dimen name="dp_582">2069.3333dp</dimen>
+	<dimen name="dp_583">2072.8889dp</dimen>
+	<dimen name="dp_584">2076.4444dp</dimen>
+	<dimen name="dp_585">2080.0000dp</dimen>
+	<dimen name="dp_586">2083.5556dp</dimen>
+	<dimen name="dp_587">2087.1111dp</dimen>
+	<dimen name="dp_588">2090.6667dp</dimen>
+	<dimen name="dp_589">2094.2222dp</dimen>
+	<dimen name="dp_590">2097.7778dp</dimen>
+	<dimen name="dp_591">2101.3333dp</dimen>
+	<dimen name="dp_592">2104.8889dp</dimen>
+	<dimen name="dp_593">2108.4444dp</dimen>
+	<dimen name="dp_594">2112.0000dp</dimen>
+	<dimen name="dp_595">2115.5556dp</dimen>
+	<dimen name="dp_596">2119.1111dp</dimen>
+	<dimen name="dp_597">2122.6667dp</dimen>
+	<dimen name="dp_598">2126.2222dp</dimen>
+	<dimen name="dp_599">2129.7778dp</dimen>
 	<dimen name="dp_600">2133.3333dp</dimen>
+	<dimen name="dp_601">2136.8889dp</dimen>
+	<dimen name="dp_602">2140.4444dp</dimen>
+	<dimen name="dp_603">2144.0000dp</dimen>
+	<dimen name="dp_604">2147.5556dp</dimen>
+	<dimen name="dp_605">2151.1111dp</dimen>
+	<dimen name="dp_606">2154.6667dp</dimen>
+	<dimen name="dp_607">2158.2222dp</dimen>
+	<dimen name="dp_608">2161.7778dp</dimen>
+	<dimen name="dp_609">2165.3333dp</dimen>
+	<dimen name="dp_610">2168.8889dp</dimen>
+	<dimen name="dp_611">2172.4444dp</dimen>
+	<dimen name="dp_612">2176.0000dp</dimen>
+	<dimen name="dp_613">2179.5556dp</dimen>
+	<dimen name="dp_614">2183.1111dp</dimen>
+	<dimen name="dp_615">2186.6667dp</dimen>
+	<dimen name="dp_616">2190.2222dp</dimen>
+	<dimen name="dp_617">2193.7778dp</dimen>
+	<dimen name="dp_618">2197.3333dp</dimen>
+	<dimen name="dp_619">2200.8889dp</dimen>
+	<dimen name="dp_620">2204.4444dp</dimen>
+	<dimen name="dp_621">2208.0000dp</dimen>
+	<dimen name="dp_622">2211.5556dp</dimen>
+	<dimen name="dp_623">2215.1111dp</dimen>
+	<dimen name="dp_624">2218.6667dp</dimen>
+	<dimen name="dp_625">2222.2222dp</dimen>
+	<dimen name="dp_626">2225.7778dp</dimen>
+	<dimen name="dp_627">2229.3333dp</dimen>
+	<dimen name="dp_628">2232.8889dp</dimen>
+	<dimen name="dp_629">2236.4444dp</dimen>
+	<dimen name="dp_630">2240.0000dp</dimen>
+	<dimen name="dp_631">2243.5556dp</dimen>
+	<dimen name="dp_632">2247.1111dp</dimen>
+	<dimen name="dp_633">2250.6667dp</dimen>
+	<dimen name="dp_634">2254.2222dp</dimen>
+	<dimen name="dp_635">2257.7778dp</dimen>
+	<dimen name="dp_636">2261.3333dp</dimen>
+	<dimen name="dp_637">2264.8889dp</dimen>
+	<dimen name="dp_638">2268.4444dp</dimen>
+	<dimen name="dp_639">2272.0000dp</dimen>
 	<dimen name="dp_640">2275.5556dp</dimen>
-	<dimen name="dp_720">2560.0000dp</dimen>
+	<dimen name="dp_641">2279.1111dp</dimen>
+	<dimen name="dp_642">2282.6667dp</dimen>
+	<dimen name="dp_643">2286.2222dp</dimen>
+	<dimen name="dp_644">2289.7778dp</dimen>
+	<dimen name="dp_645">2293.3333dp</dimen>
+	<dimen name="dp_646">2296.8889dp</dimen>
+	<dimen name="dp_647">2300.4444dp</dimen>
+	<dimen name="dp_648">2304.0000dp</dimen>
+	<dimen name="dp_649">2307.5556dp</dimen>
+	<dimen name="dp_650">2311.1111dp</dimen>
+	<dimen name="dp_651">2314.6667dp</dimen>
+	<dimen name="dp_652">2318.2222dp</dimen>
+	<dimen name="dp_653">2321.7778dp</dimen>
+	<dimen name="dp_654">2325.3333dp</dimen>
+	<dimen name="dp_655">2328.8889dp</dimen>
+	<dimen name="dp_656">2332.4444dp</dimen>
+	<dimen name="dp_657">2336.0000dp</dimen>
+	<dimen name="dp_658">2339.5556dp</dimen>
+	<dimen name="dp_659">2343.1111dp</dimen>
+	<dimen name="dp_660">2346.6667dp</dimen>
+	<dimen name="dp_661">2350.2222dp</dimen>
+	<dimen name="dp_662">2353.7778dp</dimen>
+	<dimen name="dp_663">2357.3333dp</dimen>
+	<dimen name="dp_664">2360.8889dp</dimen>
+	<dimen name="dp_665">2364.4444dp</dimen>
+	<dimen name="dp_666">2368.0000dp</dimen>
+	<dimen name="dp_667">2371.5556dp</dimen>
+	<dimen name="dp_668">2375.1111dp</dimen>
+	<dimen name="dp_669">2378.6667dp</dimen>
+	<dimen name="dp_670">2382.2222dp</dimen>
+	<dimen name="dp_671">2385.7778dp</dimen>
+	<dimen name="dp_672">2389.3333dp</dimen>
+	<dimen name="dp_673">2392.8889dp</dimen>
+	<dimen name="dp_674">2396.4444dp</dimen>
+	<dimen name="dp_675">2400.0000dp</dimen>
+	<dimen name="dp_676">2403.5556dp</dimen>
+	<dimen name="dp_677">2407.1111dp</dimen>
+	<dimen name="dp_678">2410.6667dp</dimen>
+	<dimen name="dp_679">2414.2222dp</dimen>
+	<dimen name="dp_680">2417.7778dp</dimen>
+	<dimen name="dp_681">2421.3333dp</dimen>
+	<dimen name="dp_682">2424.8889dp</dimen>
+	<dimen name="dp_683">2428.4444dp</dimen>
+	<dimen name="dp_684">2432.0000dp</dimen>
+	<dimen name="dp_685">2435.5556dp</dimen>
+	<dimen name="dp_686">2439.1111dp</dimen>
+	<dimen name="dp_687">2442.6667dp</dimen>
+	<dimen name="dp_688">2446.2222dp</dimen>
+	<dimen name="dp_689">2449.7778dp</dimen>
+	<dimen name="dp_690">2453.3333dp</dimen>
+	<dimen name="dp_691">2456.8889dp</dimen>
+	<dimen name="dp_692">2460.4444dp</dimen>
+	<dimen name="dp_693">2464.0000dp</dimen>
+	<dimen name="dp_694">2467.5556dp</dimen>
+	<dimen name="dp_695">2471.1111dp</dimen>
+	<dimen name="dp_696">2474.6667dp</dimen>
+	<dimen name="dp_697">2478.2222dp</dimen>
+	<dimen name="dp_698">2481.7778dp</dimen>
+	<dimen name="dp_699">2485.3333dp</dimen>
+	<dimen name="dp_700">2488.8889dp</dimen>
 	<dimen name="sp_1">3.5556sp</dimen>
 	<dimen name="sp_2">7.1111sp</dimen>
 	<dimen name="sp_3">10.6667sp</dimen>
@@ -573,4 +766,54 @@
 	<dimen name="sp_48">170.6667sp</dimen>
 	<dimen name="sp_49">174.2222sp</dimen>
 	<dimen name="sp_50">177.7778sp</dimen>
+	<dimen name="sp_51">181.3333sp</dimen>
+	<dimen name="sp_52">184.8889sp</dimen>
+	<dimen name="sp_53">188.4444sp</dimen>
+	<dimen name="sp_54">192.0000sp</dimen>
+	<dimen name="sp_55">195.5556sp</dimen>
+	<dimen name="sp_56">199.1111sp</dimen>
+	<dimen name="sp_57">202.6667sp</dimen>
+	<dimen name="sp_58">206.2222sp</dimen>
+	<dimen name="sp_59">209.7778sp</dimen>
+	<dimen name="sp_60">213.3333sp</dimen>
+	<dimen name="sp_61">216.8889sp</dimen>
+	<dimen name="sp_62">220.4444sp</dimen>
+	<dimen name="sp_63">224.0000sp</dimen>
+	<dimen name="sp_64">227.5556sp</dimen>
+	<dimen name="sp_65">231.1111sp</dimen>
+	<dimen name="sp_66">234.6667sp</dimen>
+	<dimen name="sp_67">238.2222sp</dimen>
+	<dimen name="sp_68">241.7778sp</dimen>
+	<dimen name="sp_69">245.3333sp</dimen>
+	<dimen name="sp_70">248.8889sp</dimen>
+	<dimen name="sp_71">252.4444sp</dimen>
+	<dimen name="sp_72">256.0000sp</dimen>
+	<dimen name="sp_73">259.5556sp</dimen>
+	<dimen name="sp_74">263.1111sp</dimen>
+	<dimen name="sp_75">266.6667sp</dimen>
+	<dimen name="sp_76">270.2222sp</dimen>
+	<dimen name="sp_77">273.7778sp</dimen>
+	<dimen name="sp_78">277.3333sp</dimen>
+	<dimen name="sp_79">280.8889sp</dimen>
+	<dimen name="sp_80">284.4444sp</dimen>
+	<dimen name="sp_81">288.0000sp</dimen>
+	<dimen name="sp_82">291.5556sp</dimen>
+	<dimen name="sp_83">295.1111sp</dimen>
+	<dimen name="sp_84">298.6667sp</dimen>
+	<dimen name="sp_85">302.2222sp</dimen>
+	<dimen name="sp_86">305.7778sp</dimen>
+	<dimen name="sp_87">309.3333sp</dimen>
+	<dimen name="sp_88">312.8889sp</dimen>
+	<dimen name="sp_89">316.4444sp</dimen>
+	<dimen name="sp_90">320.0000sp</dimen>
+	<dimen name="sp_91">323.5556sp</dimen>
+	<dimen name="sp_92">327.1111sp</dimen>
+	<dimen name="sp_93">330.6667sp</dimen>
+	<dimen name="sp_94">334.2222sp</dimen>
+	<dimen name="sp_95">337.7778sp</dimen>
+	<dimen name="sp_96">341.3333sp</dimen>
+	<dimen name="sp_97">344.8889sp</dimen>
+	<dimen name="sp_98">348.4444sp</dimen>
+	<dimen name="sp_99">352.0000sp</dimen>
+	<dimen name="sp_100">355.5556sp</dimen>
 </resources>
diff --git a/app/src/main/res/values-sw1365dp/dimens.xml b/app/src/main/res/values-sw1365dp/dimens.xml
index 2520460..8b7f4a9 100644
--- a/app/src/main/res/values-sw1365dp/dimens.xml
+++ b/app/src/main/res/values-sw1365dp/dimens.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-	<dimen name="activity_horizontal_margin">60.6667dp</dimen>
-	<dimen name="activity_vertical_margin">60.6667dp</dimen>
-	<dimen name="actions_item_font">68.2500sp</dimen>
-	<dimen name="actions_item_drawablePaddding">37.9167dp</dimen>
 	<dimen name="dp_m_60">-227.5000dp</dimen>
 	<dimen name="dp_m_30">-113.7500dp</dimen>
 	<dimen name="dp_m_20">-75.8333dp</dimen>
@@ -520,9 +516,206 @@
 	<dimen name="dp_498">1888.2500dp</dimen>
 	<dimen name="dp_499">1892.0417dp</dimen>
 	<dimen name="dp_500">1895.8333dp</dimen>
+	<dimen name="dp_501">1899.6250dp</dimen>
+	<dimen name="dp_502">1903.4167dp</dimen>
+	<dimen name="dp_503">1907.2083dp</dimen>
+	<dimen name="dp_504">1911.0000dp</dimen>
+	<dimen name="dp_505">1914.7917dp</dimen>
+	<dimen name="dp_506">1918.5833dp</dimen>
+	<dimen name="dp_507">1922.3750dp</dimen>
+	<dimen name="dp_508">1926.1667dp</dimen>
+	<dimen name="dp_509">1929.9583dp</dimen>
+	<dimen name="dp_510">1933.7500dp</dimen>
+	<dimen name="dp_511">1937.5417dp</dimen>
+	<dimen name="dp_512">1941.3333dp</dimen>
+	<dimen name="dp_513">1945.1250dp</dimen>
+	<dimen name="dp_514">1948.9167dp</dimen>
+	<dimen name="dp_515">1952.7083dp</dimen>
+	<dimen name="dp_516">1956.5000dp</dimen>
+	<dimen name="dp_517">1960.2917dp</dimen>
+	<dimen name="dp_518">1964.0833dp</dimen>
+	<dimen name="dp_519">1967.8750dp</dimen>
+	<dimen name="dp_520">1971.6667dp</dimen>
+	<dimen name="dp_521">1975.4583dp</dimen>
+	<dimen name="dp_522">1979.2500dp</dimen>
+	<dimen name="dp_523">1983.0417dp</dimen>
+	<dimen name="dp_524">1986.8333dp</dimen>
+	<dimen name="dp_525">1990.6250dp</dimen>
+	<dimen name="dp_526">1994.4167dp</dimen>
+	<dimen name="dp_527">1998.2083dp</dimen>
+	<dimen name="dp_528">2002.0000dp</dimen>
+	<dimen name="dp_529">2005.7917dp</dimen>
+	<dimen name="dp_530">2009.5833dp</dimen>
+	<dimen name="dp_531">2013.3750dp</dimen>
+	<dimen name="dp_532">2017.1667dp</dimen>
+	<dimen name="dp_533">2020.9583dp</dimen>
+	<dimen name="dp_534">2024.7500dp</dimen>
+	<dimen name="dp_535">2028.5417dp</dimen>
+	<dimen name="dp_536">2032.3333dp</dimen>
+	<dimen name="dp_537">2036.1250dp</dimen>
+	<dimen name="dp_538">2039.9167dp</dimen>
+	<dimen name="dp_539">2043.7083dp</dimen>
+	<dimen name="dp_540">2047.5000dp</dimen>
+	<dimen name="dp_541">2051.2917dp</dimen>
+	<dimen name="dp_542">2055.0833dp</dimen>
+	<dimen name="dp_543">2058.8750dp</dimen>
+	<dimen name="dp_544">2062.6667dp</dimen>
+	<dimen name="dp_545">2066.4583dp</dimen>
+	<dimen name="dp_546">2070.2500dp</dimen>
+	<dimen name="dp_547">2074.0417dp</dimen>
+	<dimen name="dp_548">2077.8333dp</dimen>
+	<dimen name="dp_549">2081.6250dp</dimen>
+	<dimen name="dp_550">2085.4167dp</dimen>
+	<dimen name="dp_551">2089.2083dp</dimen>
+	<dimen name="dp_552">2093.0000dp</dimen>
+	<dimen name="dp_553">2096.7917dp</dimen>
+	<dimen name="dp_554">2100.5833dp</dimen>
+	<dimen name="dp_555">2104.3750dp</dimen>
+	<dimen name="dp_556">2108.1667dp</dimen>
+	<dimen name="dp_557">2111.9583dp</dimen>
+	<dimen name="dp_558">2115.7500dp</dimen>
+	<dimen name="dp_559">2119.5417dp</dimen>
+	<dimen name="dp_560">2123.3333dp</dimen>
+	<dimen name="dp_561">2127.1250dp</dimen>
+	<dimen name="dp_562">2130.9167dp</dimen>
+	<dimen name="dp_563">2134.7083dp</dimen>
+	<dimen name="dp_564">2138.5000dp</dimen>
+	<dimen name="dp_565">2142.2917dp</dimen>
+	<dimen name="dp_566">2146.0833dp</dimen>
+	<dimen name="dp_567">2149.8750dp</dimen>
+	<dimen name="dp_568">2153.6667dp</dimen>
+	<dimen name="dp_569">2157.4583dp</dimen>
+	<dimen name="dp_570">2161.2500dp</dimen>
+	<dimen name="dp_571">2165.0417dp</dimen>
+	<dimen name="dp_572">2168.8333dp</dimen>
+	<dimen name="dp_573">2172.6250dp</dimen>
+	<dimen name="dp_574">2176.4167dp</dimen>
+	<dimen name="dp_575">2180.2083dp</dimen>
+	<dimen name="dp_576">2184.0000dp</dimen>
+	<dimen name="dp_577">2187.7917dp</dimen>
+	<dimen name="dp_578">2191.5833dp</dimen>
+	<dimen name="dp_579">2195.3750dp</dimen>
+	<dimen name="dp_580">2199.1667dp</dimen>
+	<dimen name="dp_581">2202.9583dp</dimen>
+	<dimen name="dp_582">2206.7500dp</dimen>
+	<dimen name="dp_583">2210.5417dp</dimen>
+	<dimen name="dp_584">2214.3333dp</dimen>
+	<dimen name="dp_585">2218.1250dp</dimen>
+	<dimen name="dp_586">2221.9167dp</dimen>
+	<dimen name="dp_587">2225.7083dp</dimen>
+	<dimen name="dp_588">2229.5000dp</dimen>
+	<dimen name="dp_589">2233.2917dp</dimen>
+	<dimen name="dp_590">2237.0833dp</dimen>
+	<dimen name="dp_591">2240.8750dp</dimen>
+	<dimen name="dp_592">2244.6667dp</dimen>
+	<dimen name="dp_593">2248.4583dp</dimen>
+	<dimen name="dp_594">2252.2500dp</dimen>
+	<dimen name="dp_595">2256.0417dp</dimen>
+	<dimen name="dp_596">2259.8333dp</dimen>
+	<dimen name="dp_597">2263.6250dp</dimen>
+	<dimen name="dp_598">2267.4167dp</dimen>
+	<dimen name="dp_599">2271.2083dp</dimen>
 	<dimen name="dp_600">2275.0000dp</dimen>
+	<dimen name="dp_601">2278.7917dp</dimen>
+	<dimen name="dp_602">2282.5833dp</dimen>
+	<dimen name="dp_603">2286.3750dp</dimen>
+	<dimen name="dp_604">2290.1667dp</dimen>
+	<dimen name="dp_605">2293.9583dp</dimen>
+	<dimen name="dp_606">2297.7500dp</dimen>
+	<dimen name="dp_607">2301.5417dp</dimen>
+	<dimen name="dp_608">2305.3333dp</dimen>
+	<dimen name="dp_609">2309.1250dp</dimen>
+	<dimen name="dp_610">2312.9167dp</dimen>
+	<dimen name="dp_611">2316.7083dp</dimen>
+	<dimen name="dp_612">2320.5000dp</dimen>
+	<dimen name="dp_613">2324.2917dp</dimen>
+	<dimen name="dp_614">2328.0833dp</dimen>
+	<dimen name="dp_615">2331.8750dp</dimen>
+	<dimen name="dp_616">2335.6667dp</dimen>
+	<dimen name="dp_617">2339.4583dp</dimen>
+	<dimen name="dp_618">2343.2500dp</dimen>
+	<dimen name="dp_619">2347.0417dp</dimen>
+	<dimen name="dp_620">2350.8333dp</dimen>
+	<dimen name="dp_621">2354.6250dp</dimen>
+	<dimen name="dp_622">2358.4167dp</dimen>
+	<dimen name="dp_623">2362.2083dp</dimen>
+	<dimen name="dp_624">2366.0000dp</dimen>
+	<dimen name="dp_625">2369.7917dp</dimen>
+	<dimen name="dp_626">2373.5833dp</dimen>
+	<dimen name="dp_627">2377.3750dp</dimen>
+	<dimen name="dp_628">2381.1667dp</dimen>
+	<dimen name="dp_629">2384.9583dp</dimen>
+	<dimen name="dp_630">2388.7500dp</dimen>
+	<dimen name="dp_631">2392.5417dp</dimen>
+	<dimen name="dp_632">2396.3333dp</dimen>
+	<dimen name="dp_633">2400.1250dp</dimen>
+	<dimen name="dp_634">2403.9167dp</dimen>
+	<dimen name="dp_635">2407.7083dp</dimen>
+	<dimen name="dp_636">2411.5000dp</dimen>
+	<dimen name="dp_637">2415.2917dp</dimen>
+	<dimen name="dp_638">2419.0833dp</dimen>
+	<dimen name="dp_639">2422.8750dp</dimen>
 	<dimen name="dp_640">2426.6667dp</dimen>
-	<dimen name="dp_720">2730.0000dp</dimen>
+	<dimen name="dp_641">2430.4583dp</dimen>
+	<dimen name="dp_642">2434.2500dp</dimen>
+	<dimen name="dp_643">2438.0417dp</dimen>
+	<dimen name="dp_644">2441.8333dp</dimen>
+	<dimen name="dp_645">2445.6250dp</dimen>
+	<dimen name="dp_646">2449.4167dp</dimen>
+	<dimen name="dp_647">2453.2083dp</dimen>
+	<dimen name="dp_648">2457.0000dp</dimen>
+	<dimen name="dp_649">2460.7917dp</dimen>
+	<dimen name="dp_650">2464.5833dp</dimen>
+	<dimen name="dp_651">2468.3750dp</dimen>
+	<dimen name="dp_652">2472.1667dp</dimen>
+	<dimen name="dp_653">2475.9583dp</dimen>
+	<dimen name="dp_654">2479.7500dp</dimen>
+	<dimen name="dp_655">2483.5417dp</dimen>
+	<dimen name="dp_656">2487.3333dp</dimen>
+	<dimen name="dp_657">2491.1250dp</dimen>
+	<dimen name="dp_658">2494.9167dp</dimen>
+	<dimen name="dp_659">2498.7083dp</dimen>
+	<dimen name="dp_660">2502.5000dp</dimen>
+	<dimen name="dp_661">2506.2917dp</dimen>
+	<dimen name="dp_662">2510.0833dp</dimen>
+	<dimen name="dp_663">2513.8750dp</dimen>
+	<dimen name="dp_664">2517.6667dp</dimen>
+	<dimen name="dp_665">2521.4583dp</dimen>
+	<dimen name="dp_666">2525.2500dp</dimen>
+	<dimen name="dp_667">2529.0417dp</dimen>
+	<dimen name="dp_668">2532.8333dp</dimen>
+	<dimen name="dp_669">2536.6250dp</dimen>
+	<dimen name="dp_670">2540.4167dp</dimen>
+	<dimen name="dp_671">2544.2083dp</dimen>
+	<dimen name="dp_672">2548.0000dp</dimen>
+	<dimen name="dp_673">2551.7917dp</dimen>
+	<dimen name="dp_674">2555.5833dp</dimen>
+	<dimen name="dp_675">2559.3750dp</dimen>
+	<dimen name="dp_676">2563.1667dp</dimen>
+	<dimen name="dp_677">2566.9583dp</dimen>
+	<dimen name="dp_678">2570.7500dp</dimen>
+	<dimen name="dp_679">2574.5417dp</dimen>
+	<dimen name="dp_680">2578.3333dp</dimen>
+	<dimen name="dp_681">2582.1250dp</dimen>
+	<dimen name="dp_682">2585.9167dp</dimen>
+	<dimen name="dp_683">2589.7083dp</dimen>
+	<dimen name="dp_684">2593.5000dp</dimen>
+	<dimen name="dp_685">2597.2917dp</dimen>
+	<dimen name="dp_686">2601.0833dp</dimen>
+	<dimen name="dp_687">2604.8750dp</dimen>
+	<dimen name="dp_688">2608.6667dp</dimen>
+	<dimen name="dp_689">2612.4583dp</dimen>
+	<dimen name="dp_690">2616.2500dp</dimen>
+	<dimen name="dp_691">2620.0417dp</dimen>
+	<dimen name="dp_692">2623.8333dp</dimen>
+	<dimen name="dp_693">2627.6250dp</dimen>
+	<dimen name="dp_694">2631.4167dp</dimen>
+	<dimen name="dp_695">2635.2083dp</dimen>
+	<dimen name="dp_696">2639.0000dp</dimen>
+	<dimen name="dp_697">2642.7917dp</dimen>
+	<dimen name="dp_698">2646.5833dp</dimen>
+	<dimen name="dp_699">2650.3750dp</dimen>
+	<dimen name="dp_700">2654.1667dp</dimen>
 	<dimen name="sp_1">3.7917sp</dimen>
 	<dimen name="sp_2">7.5833sp</dimen>
 	<dimen name="sp_3">11.3750sp</dimen>
@@ -573,4 +766,54 @@
 	<dimen name="sp_48">182.0000sp</dimen>
 	<dimen name="sp_49">185.7917sp</dimen>
 	<dimen name="sp_50">189.5833sp</dimen>
+	<dimen name="sp_51">193.3750sp</dimen>
+	<dimen name="sp_52">197.1667sp</dimen>
+	<dimen name="sp_53">200.9583sp</dimen>
+	<dimen name="sp_54">204.7500sp</dimen>
+	<dimen name="sp_55">208.5417sp</dimen>
+	<dimen name="sp_56">212.3333sp</dimen>
+	<dimen name="sp_57">216.1250sp</dimen>
+	<dimen name="sp_58">219.9167sp</dimen>
+	<dimen name="sp_59">223.7083sp</dimen>
+	<dimen name="sp_60">227.5000sp</dimen>
+	<dimen name="sp_61">231.2917sp</dimen>
+	<dimen name="sp_62">235.0833sp</dimen>
+	<dimen name="sp_63">238.8750sp</dimen>
+	<dimen name="sp_64">242.6667sp</dimen>
+	<dimen name="sp_65">246.4583sp</dimen>
+	<dimen name="sp_66">250.2500sp</dimen>
+	<dimen name="sp_67">254.0417sp</dimen>
+	<dimen name="sp_68">257.8333sp</dimen>
+	<dimen name="sp_69">261.6250sp</dimen>
+	<dimen name="sp_70">265.4167sp</dimen>
+	<dimen name="sp_71">269.2083sp</dimen>
+	<dimen name="sp_72">273.0000sp</dimen>
+	<dimen name="sp_73">276.7917sp</dimen>
+	<dimen name="sp_74">280.5833sp</dimen>
+	<dimen name="sp_75">284.3750sp</dimen>
+	<dimen name="sp_76">288.1667sp</dimen>
+	<dimen name="sp_77">291.9583sp</dimen>
+	<dimen name="sp_78">295.7500sp</dimen>
+	<dimen name="sp_79">299.5417sp</dimen>
+	<dimen name="sp_80">303.3333sp</dimen>
+	<dimen name="sp_81">307.1250sp</dimen>
+	<dimen name="sp_82">310.9167sp</dimen>
+	<dimen name="sp_83">314.7083sp</dimen>
+	<dimen name="sp_84">318.5000sp</dimen>
+	<dimen name="sp_85">322.2917sp</dimen>
+	<dimen name="sp_86">326.0833sp</dimen>
+	<dimen name="sp_87">329.8750sp</dimen>
+	<dimen name="sp_88">333.6667sp</dimen>
+	<dimen name="sp_89">337.4583sp</dimen>
+	<dimen name="sp_90">341.2500sp</dimen>
+	<dimen name="sp_91">345.0417sp</dimen>
+	<dimen name="sp_92">348.8333sp</dimen>
+	<dimen name="sp_93">352.6250sp</dimen>
+	<dimen name="sp_94">356.4167sp</dimen>
+	<dimen name="sp_95">360.2083sp</dimen>
+	<dimen name="sp_96">364.0000sp</dimen>
+	<dimen name="sp_97">367.7917sp</dimen>
+	<dimen name="sp_98">371.5833sp</dimen>
+	<dimen name="sp_99">375.3750sp</dimen>
+	<dimen name="sp_100">379.1667sp</dimen>
 </resources>
diff --git a/app/src/main/res/values-sw320dp/dimens.xml b/app/src/main/res/values-sw320dp/dimens.xml
index caa602a..fb866a7 100644
--- a/app/src/main/res/values-sw320dp/dimens.xml
+++ b/app/src/main/res/values-sw320dp/dimens.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-	<dimen name="activity_horizontal_margin">14.2222dp</dimen>
-	<dimen name="activity_vertical_margin">14.2222dp</dimen>
-	<dimen name="actions_item_font">16.0000sp</dimen>
-	<dimen name="actions_item_drawablePaddding">8.8889dp</dimen>
 	<dimen name="dp_m_60">-53.3333dp</dimen>
 	<dimen name="dp_m_30">-26.6667dp</dimen>
 	<dimen name="dp_m_20">-17.7778dp</dimen>
@@ -520,9 +516,206 @@
 	<dimen name="dp_498">442.6667dp</dimen>
 	<dimen name="dp_499">443.5556dp</dimen>
 	<dimen name="dp_500">444.4444dp</dimen>
+	<dimen name="dp_501">445.3333dp</dimen>
+	<dimen name="dp_502">446.2222dp</dimen>
+	<dimen name="dp_503">447.1111dp</dimen>
+	<dimen name="dp_504">448.0000dp</dimen>
+	<dimen name="dp_505">448.8889dp</dimen>
+	<dimen name="dp_506">449.7778dp</dimen>
+	<dimen name="dp_507">450.6667dp</dimen>
+	<dimen name="dp_508">451.5556dp</dimen>
+	<dimen name="dp_509">452.4444dp</dimen>
+	<dimen name="dp_510">453.3333dp</dimen>
+	<dimen name="dp_511">454.2222dp</dimen>
+	<dimen name="dp_512">455.1111dp</dimen>
+	<dimen name="dp_513">456.0000dp</dimen>
+	<dimen name="dp_514">456.8889dp</dimen>
+	<dimen name="dp_515">457.7778dp</dimen>
+	<dimen name="dp_516">458.6667dp</dimen>
+	<dimen name="dp_517">459.5556dp</dimen>
+	<dimen name="dp_518">460.4444dp</dimen>
+	<dimen name="dp_519">461.3333dp</dimen>
+	<dimen name="dp_520">462.2222dp</dimen>
+	<dimen name="dp_521">463.1111dp</dimen>
+	<dimen name="dp_522">464.0000dp</dimen>
+	<dimen name="dp_523">464.8889dp</dimen>
+	<dimen name="dp_524">465.7778dp</dimen>
+	<dimen name="dp_525">466.6667dp</dimen>
+	<dimen name="dp_526">467.5556dp</dimen>
+	<dimen name="dp_527">468.4444dp</dimen>
+	<dimen name="dp_528">469.3333dp</dimen>
+	<dimen name="dp_529">470.2222dp</dimen>
+	<dimen name="dp_530">471.1111dp</dimen>
+	<dimen name="dp_531">472.0000dp</dimen>
+	<dimen name="dp_532">472.8889dp</dimen>
+	<dimen name="dp_533">473.7778dp</dimen>
+	<dimen name="dp_534">474.6667dp</dimen>
+	<dimen name="dp_535">475.5556dp</dimen>
+	<dimen name="dp_536">476.4444dp</dimen>
+	<dimen name="dp_537">477.3333dp</dimen>
+	<dimen name="dp_538">478.2222dp</dimen>
+	<dimen name="dp_539">479.1111dp</dimen>
+	<dimen name="dp_540">480.0000dp</dimen>
+	<dimen name="dp_541">480.8889dp</dimen>
+	<dimen name="dp_542">481.7778dp</dimen>
+	<dimen name="dp_543">482.6667dp</dimen>
+	<dimen name="dp_544">483.5556dp</dimen>
+	<dimen name="dp_545">484.4444dp</dimen>
+	<dimen name="dp_546">485.3333dp</dimen>
+	<dimen name="dp_547">486.2222dp</dimen>
+	<dimen name="dp_548">487.1111dp</dimen>
+	<dimen name="dp_549">488.0000dp</dimen>
+	<dimen name="dp_550">488.8889dp</dimen>
+	<dimen name="dp_551">489.7778dp</dimen>
+	<dimen name="dp_552">490.6667dp</dimen>
+	<dimen name="dp_553">491.5556dp</dimen>
+	<dimen name="dp_554">492.4444dp</dimen>
+	<dimen name="dp_555">493.3333dp</dimen>
+	<dimen name="dp_556">494.2222dp</dimen>
+	<dimen name="dp_557">495.1111dp</dimen>
+	<dimen name="dp_558">496.0000dp</dimen>
+	<dimen name="dp_559">496.8889dp</dimen>
+	<dimen name="dp_560">497.7778dp</dimen>
+	<dimen name="dp_561">498.6667dp</dimen>
+	<dimen name="dp_562">499.5556dp</dimen>
+	<dimen name="dp_563">500.4444dp</dimen>
+	<dimen name="dp_564">501.3333dp</dimen>
+	<dimen name="dp_565">502.2222dp</dimen>
+	<dimen name="dp_566">503.1111dp</dimen>
+	<dimen name="dp_567">504.0000dp</dimen>
+	<dimen name="dp_568">504.8889dp</dimen>
+	<dimen name="dp_569">505.7778dp</dimen>
+	<dimen name="dp_570">506.6667dp</dimen>
+	<dimen name="dp_571">507.5556dp</dimen>
+	<dimen name="dp_572">508.4444dp</dimen>
+	<dimen name="dp_573">509.3333dp</dimen>
+	<dimen name="dp_574">510.2222dp</dimen>
+	<dimen name="dp_575">511.1111dp</dimen>
+	<dimen name="dp_576">512.0000dp</dimen>
+	<dimen name="dp_577">512.8889dp</dimen>
+	<dimen name="dp_578">513.7778dp</dimen>
+	<dimen name="dp_579">514.6667dp</dimen>
+	<dimen name="dp_580">515.5556dp</dimen>
+	<dimen name="dp_581">516.4444dp</dimen>
+	<dimen name="dp_582">517.3333dp</dimen>
+	<dimen name="dp_583">518.2222dp</dimen>
+	<dimen name="dp_584">519.1111dp</dimen>
+	<dimen name="dp_585">520.0000dp</dimen>
+	<dimen name="dp_586">520.8889dp</dimen>
+	<dimen name="dp_587">521.7778dp</dimen>
+	<dimen name="dp_588">522.6667dp</dimen>
+	<dimen name="dp_589">523.5556dp</dimen>
+	<dimen name="dp_590">524.4444dp</dimen>
+	<dimen name="dp_591">525.3333dp</dimen>
+	<dimen name="dp_592">526.2222dp</dimen>
+	<dimen name="dp_593">527.1111dp</dimen>
+	<dimen name="dp_594">528.0000dp</dimen>
+	<dimen name="dp_595">528.8889dp</dimen>
+	<dimen name="dp_596">529.7778dp</dimen>
+	<dimen name="dp_597">530.6667dp</dimen>
+	<dimen name="dp_598">531.5556dp</dimen>
+	<dimen name="dp_599">532.4444dp</dimen>
 	<dimen name="dp_600">533.3333dp</dimen>
+	<dimen name="dp_601">534.2222dp</dimen>
+	<dimen name="dp_602">535.1111dp</dimen>
+	<dimen name="dp_603">536.0000dp</dimen>
+	<dimen name="dp_604">536.8889dp</dimen>
+	<dimen name="dp_605">537.7778dp</dimen>
+	<dimen name="dp_606">538.6667dp</dimen>
+	<dimen name="dp_607">539.5556dp</dimen>
+	<dimen name="dp_608">540.4444dp</dimen>
+	<dimen name="dp_609">541.3333dp</dimen>
+	<dimen name="dp_610">542.2222dp</dimen>
+	<dimen name="dp_611">543.1111dp</dimen>
+	<dimen name="dp_612">544.0000dp</dimen>
+	<dimen name="dp_613">544.8889dp</dimen>
+	<dimen name="dp_614">545.7778dp</dimen>
+	<dimen name="dp_615">546.6667dp</dimen>
+	<dimen name="dp_616">547.5556dp</dimen>
+	<dimen name="dp_617">548.4444dp</dimen>
+	<dimen name="dp_618">549.3333dp</dimen>
+	<dimen name="dp_619">550.2222dp</dimen>
+	<dimen name="dp_620">551.1111dp</dimen>
+	<dimen name="dp_621">552.0000dp</dimen>
+	<dimen name="dp_622">552.8889dp</dimen>
+	<dimen name="dp_623">553.7778dp</dimen>
+	<dimen name="dp_624">554.6667dp</dimen>
+	<dimen name="dp_625">555.5556dp</dimen>
+	<dimen name="dp_626">556.4444dp</dimen>
+	<dimen name="dp_627">557.3333dp</dimen>
+	<dimen name="dp_628">558.2222dp</dimen>
+	<dimen name="dp_629">559.1111dp</dimen>
+	<dimen name="dp_630">560.0000dp</dimen>
+	<dimen name="dp_631">560.8889dp</dimen>
+	<dimen name="dp_632">561.7778dp</dimen>
+	<dimen name="dp_633">562.6667dp</dimen>
+	<dimen name="dp_634">563.5556dp</dimen>
+	<dimen name="dp_635">564.4444dp</dimen>
+	<dimen name="dp_636">565.3333dp</dimen>
+	<dimen name="dp_637">566.2222dp</dimen>
+	<dimen name="dp_638">567.1111dp</dimen>
+	<dimen name="dp_639">568.0000dp</dimen>
 	<dimen name="dp_640">568.8889dp</dimen>
-	<dimen name="dp_720">640.0000dp</dimen>
+	<dimen name="dp_641">569.7778dp</dimen>
+	<dimen name="dp_642">570.6667dp</dimen>
+	<dimen name="dp_643">571.5556dp</dimen>
+	<dimen name="dp_644">572.4444dp</dimen>
+	<dimen name="dp_645">573.3333dp</dimen>
+	<dimen name="dp_646">574.2222dp</dimen>
+	<dimen name="dp_647">575.1111dp</dimen>
+	<dimen name="dp_648">576.0000dp</dimen>
+	<dimen name="dp_649">576.8889dp</dimen>
+	<dimen name="dp_650">577.7778dp</dimen>
+	<dimen name="dp_651">578.6667dp</dimen>
+	<dimen name="dp_652">579.5556dp</dimen>
+	<dimen name="dp_653">580.4444dp</dimen>
+	<dimen name="dp_654">581.3333dp</dimen>
+	<dimen name="dp_655">582.2222dp</dimen>
+	<dimen name="dp_656">583.1111dp</dimen>
+	<dimen name="dp_657">584.0000dp</dimen>
+	<dimen name="dp_658">584.8889dp</dimen>
+	<dimen name="dp_659">585.7778dp</dimen>
+	<dimen name="dp_660">586.6667dp</dimen>
+	<dimen name="dp_661">587.5556dp</dimen>
+	<dimen name="dp_662">588.4444dp</dimen>
+	<dimen name="dp_663">589.3333dp</dimen>
+	<dimen name="dp_664">590.2222dp</dimen>
+	<dimen name="dp_665">591.1111dp</dimen>
+	<dimen name="dp_666">592.0000dp</dimen>
+	<dimen name="dp_667">592.8889dp</dimen>
+	<dimen name="dp_668">593.7778dp</dimen>
+	<dimen name="dp_669">594.6667dp</dimen>
+	<dimen name="dp_670">595.5556dp</dimen>
+	<dimen name="dp_671">596.4444dp</dimen>
+	<dimen name="dp_672">597.3333dp</dimen>
+	<dimen name="dp_673">598.2222dp</dimen>
+	<dimen name="dp_674">599.1111dp</dimen>
+	<dimen name="dp_675">600.0000dp</dimen>
+	<dimen name="dp_676">600.8889dp</dimen>
+	<dimen name="dp_677">601.7778dp</dimen>
+	<dimen name="dp_678">602.6667dp</dimen>
+	<dimen name="dp_679">603.5556dp</dimen>
+	<dimen name="dp_680">604.4444dp</dimen>
+	<dimen name="dp_681">605.3333dp</dimen>
+	<dimen name="dp_682">606.2222dp</dimen>
+	<dimen name="dp_683">607.1111dp</dimen>
+	<dimen name="dp_684">608.0000dp</dimen>
+	<dimen name="dp_685">608.8889dp</dimen>
+	<dimen name="dp_686">609.7778dp</dimen>
+	<dimen name="dp_687">610.6667dp</dimen>
+	<dimen name="dp_688">611.5556dp</dimen>
+	<dimen name="dp_689">612.4444dp</dimen>
+	<dimen name="dp_690">613.3333dp</dimen>
+	<dimen name="dp_691">614.2222dp</dimen>
+	<dimen name="dp_692">615.1111dp</dimen>
+	<dimen name="dp_693">616.0000dp</dimen>
+	<dimen name="dp_694">616.8889dp</dimen>
+	<dimen name="dp_695">617.7778dp</dimen>
+	<dimen name="dp_696">618.6667dp</dimen>
+	<dimen name="dp_697">619.5556dp</dimen>
+	<dimen name="dp_698">620.4444dp</dimen>
+	<dimen name="dp_699">621.3333dp</dimen>
+	<dimen name="dp_700">622.2222dp</dimen>
 	<dimen name="sp_1">0.8889sp</dimen>
 	<dimen name="sp_2">1.7778sp</dimen>
 	<dimen name="sp_3">2.6667sp</dimen>
@@ -573,4 +766,54 @@
 	<dimen name="sp_48">42.6667sp</dimen>
 	<dimen name="sp_49">43.5556sp</dimen>
 	<dimen name="sp_50">44.4444sp</dimen>
+	<dimen name="sp_51">45.3333sp</dimen>
+	<dimen name="sp_52">46.2222sp</dimen>
+	<dimen name="sp_53">47.1111sp</dimen>
+	<dimen name="sp_54">48.0000sp</dimen>
+	<dimen name="sp_55">48.8889sp</dimen>
+	<dimen name="sp_56">49.7778sp</dimen>
+	<dimen name="sp_57">50.6667sp</dimen>
+	<dimen name="sp_58">51.5556sp</dimen>
+	<dimen name="sp_59">52.4444sp</dimen>
+	<dimen name="sp_60">53.3333sp</dimen>
+	<dimen name="sp_61">54.2222sp</dimen>
+	<dimen name="sp_62">55.1111sp</dimen>
+	<dimen name="sp_63">56.0000sp</dimen>
+	<dimen name="sp_64">56.8889sp</dimen>
+	<dimen name="sp_65">57.7778sp</dimen>
+	<dimen name="sp_66">58.6667sp</dimen>
+	<dimen name="sp_67">59.5556sp</dimen>
+	<dimen name="sp_68">60.4444sp</dimen>
+	<dimen name="sp_69">61.3333sp</dimen>
+	<dimen name="sp_70">62.2222sp</dimen>
+	<dimen name="sp_71">63.1111sp</dimen>
+	<dimen name="sp_72">64.0000sp</dimen>
+	<dimen name="sp_73">64.8889sp</dimen>
+	<dimen name="sp_74">65.7778sp</dimen>
+	<dimen name="sp_75">66.6667sp</dimen>
+	<dimen name="sp_76">67.5556sp</dimen>
+	<dimen name="sp_77">68.4444sp</dimen>
+	<dimen name="sp_78">69.3333sp</dimen>
+	<dimen name="sp_79">70.2222sp</dimen>
+	<dimen name="sp_80">71.1111sp</dimen>
+	<dimen name="sp_81">72.0000sp</dimen>
+	<dimen name="sp_82">72.8889sp</dimen>
+	<dimen name="sp_83">73.7778sp</dimen>
+	<dimen name="sp_84">74.6667sp</dimen>
+	<dimen name="sp_85">75.5556sp</dimen>
+	<dimen name="sp_86">76.4444sp</dimen>
+	<dimen name="sp_87">77.3333sp</dimen>
+	<dimen name="sp_88">78.2222sp</dimen>
+	<dimen name="sp_89">79.1111sp</dimen>
+	<dimen name="sp_90">80.0000sp</dimen>
+	<dimen name="sp_91">80.8889sp</dimen>
+	<dimen name="sp_92">81.7778sp</dimen>
+	<dimen name="sp_93">82.6667sp</dimen>
+	<dimen name="sp_94">83.5556sp</dimen>
+	<dimen name="sp_95">84.4444sp</dimen>
+	<dimen name="sp_96">85.3333sp</dimen>
+	<dimen name="sp_97">86.2222sp</dimen>
+	<dimen name="sp_98">87.1111sp</dimen>
+	<dimen name="sp_99">88.0000sp</dimen>
+	<dimen name="sp_100">88.8889sp</dimen>
 </resources>
diff --git a/app/src/main/res/values-sw360dp/dimens.xml b/app/src/main/res/values-sw360dp/dimens.xml
index b05b061..c110652 100644
--- a/app/src/main/res/values-sw360dp/dimens.xml
+++ b/app/src/main/res/values-sw360dp/dimens.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-	<dimen name="activity_horizontal_margin">16.0000dp</dimen>
-	<dimen name="activity_vertical_margin">16.0000dp</dimen>
-	<dimen name="actions_item_font">18.0000sp</dimen>
-	<dimen name="actions_item_drawablePaddding">10.0000dp</dimen>
 	<dimen name="dp_m_60">-60.0000dp</dimen>
 	<dimen name="dp_m_30">-30.0000dp</dimen>
 	<dimen name="dp_m_20">-20.0000dp</dimen>
@@ -520,9 +516,206 @@
 	<dimen name="dp_498">498.0000dp</dimen>
 	<dimen name="dp_499">499.0000dp</dimen>
 	<dimen name="dp_500">500.0000dp</dimen>
+	<dimen name="dp_501">501.0000dp</dimen>
+	<dimen name="dp_502">502.0000dp</dimen>
+	<dimen name="dp_503">503.0000dp</dimen>
+	<dimen name="dp_504">504.0000dp</dimen>
+	<dimen name="dp_505">505.0000dp</dimen>
+	<dimen name="dp_506">506.0000dp</dimen>
+	<dimen name="dp_507">507.0000dp</dimen>
+	<dimen name="dp_508">508.0000dp</dimen>
+	<dimen name="dp_509">509.0000dp</dimen>
+	<dimen name="dp_510">510.0000dp</dimen>
+	<dimen name="dp_511">511.0000dp</dimen>
+	<dimen name="dp_512">512.0000dp</dimen>
+	<dimen name="dp_513">513.0000dp</dimen>
+	<dimen name="dp_514">514.0000dp</dimen>
+	<dimen name="dp_515">515.0000dp</dimen>
+	<dimen name="dp_516">516.0000dp</dimen>
+	<dimen name="dp_517">517.0000dp</dimen>
+	<dimen name="dp_518">518.0000dp</dimen>
+	<dimen name="dp_519">519.0000dp</dimen>
+	<dimen name="dp_520">520.0000dp</dimen>
+	<dimen name="dp_521">521.0000dp</dimen>
+	<dimen name="dp_522">522.0000dp</dimen>
+	<dimen name="dp_523">523.0000dp</dimen>
+	<dimen name="dp_524">524.0000dp</dimen>
+	<dimen name="dp_525">525.0000dp</dimen>
+	<dimen name="dp_526">526.0000dp</dimen>
+	<dimen name="dp_527">527.0000dp</dimen>
+	<dimen name="dp_528">528.0000dp</dimen>
+	<dimen name="dp_529">529.0000dp</dimen>
+	<dimen name="dp_530">530.0000dp</dimen>
+	<dimen name="dp_531">531.0000dp</dimen>
+	<dimen name="dp_532">532.0000dp</dimen>
+	<dimen name="dp_533">533.0000dp</dimen>
+	<dimen name="dp_534">534.0000dp</dimen>
+	<dimen name="dp_535">535.0000dp</dimen>
+	<dimen name="dp_536">536.0000dp</dimen>
+	<dimen name="dp_537">537.0000dp</dimen>
+	<dimen name="dp_538">538.0000dp</dimen>
+	<dimen name="dp_539">539.0000dp</dimen>
+	<dimen name="dp_540">540.0000dp</dimen>
+	<dimen name="dp_541">541.0000dp</dimen>
+	<dimen name="dp_542">542.0000dp</dimen>
+	<dimen name="dp_543">543.0000dp</dimen>
+	<dimen name="dp_544">544.0000dp</dimen>
+	<dimen name="dp_545">545.0000dp</dimen>
+	<dimen name="dp_546">546.0000dp</dimen>
+	<dimen name="dp_547">547.0000dp</dimen>
+	<dimen name="dp_548">548.0000dp</dimen>
+	<dimen name="dp_549">549.0000dp</dimen>
+	<dimen name="dp_550">550.0000dp</dimen>
+	<dimen name="dp_551">551.0000dp</dimen>
+	<dimen name="dp_552">552.0000dp</dimen>
+	<dimen name="dp_553">553.0000dp</dimen>
+	<dimen name="dp_554">554.0000dp</dimen>
+	<dimen name="dp_555">555.0000dp</dimen>
+	<dimen name="dp_556">556.0000dp</dimen>
+	<dimen name="dp_557">557.0000dp</dimen>
+	<dimen name="dp_558">558.0000dp</dimen>
+	<dimen name="dp_559">559.0000dp</dimen>
+	<dimen name="dp_560">560.0000dp</dimen>
+	<dimen name="dp_561">561.0000dp</dimen>
+	<dimen name="dp_562">562.0000dp</dimen>
+	<dimen name="dp_563">563.0000dp</dimen>
+	<dimen name="dp_564">564.0000dp</dimen>
+	<dimen name="dp_565">565.0000dp</dimen>
+	<dimen name="dp_566">566.0000dp</dimen>
+	<dimen name="dp_567">567.0000dp</dimen>
+	<dimen name="dp_568">568.0000dp</dimen>
+	<dimen name="dp_569">569.0000dp</dimen>
+	<dimen name="dp_570">570.0000dp</dimen>
+	<dimen name="dp_571">571.0000dp</dimen>
+	<dimen name="dp_572">572.0000dp</dimen>
+	<dimen name="dp_573">573.0000dp</dimen>
+	<dimen name="dp_574">574.0000dp</dimen>
+	<dimen name="dp_575">575.0000dp</dimen>
+	<dimen name="dp_576">576.0000dp</dimen>
+	<dimen name="dp_577">577.0000dp</dimen>
+	<dimen name="dp_578">578.0000dp</dimen>
+	<dimen name="dp_579">579.0000dp</dimen>
+	<dimen name="dp_580">580.0000dp</dimen>
+	<dimen name="dp_581">581.0000dp</dimen>
+	<dimen name="dp_582">582.0000dp</dimen>
+	<dimen name="dp_583">583.0000dp</dimen>
+	<dimen name="dp_584">584.0000dp</dimen>
+	<dimen name="dp_585">585.0000dp</dimen>
+	<dimen name="dp_586">586.0000dp</dimen>
+	<dimen name="dp_587">587.0000dp</dimen>
+	<dimen name="dp_588">588.0000dp</dimen>
+	<dimen name="dp_589">589.0000dp</dimen>
+	<dimen name="dp_590">590.0000dp</dimen>
+	<dimen name="dp_591">591.0000dp</dimen>
+	<dimen name="dp_592">592.0000dp</dimen>
+	<dimen name="dp_593">593.0000dp</dimen>
+	<dimen name="dp_594">594.0000dp</dimen>
+	<dimen name="dp_595">595.0000dp</dimen>
+	<dimen name="dp_596">596.0000dp</dimen>
+	<dimen name="dp_597">597.0000dp</dimen>
+	<dimen name="dp_598">598.0000dp</dimen>
+	<dimen name="dp_599">599.0000dp</dimen>
 	<dimen name="dp_600">600.0000dp</dimen>
+	<dimen name="dp_601">601.0000dp</dimen>
+	<dimen name="dp_602">602.0000dp</dimen>
+	<dimen name="dp_603">603.0000dp</dimen>
+	<dimen name="dp_604">604.0000dp</dimen>
+	<dimen name="dp_605">605.0000dp</dimen>
+	<dimen name="dp_606">606.0000dp</dimen>
+	<dimen name="dp_607">607.0000dp</dimen>
+	<dimen name="dp_608">608.0000dp</dimen>
+	<dimen name="dp_609">609.0000dp</dimen>
+	<dimen name="dp_610">610.0000dp</dimen>
+	<dimen name="dp_611">611.0000dp</dimen>
+	<dimen name="dp_612">612.0000dp</dimen>
+	<dimen name="dp_613">613.0000dp</dimen>
+	<dimen name="dp_614">614.0000dp</dimen>
+	<dimen name="dp_615">615.0000dp</dimen>
+	<dimen name="dp_616">616.0000dp</dimen>
+	<dimen name="dp_617">617.0000dp</dimen>
+	<dimen name="dp_618">618.0000dp</dimen>
+	<dimen name="dp_619">619.0000dp</dimen>
+	<dimen name="dp_620">620.0000dp</dimen>
+	<dimen name="dp_621">621.0000dp</dimen>
+	<dimen name="dp_622">622.0000dp</dimen>
+	<dimen name="dp_623">623.0000dp</dimen>
+	<dimen name="dp_624">624.0000dp</dimen>
+	<dimen name="dp_625">625.0000dp</dimen>
+	<dimen name="dp_626">626.0000dp</dimen>
+	<dimen name="dp_627">627.0000dp</dimen>
+	<dimen name="dp_628">628.0000dp</dimen>
+	<dimen name="dp_629">629.0000dp</dimen>
+	<dimen name="dp_630">630.0000dp</dimen>
+	<dimen name="dp_631">631.0000dp</dimen>
+	<dimen name="dp_632">632.0000dp</dimen>
+	<dimen name="dp_633">633.0000dp</dimen>
+	<dimen name="dp_634">634.0000dp</dimen>
+	<dimen name="dp_635">635.0000dp</dimen>
+	<dimen name="dp_636">636.0000dp</dimen>
+	<dimen name="dp_637">637.0000dp</dimen>
+	<dimen name="dp_638">638.0000dp</dimen>
+	<dimen name="dp_639">639.0000dp</dimen>
 	<dimen name="dp_640">640.0000dp</dimen>
-	<dimen name="dp_720">720.0000dp</dimen>
+	<dimen name="dp_641">641.0000dp</dimen>
+	<dimen name="dp_642">642.0000dp</dimen>
+	<dimen name="dp_643">643.0000dp</dimen>
+	<dimen name="dp_644">644.0000dp</dimen>
+	<dimen name="dp_645">645.0000dp</dimen>
+	<dimen name="dp_646">646.0000dp</dimen>
+	<dimen name="dp_647">647.0000dp</dimen>
+	<dimen name="dp_648">648.0000dp</dimen>
+	<dimen name="dp_649">649.0000dp</dimen>
+	<dimen name="dp_650">650.0000dp</dimen>
+	<dimen name="dp_651">651.0000dp</dimen>
+	<dimen name="dp_652">652.0000dp</dimen>
+	<dimen name="dp_653">653.0000dp</dimen>
+	<dimen name="dp_654">654.0000dp</dimen>
+	<dimen name="dp_655">655.0000dp</dimen>
+	<dimen name="dp_656">656.0000dp</dimen>
+	<dimen name="dp_657">657.0000dp</dimen>
+	<dimen name="dp_658">658.0000dp</dimen>
+	<dimen name="dp_659">659.0000dp</dimen>
+	<dimen name="dp_660">660.0000dp</dimen>
+	<dimen name="dp_661">661.0000dp</dimen>
+	<dimen name="dp_662">662.0000dp</dimen>
+	<dimen name="dp_663">663.0000dp</dimen>
+	<dimen name="dp_664">664.0000dp</dimen>
+	<dimen name="dp_665">665.0000dp</dimen>
+	<dimen name="dp_666">666.0000dp</dimen>
+	<dimen name="dp_667">667.0000dp</dimen>
+	<dimen name="dp_668">668.0000dp</dimen>
+	<dimen name="dp_669">669.0000dp</dimen>
+	<dimen name="dp_670">670.0000dp</dimen>
+	<dimen name="dp_671">671.0000dp</dimen>
+	<dimen name="dp_672">672.0000dp</dimen>
+	<dimen name="dp_673">673.0000dp</dimen>
+	<dimen name="dp_674">674.0000dp</dimen>
+	<dimen name="dp_675">675.0000dp</dimen>
+	<dimen name="dp_676">676.0000dp</dimen>
+	<dimen name="dp_677">677.0000dp</dimen>
+	<dimen name="dp_678">678.0000dp</dimen>
+	<dimen name="dp_679">679.0000dp</dimen>
+	<dimen name="dp_680">680.0000dp</dimen>
+	<dimen name="dp_681">681.0000dp</dimen>
+	<dimen name="dp_682">682.0000dp</dimen>
+	<dimen name="dp_683">683.0000dp</dimen>
+	<dimen name="dp_684">684.0000dp</dimen>
+	<dimen name="dp_685">685.0000dp</dimen>
+	<dimen name="dp_686">686.0000dp</dimen>
+	<dimen name="dp_687">687.0000dp</dimen>
+	<dimen name="dp_688">688.0000dp</dimen>
+	<dimen name="dp_689">689.0000dp</dimen>
+	<dimen name="dp_690">690.0000dp</dimen>
+	<dimen name="dp_691">691.0000dp</dimen>
+	<dimen name="dp_692">692.0000dp</dimen>
+	<dimen name="dp_693">693.0000dp</dimen>
+	<dimen name="dp_694">694.0000dp</dimen>
+	<dimen name="dp_695">695.0000dp</dimen>
+	<dimen name="dp_696">696.0000dp</dimen>
+	<dimen name="dp_697">697.0000dp</dimen>
+	<dimen name="dp_698">698.0000dp</dimen>
+	<dimen name="dp_699">699.0000dp</dimen>
+	<dimen name="dp_700">700.0000dp</dimen>
 	<dimen name="sp_1">1.0000sp</dimen>
 	<dimen name="sp_2">2.0000sp</dimen>
 	<dimen name="sp_3">3.0000sp</dimen>
@@ -573,4 +766,54 @@
 	<dimen name="sp_48">48.0000sp</dimen>
 	<dimen name="sp_49">49.0000sp</dimen>
 	<dimen name="sp_50">50.0000sp</dimen>
+	<dimen name="sp_51">51.0000sp</dimen>
+	<dimen name="sp_52">52.0000sp</dimen>
+	<dimen name="sp_53">53.0000sp</dimen>
+	<dimen name="sp_54">54.0000sp</dimen>
+	<dimen name="sp_55">55.0000sp</dimen>
+	<dimen name="sp_56">56.0000sp</dimen>
+	<dimen name="sp_57">57.0000sp</dimen>
+	<dimen name="sp_58">58.0000sp</dimen>
+	<dimen name="sp_59">59.0000sp</dimen>
+	<dimen name="sp_60">60.0000sp</dimen>
+	<dimen name="sp_61">61.0000sp</dimen>
+	<dimen name="sp_62">62.0000sp</dimen>
+	<dimen name="sp_63">63.0000sp</dimen>
+	<dimen name="sp_64">64.0000sp</dimen>
+	<dimen name="sp_65">65.0000sp</dimen>
+	<dimen name="sp_66">66.0000sp</dimen>
+	<dimen name="sp_67">67.0000sp</dimen>
+	<dimen name="sp_68">68.0000sp</dimen>
+	<dimen name="sp_69">69.0000sp</dimen>
+	<dimen name="sp_70">70.0000sp</dimen>
+	<dimen name="sp_71">71.0000sp</dimen>
+	<dimen name="sp_72">72.0000sp</dimen>
+	<dimen name="sp_73">73.0000sp</dimen>
+	<dimen name="sp_74">74.0000sp</dimen>
+	<dimen name="sp_75">75.0000sp</dimen>
+	<dimen name="sp_76">76.0000sp</dimen>
+	<dimen name="sp_77">77.0000sp</dimen>
+	<dimen name="sp_78">78.0000sp</dimen>
+	<dimen name="sp_79">79.0000sp</dimen>
+	<dimen name="sp_80">80.0000sp</dimen>
+	<dimen name="sp_81">81.0000sp</dimen>
+	<dimen name="sp_82">82.0000sp</dimen>
+	<dimen name="sp_83">83.0000sp</dimen>
+	<dimen name="sp_84">84.0000sp</dimen>
+	<dimen name="sp_85">85.0000sp</dimen>
+	<dimen name="sp_86">86.0000sp</dimen>
+	<dimen name="sp_87">87.0000sp</dimen>
+	<dimen name="sp_88">88.0000sp</dimen>
+	<dimen name="sp_89">89.0000sp</dimen>
+	<dimen name="sp_90">90.0000sp</dimen>
+	<dimen name="sp_91">91.0000sp</dimen>
+	<dimen name="sp_92">92.0000sp</dimen>
+	<dimen name="sp_93">93.0000sp</dimen>
+	<dimen name="sp_94">94.0000sp</dimen>
+	<dimen name="sp_95">95.0000sp</dimen>
+	<dimen name="sp_96">96.0000sp</dimen>
+	<dimen name="sp_97">97.0000sp</dimen>
+	<dimen name="sp_98">98.0000sp</dimen>
+	<dimen name="sp_99">99.0000sp</dimen>
+	<dimen name="sp_100">100.0000sp</dimen>
 </resources>
diff --git a/app/src/main/res/values-sw362dp/dimens.xml b/app/src/main/res/values-sw362dp/dimens.xml
index c117c57..e56c30d 100644
--- a/app/src/main/res/values-sw362dp/dimens.xml
+++ b/app/src/main/res/values-sw362dp/dimens.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-	<dimen name="activity_horizontal_margin">16.1006dp</dimen>
-	<dimen name="activity_vertical_margin">16.1006dp</dimen>
-	<dimen name="actions_item_font">18.1132sp</dimen>
-	<dimen name="actions_item_drawablePaddding">10.0629dp</dimen>
 	<dimen name="dp_m_60">-60.3773dp</dimen>
 	<dimen name="dp_m_30">-30.1887dp</dimen>
 	<dimen name="dp_m_20">-20.1258dp</dimen>
@@ -520,9 +516,206 @@
 	<dimen name="dp_498">501.1320dp</dimen>
 	<dimen name="dp_499">502.1383dp</dimen>
 	<dimen name="dp_500">503.1446dp</dimen>
+	<dimen name="dp_501">504.1509dp</dimen>
+	<dimen name="dp_502">505.1572dp</dimen>
+	<dimen name="dp_503">506.1635dp</dimen>
+	<dimen name="dp_504">507.1697dp</dimen>
+	<dimen name="dp_505">508.1760dp</dimen>
+	<dimen name="dp_506">509.1823dp</dimen>
+	<dimen name="dp_507">510.1886dp</dimen>
+	<dimen name="dp_508">511.1949dp</dimen>
+	<dimen name="dp_509">512.2012dp</dimen>
+	<dimen name="dp_510">513.2075dp</dimen>
+	<dimen name="dp_511">514.2138dp</dimen>
+	<dimen name="dp_512">515.2201dp</dimen>
+	<dimen name="dp_513">516.2263dp</dimen>
+	<dimen name="dp_514">517.2326dp</dimen>
+	<dimen name="dp_515">518.2389dp</dimen>
+	<dimen name="dp_516">519.2452dp</dimen>
+	<dimen name="dp_517">520.2515dp</dimen>
+	<dimen name="dp_518">521.2578dp</dimen>
+	<dimen name="dp_519">522.2641dp</dimen>
+	<dimen name="dp_520">523.2704dp</dimen>
+	<dimen name="dp_521">524.2767dp</dimen>
+	<dimen name="dp_522">525.2829dp</dimen>
+	<dimen name="dp_523">526.2892dp</dimen>
+	<dimen name="dp_524">527.2955dp</dimen>
+	<dimen name="dp_525">528.3018dp</dimen>
+	<dimen name="dp_526">529.3081dp</dimen>
+	<dimen name="dp_527">530.3144dp</dimen>
+	<dimen name="dp_528">531.3207dp</dimen>
+	<dimen name="dp_529">532.3270dp</dimen>
+	<dimen name="dp_530">533.3333dp</dimen>
+	<dimen name="dp_531">534.3395dp</dimen>
+	<dimen name="dp_532">535.3458dp</dimen>
+	<dimen name="dp_533">536.3521dp</dimen>
+	<dimen name="dp_534">537.3584dp</dimen>
+	<dimen name="dp_535">538.3647dp</dimen>
+	<dimen name="dp_536">539.3710dp</dimen>
+	<dimen name="dp_537">540.3773dp</dimen>
+	<dimen name="dp_538">541.3836dp</dimen>
+	<dimen name="dp_539">542.3899dp</dimen>
+	<dimen name="dp_540">543.3962dp</dimen>
+	<dimen name="dp_541">544.4024dp</dimen>
+	<dimen name="dp_542">545.4087dp</dimen>
+	<dimen name="dp_543">546.4150dp</dimen>
+	<dimen name="dp_544">547.4213dp</dimen>
+	<dimen name="dp_545">548.4276dp</dimen>
+	<dimen name="dp_546">549.4339dp</dimen>
+	<dimen name="dp_547">550.4402dp</dimen>
+	<dimen name="dp_548">551.4465dp</dimen>
+	<dimen name="dp_549">552.4528dp</dimen>
+	<dimen name="dp_550">553.4590dp</dimen>
+	<dimen name="dp_551">554.4653dp</dimen>
+	<dimen name="dp_552">555.4716dp</dimen>
+	<dimen name="dp_553">556.4779dp</dimen>
+	<dimen name="dp_554">557.4842dp</dimen>
+	<dimen name="dp_555">558.4905dp</dimen>
+	<dimen name="dp_556">559.4968dp</dimen>
+	<dimen name="dp_557">560.5031dp</dimen>
+	<dimen name="dp_558">561.5094dp</dimen>
+	<dimen name="dp_559">562.5156dp</dimen>
+	<dimen name="dp_560">563.5219dp</dimen>
+	<dimen name="dp_561">564.5282dp</dimen>
+	<dimen name="dp_562">565.5345dp</dimen>
+	<dimen name="dp_563">566.5408dp</dimen>
+	<dimen name="dp_564">567.5471dp</dimen>
+	<dimen name="dp_565">568.5534dp</dimen>
+	<dimen name="dp_566">569.5597dp</dimen>
+	<dimen name="dp_567">570.5660dp</dimen>
+	<dimen name="dp_568">571.5722dp</dimen>
+	<dimen name="dp_569">572.5785dp</dimen>
+	<dimen name="dp_570">573.5848dp</dimen>
+	<dimen name="dp_571">574.5911dp</dimen>
+	<dimen name="dp_572">575.5974dp</dimen>
+	<dimen name="dp_573">576.6037dp</dimen>
+	<dimen name="dp_574">577.6100dp</dimen>
+	<dimen name="dp_575">578.6163dp</dimen>
+	<dimen name="dp_576">579.6226dp</dimen>
+	<dimen name="dp_577">580.6288dp</dimen>
+	<dimen name="dp_578">581.6351dp</dimen>
+	<dimen name="dp_579">582.6414dp</dimen>
+	<dimen name="dp_580">583.6477dp</dimen>
+	<dimen name="dp_581">584.6540dp</dimen>
+	<dimen name="dp_582">585.6603dp</dimen>
+	<dimen name="dp_583">586.6666dp</dimen>
+	<dimen name="dp_584">587.6729dp</dimen>
+	<dimen name="dp_585">588.6792dp</dimen>
+	<dimen name="dp_586">589.6855dp</dimen>
+	<dimen name="dp_587">590.6917dp</dimen>
+	<dimen name="dp_588">591.6980dp</dimen>
+	<dimen name="dp_589">592.7043dp</dimen>
+	<dimen name="dp_590">593.7106dp</dimen>
+	<dimen name="dp_591">594.7169dp</dimen>
+	<dimen name="dp_592">595.7232dp</dimen>
+	<dimen name="dp_593">596.7295dp</dimen>
+	<dimen name="dp_594">597.7358dp</dimen>
+	<dimen name="dp_595">598.7421dp</dimen>
+	<dimen name="dp_596">599.7483dp</dimen>
+	<dimen name="dp_597">600.7546dp</dimen>
+	<dimen name="dp_598">601.7609dp</dimen>
+	<dimen name="dp_599">602.7672dp</dimen>
 	<dimen name="dp_600">603.7735dp</dimen>
+	<dimen name="dp_601">604.7798dp</dimen>
+	<dimen name="dp_602">605.7861dp</dimen>
+	<dimen name="dp_603">606.7924dp</dimen>
+	<dimen name="dp_604">607.7987dp</dimen>
+	<dimen name="dp_605">608.8049dp</dimen>
+	<dimen name="dp_606">609.8112dp</dimen>
+	<dimen name="dp_607">610.8175dp</dimen>
+	<dimen name="dp_608">611.8238dp</dimen>
+	<dimen name="dp_609">612.8301dp</dimen>
+	<dimen name="dp_610">613.8364dp</dimen>
+	<dimen name="dp_611">614.8427dp</dimen>
+	<dimen name="dp_612">615.8490dp</dimen>
+	<dimen name="dp_613">616.8553dp</dimen>
+	<dimen name="dp_614">617.8615dp</dimen>
+	<dimen name="dp_615">618.8678dp</dimen>
+	<dimen name="dp_616">619.8741dp</dimen>
+	<dimen name="dp_617">620.8804dp</dimen>
+	<dimen name="dp_618">621.8867dp</dimen>
+	<dimen name="dp_619">622.8930dp</dimen>
+	<dimen name="dp_620">623.8993dp</dimen>
+	<dimen name="dp_621">624.9056dp</dimen>
+	<dimen name="dp_622">625.9119dp</dimen>
+	<dimen name="dp_623">626.9182dp</dimen>
+	<dimen name="dp_624">627.9244dp</dimen>
+	<dimen name="dp_625">628.9307dp</dimen>
+	<dimen name="dp_626">629.9370dp</dimen>
+	<dimen name="dp_627">630.9433dp</dimen>
+	<dimen name="dp_628">631.9496dp</dimen>
+	<dimen name="dp_629">632.9559dp</dimen>
+	<dimen name="dp_630">633.9622dp</dimen>
+	<dimen name="dp_631">634.9685dp</dimen>
+	<dimen name="dp_632">635.9748dp</dimen>
+	<dimen name="dp_633">636.9810dp</dimen>
+	<dimen name="dp_634">637.9873dp</dimen>
+	<dimen name="dp_635">638.9936dp</dimen>
+	<dimen name="dp_636">639.9999dp</dimen>
+	<dimen name="dp_637">641.0062dp</dimen>
+	<dimen name="dp_638">642.0125dp</dimen>
+	<dimen name="dp_639">643.0188dp</dimen>
 	<dimen name="dp_640">644.0251dp</dimen>
-	<dimen name="dp_720">724.5282dp</dimen>
+	<dimen name="dp_641">645.0314dp</dimen>
+	<dimen name="dp_642">646.0376dp</dimen>
+	<dimen name="dp_643">647.0439dp</dimen>
+	<dimen name="dp_644">648.0502dp</dimen>
+	<dimen name="dp_645">649.0565dp</dimen>
+	<dimen name="dp_646">650.0628dp</dimen>
+	<dimen name="dp_647">651.0691dp</dimen>
+	<dimen name="dp_648">652.0754dp</dimen>
+	<dimen name="dp_649">653.0817dp</dimen>
+	<dimen name="dp_650">654.0880dp</dimen>
+	<dimen name="dp_651">655.0942dp</dimen>
+	<dimen name="dp_652">656.1005dp</dimen>
+	<dimen name="dp_653">657.1068dp</dimen>
+	<dimen name="dp_654">658.1131dp</dimen>
+	<dimen name="dp_655">659.1194dp</dimen>
+	<dimen name="dp_656">660.1257dp</dimen>
+	<dimen name="dp_657">661.1320dp</dimen>
+	<dimen name="dp_658">662.1383dp</dimen>
+	<dimen name="dp_659">663.1446dp</dimen>
+	<dimen name="dp_660">664.1508dp</dimen>
+	<dimen name="dp_661">665.1571dp</dimen>
+	<dimen name="dp_662">666.1634dp</dimen>
+	<dimen name="dp_663">667.1697dp</dimen>
+	<dimen name="dp_664">668.1760dp</dimen>
+	<dimen name="dp_665">669.1823dp</dimen>
+	<dimen name="dp_666">670.1886dp</dimen>
+	<dimen name="dp_667">671.1949dp</dimen>
+	<dimen name="dp_668">672.2012dp</dimen>
+	<dimen name="dp_669">673.2075dp</dimen>
+	<dimen name="dp_670">674.2137dp</dimen>
+	<dimen name="dp_671">675.2200dp</dimen>
+	<dimen name="dp_672">676.2263dp</dimen>
+	<dimen name="dp_673">677.2326dp</dimen>
+	<dimen name="dp_674">678.2389dp</dimen>
+	<dimen name="dp_675">679.2452dp</dimen>
+	<dimen name="dp_676">680.2515dp</dimen>
+	<dimen name="dp_677">681.2578dp</dimen>
+	<dimen name="dp_678">682.2641dp</dimen>
+	<dimen name="dp_679">683.2703dp</dimen>
+	<dimen name="dp_680">684.2766dp</dimen>
+	<dimen name="dp_681">685.2829dp</dimen>
+	<dimen name="dp_682">686.2892dp</dimen>
+	<dimen name="dp_683">687.2955dp</dimen>
+	<dimen name="dp_684">688.3018dp</dimen>
+	<dimen name="dp_685">689.3081dp</dimen>
+	<dimen name="dp_686">690.3144dp</dimen>
+	<dimen name="dp_687">691.3207dp</dimen>
+	<dimen name="dp_688">692.3269dp</dimen>
+	<dimen name="dp_689">693.3332dp</dimen>
+	<dimen name="dp_690">694.3395dp</dimen>
+	<dimen name="dp_691">695.3458dp</dimen>
+	<dimen name="dp_692">696.3521dp</dimen>
+	<dimen name="dp_693">697.3584dp</dimen>
+	<dimen name="dp_694">698.3647dp</dimen>
+	<dimen name="dp_695">699.3710dp</dimen>
+	<dimen name="dp_696">700.3773dp</dimen>
+	<dimen name="dp_697">701.3835dp</dimen>
+	<dimen name="dp_698">702.3898dp</dimen>
+	<dimen name="dp_699">703.3961dp</dimen>
+	<dimen name="dp_700">704.4024dp</dimen>
 	<dimen name="sp_1">1.0063sp</dimen>
 	<dimen name="sp_2">2.0126sp</dimen>
 	<dimen name="sp_3">3.0189sp</dimen>
@@ -573,4 +766,54 @@
 	<dimen name="sp_48">48.3019sp</dimen>
 	<dimen name="sp_49">49.3082sp</dimen>
 	<dimen name="sp_50">50.3145sp</dimen>
+	<dimen name="sp_51">51.3207sp</dimen>
+	<dimen name="sp_52">52.3270sp</dimen>
+	<dimen name="sp_53">53.3333sp</dimen>
+	<dimen name="sp_54">54.3396sp</dimen>
+	<dimen name="sp_55">55.3459sp</dimen>
+	<dimen name="sp_56">56.3522sp</dimen>
+	<dimen name="sp_57">57.3585sp</dimen>
+	<dimen name="sp_58">58.3648sp</dimen>
+	<dimen name="sp_59">59.3711sp</dimen>
+	<dimen name="sp_60">60.3773sp</dimen>
+	<dimen name="sp_61">61.3836sp</dimen>
+	<dimen name="sp_62">62.3899sp</dimen>
+	<dimen name="sp_63">63.3962sp</dimen>
+	<dimen name="sp_64">64.4025sp</dimen>
+	<dimen name="sp_65">65.4088sp</dimen>
+	<dimen name="sp_66">66.4151sp</dimen>
+	<dimen name="sp_67">67.4214sp</dimen>
+	<dimen name="sp_68">68.4277sp</dimen>
+	<dimen name="sp_69">69.4340sp</dimen>
+	<dimen name="sp_70">70.4402sp</dimen>
+	<dimen name="sp_71">71.4465sp</dimen>
+	<dimen name="sp_72">72.4528sp</dimen>
+	<dimen name="sp_73">73.4591sp</dimen>
+	<dimen name="sp_74">74.4654sp</dimen>
+	<dimen name="sp_75">75.4717sp</dimen>
+	<dimen name="sp_76">76.4780sp</dimen>
+	<dimen name="sp_77">77.4843sp</dimen>
+	<dimen name="sp_78">78.4906sp</dimen>
+	<dimen name="sp_79">79.4968sp</dimen>
+	<dimen name="sp_80">80.5031sp</dimen>
+	<dimen name="sp_81">81.5094sp</dimen>
+	<dimen name="sp_82">82.5157sp</dimen>
+	<dimen name="sp_83">83.5220sp</dimen>
+	<dimen name="sp_84">84.5283sp</dimen>
+	<dimen name="sp_85">85.5346sp</dimen>
+	<dimen name="sp_86">86.5409sp</dimen>
+	<dimen name="sp_87">87.5472sp</dimen>
+	<dimen name="sp_88">88.5534sp</dimen>
+	<dimen name="sp_89">89.5597sp</dimen>
+	<dimen name="sp_90">90.5660sp</dimen>
+	<dimen name="sp_91">91.5723sp</dimen>
+	<dimen name="sp_92">92.5786sp</dimen>
+	<dimen name="sp_93">93.5849sp</dimen>
+	<dimen name="sp_94">94.5912sp</dimen>
+	<dimen name="sp_95">95.5975sp</dimen>
+	<dimen name="sp_96">96.6038sp</dimen>
+	<dimen name="sp_97">97.6100sp</dimen>
+	<dimen name="sp_98">98.6163sp</dimen>
+	<dimen name="sp_99">99.6226sp</dimen>
+	<dimen name="sp_100">100.6289sp</dimen>
 </resources>
diff --git a/app/src/main/res/values-sw384dp/dimens.xml b/app/src/main/res/values-sw384dp/dimens.xml
index 1d636b0..cd444a5 100644
--- a/app/src/main/res/values-sw384dp/dimens.xml
+++ b/app/src/main/res/values-sw384dp/dimens.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-	<dimen name="activity_horizontal_margin">17.0667dp</dimen>
-	<dimen name="activity_vertical_margin">17.0667dp</dimen>
-	<dimen name="actions_item_font">19.2000sp</dimen>
-	<dimen name="actions_item_drawablePaddding">10.6667dp</dimen>
 	<dimen name="dp_m_60">-64.0000dp</dimen>
 	<dimen name="dp_m_30">-32.0000dp</dimen>
 	<dimen name="dp_m_20">-21.3333dp</dimen>
@@ -520,9 +516,206 @@
 	<dimen name="dp_498">531.2000dp</dimen>
 	<dimen name="dp_499">532.2667dp</dimen>
 	<dimen name="dp_500">533.3333dp</dimen>
+	<dimen name="dp_501">534.4000dp</dimen>
+	<dimen name="dp_502">535.4667dp</dimen>
+	<dimen name="dp_503">536.5333dp</dimen>
+	<dimen name="dp_504">537.6000dp</dimen>
+	<dimen name="dp_505">538.6667dp</dimen>
+	<dimen name="dp_506">539.7333dp</dimen>
+	<dimen name="dp_507">540.8000dp</dimen>
+	<dimen name="dp_508">541.8667dp</dimen>
+	<dimen name="dp_509">542.9333dp</dimen>
+	<dimen name="dp_510">544.0000dp</dimen>
+	<dimen name="dp_511">545.0667dp</dimen>
+	<dimen name="dp_512">546.1333dp</dimen>
+	<dimen name="dp_513">547.2000dp</dimen>
+	<dimen name="dp_514">548.2667dp</dimen>
+	<dimen name="dp_515">549.3333dp</dimen>
+	<dimen name="dp_516">550.4000dp</dimen>
+	<dimen name="dp_517">551.4667dp</dimen>
+	<dimen name="dp_518">552.5333dp</dimen>
+	<dimen name="dp_519">553.6000dp</dimen>
+	<dimen name="dp_520">554.6667dp</dimen>
+	<dimen name="dp_521">555.7333dp</dimen>
+	<dimen name="dp_522">556.8000dp</dimen>
+	<dimen name="dp_523">557.8667dp</dimen>
+	<dimen name="dp_524">558.9333dp</dimen>
+	<dimen name="dp_525">560.0000dp</dimen>
+	<dimen name="dp_526">561.0667dp</dimen>
+	<dimen name="dp_527">562.1333dp</dimen>
+	<dimen name="dp_528">563.2000dp</dimen>
+	<dimen name="dp_529">564.2667dp</dimen>
+	<dimen name="dp_530">565.3333dp</dimen>
+	<dimen name="dp_531">566.4000dp</dimen>
+	<dimen name="dp_532">567.4667dp</dimen>
+	<dimen name="dp_533">568.5333dp</dimen>
+	<dimen name="dp_534">569.6000dp</dimen>
+	<dimen name="dp_535">570.6667dp</dimen>
+	<dimen name="dp_536">571.7333dp</dimen>
+	<dimen name="dp_537">572.8000dp</dimen>
+	<dimen name="dp_538">573.8667dp</dimen>
+	<dimen name="dp_539">574.9333dp</dimen>
+	<dimen name="dp_540">576.0000dp</dimen>
+	<dimen name="dp_541">577.0667dp</dimen>
+	<dimen name="dp_542">578.1333dp</dimen>
+	<dimen name="dp_543">579.2000dp</dimen>
+	<dimen name="dp_544">580.2667dp</dimen>
+	<dimen name="dp_545">581.3333dp</dimen>
+	<dimen name="dp_546">582.4000dp</dimen>
+	<dimen name="dp_547">583.4667dp</dimen>
+	<dimen name="dp_548">584.5333dp</dimen>
+	<dimen name="dp_549">585.6000dp</dimen>
+	<dimen name="dp_550">586.6667dp</dimen>
+	<dimen name="dp_551">587.7333dp</dimen>
+	<dimen name="dp_552">588.8000dp</dimen>
+	<dimen name="dp_553">589.8667dp</dimen>
+	<dimen name="dp_554">590.9333dp</dimen>
+	<dimen name="dp_555">592.0000dp</dimen>
+	<dimen name="dp_556">593.0667dp</dimen>
+	<dimen name="dp_557">594.1333dp</dimen>
+	<dimen name="dp_558">595.2000dp</dimen>
+	<dimen name="dp_559">596.2667dp</dimen>
+	<dimen name="dp_560">597.3333dp</dimen>
+	<dimen name="dp_561">598.4000dp</dimen>
+	<dimen name="dp_562">599.4667dp</dimen>
+	<dimen name="dp_563">600.5333dp</dimen>
+	<dimen name="dp_564">601.6000dp</dimen>
+	<dimen name="dp_565">602.6667dp</dimen>
+	<dimen name="dp_566">603.7333dp</dimen>
+	<dimen name="dp_567">604.8000dp</dimen>
+	<dimen name="dp_568">605.8667dp</dimen>
+	<dimen name="dp_569">606.9333dp</dimen>
+	<dimen name="dp_570">608.0000dp</dimen>
+	<dimen name="dp_571">609.0667dp</dimen>
+	<dimen name="dp_572">610.1333dp</dimen>
+	<dimen name="dp_573">611.2000dp</dimen>
+	<dimen name="dp_574">612.2667dp</dimen>
+	<dimen name="dp_575">613.3333dp</dimen>
+	<dimen name="dp_576">614.4000dp</dimen>
+	<dimen name="dp_577">615.4667dp</dimen>
+	<dimen name="dp_578">616.5333dp</dimen>
+	<dimen name="dp_579">617.6000dp</dimen>
+	<dimen name="dp_580">618.6667dp</dimen>
+	<dimen name="dp_581">619.7333dp</dimen>
+	<dimen name="dp_582">620.8000dp</dimen>
+	<dimen name="dp_583">621.8667dp</dimen>
+	<dimen name="dp_584">622.9333dp</dimen>
+	<dimen name="dp_585">624.0000dp</dimen>
+	<dimen name="dp_586">625.0667dp</dimen>
+	<dimen name="dp_587">626.1333dp</dimen>
+	<dimen name="dp_588">627.2000dp</dimen>
+	<dimen name="dp_589">628.2667dp</dimen>
+	<dimen name="dp_590">629.3333dp</dimen>
+	<dimen name="dp_591">630.4000dp</dimen>
+	<dimen name="dp_592">631.4667dp</dimen>
+	<dimen name="dp_593">632.5333dp</dimen>
+	<dimen name="dp_594">633.6000dp</dimen>
+	<dimen name="dp_595">634.6667dp</dimen>
+	<dimen name="dp_596">635.7333dp</dimen>
+	<dimen name="dp_597">636.8000dp</dimen>
+	<dimen name="dp_598">637.8667dp</dimen>
+	<dimen name="dp_599">638.9333dp</dimen>
 	<dimen name="dp_600">640.0000dp</dimen>
+	<dimen name="dp_601">641.0667dp</dimen>
+	<dimen name="dp_602">642.1333dp</dimen>
+	<dimen name="dp_603">643.2000dp</dimen>
+	<dimen name="dp_604">644.2667dp</dimen>
+	<dimen name="dp_605">645.3333dp</dimen>
+	<dimen name="dp_606">646.4000dp</dimen>
+	<dimen name="dp_607">647.4667dp</dimen>
+	<dimen name="dp_608">648.5333dp</dimen>
+	<dimen name="dp_609">649.6000dp</dimen>
+	<dimen name="dp_610">650.6667dp</dimen>
+	<dimen name="dp_611">651.7333dp</dimen>
+	<dimen name="dp_612">652.8000dp</dimen>
+	<dimen name="dp_613">653.8667dp</dimen>
+	<dimen name="dp_614">654.9333dp</dimen>
+	<dimen name="dp_615">656.0000dp</dimen>
+	<dimen name="dp_616">657.0667dp</dimen>
+	<dimen name="dp_617">658.1333dp</dimen>
+	<dimen name="dp_618">659.2000dp</dimen>
+	<dimen name="dp_619">660.2667dp</dimen>
+	<dimen name="dp_620">661.3333dp</dimen>
+	<dimen name="dp_621">662.4000dp</dimen>
+	<dimen name="dp_622">663.4667dp</dimen>
+	<dimen name="dp_623">664.5333dp</dimen>
+	<dimen name="dp_624">665.6000dp</dimen>
+	<dimen name="dp_625">666.6667dp</dimen>
+	<dimen name="dp_626">667.7333dp</dimen>
+	<dimen name="dp_627">668.8000dp</dimen>
+	<dimen name="dp_628">669.8667dp</dimen>
+	<dimen name="dp_629">670.9333dp</dimen>
+	<dimen name="dp_630">672.0000dp</dimen>
+	<dimen name="dp_631">673.0667dp</dimen>
+	<dimen name="dp_632">674.1333dp</dimen>
+	<dimen name="dp_633">675.2000dp</dimen>
+	<dimen name="dp_634">676.2667dp</dimen>
+	<dimen name="dp_635">677.3333dp</dimen>
+	<dimen name="dp_636">678.4000dp</dimen>
+	<dimen name="dp_637">679.4667dp</dimen>
+	<dimen name="dp_638">680.5333dp</dimen>
+	<dimen name="dp_639">681.6000dp</dimen>
 	<dimen name="dp_640">682.6667dp</dimen>
-	<dimen name="dp_720">768.0000dp</dimen>
+	<dimen name="dp_641">683.7333dp</dimen>
+	<dimen name="dp_642">684.8000dp</dimen>
+	<dimen name="dp_643">685.8667dp</dimen>
+	<dimen name="dp_644">686.9333dp</dimen>
+	<dimen name="dp_645">688.0000dp</dimen>
+	<dimen name="dp_646">689.0667dp</dimen>
+	<dimen name="dp_647">690.1333dp</dimen>
+	<dimen name="dp_648">691.2000dp</dimen>
+	<dimen name="dp_649">692.2667dp</dimen>
+	<dimen name="dp_650">693.3333dp</dimen>
+	<dimen name="dp_651">694.4000dp</dimen>
+	<dimen name="dp_652">695.4667dp</dimen>
+	<dimen name="dp_653">696.5333dp</dimen>
+	<dimen name="dp_654">697.6000dp</dimen>
+	<dimen name="dp_655">698.6667dp</dimen>
+	<dimen name="dp_656">699.7333dp</dimen>
+	<dimen name="dp_657">700.8000dp</dimen>
+	<dimen name="dp_658">701.8667dp</dimen>
+	<dimen name="dp_659">702.9333dp</dimen>
+	<dimen name="dp_660">704.0000dp</dimen>
+	<dimen name="dp_661">705.0667dp</dimen>
+	<dimen name="dp_662">706.1333dp</dimen>
+	<dimen name="dp_663">707.2000dp</dimen>
+	<dimen name="dp_664">708.2667dp</dimen>
+	<dimen name="dp_665">709.3333dp</dimen>
+	<dimen name="dp_666">710.4000dp</dimen>
+	<dimen name="dp_667">711.4667dp</dimen>
+	<dimen name="dp_668">712.5333dp</dimen>
+	<dimen name="dp_669">713.6000dp</dimen>
+	<dimen name="dp_670">714.6667dp</dimen>
+	<dimen name="dp_671">715.7333dp</dimen>
+	<dimen name="dp_672">716.8000dp</dimen>
+	<dimen name="dp_673">717.8667dp</dimen>
+	<dimen name="dp_674">718.9333dp</dimen>
+	<dimen name="dp_675">720.0000dp</dimen>
+	<dimen name="dp_676">721.0667dp</dimen>
+	<dimen name="dp_677">722.1333dp</dimen>
+	<dimen name="dp_678">723.2000dp</dimen>
+	<dimen name="dp_679">724.2667dp</dimen>
+	<dimen name="dp_680">725.3333dp</dimen>
+	<dimen name="dp_681">726.4000dp</dimen>
+	<dimen name="dp_682">727.4667dp</dimen>
+	<dimen name="dp_683">728.5333dp</dimen>
+	<dimen name="dp_684">729.6000dp</dimen>
+	<dimen name="dp_685">730.6667dp</dimen>
+	<dimen name="dp_686">731.7333dp</dimen>
+	<dimen name="dp_687">732.8000dp</dimen>
+	<dimen name="dp_688">733.8667dp</dimen>
+	<dimen name="dp_689">734.9333dp</dimen>
+	<dimen name="dp_690">736.0000dp</dimen>
+	<dimen name="dp_691">737.0667dp</dimen>
+	<dimen name="dp_692">738.1333dp</dimen>
+	<dimen name="dp_693">739.2000dp</dimen>
+	<dimen name="dp_694">740.2667dp</dimen>
+	<dimen name="dp_695">741.3333dp</dimen>
+	<dimen name="dp_696">742.4000dp</dimen>
+	<dimen name="dp_697">743.4667dp</dimen>
+	<dimen name="dp_698">744.5333dp</dimen>
+	<dimen name="dp_699">745.6000dp</dimen>
+	<dimen name="dp_700">746.6667dp</dimen>
 	<dimen name="sp_1">1.0667sp</dimen>
 	<dimen name="sp_2">2.1333sp</dimen>
 	<dimen name="sp_3">3.2000sp</dimen>
@@ -573,4 +766,54 @@
 	<dimen name="sp_48">51.2000sp</dimen>
 	<dimen name="sp_49">52.2667sp</dimen>
 	<dimen name="sp_50">53.3333sp</dimen>
+	<dimen name="sp_51">54.4000sp</dimen>
+	<dimen name="sp_52">55.4667sp</dimen>
+	<dimen name="sp_53">56.5333sp</dimen>
+	<dimen name="sp_54">57.6000sp</dimen>
+	<dimen name="sp_55">58.6667sp</dimen>
+	<dimen name="sp_56">59.7333sp</dimen>
+	<dimen name="sp_57">60.8000sp</dimen>
+	<dimen name="sp_58">61.8667sp</dimen>
+	<dimen name="sp_59">62.9333sp</dimen>
+	<dimen name="sp_60">64.0000sp</dimen>
+	<dimen name="sp_61">65.0667sp</dimen>
+	<dimen name="sp_62">66.1333sp</dimen>
+	<dimen name="sp_63">67.2000sp</dimen>
+	<dimen name="sp_64">68.2667sp</dimen>
+	<dimen name="sp_65">69.3333sp</dimen>
+	<dimen name="sp_66">70.4000sp</dimen>
+	<dimen name="sp_67">71.4667sp</dimen>
+	<dimen name="sp_68">72.5333sp</dimen>
+	<dimen name="sp_69">73.6000sp</dimen>
+	<dimen name="sp_70">74.6667sp</dimen>
+	<dimen name="sp_71">75.7333sp</dimen>
+	<dimen name="sp_72">76.8000sp</dimen>
+	<dimen name="sp_73">77.8667sp</dimen>
+	<dimen name="sp_74">78.9333sp</dimen>
+	<dimen name="sp_75">80.0000sp</dimen>
+	<dimen name="sp_76">81.0667sp</dimen>
+	<dimen name="sp_77">82.1333sp</dimen>
+	<dimen name="sp_78">83.2000sp</dimen>
+	<dimen name="sp_79">84.2667sp</dimen>
+	<dimen name="sp_80">85.3333sp</dimen>
+	<dimen name="sp_81">86.4000sp</dimen>
+	<dimen name="sp_82">87.4667sp</dimen>
+	<dimen name="sp_83">88.5333sp</dimen>
+	<dimen name="sp_84">89.6000sp</dimen>
+	<dimen name="sp_85">90.6667sp</dimen>
+	<dimen name="sp_86">91.7333sp</dimen>
+	<dimen name="sp_87">92.8000sp</dimen>
+	<dimen name="sp_88">93.8667sp</dimen>
+	<dimen name="sp_89">94.9333sp</dimen>
+	<dimen name="sp_90">96.0000sp</dimen>
+	<dimen name="sp_91">97.0667sp</dimen>
+	<dimen name="sp_92">98.1333sp</dimen>
+	<dimen name="sp_93">99.2000sp</dimen>
+	<dimen name="sp_94">100.2667sp</dimen>
+	<dimen name="sp_95">101.3333sp</dimen>
+	<dimen name="sp_96">102.4000sp</dimen>
+	<dimen name="sp_97">103.4667sp</dimen>
+	<dimen name="sp_98">104.5333sp</dimen>
+	<dimen name="sp_99">105.6000sp</dimen>
+	<dimen name="sp_100">106.6667sp</dimen>
 </resources>
diff --git a/app/src/main/res/values-sw392dp/dimens.xml b/app/src/main/res/values-sw392dp/dimens.xml
index 35902d8..429810e 100644
--- a/app/src/main/res/values-sw392dp/dimens.xml
+++ b/app/src/main/res/values-sw392dp/dimens.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-	<dimen name="activity_horizontal_margin">17.4545dp</dimen>
-	<dimen name="activity_vertical_margin">17.4545dp</dimen>
-	<dimen name="actions_item_font">19.6364sp</dimen>
-	<dimen name="actions_item_drawablePaddding">10.9091dp</dimen>
 	<dimen name="dp_m_60">-65.4545dp</dimen>
 	<dimen name="dp_m_30">-32.7273dp</dimen>
 	<dimen name="dp_m_20">-21.8182dp</dimen>
@@ -520,9 +516,206 @@
 	<dimen name="dp_498">543.2726dp</dimen>
 	<dimen name="dp_499">544.3635dp</dimen>
 	<dimen name="dp_500">545.4544dp</dimen>
+	<dimen name="dp_501">546.5454dp</dimen>
+	<dimen name="dp_502">547.6363dp</dimen>
+	<dimen name="dp_503">548.7272dp</dimen>
+	<dimen name="dp_504">549.8181dp</dimen>
+	<dimen name="dp_505">550.9090dp</dimen>
+	<dimen name="dp_506">551.9999dp</dimen>
+	<dimen name="dp_507">553.0908dp</dimen>
+	<dimen name="dp_508">554.1817dp</dimen>
+	<dimen name="dp_509">555.2726dp</dimen>
+	<dimen name="dp_510">556.3635dp</dimen>
+	<dimen name="dp_511">557.4544dp</dimen>
+	<dimen name="dp_512">558.5454dp</dimen>
+	<dimen name="dp_513">559.6363dp</dimen>
+	<dimen name="dp_514">560.7272dp</dimen>
+	<dimen name="dp_515">561.8181dp</dimen>
+	<dimen name="dp_516">562.9090dp</dimen>
+	<dimen name="dp_517">563.9999dp</dimen>
+	<dimen name="dp_518">565.0908dp</dimen>
+	<dimen name="dp_519">566.1817dp</dimen>
+	<dimen name="dp_520">567.2726dp</dimen>
+	<dimen name="dp_521">568.3635dp</dimen>
+	<dimen name="dp_522">569.4544dp</dimen>
+	<dimen name="dp_523">570.5453dp</dimen>
+	<dimen name="dp_524">571.6363dp</dimen>
+	<dimen name="dp_525">572.7272dp</dimen>
+	<dimen name="dp_526">573.8181dp</dimen>
+	<dimen name="dp_527">574.9090dp</dimen>
+	<dimen name="dp_528">575.9999dp</dimen>
+	<dimen name="dp_529">577.0908dp</dimen>
+	<dimen name="dp_530">578.1817dp</dimen>
+	<dimen name="dp_531">579.2726dp</dimen>
+	<dimen name="dp_532">580.3635dp</dimen>
+	<dimen name="dp_533">581.4544dp</dimen>
+	<dimen name="dp_534">582.5453dp</dimen>
+	<dimen name="dp_535">583.6363dp</dimen>
+	<dimen name="dp_536">584.7272dp</dimen>
+	<dimen name="dp_537">585.8181dp</dimen>
+	<dimen name="dp_538">586.9090dp</dimen>
+	<dimen name="dp_539">587.9999dp</dimen>
+	<dimen name="dp_540">589.0908dp</dimen>
+	<dimen name="dp_541">590.1817dp</dimen>
+	<dimen name="dp_542">591.2726dp</dimen>
+	<dimen name="dp_543">592.3635dp</dimen>
+	<dimen name="dp_544">593.4544dp</dimen>
+	<dimen name="dp_545">594.5453dp</dimen>
+	<dimen name="dp_546">595.6363dp</dimen>
+	<dimen name="dp_547">596.7272dp</dimen>
+	<dimen name="dp_548">597.8181dp</dimen>
+	<dimen name="dp_549">598.9090dp</dimen>
+	<dimen name="dp_550">599.9999dp</dimen>
+	<dimen name="dp_551">601.0908dp</dimen>
+	<dimen name="dp_552">602.1817dp</dimen>
+	<dimen name="dp_553">603.2726dp</dimen>
+	<dimen name="dp_554">604.3635dp</dimen>
+	<dimen name="dp_555">605.4544dp</dimen>
+	<dimen name="dp_556">606.5453dp</dimen>
+	<dimen name="dp_557">607.6363dp</dimen>
+	<dimen name="dp_558">608.7272dp</dimen>
+	<dimen name="dp_559">609.8181dp</dimen>
+	<dimen name="dp_560">610.9090dp</dimen>
+	<dimen name="dp_561">611.9999dp</dimen>
+	<dimen name="dp_562">613.0908dp</dimen>
+	<dimen name="dp_563">614.1817dp</dimen>
+	<dimen name="dp_564">615.2726dp</dimen>
+	<dimen name="dp_565">616.3635dp</dimen>
+	<dimen name="dp_566">617.4544dp</dimen>
+	<dimen name="dp_567">618.5453dp</dimen>
+	<dimen name="dp_568">619.6362dp</dimen>
+	<dimen name="dp_569">620.7272dp</dimen>
+	<dimen name="dp_570">621.8181dp</dimen>
+	<dimen name="dp_571">622.9090dp</dimen>
+	<dimen name="dp_572">623.9999dp</dimen>
+	<dimen name="dp_573">625.0908dp</dimen>
+	<dimen name="dp_574">626.1817dp</dimen>
+	<dimen name="dp_575">627.2726dp</dimen>
+	<dimen name="dp_576">628.3635dp</dimen>
+	<dimen name="dp_577">629.4544dp</dimen>
+	<dimen name="dp_578">630.5453dp</dimen>
+	<dimen name="dp_579">631.6362dp</dimen>
+	<dimen name="dp_580">632.7272dp</dimen>
+	<dimen name="dp_581">633.8181dp</dimen>
+	<dimen name="dp_582">634.9090dp</dimen>
+	<dimen name="dp_583">635.9999dp</dimen>
+	<dimen name="dp_584">637.0908dp</dimen>
+	<dimen name="dp_585">638.1817dp</dimen>
+	<dimen name="dp_586">639.2726dp</dimen>
+	<dimen name="dp_587">640.3635dp</dimen>
+	<dimen name="dp_588">641.4544dp</dimen>
+	<dimen name="dp_589">642.5453dp</dimen>
+	<dimen name="dp_590">643.6362dp</dimen>
+	<dimen name="dp_591">644.7272dp</dimen>
+	<dimen name="dp_592">645.8181dp</dimen>
+	<dimen name="dp_593">646.9090dp</dimen>
+	<dimen name="dp_594">647.9999dp</dimen>
+	<dimen name="dp_595">649.0908dp</dimen>
+	<dimen name="dp_596">650.1817dp</dimen>
+	<dimen name="dp_597">651.2726dp</dimen>
+	<dimen name="dp_598">652.3635dp</dimen>
+	<dimen name="dp_599">653.4544dp</dimen>
 	<dimen name="dp_600">654.5453dp</dimen>
+	<dimen name="dp_601">655.6362dp</dimen>
+	<dimen name="dp_602">656.7272dp</dimen>
+	<dimen name="dp_603">657.8181dp</dimen>
+	<dimen name="dp_604">658.9090dp</dimen>
+	<dimen name="dp_605">659.9999dp</dimen>
+	<dimen name="dp_606">661.0908dp</dimen>
+	<dimen name="dp_607">662.1817dp</dimen>
+	<dimen name="dp_608">663.2726dp</dimen>
+	<dimen name="dp_609">664.3635dp</dimen>
+	<dimen name="dp_610">665.4544dp</dimen>
+	<dimen name="dp_611">666.5453dp</dimen>
+	<dimen name="dp_612">667.6362dp</dimen>
+	<dimen name="dp_613">668.7271dp</dimen>
+	<dimen name="dp_614">669.8181dp</dimen>
+	<dimen name="dp_615">670.9090dp</dimen>
+	<dimen name="dp_616">671.9999dp</dimen>
+	<dimen name="dp_617">673.0908dp</dimen>
+	<dimen name="dp_618">674.1817dp</dimen>
+	<dimen name="dp_619">675.2726dp</dimen>
+	<dimen name="dp_620">676.3635dp</dimen>
+	<dimen name="dp_621">677.4544dp</dimen>
+	<dimen name="dp_622">678.5453dp</dimen>
+	<dimen name="dp_623">679.6362dp</dimen>
+	<dimen name="dp_624">680.7271dp</dimen>
+	<dimen name="dp_625">681.8181dp</dimen>
+	<dimen name="dp_626">682.9090dp</dimen>
+	<dimen name="dp_627">683.9999dp</dimen>
+	<dimen name="dp_628">685.0908dp</dimen>
+	<dimen name="dp_629">686.1817dp</dimen>
+	<dimen name="dp_630">687.2726dp</dimen>
+	<dimen name="dp_631">688.3635dp</dimen>
+	<dimen name="dp_632">689.4544dp</dimen>
+	<dimen name="dp_633">690.5453dp</dimen>
+	<dimen name="dp_634">691.6362dp</dimen>
+	<dimen name="dp_635">692.7271dp</dimen>
+	<dimen name="dp_636">693.8181dp</dimen>
+	<dimen name="dp_637">694.9090dp</dimen>
+	<dimen name="dp_638">695.9999dp</dimen>
+	<dimen name="dp_639">697.0908dp</dimen>
 	<dimen name="dp_640">698.1817dp</dimen>
-	<dimen name="dp_720">785.4544dp</dimen>
+	<dimen name="dp_641">699.2726dp</dimen>
+	<dimen name="dp_642">700.3635dp</dimen>
+	<dimen name="dp_643">701.4544dp</dimen>
+	<dimen name="dp_644">702.5453dp</dimen>
+	<dimen name="dp_645">703.6362dp</dimen>
+	<dimen name="dp_646">704.7271dp</dimen>
+	<dimen name="dp_647">705.8181dp</dimen>
+	<dimen name="dp_648">706.9090dp</dimen>
+	<dimen name="dp_649">707.9999dp</dimen>
+	<dimen name="dp_650">709.0908dp</dimen>
+	<dimen name="dp_651">710.1817dp</dimen>
+	<dimen name="dp_652">711.2726dp</dimen>
+	<dimen name="dp_653">712.3635dp</dimen>
+	<dimen name="dp_654">713.4544dp</dimen>
+	<dimen name="dp_655">714.5453dp</dimen>
+	<dimen name="dp_656">715.6362dp</dimen>
+	<dimen name="dp_657">716.7271dp</dimen>
+	<dimen name="dp_658">717.8180dp</dimen>
+	<dimen name="dp_659">718.9090dp</dimen>
+	<dimen name="dp_660">719.9999dp</dimen>
+	<dimen name="dp_661">721.0908dp</dimen>
+	<dimen name="dp_662">722.1817dp</dimen>
+	<dimen name="dp_663">723.2726dp</dimen>
+	<dimen name="dp_664">724.3635dp</dimen>
+	<dimen name="dp_665">725.4544dp</dimen>
+	<dimen name="dp_666">726.5453dp</dimen>
+	<dimen name="dp_667">727.6362dp</dimen>
+	<dimen name="dp_668">728.7271dp</dimen>
+	<dimen name="dp_669">729.8180dp</dimen>
+	<dimen name="dp_670">730.9090dp</dimen>
+	<dimen name="dp_671">731.9999dp</dimen>
+	<dimen name="dp_672">733.0908dp</dimen>
+	<dimen name="dp_673">734.1817dp</dimen>
+	<dimen name="dp_674">735.2726dp</dimen>
+	<dimen name="dp_675">736.3635dp</dimen>
+	<dimen name="dp_676">737.4544dp</dimen>
+	<dimen name="dp_677">738.5453dp</dimen>
+	<dimen name="dp_678">739.6362dp</dimen>
+	<dimen name="dp_679">740.7271dp</dimen>
+	<dimen name="dp_680">741.8180dp</dimen>
+	<dimen name="dp_681">742.9090dp</dimen>
+	<dimen name="dp_682">743.9999dp</dimen>
+	<dimen name="dp_683">745.0908dp</dimen>
+	<dimen name="dp_684">746.1817dp</dimen>
+	<dimen name="dp_685">747.2726dp</dimen>
+	<dimen name="dp_686">748.3635dp</dimen>
+	<dimen name="dp_687">749.4544dp</dimen>
+	<dimen name="dp_688">750.5453dp</dimen>
+	<dimen name="dp_689">751.6362dp</dimen>
+	<dimen name="dp_690">752.7271dp</dimen>
+	<dimen name="dp_691">753.8180dp</dimen>
+	<dimen name="dp_692">754.9090dp</dimen>
+	<dimen name="dp_693">755.9999dp</dimen>
+	<dimen name="dp_694">757.0908dp</dimen>
+	<dimen name="dp_695">758.1817dp</dimen>
+	<dimen name="dp_696">759.2726dp</dimen>
+	<dimen name="dp_697">760.3635dp</dimen>
+	<dimen name="dp_698">761.4544dp</dimen>
+	<dimen name="dp_699">762.5453dp</dimen>
+	<dimen name="dp_700">763.6362dp</dimen>
 	<dimen name="sp_1">1.0909sp</dimen>
 	<dimen name="sp_2">2.1818sp</dimen>
 	<dimen name="sp_3">3.2727sp</dimen>
@@ -573,4 +766,54 @@
 	<dimen name="sp_48">52.3636sp</dimen>
 	<dimen name="sp_49">53.4545sp</dimen>
 	<dimen name="sp_50">54.5454sp</dimen>
+	<dimen name="sp_51">55.6364sp</dimen>
+	<dimen name="sp_52">56.7273sp</dimen>
+	<dimen name="sp_53">57.8182sp</dimen>
+	<dimen name="sp_54">58.9091sp</dimen>
+	<dimen name="sp_55">60.0000sp</dimen>
+	<dimen name="sp_56">61.0909sp</dimen>
+	<dimen name="sp_57">62.1818sp</dimen>
+	<dimen name="sp_58">63.2727sp</dimen>
+	<dimen name="sp_59">64.3636sp</dimen>
+	<dimen name="sp_60">65.4545sp</dimen>
+	<dimen name="sp_61">66.5454sp</dimen>
+	<dimen name="sp_62">67.6364sp</dimen>
+	<dimen name="sp_63">68.7273sp</dimen>
+	<dimen name="sp_64">69.8182sp</dimen>
+	<dimen name="sp_65">70.9091sp</dimen>
+	<dimen name="sp_66">72.0000sp</dimen>
+	<dimen name="sp_67">73.0909sp</dimen>
+	<dimen name="sp_68">74.1818sp</dimen>
+	<dimen name="sp_69">75.2727sp</dimen>
+	<dimen name="sp_70">76.3636sp</dimen>
+	<dimen name="sp_71">77.4545sp</dimen>
+	<dimen name="sp_72">78.5454sp</dimen>
+	<dimen name="sp_73">79.6363sp</dimen>
+	<dimen name="sp_74">80.7273sp</dimen>
+	<dimen name="sp_75">81.8182sp</dimen>
+	<dimen name="sp_76">82.9091sp</dimen>
+	<dimen name="sp_77">84.0000sp</dimen>
+	<dimen name="sp_78">85.0909sp</dimen>
+	<dimen name="sp_79">86.1818sp</dimen>
+	<dimen name="sp_80">87.2727sp</dimen>
+	<dimen name="sp_81">88.3636sp</dimen>
+	<dimen name="sp_82">89.4545sp</dimen>
+	<dimen name="sp_83">90.5454sp</dimen>
+	<dimen name="sp_84">91.6363sp</dimen>
+	<dimen name="sp_85">92.7273sp</dimen>
+	<dimen name="sp_86">93.8182sp</dimen>
+	<dimen name="sp_87">94.9091sp</dimen>
+	<dimen name="sp_88">96.0000sp</dimen>
+	<dimen name="sp_89">97.0909sp</dimen>
+	<dimen name="sp_90">98.1818sp</dimen>
+	<dimen name="sp_91">99.2727sp</dimen>
+	<dimen name="sp_92">100.3636sp</dimen>
+	<dimen name="sp_93">101.4545sp</dimen>
+	<dimen name="sp_94">102.5454sp</dimen>
+	<dimen name="sp_95">103.6363sp</dimen>
+	<dimen name="sp_96">104.7273sp</dimen>
+	<dimen name="sp_97">105.8182sp</dimen>
+	<dimen name="sp_98">106.9091sp</dimen>
+	<dimen name="sp_99">108.0000sp</dimen>
+	<dimen name="sp_100">109.0909sp</dimen>
 </resources>
diff --git a/app/src/main/res/values-sw400dp/dimens.xml b/app/src/main/res/values-sw400dp/dimens.xml
index a0dfd31..123bbc8 100644
--- a/app/src/main/res/values-sw400dp/dimens.xml
+++ b/app/src/main/res/values-sw400dp/dimens.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-	<dimen name="activity_horizontal_margin">17.7778dp</dimen>
-	<dimen name="activity_vertical_margin">17.7778dp</dimen>
-	<dimen name="actions_item_font">20.0000sp</dimen>
-	<dimen name="actions_item_drawablePaddding">11.1111dp</dimen>
 	<dimen name="dp_m_60">-66.6667dp</dimen>
 	<dimen name="dp_m_30">-33.3333dp</dimen>
 	<dimen name="dp_m_20">-22.2222dp</dimen>
@@ -520,9 +516,206 @@
 	<dimen name="dp_498">553.3333dp</dimen>
 	<dimen name="dp_499">554.4444dp</dimen>
 	<dimen name="dp_500">555.5556dp</dimen>
+	<dimen name="dp_501">556.6667dp</dimen>
+	<dimen name="dp_502">557.7778dp</dimen>
+	<dimen name="dp_503">558.8889dp</dimen>
+	<dimen name="dp_504">560.0000dp</dimen>
+	<dimen name="dp_505">561.1111dp</dimen>
+	<dimen name="dp_506">562.2222dp</dimen>
+	<dimen name="dp_507">563.3333dp</dimen>
+	<dimen name="dp_508">564.4444dp</dimen>
+	<dimen name="dp_509">565.5556dp</dimen>
+	<dimen name="dp_510">566.6667dp</dimen>
+	<dimen name="dp_511">567.7778dp</dimen>
+	<dimen name="dp_512">568.8889dp</dimen>
+	<dimen name="dp_513">570.0000dp</dimen>
+	<dimen name="dp_514">571.1111dp</dimen>
+	<dimen name="dp_515">572.2222dp</dimen>
+	<dimen name="dp_516">573.3333dp</dimen>
+	<dimen name="dp_517">574.4444dp</dimen>
+	<dimen name="dp_518">575.5556dp</dimen>
+	<dimen name="dp_519">576.6667dp</dimen>
+	<dimen name="dp_520">577.7778dp</dimen>
+	<dimen name="dp_521">578.8889dp</dimen>
+	<dimen name="dp_522">580.0000dp</dimen>
+	<dimen name="dp_523">581.1111dp</dimen>
+	<dimen name="dp_524">582.2222dp</dimen>
+	<dimen name="dp_525">583.3333dp</dimen>
+	<dimen name="dp_526">584.4444dp</dimen>
+	<dimen name="dp_527">585.5556dp</dimen>
+	<dimen name="dp_528">586.6667dp</dimen>
+	<dimen name="dp_529">587.7778dp</dimen>
+	<dimen name="dp_530">588.8889dp</dimen>
+	<dimen name="dp_531">590.0000dp</dimen>
+	<dimen name="dp_532">591.1111dp</dimen>
+	<dimen name="dp_533">592.2222dp</dimen>
+	<dimen name="dp_534">593.3333dp</dimen>
+	<dimen name="dp_535">594.4444dp</dimen>
+	<dimen name="dp_536">595.5556dp</dimen>
+	<dimen name="dp_537">596.6667dp</dimen>
+	<dimen name="dp_538">597.7778dp</dimen>
+	<dimen name="dp_539">598.8889dp</dimen>
+	<dimen name="dp_540">600.0000dp</dimen>
+	<dimen name="dp_541">601.1111dp</dimen>
+	<dimen name="dp_542">602.2222dp</dimen>
+	<dimen name="dp_543">603.3333dp</dimen>
+	<dimen name="dp_544">604.4444dp</dimen>
+	<dimen name="dp_545">605.5556dp</dimen>
+	<dimen name="dp_546">606.6667dp</dimen>
+	<dimen name="dp_547">607.7778dp</dimen>
+	<dimen name="dp_548">608.8889dp</dimen>
+	<dimen name="dp_549">610.0000dp</dimen>
+	<dimen name="dp_550">611.1111dp</dimen>
+	<dimen name="dp_551">612.2222dp</dimen>
+	<dimen name="dp_552">613.3333dp</dimen>
+	<dimen name="dp_553">614.4444dp</dimen>
+	<dimen name="dp_554">615.5556dp</dimen>
+	<dimen name="dp_555">616.6667dp</dimen>
+	<dimen name="dp_556">617.7778dp</dimen>
+	<dimen name="dp_557">618.8889dp</dimen>
+	<dimen name="dp_558">620.0000dp</dimen>
+	<dimen name="dp_559">621.1111dp</dimen>
+	<dimen name="dp_560">622.2222dp</dimen>
+	<dimen name="dp_561">623.3333dp</dimen>
+	<dimen name="dp_562">624.4444dp</dimen>
+	<dimen name="dp_563">625.5556dp</dimen>
+	<dimen name="dp_564">626.6667dp</dimen>
+	<dimen name="dp_565">627.7778dp</dimen>
+	<dimen name="dp_566">628.8889dp</dimen>
+	<dimen name="dp_567">630.0000dp</dimen>
+	<dimen name="dp_568">631.1111dp</dimen>
+	<dimen name="dp_569">632.2222dp</dimen>
+	<dimen name="dp_570">633.3333dp</dimen>
+	<dimen name="dp_571">634.4444dp</dimen>
+	<dimen name="dp_572">635.5556dp</dimen>
+	<dimen name="dp_573">636.6667dp</dimen>
+	<dimen name="dp_574">637.7778dp</dimen>
+	<dimen name="dp_575">638.8889dp</dimen>
+	<dimen name="dp_576">640.0000dp</dimen>
+	<dimen name="dp_577">641.1111dp</dimen>
+	<dimen name="dp_578">642.2222dp</dimen>
+	<dimen name="dp_579">643.3333dp</dimen>
+	<dimen name="dp_580">644.4444dp</dimen>
+	<dimen name="dp_581">645.5556dp</dimen>
+	<dimen name="dp_582">646.6667dp</dimen>
+	<dimen name="dp_583">647.7778dp</dimen>
+	<dimen name="dp_584">648.8889dp</dimen>
+	<dimen name="dp_585">650.0000dp</dimen>
+	<dimen name="dp_586">651.1111dp</dimen>
+	<dimen name="dp_587">652.2222dp</dimen>
+	<dimen name="dp_588">653.3333dp</dimen>
+	<dimen name="dp_589">654.4444dp</dimen>
+	<dimen name="dp_590">655.5556dp</dimen>
+	<dimen name="dp_591">656.6667dp</dimen>
+	<dimen name="dp_592">657.7778dp</dimen>
+	<dimen name="dp_593">658.8889dp</dimen>
+	<dimen name="dp_594">660.0000dp</dimen>
+	<dimen name="dp_595">661.1111dp</dimen>
+	<dimen name="dp_596">662.2222dp</dimen>
+	<dimen name="dp_597">663.3333dp</dimen>
+	<dimen name="dp_598">664.4444dp</dimen>
+	<dimen name="dp_599">665.5556dp</dimen>
 	<dimen name="dp_600">666.6667dp</dimen>
+	<dimen name="dp_601">667.7778dp</dimen>
+	<dimen name="dp_602">668.8889dp</dimen>
+	<dimen name="dp_603">670.0000dp</dimen>
+	<dimen name="dp_604">671.1111dp</dimen>
+	<dimen name="dp_605">672.2222dp</dimen>
+	<dimen name="dp_606">673.3333dp</dimen>
+	<dimen name="dp_607">674.4444dp</dimen>
+	<dimen name="dp_608">675.5556dp</dimen>
+	<dimen name="dp_609">676.6667dp</dimen>
+	<dimen name="dp_610">677.7778dp</dimen>
+	<dimen name="dp_611">678.8889dp</dimen>
+	<dimen name="dp_612">680.0000dp</dimen>
+	<dimen name="dp_613">681.1111dp</dimen>
+	<dimen name="dp_614">682.2222dp</dimen>
+	<dimen name="dp_615">683.3333dp</dimen>
+	<dimen name="dp_616">684.4444dp</dimen>
+	<dimen name="dp_617">685.5556dp</dimen>
+	<dimen name="dp_618">686.6667dp</dimen>
+	<dimen name="dp_619">687.7778dp</dimen>
+	<dimen name="dp_620">688.8889dp</dimen>
+	<dimen name="dp_621">690.0000dp</dimen>
+	<dimen name="dp_622">691.1111dp</dimen>
+	<dimen name="dp_623">692.2222dp</dimen>
+	<dimen name="dp_624">693.3333dp</dimen>
+	<dimen name="dp_625">694.4444dp</dimen>
+	<dimen name="dp_626">695.5556dp</dimen>
+	<dimen name="dp_627">696.6667dp</dimen>
+	<dimen name="dp_628">697.7778dp</dimen>
+	<dimen name="dp_629">698.8889dp</dimen>
+	<dimen name="dp_630">700.0000dp</dimen>
+	<dimen name="dp_631">701.1111dp</dimen>
+	<dimen name="dp_632">702.2222dp</dimen>
+	<dimen name="dp_633">703.3333dp</dimen>
+	<dimen name="dp_634">704.4444dp</dimen>
+	<dimen name="dp_635">705.5556dp</dimen>
+	<dimen name="dp_636">706.6667dp</dimen>
+	<dimen name="dp_637">707.7778dp</dimen>
+	<dimen name="dp_638">708.8889dp</dimen>
+	<dimen name="dp_639">710.0000dp</dimen>
 	<dimen name="dp_640">711.1111dp</dimen>
-	<dimen name="dp_720">800.0000dp</dimen>
+	<dimen name="dp_641">712.2222dp</dimen>
+	<dimen name="dp_642">713.3333dp</dimen>
+	<dimen name="dp_643">714.4444dp</dimen>
+	<dimen name="dp_644">715.5556dp</dimen>
+	<dimen name="dp_645">716.6667dp</dimen>
+	<dimen name="dp_646">717.7778dp</dimen>
+	<dimen name="dp_647">718.8889dp</dimen>
+	<dimen name="dp_648">720.0000dp</dimen>
+	<dimen name="dp_649">721.1111dp</dimen>
+	<dimen name="dp_650">722.2222dp</dimen>
+	<dimen name="dp_651">723.3333dp</dimen>
+	<dimen name="dp_652">724.4444dp</dimen>
+	<dimen name="dp_653">725.5556dp</dimen>
+	<dimen name="dp_654">726.6667dp</dimen>
+	<dimen name="dp_655">727.7778dp</dimen>
+	<dimen name="dp_656">728.8889dp</dimen>
+	<dimen name="dp_657">730.0000dp</dimen>
+	<dimen name="dp_658">731.1111dp</dimen>
+	<dimen name="dp_659">732.2222dp</dimen>
+	<dimen name="dp_660">733.3333dp</dimen>
+	<dimen name="dp_661">734.4444dp</dimen>
+	<dimen name="dp_662">735.5556dp</dimen>
+	<dimen name="dp_663">736.6667dp</dimen>
+	<dimen name="dp_664">737.7778dp</dimen>
+	<dimen name="dp_665">738.8889dp</dimen>
+	<dimen name="dp_666">740.0000dp</dimen>
+	<dimen name="dp_667">741.1111dp</dimen>
+	<dimen name="dp_668">742.2222dp</dimen>
+	<dimen name="dp_669">743.3333dp</dimen>
+	<dimen name="dp_670">744.4444dp</dimen>
+	<dimen name="dp_671">745.5556dp</dimen>
+	<dimen name="dp_672">746.6667dp</dimen>
+	<dimen name="dp_673">747.7778dp</dimen>
+	<dimen name="dp_674">748.8889dp</dimen>
+	<dimen name="dp_675">750.0000dp</dimen>
+	<dimen name="dp_676">751.1111dp</dimen>
+	<dimen name="dp_677">752.2222dp</dimen>
+	<dimen name="dp_678">753.3333dp</dimen>
+	<dimen name="dp_679">754.4444dp</dimen>
+	<dimen name="dp_680">755.5556dp</dimen>
+	<dimen name="dp_681">756.6667dp</dimen>
+	<dimen name="dp_682">757.7778dp</dimen>
+	<dimen name="dp_683">758.8889dp</dimen>
+	<dimen name="dp_684">760.0000dp</dimen>
+	<dimen name="dp_685">761.1111dp</dimen>
+	<dimen name="dp_686">762.2222dp</dimen>
+	<dimen name="dp_687">763.3333dp</dimen>
+	<dimen name="dp_688">764.4444dp</dimen>
+	<dimen name="dp_689">765.5556dp</dimen>
+	<dimen name="dp_690">766.6667dp</dimen>
+	<dimen name="dp_691">767.7778dp</dimen>
+	<dimen name="dp_692">768.8889dp</dimen>
+	<dimen name="dp_693">770.0000dp</dimen>
+	<dimen name="dp_694">771.1111dp</dimen>
+	<dimen name="dp_695">772.2222dp</dimen>
+	<dimen name="dp_696">773.3333dp</dimen>
+	<dimen name="dp_697">774.4444dp</dimen>
+	<dimen name="dp_698">775.5556dp</dimen>
+	<dimen name="dp_699">776.6667dp</dimen>
+	<dimen name="dp_700">777.7778dp</dimen>
 	<dimen name="sp_1">1.1111sp</dimen>
 	<dimen name="sp_2">2.2222sp</dimen>
 	<dimen name="sp_3">3.3333sp</dimen>
@@ -573,4 +766,54 @@
 	<dimen name="sp_48">53.3333sp</dimen>
 	<dimen name="sp_49">54.4444sp</dimen>
 	<dimen name="sp_50">55.5556sp</dimen>
+	<dimen name="sp_51">56.6667sp</dimen>
+	<dimen name="sp_52">57.7778sp</dimen>
+	<dimen name="sp_53">58.8889sp</dimen>
+	<dimen name="sp_54">60.0000sp</dimen>
+	<dimen name="sp_55">61.1111sp</dimen>
+	<dimen name="sp_56">62.2222sp</dimen>
+	<dimen name="sp_57">63.3333sp</dimen>
+	<dimen name="sp_58">64.4444sp</dimen>
+	<dimen name="sp_59">65.5556sp</dimen>
+	<dimen name="sp_60">66.6667sp</dimen>
+	<dimen name="sp_61">67.7778sp</dimen>
+	<dimen name="sp_62">68.8889sp</dimen>
+	<dimen name="sp_63">70.0000sp</dimen>
+	<dimen name="sp_64">71.1111sp</dimen>
+	<dimen name="sp_65">72.2222sp</dimen>
+	<dimen name="sp_66">73.3333sp</dimen>
+	<dimen name="sp_67">74.4444sp</dimen>
+	<dimen name="sp_68">75.5556sp</dimen>
+	<dimen name="sp_69">76.6667sp</dimen>
+	<dimen name="sp_70">77.7778sp</dimen>
+	<dimen name="sp_71">78.8889sp</dimen>
+	<dimen name="sp_72">80.0000sp</dimen>
+	<dimen name="sp_73">81.1111sp</dimen>
+	<dimen name="sp_74">82.2222sp</dimen>
+	<dimen name="sp_75">83.3333sp</dimen>
+	<dimen name="sp_76">84.4444sp</dimen>
+	<dimen name="sp_77">85.5556sp</dimen>
+	<dimen name="sp_78">86.6667sp</dimen>
+	<dimen name="sp_79">87.7778sp</dimen>
+	<dimen name="sp_80">88.8889sp</dimen>
+	<dimen name="sp_81">90.0000sp</dimen>
+	<dimen name="sp_82">91.1111sp</dimen>
+	<dimen name="sp_83">92.2222sp</dimen>
+	<dimen name="sp_84">93.3333sp</dimen>
+	<dimen name="sp_85">94.4444sp</dimen>
+	<dimen name="sp_86">95.5556sp</dimen>
+	<dimen name="sp_87">96.6667sp</dimen>
+	<dimen name="sp_88">97.7778sp</dimen>
+	<dimen name="sp_89">98.8889sp</dimen>
+	<dimen name="sp_90">100.0000sp</dimen>
+	<dimen name="sp_91">101.1111sp</dimen>
+	<dimen name="sp_92">102.2222sp</dimen>
+	<dimen name="sp_93">103.3333sp</dimen>
+	<dimen name="sp_94">104.4444sp</dimen>
+	<dimen name="sp_95">105.5556sp</dimen>
+	<dimen name="sp_96">106.6667sp</dimen>
+	<dimen name="sp_97">107.7778sp</dimen>
+	<dimen name="sp_98">108.8889sp</dimen>
+	<dimen name="sp_99">110.0000sp</dimen>
+	<dimen name="sp_100">111.1111sp</dimen>
 </resources>
diff --git a/app/src/main/res/values-sw410dp/dimens.xml b/app/src/main/res/values-sw410dp/dimens.xml
index b0fc5ea..df5f8a7 100644
--- a/app/src/main/res/values-sw410dp/dimens.xml
+++ b/app/src/main/res/values-sw410dp/dimens.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-	<dimen name="activity_horizontal_margin">18.2222dp</dimen>
-	<dimen name="activity_vertical_margin">18.2222dp</dimen>
-	<dimen name="actions_item_font">20.5000sp</dimen>
-	<dimen name="actions_item_drawablePaddding">11.3889dp</dimen>
 	<dimen name="dp_m_60">-68.3333dp</dimen>
 	<dimen name="dp_m_30">-34.1667dp</dimen>
 	<dimen name="dp_m_20">-22.7778dp</dimen>
@@ -520,9 +516,206 @@
 	<dimen name="dp_498">567.1667dp</dimen>
 	<dimen name="dp_499">568.3056dp</dimen>
 	<dimen name="dp_500">569.4444dp</dimen>
+	<dimen name="dp_501">570.5833dp</dimen>
+	<dimen name="dp_502">571.7222dp</dimen>
+	<dimen name="dp_503">572.8611dp</dimen>
+	<dimen name="dp_504">574.0000dp</dimen>
+	<dimen name="dp_505">575.1389dp</dimen>
+	<dimen name="dp_506">576.2778dp</dimen>
+	<dimen name="dp_507">577.4167dp</dimen>
+	<dimen name="dp_508">578.5556dp</dimen>
+	<dimen name="dp_509">579.6944dp</dimen>
+	<dimen name="dp_510">580.8333dp</dimen>
+	<dimen name="dp_511">581.9722dp</dimen>
+	<dimen name="dp_512">583.1111dp</dimen>
+	<dimen name="dp_513">584.2500dp</dimen>
+	<dimen name="dp_514">585.3889dp</dimen>
+	<dimen name="dp_515">586.5278dp</dimen>
+	<dimen name="dp_516">587.6667dp</dimen>
+	<dimen name="dp_517">588.8056dp</dimen>
+	<dimen name="dp_518">589.9444dp</dimen>
+	<dimen name="dp_519">591.0833dp</dimen>
+	<dimen name="dp_520">592.2222dp</dimen>
+	<dimen name="dp_521">593.3611dp</dimen>
+	<dimen name="dp_522">594.5000dp</dimen>
+	<dimen name="dp_523">595.6389dp</dimen>
+	<dimen name="dp_524">596.7778dp</dimen>
+	<dimen name="dp_525">597.9167dp</dimen>
+	<dimen name="dp_526">599.0556dp</dimen>
+	<dimen name="dp_527">600.1944dp</dimen>
+	<dimen name="dp_528">601.3333dp</dimen>
+	<dimen name="dp_529">602.4722dp</dimen>
+	<dimen name="dp_530">603.6111dp</dimen>
+	<dimen name="dp_531">604.7500dp</dimen>
+	<dimen name="dp_532">605.8889dp</dimen>
+	<dimen name="dp_533">607.0278dp</dimen>
+	<dimen name="dp_534">608.1667dp</dimen>
+	<dimen name="dp_535">609.3056dp</dimen>
+	<dimen name="dp_536">610.4444dp</dimen>
+	<dimen name="dp_537">611.5833dp</dimen>
+	<dimen name="dp_538">612.7222dp</dimen>
+	<dimen name="dp_539">613.8611dp</dimen>
+	<dimen name="dp_540">615.0000dp</dimen>
+	<dimen name="dp_541">616.1389dp</dimen>
+	<dimen name="dp_542">617.2778dp</dimen>
+	<dimen name="dp_543">618.4167dp</dimen>
+	<dimen name="dp_544">619.5556dp</dimen>
+	<dimen name="dp_545">620.6944dp</dimen>
+	<dimen name="dp_546">621.8333dp</dimen>
+	<dimen name="dp_547">622.9722dp</dimen>
+	<dimen name="dp_548">624.1111dp</dimen>
+	<dimen name="dp_549">625.2500dp</dimen>
+	<dimen name="dp_550">626.3889dp</dimen>
+	<dimen name="dp_551">627.5278dp</dimen>
+	<dimen name="dp_552">628.6667dp</dimen>
+	<dimen name="dp_553">629.8056dp</dimen>
+	<dimen name="dp_554">630.9444dp</dimen>
+	<dimen name="dp_555">632.0833dp</dimen>
+	<dimen name="dp_556">633.2222dp</dimen>
+	<dimen name="dp_557">634.3611dp</dimen>
+	<dimen name="dp_558">635.5000dp</dimen>
+	<dimen name="dp_559">636.6389dp</dimen>
+	<dimen name="dp_560">637.7778dp</dimen>
+	<dimen name="dp_561">638.9167dp</dimen>
+	<dimen name="dp_562">640.0556dp</dimen>
+	<dimen name="dp_563">641.1944dp</dimen>
+	<dimen name="dp_564">642.3333dp</dimen>
+	<dimen name="dp_565">643.4722dp</dimen>
+	<dimen name="dp_566">644.6111dp</dimen>
+	<dimen name="dp_567">645.7500dp</dimen>
+	<dimen name="dp_568">646.8889dp</dimen>
+	<dimen name="dp_569">648.0278dp</dimen>
+	<dimen name="dp_570">649.1667dp</dimen>
+	<dimen name="dp_571">650.3056dp</dimen>
+	<dimen name="dp_572">651.4444dp</dimen>
+	<dimen name="dp_573">652.5833dp</dimen>
+	<dimen name="dp_574">653.7222dp</dimen>
+	<dimen name="dp_575">654.8611dp</dimen>
+	<dimen name="dp_576">656.0000dp</dimen>
+	<dimen name="dp_577">657.1389dp</dimen>
+	<dimen name="dp_578">658.2778dp</dimen>
+	<dimen name="dp_579">659.4167dp</dimen>
+	<dimen name="dp_580">660.5556dp</dimen>
+	<dimen name="dp_581">661.6944dp</dimen>
+	<dimen name="dp_582">662.8333dp</dimen>
+	<dimen name="dp_583">663.9722dp</dimen>
+	<dimen name="dp_584">665.1111dp</dimen>
+	<dimen name="dp_585">666.2500dp</dimen>
+	<dimen name="dp_586">667.3889dp</dimen>
+	<dimen name="dp_587">668.5278dp</dimen>
+	<dimen name="dp_588">669.6667dp</dimen>
+	<dimen name="dp_589">670.8056dp</dimen>
+	<dimen name="dp_590">671.9444dp</dimen>
+	<dimen name="dp_591">673.0833dp</dimen>
+	<dimen name="dp_592">674.2222dp</dimen>
+	<dimen name="dp_593">675.3611dp</dimen>
+	<dimen name="dp_594">676.5000dp</dimen>
+	<dimen name="dp_595">677.6389dp</dimen>
+	<dimen name="dp_596">678.7778dp</dimen>
+	<dimen name="dp_597">679.9167dp</dimen>
+	<dimen name="dp_598">681.0556dp</dimen>
+	<dimen name="dp_599">682.1944dp</dimen>
 	<dimen name="dp_600">683.3333dp</dimen>
+	<dimen name="dp_601">684.4722dp</dimen>
+	<dimen name="dp_602">685.6111dp</dimen>
+	<dimen name="dp_603">686.7500dp</dimen>
+	<dimen name="dp_604">687.8889dp</dimen>
+	<dimen name="dp_605">689.0278dp</dimen>
+	<dimen name="dp_606">690.1667dp</dimen>
+	<dimen name="dp_607">691.3056dp</dimen>
+	<dimen name="dp_608">692.4444dp</dimen>
+	<dimen name="dp_609">693.5833dp</dimen>
+	<dimen name="dp_610">694.7222dp</dimen>
+	<dimen name="dp_611">695.8611dp</dimen>
+	<dimen name="dp_612">697.0000dp</dimen>
+	<dimen name="dp_613">698.1389dp</dimen>
+	<dimen name="dp_614">699.2778dp</dimen>
+	<dimen name="dp_615">700.4167dp</dimen>
+	<dimen name="dp_616">701.5556dp</dimen>
+	<dimen name="dp_617">702.6944dp</dimen>
+	<dimen name="dp_618">703.8333dp</dimen>
+	<dimen name="dp_619">704.9722dp</dimen>
+	<dimen name="dp_620">706.1111dp</dimen>
+	<dimen name="dp_621">707.2500dp</dimen>
+	<dimen name="dp_622">708.3889dp</dimen>
+	<dimen name="dp_623">709.5278dp</dimen>
+	<dimen name="dp_624">710.6667dp</dimen>
+	<dimen name="dp_625">711.8056dp</dimen>
+	<dimen name="dp_626">712.9444dp</dimen>
+	<dimen name="dp_627">714.0833dp</dimen>
+	<dimen name="dp_628">715.2222dp</dimen>
+	<dimen name="dp_629">716.3611dp</dimen>
+	<dimen name="dp_630">717.5000dp</dimen>
+	<dimen name="dp_631">718.6389dp</dimen>
+	<dimen name="dp_632">719.7778dp</dimen>
+	<dimen name="dp_633">720.9167dp</dimen>
+	<dimen name="dp_634">722.0556dp</dimen>
+	<dimen name="dp_635">723.1944dp</dimen>
+	<dimen name="dp_636">724.3333dp</dimen>
+	<dimen name="dp_637">725.4722dp</dimen>
+	<dimen name="dp_638">726.6111dp</dimen>
+	<dimen name="dp_639">727.7500dp</dimen>
 	<dimen name="dp_640">728.8889dp</dimen>
-	<dimen name="dp_720">820.0000dp</dimen>
+	<dimen name="dp_641">730.0278dp</dimen>
+	<dimen name="dp_642">731.1667dp</dimen>
+	<dimen name="dp_643">732.3056dp</dimen>
+	<dimen name="dp_644">733.4444dp</dimen>
+	<dimen name="dp_645">734.5833dp</dimen>
+	<dimen name="dp_646">735.7222dp</dimen>
+	<dimen name="dp_647">736.8611dp</dimen>
+	<dimen name="dp_648">738.0000dp</dimen>
+	<dimen name="dp_649">739.1389dp</dimen>
+	<dimen name="dp_650">740.2778dp</dimen>
+	<dimen name="dp_651">741.4167dp</dimen>
+	<dimen name="dp_652">742.5556dp</dimen>
+	<dimen name="dp_653">743.6944dp</dimen>
+	<dimen name="dp_654">744.8333dp</dimen>
+	<dimen name="dp_655">745.9722dp</dimen>
+	<dimen name="dp_656">747.1111dp</dimen>
+	<dimen name="dp_657">748.2500dp</dimen>
+	<dimen name="dp_658">749.3889dp</dimen>
+	<dimen name="dp_659">750.5278dp</dimen>
+	<dimen name="dp_660">751.6667dp</dimen>
+	<dimen name="dp_661">752.8056dp</dimen>
+	<dimen name="dp_662">753.9444dp</dimen>
+	<dimen name="dp_663">755.0833dp</dimen>
+	<dimen name="dp_664">756.2222dp</dimen>
+	<dimen name="dp_665">757.3611dp</dimen>
+	<dimen name="dp_666">758.5000dp</dimen>
+	<dimen name="dp_667">759.6389dp</dimen>
+	<dimen name="dp_668">760.7778dp</dimen>
+	<dimen name="dp_669">761.9167dp</dimen>
+	<dimen name="dp_670">763.0556dp</dimen>
+	<dimen name="dp_671">764.1944dp</dimen>
+	<dimen name="dp_672">765.3333dp</dimen>
+	<dimen name="dp_673">766.4722dp</dimen>
+	<dimen name="dp_674">767.6111dp</dimen>
+	<dimen name="dp_675">768.7500dp</dimen>
+	<dimen name="dp_676">769.8889dp</dimen>
+	<dimen name="dp_677">771.0278dp</dimen>
+	<dimen name="dp_678">772.1667dp</dimen>
+	<dimen name="dp_679">773.3056dp</dimen>
+	<dimen name="dp_680">774.4444dp</dimen>
+	<dimen name="dp_681">775.5833dp</dimen>
+	<dimen name="dp_682">776.7222dp</dimen>
+	<dimen name="dp_683">777.8611dp</dimen>
+	<dimen name="dp_684">779.0000dp</dimen>
+	<dimen name="dp_685">780.1389dp</dimen>
+	<dimen name="dp_686">781.2778dp</dimen>
+	<dimen name="dp_687">782.4167dp</dimen>
+	<dimen name="dp_688">783.5556dp</dimen>
+	<dimen name="dp_689">784.6944dp</dimen>
+	<dimen name="dp_690">785.8333dp</dimen>
+	<dimen name="dp_691">786.9722dp</dimen>
+	<dimen name="dp_692">788.1111dp</dimen>
+	<dimen name="dp_693">789.2500dp</dimen>
+	<dimen name="dp_694">790.3889dp</dimen>
+	<dimen name="dp_695">791.5278dp</dimen>
+	<dimen name="dp_696">792.6667dp</dimen>
+	<dimen name="dp_697">793.8056dp</dimen>
+	<dimen name="dp_698">794.9444dp</dimen>
+	<dimen name="dp_699">796.0833dp</dimen>
+	<dimen name="dp_700">797.2222dp</dimen>
 	<dimen name="sp_1">1.1389sp</dimen>
 	<dimen name="sp_2">2.2778sp</dimen>
 	<dimen name="sp_3">3.4167sp</dimen>
@@ -573,4 +766,54 @@
 	<dimen name="sp_48">54.6667sp</dimen>
 	<dimen name="sp_49">55.8056sp</dimen>
 	<dimen name="sp_50">56.9444sp</dimen>
+	<dimen name="sp_51">58.0833sp</dimen>
+	<dimen name="sp_52">59.2222sp</dimen>
+	<dimen name="sp_53">60.3611sp</dimen>
+	<dimen name="sp_54">61.5000sp</dimen>
+	<dimen name="sp_55">62.6389sp</dimen>
+	<dimen name="sp_56">63.7778sp</dimen>
+	<dimen name="sp_57">64.9167sp</dimen>
+	<dimen name="sp_58">66.0556sp</dimen>
+	<dimen name="sp_59">67.1944sp</dimen>
+	<dimen name="sp_60">68.3333sp</dimen>
+	<dimen name="sp_61">69.4722sp</dimen>
+	<dimen name="sp_62">70.6111sp</dimen>
+	<dimen name="sp_63">71.7500sp</dimen>
+	<dimen name="sp_64">72.8889sp</dimen>
+	<dimen name="sp_65">74.0278sp</dimen>
+	<dimen name="sp_66">75.1667sp</dimen>
+	<dimen name="sp_67">76.3056sp</dimen>
+	<dimen name="sp_68">77.4444sp</dimen>
+	<dimen name="sp_69">78.5833sp</dimen>
+	<dimen name="sp_70">79.7222sp</dimen>
+	<dimen name="sp_71">80.8611sp</dimen>
+	<dimen name="sp_72">82.0000sp</dimen>
+	<dimen name="sp_73">83.1389sp</dimen>
+	<dimen name="sp_74">84.2778sp</dimen>
+	<dimen name="sp_75">85.4167sp</dimen>
+	<dimen name="sp_76">86.5556sp</dimen>
+	<dimen name="sp_77">87.6944sp</dimen>
+	<dimen name="sp_78">88.8333sp</dimen>
+	<dimen name="sp_79">89.9722sp</dimen>
+	<dimen name="sp_80">91.1111sp</dimen>
+	<dimen name="sp_81">92.2500sp</dimen>
+	<dimen name="sp_82">93.3889sp</dimen>
+	<dimen name="sp_83">94.5278sp</dimen>
+	<dimen name="sp_84">95.6667sp</dimen>
+	<dimen name="sp_85">96.8056sp</dimen>
+	<dimen name="sp_86">97.9444sp</dimen>
+	<dimen name="sp_87">99.0833sp</dimen>
+	<dimen name="sp_88">100.2222sp</dimen>
+	<dimen name="sp_89">101.3611sp</dimen>
+	<dimen name="sp_90">102.5000sp</dimen>
+	<dimen name="sp_91">103.6389sp</dimen>
+	<dimen name="sp_92">104.7778sp</dimen>
+	<dimen name="sp_93">105.9167sp</dimen>
+	<dimen name="sp_94">107.0556sp</dimen>
+	<dimen name="sp_95">108.1944sp</dimen>
+	<dimen name="sp_96">109.3333sp</dimen>
+	<dimen name="sp_97">110.4722sp</dimen>
+	<dimen name="sp_98">111.6111sp</dimen>
+	<dimen name="sp_99">112.7500sp</dimen>
+	<dimen name="sp_100">113.8889sp</dimen>
 </resources>
diff --git a/app/src/main/res/values-sw411dp/dimens.xml b/app/src/main/res/values-sw411dp/dimens.xml
index fa6ffee..ac02dab 100644
--- a/app/src/main/res/values-sw411dp/dimens.xml
+++ b/app/src/main/res/values-sw411dp/dimens.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-	<dimen name="activity_horizontal_margin">18.2857dp</dimen>
-	<dimen name="activity_vertical_margin">18.2857dp</dimen>
-	<dimen name="actions_item_font">20.5714sp</dimen>
-	<dimen name="actions_item_drawablePaddding">11.4286dp</dimen>
 	<dimen name="dp_m_60">-68.5714dp</dimen>
 	<dimen name="dp_m_30">-34.2857dp</dimen>
 	<dimen name="dp_m_20">-22.8571dp</dimen>
@@ -520,9 +516,206 @@
 	<dimen name="dp_498">569.1428dp</dimen>
 	<dimen name="dp_499">570.2856dp</dimen>
 	<dimen name="dp_500">571.4285dp</dimen>
+	<dimen name="dp_501">572.5713dp</dimen>
+	<dimen name="dp_502">573.7142dp</dimen>
+	<dimen name="dp_503">574.8570dp</dimen>
+	<dimen name="dp_504">575.9999dp</dimen>
+	<dimen name="dp_505">577.1428dp</dimen>
+	<dimen name="dp_506">578.2856dp</dimen>
+	<dimen name="dp_507">579.4285dp</dimen>
+	<dimen name="dp_508">580.5713dp</dimen>
+	<dimen name="dp_509">581.7142dp</dimen>
+	<dimen name="dp_510">582.8570dp</dimen>
+	<dimen name="dp_511">583.9999dp</dimen>
+	<dimen name="dp_512">585.1428dp</dimen>
+	<dimen name="dp_513">586.2856dp</dimen>
+	<dimen name="dp_514">587.4285dp</dimen>
+	<dimen name="dp_515">588.5713dp</dimen>
+	<dimen name="dp_516">589.7142dp</dimen>
+	<dimen name="dp_517">590.8570dp</dimen>
+	<dimen name="dp_518">591.9999dp</dimen>
+	<dimen name="dp_519">593.1428dp</dimen>
+	<dimen name="dp_520">594.2856dp</dimen>
+	<dimen name="dp_521">595.4285dp</dimen>
+	<dimen name="dp_522">596.5713dp</dimen>
+	<dimen name="dp_523">597.7142dp</dimen>
+	<dimen name="dp_524">598.8570dp</dimen>
+	<dimen name="dp_525">599.9999dp</dimen>
+	<dimen name="dp_526">601.1428dp</dimen>
+	<dimen name="dp_527">602.2856dp</dimen>
+	<dimen name="dp_528">603.4285dp</dimen>
+	<dimen name="dp_529">604.5713dp</dimen>
+	<dimen name="dp_530">605.7142dp</dimen>
+	<dimen name="dp_531">606.8570dp</dimen>
+	<dimen name="dp_532">607.9999dp</dimen>
+	<dimen name="dp_533">609.1428dp</dimen>
+	<dimen name="dp_534">610.2856dp</dimen>
+	<dimen name="dp_535">611.4285dp</dimen>
+	<dimen name="dp_536">612.5713dp</dimen>
+	<dimen name="dp_537">613.7142dp</dimen>
+	<dimen name="dp_538">614.8570dp</dimen>
+	<dimen name="dp_539">615.9999dp</dimen>
+	<dimen name="dp_540">617.1427dp</dimen>
+	<dimen name="dp_541">618.2856dp</dimen>
+	<dimen name="dp_542">619.4285dp</dimen>
+	<dimen name="dp_543">620.5713dp</dimen>
+	<dimen name="dp_544">621.7142dp</dimen>
+	<dimen name="dp_545">622.8570dp</dimen>
+	<dimen name="dp_546">623.9999dp</dimen>
+	<dimen name="dp_547">625.1427dp</dimen>
+	<dimen name="dp_548">626.2856dp</dimen>
+	<dimen name="dp_549">627.4285dp</dimen>
+	<dimen name="dp_550">628.5713dp</dimen>
+	<dimen name="dp_551">629.7142dp</dimen>
+	<dimen name="dp_552">630.8570dp</dimen>
+	<dimen name="dp_553">631.9999dp</dimen>
+	<dimen name="dp_554">633.1427dp</dimen>
+	<dimen name="dp_555">634.2856dp</dimen>
+	<dimen name="dp_556">635.4285dp</dimen>
+	<dimen name="dp_557">636.5713dp</dimen>
+	<dimen name="dp_558">637.7142dp</dimen>
+	<dimen name="dp_559">638.8570dp</dimen>
+	<dimen name="dp_560">639.9999dp</dimen>
+	<dimen name="dp_561">641.1427dp</dimen>
+	<dimen name="dp_562">642.2856dp</dimen>
+	<dimen name="dp_563">643.4285dp</dimen>
+	<dimen name="dp_564">644.5713dp</dimen>
+	<dimen name="dp_565">645.7142dp</dimen>
+	<dimen name="dp_566">646.8570dp</dimen>
+	<dimen name="dp_567">647.9999dp</dimen>
+	<dimen name="dp_568">649.1427dp</dimen>
+	<dimen name="dp_569">650.2856dp</dimen>
+	<dimen name="dp_570">651.4285dp</dimen>
+	<dimen name="dp_571">652.5713dp</dimen>
+	<dimen name="dp_572">653.7142dp</dimen>
+	<dimen name="dp_573">654.8570dp</dimen>
+	<dimen name="dp_574">655.9999dp</dimen>
+	<dimen name="dp_575">657.1427dp</dimen>
+	<dimen name="dp_576">658.2856dp</dimen>
+	<dimen name="dp_577">659.4285dp</dimen>
+	<dimen name="dp_578">660.5713dp</dimen>
+	<dimen name="dp_579">661.7142dp</dimen>
+	<dimen name="dp_580">662.8570dp</dimen>
+	<dimen name="dp_581">663.9999dp</dimen>
+	<dimen name="dp_582">665.1427dp</dimen>
+	<dimen name="dp_583">666.2856dp</dimen>
+	<dimen name="dp_584">667.4285dp</dimen>
+	<dimen name="dp_585">668.5713dp</dimen>
+	<dimen name="dp_586">669.7142dp</dimen>
+	<dimen name="dp_587">670.8570dp</dimen>
+	<dimen name="dp_588">671.9999dp</dimen>
+	<dimen name="dp_589">673.1427dp</dimen>
+	<dimen name="dp_590">674.2856dp</dimen>
+	<dimen name="dp_591">675.4285dp</dimen>
+	<dimen name="dp_592">676.5713dp</dimen>
+	<dimen name="dp_593">677.7142dp</dimen>
+	<dimen name="dp_594">678.8570dp</dimen>
+	<dimen name="dp_595">679.9999dp</dimen>
+	<dimen name="dp_596">681.1427dp</dimen>
+	<dimen name="dp_597">682.2856dp</dimen>
+	<dimen name="dp_598">683.4285dp</dimen>
+	<dimen name="dp_599">684.5713dp</dimen>
 	<dimen name="dp_600">685.7142dp</dimen>
+	<dimen name="dp_601">686.8570dp</dimen>
+	<dimen name="dp_602">687.9999dp</dimen>
+	<dimen name="dp_603">689.1427dp</dimen>
+	<dimen name="dp_604">690.2856dp</dimen>
+	<dimen name="dp_605">691.4285dp</dimen>
+	<dimen name="dp_606">692.5713dp</dimen>
+	<dimen name="dp_607">693.7142dp</dimen>
+	<dimen name="dp_608">694.8570dp</dimen>
+	<dimen name="dp_609">695.9999dp</dimen>
+	<dimen name="dp_610">697.1427dp</dimen>
+	<dimen name="dp_611">698.2856dp</dimen>
+	<dimen name="dp_612">699.4284dp</dimen>
+	<dimen name="dp_613">700.5713dp</dimen>
+	<dimen name="dp_614">701.7142dp</dimen>
+	<dimen name="dp_615">702.8570dp</dimen>
+	<dimen name="dp_616">703.9999dp</dimen>
+	<dimen name="dp_617">705.1427dp</dimen>
+	<dimen name="dp_618">706.2856dp</dimen>
+	<dimen name="dp_619">707.4284dp</dimen>
+	<dimen name="dp_620">708.5713dp</dimen>
+	<dimen name="dp_621">709.7142dp</dimen>
+	<dimen name="dp_622">710.8570dp</dimen>
+	<dimen name="dp_623">711.9999dp</dimen>
+	<dimen name="dp_624">713.1427dp</dimen>
+	<dimen name="dp_625">714.2856dp</dimen>
+	<dimen name="dp_626">715.4284dp</dimen>
+	<dimen name="dp_627">716.5713dp</dimen>
+	<dimen name="dp_628">717.7142dp</dimen>
+	<dimen name="dp_629">718.8570dp</dimen>
+	<dimen name="dp_630">719.9999dp</dimen>
+	<dimen name="dp_631">721.1427dp</dimen>
+	<dimen name="dp_632">722.2856dp</dimen>
+	<dimen name="dp_633">723.4284dp</dimen>
+	<dimen name="dp_634">724.5713dp</dimen>
+	<dimen name="dp_635">725.7142dp</dimen>
+	<dimen name="dp_636">726.8570dp</dimen>
+	<dimen name="dp_637">727.9999dp</dimen>
+	<dimen name="dp_638">729.1427dp</dimen>
+	<dimen name="dp_639">730.2856dp</dimen>
 	<dimen name="dp_640">731.4284dp</dimen>
-	<dimen name="dp_720">822.8570dp</dimen>
+	<dimen name="dp_641">732.5713dp</dimen>
+	<dimen name="dp_642">733.7142dp</dimen>
+	<dimen name="dp_643">734.8570dp</dimen>
+	<dimen name="dp_644">735.9999dp</dimen>
+	<dimen name="dp_645">737.1427dp</dimen>
+	<dimen name="dp_646">738.2856dp</dimen>
+	<dimen name="dp_647">739.4284dp</dimen>
+	<dimen name="dp_648">740.5713dp</dimen>
+	<dimen name="dp_649">741.7142dp</dimen>
+	<dimen name="dp_650">742.8570dp</dimen>
+	<dimen name="dp_651">743.9999dp</dimen>
+	<dimen name="dp_652">745.1427dp</dimen>
+	<dimen name="dp_653">746.2856dp</dimen>
+	<dimen name="dp_654">747.4284dp</dimen>
+	<dimen name="dp_655">748.5713dp</dimen>
+	<dimen name="dp_656">749.7142dp</dimen>
+	<dimen name="dp_657">750.8570dp</dimen>
+	<dimen name="dp_658">751.9999dp</dimen>
+	<dimen name="dp_659">753.1427dp</dimen>
+	<dimen name="dp_660">754.2856dp</dimen>
+	<dimen name="dp_661">755.4284dp</dimen>
+	<dimen name="dp_662">756.5713dp</dimen>
+	<dimen name="dp_663">757.7142dp</dimen>
+	<dimen name="dp_664">758.8570dp</dimen>
+	<dimen name="dp_665">759.9999dp</dimen>
+	<dimen name="dp_666">761.1427dp</dimen>
+	<dimen name="dp_667">762.2856dp</dimen>
+	<dimen name="dp_668">763.4284dp</dimen>
+	<dimen name="dp_669">764.5713dp</dimen>
+	<dimen name="dp_670">765.7142dp</dimen>
+	<dimen name="dp_671">766.8570dp</dimen>
+	<dimen name="dp_672">767.9999dp</dimen>
+	<dimen name="dp_673">769.1427dp</dimen>
+	<dimen name="dp_674">770.2856dp</dimen>
+	<dimen name="dp_675">771.4284dp</dimen>
+	<dimen name="dp_676">772.5713dp</dimen>
+	<dimen name="dp_677">773.7142dp</dimen>
+	<dimen name="dp_678">774.8570dp</dimen>
+	<dimen name="dp_679">775.9999dp</dimen>
+	<dimen name="dp_680">777.1427dp</dimen>
+	<dimen name="dp_681">778.2856dp</dimen>
+	<dimen name="dp_682">779.4284dp</dimen>
+	<dimen name="dp_683">780.5713dp</dimen>
+	<dimen name="dp_684">781.7141dp</dimen>
+	<dimen name="dp_685">782.8570dp</dimen>
+	<dimen name="dp_686">783.9999dp</dimen>
+	<dimen name="dp_687">785.1427dp</dimen>
+	<dimen name="dp_688">786.2856dp</dimen>
+	<dimen name="dp_689">787.4284dp</dimen>
+	<dimen name="dp_690">788.5713dp</dimen>
+	<dimen name="dp_691">789.7141dp</dimen>
+	<dimen name="dp_692">790.8570dp</dimen>
+	<dimen name="dp_693">791.9999dp</dimen>
+	<dimen name="dp_694">793.1427dp</dimen>
+	<dimen name="dp_695">794.2856dp</dimen>
+	<dimen name="dp_696">795.4284dp</dimen>
+	<dimen name="dp_697">796.5713dp</dimen>
+	<dimen name="dp_698">797.7141dp</dimen>
+	<dimen name="dp_699">798.8570dp</dimen>
+	<dimen name="dp_700">799.9999dp</dimen>
 	<dimen name="sp_1">1.1429sp</dimen>
 	<dimen name="sp_2">2.2857sp</dimen>
 	<dimen name="sp_3">3.4286sp</dimen>
@@ -573,4 +766,54 @@
 	<dimen name="sp_48">54.8571sp</dimen>
 	<dimen name="sp_49">56.0000sp</dimen>
 	<dimen name="sp_50">57.1428sp</dimen>
+	<dimen name="sp_51">58.2857sp</dimen>
+	<dimen name="sp_52">59.4286sp</dimen>
+	<dimen name="sp_53">60.5714sp</dimen>
+	<dimen name="sp_54">61.7143sp</dimen>
+	<dimen name="sp_55">62.8571sp</dimen>
+	<dimen name="sp_56">64.0000sp</dimen>
+	<dimen name="sp_57">65.1428sp</dimen>
+	<dimen name="sp_58">66.2857sp</dimen>
+	<dimen name="sp_59">67.4286sp</dimen>
+	<dimen name="sp_60">68.5714sp</dimen>
+	<dimen name="sp_61">69.7143sp</dimen>
+	<dimen name="sp_62">70.8571sp</dimen>
+	<dimen name="sp_63">72.0000sp</dimen>
+	<dimen name="sp_64">73.1428sp</dimen>
+	<dimen name="sp_65">74.2857sp</dimen>
+	<dimen name="sp_66">75.4286sp</dimen>
+	<dimen name="sp_67">76.5714sp</dimen>
+	<dimen name="sp_68">77.7143sp</dimen>
+	<dimen name="sp_69">78.8571sp</dimen>
+	<dimen name="sp_70">80.0000sp</dimen>
+	<dimen name="sp_71">81.1428sp</dimen>
+	<dimen name="sp_72">82.2857sp</dimen>
+	<dimen name="sp_73">83.4286sp</dimen>
+	<dimen name="sp_74">84.5714sp</dimen>
+	<dimen name="sp_75">85.7143sp</dimen>
+	<dimen name="sp_76">86.8571sp</dimen>
+	<dimen name="sp_77">88.0000sp</dimen>
+	<dimen name="sp_78">89.1428sp</dimen>
+	<dimen name="sp_79">90.2857sp</dimen>
+	<dimen name="sp_80">91.4286sp</dimen>
+	<dimen name="sp_81">92.5714sp</dimen>
+	<dimen name="sp_82">93.7143sp</dimen>
+	<dimen name="sp_83">94.8571sp</dimen>
+	<dimen name="sp_84">96.0000sp</dimen>
+	<dimen name="sp_85">97.1428sp</dimen>
+	<dimen name="sp_86">98.2857sp</dimen>
+	<dimen name="sp_87">99.4286sp</dimen>
+	<dimen name="sp_88">100.5714sp</dimen>
+	<dimen name="sp_89">101.7143sp</dimen>
+	<dimen name="sp_90">102.8571sp</dimen>
+	<dimen name="sp_91">104.0000sp</dimen>
+	<dimen name="sp_92">105.1428sp</dimen>
+	<dimen name="sp_93">106.2857sp</dimen>
+	<dimen name="sp_94">107.4286sp</dimen>
+	<dimen name="sp_95">108.5714sp</dimen>
+	<dimen name="sp_96">109.7143sp</dimen>
+	<dimen name="sp_97">110.8571sp</dimen>
+	<dimen name="sp_98">112.0000sp</dimen>
+	<dimen name="sp_99">113.1428sp</dimen>
+	<dimen name="sp_100">114.2857sp</dimen>
 </resources>
diff --git a/app/src/main/res/values-sw432dp/dimens.xml b/app/src/main/res/values-sw432dp/dimens.xml
index 143d28a..0d85a1d 100644
--- a/app/src/main/res/values-sw432dp/dimens.xml
+++ b/app/src/main/res/values-sw432dp/dimens.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-	<dimen name="activity_horizontal_margin">19.2000dp</dimen>
-	<dimen name="activity_vertical_margin">19.2000dp</dimen>
-	<dimen name="actions_item_font">21.6000sp</dimen>
-	<dimen name="actions_item_drawablePaddding">12.0000dp</dimen>
 	<dimen name="dp_m_60">-72.0000dp</dimen>
 	<dimen name="dp_m_30">-36.0000dp</dimen>
 	<dimen name="dp_m_20">-24.0000dp</dimen>
@@ -520,9 +516,206 @@
 	<dimen name="dp_498">597.6000dp</dimen>
 	<dimen name="dp_499">598.8000dp</dimen>
 	<dimen name="dp_500">600.0000dp</dimen>
+	<dimen name="dp_501">601.2000dp</dimen>
+	<dimen name="dp_502">602.4000dp</dimen>
+	<dimen name="dp_503">603.6000dp</dimen>
+	<dimen name="dp_504">604.8000dp</dimen>
+	<dimen name="dp_505">606.0000dp</dimen>
+	<dimen name="dp_506">607.2000dp</dimen>
+	<dimen name="dp_507">608.4000dp</dimen>
+	<dimen name="dp_508">609.6000dp</dimen>
+	<dimen name="dp_509">610.8000dp</dimen>
+	<dimen name="dp_510">612.0000dp</dimen>
+	<dimen name="dp_511">613.2000dp</dimen>
+	<dimen name="dp_512">614.4000dp</dimen>
+	<dimen name="dp_513">615.6000dp</dimen>
+	<dimen name="dp_514">616.8000dp</dimen>
+	<dimen name="dp_515">618.0000dp</dimen>
+	<dimen name="dp_516">619.2000dp</dimen>
+	<dimen name="dp_517">620.4000dp</dimen>
+	<dimen name="dp_518">621.6000dp</dimen>
+	<dimen name="dp_519">622.8000dp</dimen>
+	<dimen name="dp_520">624.0000dp</dimen>
+	<dimen name="dp_521">625.2000dp</dimen>
+	<dimen name="dp_522">626.4000dp</dimen>
+	<dimen name="dp_523">627.6000dp</dimen>
+	<dimen name="dp_524">628.8000dp</dimen>
+	<dimen name="dp_525">630.0000dp</dimen>
+	<dimen name="dp_526">631.2000dp</dimen>
+	<dimen name="dp_527">632.4000dp</dimen>
+	<dimen name="dp_528">633.6000dp</dimen>
+	<dimen name="dp_529">634.8000dp</dimen>
+	<dimen name="dp_530">636.0000dp</dimen>
+	<dimen name="dp_531">637.2000dp</dimen>
+	<dimen name="dp_532">638.4000dp</dimen>
+	<dimen name="dp_533">639.6000dp</dimen>
+	<dimen name="dp_534">640.8000dp</dimen>
+	<dimen name="dp_535">642.0000dp</dimen>
+	<dimen name="dp_536">643.2000dp</dimen>
+	<dimen name="dp_537">644.4000dp</dimen>
+	<dimen name="dp_538">645.6000dp</dimen>
+	<dimen name="dp_539">646.8000dp</dimen>
+	<dimen name="dp_540">648.0000dp</dimen>
+	<dimen name="dp_541">649.2000dp</dimen>
+	<dimen name="dp_542">650.4000dp</dimen>
+	<dimen name="dp_543">651.6000dp</dimen>
+	<dimen name="dp_544">652.8000dp</dimen>
+	<dimen name="dp_545">654.0000dp</dimen>
+	<dimen name="dp_546">655.2000dp</dimen>
+	<dimen name="dp_547">656.4000dp</dimen>
+	<dimen name="dp_548">657.6000dp</dimen>
+	<dimen name="dp_549">658.8000dp</dimen>
+	<dimen name="dp_550">660.0000dp</dimen>
+	<dimen name="dp_551">661.2000dp</dimen>
+	<dimen name="dp_552">662.4000dp</dimen>
+	<dimen name="dp_553">663.6000dp</dimen>
+	<dimen name="dp_554">664.8000dp</dimen>
+	<dimen name="dp_555">666.0000dp</dimen>
+	<dimen name="dp_556">667.2000dp</dimen>
+	<dimen name="dp_557">668.4000dp</dimen>
+	<dimen name="dp_558">669.6000dp</dimen>
+	<dimen name="dp_559">670.8000dp</dimen>
+	<dimen name="dp_560">672.0000dp</dimen>
+	<dimen name="dp_561">673.2000dp</dimen>
+	<dimen name="dp_562">674.4000dp</dimen>
+	<dimen name="dp_563">675.6000dp</dimen>
+	<dimen name="dp_564">676.8000dp</dimen>
+	<dimen name="dp_565">678.0000dp</dimen>
+	<dimen name="dp_566">679.2000dp</dimen>
+	<dimen name="dp_567">680.4000dp</dimen>
+	<dimen name="dp_568">681.6000dp</dimen>
+	<dimen name="dp_569">682.8000dp</dimen>
+	<dimen name="dp_570">684.0000dp</dimen>
+	<dimen name="dp_571">685.2000dp</dimen>
+	<dimen name="dp_572">686.4000dp</dimen>
+	<dimen name="dp_573">687.6000dp</dimen>
+	<dimen name="dp_574">688.8000dp</dimen>
+	<dimen name="dp_575">690.0000dp</dimen>
+	<dimen name="dp_576">691.2000dp</dimen>
+	<dimen name="dp_577">692.4000dp</dimen>
+	<dimen name="dp_578">693.6000dp</dimen>
+	<dimen name="dp_579">694.8000dp</dimen>
+	<dimen name="dp_580">696.0000dp</dimen>
+	<dimen name="dp_581">697.2000dp</dimen>
+	<dimen name="dp_582">698.4000dp</dimen>
+	<dimen name="dp_583">699.6000dp</dimen>
+	<dimen name="dp_584">700.8000dp</dimen>
+	<dimen name="dp_585">702.0000dp</dimen>
+	<dimen name="dp_586">703.2000dp</dimen>
+	<dimen name="dp_587">704.4000dp</dimen>
+	<dimen name="dp_588">705.6000dp</dimen>
+	<dimen name="dp_589">706.8000dp</dimen>
+	<dimen name="dp_590">708.0000dp</dimen>
+	<dimen name="dp_591">709.2000dp</dimen>
+	<dimen name="dp_592">710.4000dp</dimen>
+	<dimen name="dp_593">711.6000dp</dimen>
+	<dimen name="dp_594">712.8000dp</dimen>
+	<dimen name="dp_595">714.0000dp</dimen>
+	<dimen name="dp_596">715.2000dp</dimen>
+	<dimen name="dp_597">716.4000dp</dimen>
+	<dimen name="dp_598">717.6000dp</dimen>
+	<dimen name="dp_599">718.8000dp</dimen>
 	<dimen name="dp_600">720.0000dp</dimen>
+	<dimen name="dp_601">721.2000dp</dimen>
+	<dimen name="dp_602">722.4000dp</dimen>
+	<dimen name="dp_603">723.6000dp</dimen>
+	<dimen name="dp_604">724.8000dp</dimen>
+	<dimen name="dp_605">726.0000dp</dimen>
+	<dimen name="dp_606">727.2000dp</dimen>
+	<dimen name="dp_607">728.4000dp</dimen>
+	<dimen name="dp_608">729.6000dp</dimen>
+	<dimen name="dp_609">730.8000dp</dimen>
+	<dimen name="dp_610">732.0000dp</dimen>
+	<dimen name="dp_611">733.2000dp</dimen>
+	<dimen name="dp_612">734.4000dp</dimen>
+	<dimen name="dp_613">735.6000dp</dimen>
+	<dimen name="dp_614">736.8000dp</dimen>
+	<dimen name="dp_615">738.0000dp</dimen>
+	<dimen name="dp_616">739.2000dp</dimen>
+	<dimen name="dp_617">740.4000dp</dimen>
+	<dimen name="dp_618">741.6000dp</dimen>
+	<dimen name="dp_619">742.8000dp</dimen>
+	<dimen name="dp_620">744.0000dp</dimen>
+	<dimen name="dp_621">745.2000dp</dimen>
+	<dimen name="dp_622">746.4000dp</dimen>
+	<dimen name="dp_623">747.6000dp</dimen>
+	<dimen name="dp_624">748.8000dp</dimen>
+	<dimen name="dp_625">750.0000dp</dimen>
+	<dimen name="dp_626">751.2000dp</dimen>
+	<dimen name="dp_627">752.4000dp</dimen>
+	<dimen name="dp_628">753.6000dp</dimen>
+	<dimen name="dp_629">754.8000dp</dimen>
+	<dimen name="dp_630">756.0000dp</dimen>
+	<dimen name="dp_631">757.2000dp</dimen>
+	<dimen name="dp_632">758.4000dp</dimen>
+	<dimen name="dp_633">759.6000dp</dimen>
+	<dimen name="dp_634">760.8000dp</dimen>
+	<dimen name="dp_635">762.0000dp</dimen>
+	<dimen name="dp_636">763.2000dp</dimen>
+	<dimen name="dp_637">764.4000dp</dimen>
+	<dimen name="dp_638">765.6000dp</dimen>
+	<dimen name="dp_639">766.8000dp</dimen>
 	<dimen name="dp_640">768.0000dp</dimen>
-	<dimen name="dp_720">864.0000dp</dimen>
+	<dimen name="dp_641">769.2000dp</dimen>
+	<dimen name="dp_642">770.4000dp</dimen>
+	<dimen name="dp_643">771.6000dp</dimen>
+	<dimen name="dp_644">772.8000dp</dimen>
+	<dimen name="dp_645">774.0000dp</dimen>
+	<dimen name="dp_646">775.2000dp</dimen>
+	<dimen name="dp_647">776.4000dp</dimen>
+	<dimen name="dp_648">777.6000dp</dimen>
+	<dimen name="dp_649">778.8000dp</dimen>
+	<dimen name="dp_650">780.0000dp</dimen>
+	<dimen name="dp_651">781.2000dp</dimen>
+	<dimen name="dp_652">782.4000dp</dimen>
+	<dimen name="dp_653">783.6000dp</dimen>
+	<dimen name="dp_654">784.8000dp</dimen>
+	<dimen name="dp_655">786.0000dp</dimen>
+	<dimen name="dp_656">787.2000dp</dimen>
+	<dimen name="dp_657">788.4000dp</dimen>
+	<dimen name="dp_658">789.6000dp</dimen>
+	<dimen name="dp_659">790.8000dp</dimen>
+	<dimen name="dp_660">792.0000dp</dimen>
+	<dimen name="dp_661">793.2000dp</dimen>
+	<dimen name="dp_662">794.4000dp</dimen>
+	<dimen name="dp_663">795.6000dp</dimen>
+	<dimen name="dp_664">796.8000dp</dimen>
+	<dimen name="dp_665">798.0000dp</dimen>
+	<dimen name="dp_666">799.2000dp</dimen>
+	<dimen name="dp_667">800.4000dp</dimen>
+	<dimen name="dp_668">801.6000dp</dimen>
+	<dimen name="dp_669">802.8000dp</dimen>
+	<dimen name="dp_670">804.0000dp</dimen>
+	<dimen name="dp_671">805.2000dp</dimen>
+	<dimen name="dp_672">806.4000dp</dimen>
+	<dimen name="dp_673">807.6000dp</dimen>
+	<dimen name="dp_674">808.8000dp</dimen>
+	<dimen name="dp_675">810.0000dp</dimen>
+	<dimen name="dp_676">811.2000dp</dimen>
+	<dimen name="dp_677">812.4000dp</dimen>
+	<dimen name="dp_678">813.6000dp</dimen>
+	<dimen name="dp_679">814.8000dp</dimen>
+	<dimen name="dp_680">816.0000dp</dimen>
+	<dimen name="dp_681">817.2000dp</dimen>
+	<dimen name="dp_682">818.4000dp</dimen>
+	<dimen name="dp_683">819.6000dp</dimen>
+	<dimen name="dp_684">820.8000dp</dimen>
+	<dimen name="dp_685">822.0000dp</dimen>
+	<dimen name="dp_686">823.2000dp</dimen>
+	<dimen name="dp_687">824.4000dp</dimen>
+	<dimen name="dp_688">825.6000dp</dimen>
+	<dimen name="dp_689">826.8000dp</dimen>
+	<dimen name="dp_690">828.0000dp</dimen>
+	<dimen name="dp_691">829.2000dp</dimen>
+	<dimen name="dp_692">830.4000dp</dimen>
+	<dimen name="dp_693">831.6000dp</dimen>
+	<dimen name="dp_694">832.8000dp</dimen>
+	<dimen name="dp_695">834.0000dp</dimen>
+	<dimen name="dp_696">835.2000dp</dimen>
+	<dimen name="dp_697">836.4000dp</dimen>
+	<dimen name="dp_698">837.6000dp</dimen>
+	<dimen name="dp_699">838.8000dp</dimen>
+	<dimen name="dp_700">840.0000dp</dimen>
 	<dimen name="sp_1">1.2000sp</dimen>
 	<dimen name="sp_2">2.4000sp</dimen>
 	<dimen name="sp_3">3.6000sp</dimen>
@@ -573,4 +766,54 @@
 	<dimen name="sp_48">57.6000sp</dimen>
 	<dimen name="sp_49">58.8000sp</dimen>
 	<dimen name="sp_50">60.0000sp</dimen>
+	<dimen name="sp_51">61.2000sp</dimen>
+	<dimen name="sp_52">62.4000sp</dimen>
+	<dimen name="sp_53">63.6000sp</dimen>
+	<dimen name="sp_54">64.8000sp</dimen>
+	<dimen name="sp_55">66.0000sp</dimen>
+	<dimen name="sp_56">67.2000sp</dimen>
+	<dimen name="sp_57">68.4000sp</dimen>
+	<dimen name="sp_58">69.6000sp</dimen>
+	<dimen name="sp_59">70.8000sp</dimen>
+	<dimen name="sp_60">72.0000sp</dimen>
+	<dimen name="sp_61">73.2000sp</dimen>
+	<dimen name="sp_62">74.4000sp</dimen>
+	<dimen name="sp_63">75.6000sp</dimen>
+	<dimen name="sp_64">76.8000sp</dimen>
+	<dimen name="sp_65">78.0000sp</dimen>
+	<dimen name="sp_66">79.2000sp</dimen>
+	<dimen name="sp_67">80.4000sp</dimen>
+	<dimen name="sp_68">81.6000sp</dimen>
+	<dimen name="sp_69">82.8000sp</dimen>
+	<dimen name="sp_70">84.0000sp</dimen>
+	<dimen name="sp_71">85.2000sp</dimen>
+	<dimen name="sp_72">86.4000sp</dimen>
+	<dimen name="sp_73">87.6000sp</dimen>
+	<dimen name="sp_74">88.8000sp</dimen>
+	<dimen name="sp_75">90.0000sp</dimen>
+	<dimen name="sp_76">91.2000sp</dimen>
+	<dimen name="sp_77">92.4000sp</dimen>
+	<dimen name="sp_78">93.6000sp</dimen>
+	<dimen name="sp_79">94.8000sp</dimen>
+	<dimen name="sp_80">96.0000sp</dimen>
+	<dimen name="sp_81">97.2000sp</dimen>
+	<dimen name="sp_82">98.4000sp</dimen>
+	<dimen name="sp_83">99.6000sp</dimen>
+	<dimen name="sp_84">100.8000sp</dimen>
+	<dimen name="sp_85">102.0000sp</dimen>
+	<dimen name="sp_86">103.2000sp</dimen>
+	<dimen name="sp_87">104.4000sp</dimen>
+	<dimen name="sp_88">105.6000sp</dimen>
+	<dimen name="sp_89">106.8000sp</dimen>
+	<dimen name="sp_90">108.0000sp</dimen>
+	<dimen name="sp_91">109.2000sp</dimen>
+	<dimen name="sp_92">110.4000sp</dimen>
+	<dimen name="sp_93">111.6000sp</dimen>
+	<dimen name="sp_94">112.8000sp</dimen>
+	<dimen name="sp_95">114.0000sp</dimen>
+	<dimen name="sp_96">115.2000sp</dimen>
+	<dimen name="sp_97">116.4000sp</dimen>
+	<dimen name="sp_98">117.6000sp</dimen>
+	<dimen name="sp_99">118.8000sp</dimen>
+	<dimen name="sp_100">120.0000sp</dimen>
 </resources>
diff --git a/app/src/main/res/values-sw451dp/dimens.xml b/app/src/main/res/values-sw451dp/dimens.xml
index 9bba075..86878a8 100644
--- a/app/src/main/res/values-sw451dp/dimens.xml
+++ b/app/src/main/res/values-sw451dp/dimens.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-	<dimen name="activity_horizontal_margin">20.0784dp</dimen>
-	<dimen name="activity_vertical_margin">20.0784dp</dimen>
-	<dimen name="actions_item_font">22.5882sp</dimen>
-	<dimen name="actions_item_drawablePaddding">12.5490dp</dimen>
 	<dimen name="dp_m_60">-75.2941dp</dimen>
 	<dimen name="dp_m_30">-37.6471dp</dimen>
 	<dimen name="dp_m_20">-25.0980dp</dimen>
@@ -520,9 +516,206 @@
 	<dimen name="dp_498">624.9412dp</dimen>
 	<dimen name="dp_499">626.1961dp</dimen>
 	<dimen name="dp_500">627.4510dp</dimen>
+	<dimen name="dp_501">628.7059dp</dimen>
+	<dimen name="dp_502">629.9608dp</dimen>
+	<dimen name="dp_503">631.2157dp</dimen>
+	<dimen name="dp_504">632.4706dp</dimen>
+	<dimen name="dp_505">633.7255dp</dimen>
+	<dimen name="dp_506">634.9804dp</dimen>
+	<dimen name="dp_507">636.2353dp</dimen>
+	<dimen name="dp_508">637.4902dp</dimen>
+	<dimen name="dp_509">638.7451dp</dimen>
+	<dimen name="dp_510">640.0000dp</dimen>
+	<dimen name="dp_511">641.2549dp</dimen>
+	<dimen name="dp_512">642.5098dp</dimen>
+	<dimen name="dp_513">643.7647dp</dimen>
+	<dimen name="dp_514">645.0196dp</dimen>
+	<dimen name="dp_515">646.2745dp</dimen>
+	<dimen name="dp_516">647.5294dp</dimen>
+	<dimen name="dp_517">648.7843dp</dimen>
+	<dimen name="dp_518">650.0392dp</dimen>
+	<dimen name="dp_519">651.2941dp</dimen>
+	<dimen name="dp_520">652.5490dp</dimen>
+	<dimen name="dp_521">653.8039dp</dimen>
+	<dimen name="dp_522">655.0588dp</dimen>
+	<dimen name="dp_523">656.3137dp</dimen>
+	<dimen name="dp_524">657.5686dp</dimen>
+	<dimen name="dp_525">658.8235dp</dimen>
+	<dimen name="dp_526">660.0784dp</dimen>
+	<dimen name="dp_527">661.3333dp</dimen>
+	<dimen name="dp_528">662.5882dp</dimen>
+	<dimen name="dp_529">663.8431dp</dimen>
+	<dimen name="dp_530">665.0980dp</dimen>
+	<dimen name="dp_531">666.3529dp</dimen>
+	<dimen name="dp_532">667.6078dp</dimen>
+	<dimen name="dp_533">668.8627dp</dimen>
+	<dimen name="dp_534">670.1176dp</dimen>
+	<dimen name="dp_535">671.3725dp</dimen>
+	<dimen name="dp_536">672.6274dp</dimen>
+	<dimen name="dp_537">673.8823dp</dimen>
+	<dimen name="dp_538">675.1372dp</dimen>
+	<dimen name="dp_539">676.3921dp</dimen>
+	<dimen name="dp_540">677.6471dp</dimen>
+	<dimen name="dp_541">678.9020dp</dimen>
+	<dimen name="dp_542">680.1569dp</dimen>
+	<dimen name="dp_543">681.4118dp</dimen>
+	<dimen name="dp_544">682.6667dp</dimen>
+	<dimen name="dp_545">683.9216dp</dimen>
+	<dimen name="dp_546">685.1765dp</dimen>
+	<dimen name="dp_547">686.4314dp</dimen>
+	<dimen name="dp_548">687.6863dp</dimen>
+	<dimen name="dp_549">688.9412dp</dimen>
+	<dimen name="dp_550">690.1961dp</dimen>
+	<dimen name="dp_551">691.4510dp</dimen>
+	<dimen name="dp_552">692.7059dp</dimen>
+	<dimen name="dp_553">693.9608dp</dimen>
+	<dimen name="dp_554">695.2157dp</dimen>
+	<dimen name="dp_555">696.4706dp</dimen>
+	<dimen name="dp_556">697.7255dp</dimen>
+	<dimen name="dp_557">698.9804dp</dimen>
+	<dimen name="dp_558">700.2353dp</dimen>
+	<dimen name="dp_559">701.4902dp</dimen>
+	<dimen name="dp_560">702.7451dp</dimen>
+	<dimen name="dp_561">704.0000dp</dimen>
+	<dimen name="dp_562">705.2549dp</dimen>
+	<dimen name="dp_563">706.5098dp</dimen>
+	<dimen name="dp_564">707.7647dp</dimen>
+	<dimen name="dp_565">709.0196dp</dimen>
+	<dimen name="dp_566">710.2745dp</dimen>
+	<dimen name="dp_567">711.5294dp</dimen>
+	<dimen name="dp_568">712.7843dp</dimen>
+	<dimen name="dp_569">714.0392dp</dimen>
+	<dimen name="dp_570">715.2941dp</dimen>
+	<dimen name="dp_571">716.5490dp</dimen>
+	<dimen name="dp_572">717.8039dp</dimen>
+	<dimen name="dp_573">719.0588dp</dimen>
+	<dimen name="dp_574">720.3137dp</dimen>
+	<dimen name="dp_575">721.5686dp</dimen>
+	<dimen name="dp_576">722.8235dp</dimen>
+	<dimen name="dp_577">724.0784dp</dimen>
+	<dimen name="dp_578">725.3333dp</dimen>
+	<dimen name="dp_579">726.5882dp</dimen>
+	<dimen name="dp_580">727.8431dp</dimen>
+	<dimen name="dp_581">729.0980dp</dimen>
+	<dimen name="dp_582">730.3529dp</dimen>
+	<dimen name="dp_583">731.6078dp</dimen>
+	<dimen name="dp_584">732.8627dp</dimen>
+	<dimen name="dp_585">734.1176dp</dimen>
+	<dimen name="dp_586">735.3725dp</dimen>
+	<dimen name="dp_587">736.6274dp</dimen>
+	<dimen name="dp_588">737.8823dp</dimen>
+	<dimen name="dp_589">739.1372dp</dimen>
+	<dimen name="dp_590">740.3921dp</dimen>
+	<dimen name="dp_591">741.6470dp</dimen>
+	<dimen name="dp_592">742.9020dp</dimen>
+	<dimen name="dp_593">744.1569dp</dimen>
+	<dimen name="dp_594">745.4118dp</dimen>
+	<dimen name="dp_595">746.6667dp</dimen>
+	<dimen name="dp_596">747.9216dp</dimen>
+	<dimen name="dp_597">749.1765dp</dimen>
+	<dimen name="dp_598">750.4314dp</dimen>
+	<dimen name="dp_599">751.6863dp</dimen>
 	<dimen name="dp_600">752.9412dp</dimen>
+	<dimen name="dp_601">754.1961dp</dimen>
+	<dimen name="dp_602">755.4510dp</dimen>
+	<dimen name="dp_603">756.7059dp</dimen>
+	<dimen name="dp_604">757.9608dp</dimen>
+	<dimen name="dp_605">759.2157dp</dimen>
+	<dimen name="dp_606">760.4706dp</dimen>
+	<dimen name="dp_607">761.7255dp</dimen>
+	<dimen name="dp_608">762.9804dp</dimen>
+	<dimen name="dp_609">764.2353dp</dimen>
+	<dimen name="dp_610">765.4902dp</dimen>
+	<dimen name="dp_611">766.7451dp</dimen>
+	<dimen name="dp_612">768.0000dp</dimen>
+	<dimen name="dp_613">769.2549dp</dimen>
+	<dimen name="dp_614">770.5098dp</dimen>
+	<dimen name="dp_615">771.7647dp</dimen>
+	<dimen name="dp_616">773.0196dp</dimen>
+	<dimen name="dp_617">774.2745dp</dimen>
+	<dimen name="dp_618">775.5294dp</dimen>
+	<dimen name="dp_619">776.7843dp</dimen>
+	<dimen name="dp_620">778.0392dp</dimen>
+	<dimen name="dp_621">779.2941dp</dimen>
+	<dimen name="dp_622">780.5490dp</dimen>
+	<dimen name="dp_623">781.8039dp</dimen>
+	<dimen name="dp_624">783.0588dp</dimen>
+	<dimen name="dp_625">784.3137dp</dimen>
+	<dimen name="dp_626">785.5686dp</dimen>
+	<dimen name="dp_627">786.8235dp</dimen>
+	<dimen name="dp_628">788.0784dp</dimen>
+	<dimen name="dp_629">789.3333dp</dimen>
+	<dimen name="dp_630">790.5882dp</dimen>
+	<dimen name="dp_631">791.8431dp</dimen>
+	<dimen name="dp_632">793.0980dp</dimen>
+	<dimen name="dp_633">794.3529dp</dimen>
+	<dimen name="dp_634">795.6078dp</dimen>
+	<dimen name="dp_635">796.8627dp</dimen>
+	<dimen name="dp_636">798.1176dp</dimen>
+	<dimen name="dp_637">799.3725dp</dimen>
+	<dimen name="dp_638">800.6274dp</dimen>
+	<dimen name="dp_639">801.8823dp</dimen>
 	<dimen name="dp_640">803.1372dp</dimen>
-	<dimen name="dp_720">903.5294dp</dimen>
+	<dimen name="dp_641">804.3921dp</dimen>
+	<dimen name="dp_642">805.6470dp</dimen>
+	<dimen name="dp_643">806.9020dp</dimen>
+	<dimen name="dp_644">808.1569dp</dimen>
+	<dimen name="dp_645">809.4118dp</dimen>
+	<dimen name="dp_646">810.6667dp</dimen>
+	<dimen name="dp_647">811.9216dp</dimen>
+	<dimen name="dp_648">813.1765dp</dimen>
+	<dimen name="dp_649">814.4314dp</dimen>
+	<dimen name="dp_650">815.6863dp</dimen>
+	<dimen name="dp_651">816.9412dp</dimen>
+	<dimen name="dp_652">818.1961dp</dimen>
+	<dimen name="dp_653">819.4510dp</dimen>
+	<dimen name="dp_654">820.7059dp</dimen>
+	<dimen name="dp_655">821.9608dp</dimen>
+	<dimen name="dp_656">823.2157dp</dimen>
+	<dimen name="dp_657">824.4706dp</dimen>
+	<dimen name="dp_658">825.7255dp</dimen>
+	<dimen name="dp_659">826.9804dp</dimen>
+	<dimen name="dp_660">828.2353dp</dimen>
+	<dimen name="dp_661">829.4902dp</dimen>
+	<dimen name="dp_662">830.7451dp</dimen>
+	<dimen name="dp_663">832.0000dp</dimen>
+	<dimen name="dp_664">833.2549dp</dimen>
+	<dimen name="dp_665">834.5098dp</dimen>
+	<dimen name="dp_666">835.7647dp</dimen>
+	<dimen name="dp_667">837.0196dp</dimen>
+	<dimen name="dp_668">838.2745dp</dimen>
+	<dimen name="dp_669">839.5294dp</dimen>
+	<dimen name="dp_670">840.7843dp</dimen>
+	<dimen name="dp_671">842.0392dp</dimen>
+	<dimen name="dp_672">843.2941dp</dimen>
+	<dimen name="dp_673">844.5490dp</dimen>
+	<dimen name="dp_674">845.8039dp</dimen>
+	<dimen name="dp_675">847.0588dp</dimen>
+	<dimen name="dp_676">848.3137dp</dimen>
+	<dimen name="dp_677">849.5686dp</dimen>
+	<dimen name="dp_678">850.8235dp</dimen>
+	<dimen name="dp_679">852.0784dp</dimen>
+	<dimen name="dp_680">853.3333dp</dimen>
+	<dimen name="dp_681">854.5882dp</dimen>
+	<dimen name="dp_682">855.8431dp</dimen>
+	<dimen name="dp_683">857.0980dp</dimen>
+	<dimen name="dp_684">858.3529dp</dimen>
+	<dimen name="dp_685">859.6078dp</dimen>
+	<dimen name="dp_686">860.8627dp</dimen>
+	<dimen name="dp_687">862.1176dp</dimen>
+	<dimen name="dp_688">863.3725dp</dimen>
+	<dimen name="dp_689">864.6274dp</dimen>
+	<dimen name="dp_690">865.8823dp</dimen>
+	<dimen name="dp_691">867.1372dp</dimen>
+	<dimen name="dp_692">868.3921dp</dimen>
+	<dimen name="dp_693">869.6470dp</dimen>
+	<dimen name="dp_694">870.9019dp</dimen>
+	<dimen name="dp_695">872.1569dp</dimen>
+	<dimen name="dp_696">873.4118dp</dimen>
+	<dimen name="dp_697">874.6667dp</dimen>
+	<dimen name="dp_698">875.9216dp</dimen>
+	<dimen name="dp_699">877.1765dp</dimen>
+	<dimen name="dp_700">878.4314dp</dimen>
 	<dimen name="sp_1">1.2549sp</dimen>
 	<dimen name="sp_2">2.5098sp</dimen>
 	<dimen name="sp_3">3.7647sp</dimen>
@@ -573,4 +766,54 @@
 	<dimen name="sp_48">60.2353sp</dimen>
 	<dimen name="sp_49">61.4902sp</dimen>
 	<dimen name="sp_50">62.7451sp</dimen>
+	<dimen name="sp_51">64.0000sp</dimen>
+	<dimen name="sp_52">65.2549sp</dimen>
+	<dimen name="sp_53">66.5098sp</dimen>
+	<dimen name="sp_54">67.7647sp</dimen>
+	<dimen name="sp_55">69.0196sp</dimen>
+	<dimen name="sp_56">70.2745sp</dimen>
+	<dimen name="sp_57">71.5294sp</dimen>
+	<dimen name="sp_58">72.7843sp</dimen>
+	<dimen name="sp_59">74.0392sp</dimen>
+	<dimen name="sp_60">75.2941sp</dimen>
+	<dimen name="sp_61">76.5490sp</dimen>
+	<dimen name="sp_62">77.8039sp</dimen>
+	<dimen name="sp_63">79.0588sp</dimen>
+	<dimen name="sp_64">80.3137sp</dimen>
+	<dimen name="sp_65">81.5686sp</dimen>
+	<dimen name="sp_66">82.8235sp</dimen>
+	<dimen name="sp_67">84.0784sp</dimen>
+	<dimen name="sp_68">85.3333sp</dimen>
+	<dimen name="sp_69">86.5882sp</dimen>
+	<dimen name="sp_70">87.8431sp</dimen>
+	<dimen name="sp_71">89.0980sp</dimen>
+	<dimen name="sp_72">90.3529sp</dimen>
+	<dimen name="sp_73">91.6078sp</dimen>
+	<dimen name="sp_74">92.8627sp</dimen>
+	<dimen name="sp_75">94.1176sp</dimen>
+	<dimen name="sp_76">95.3725sp</dimen>
+	<dimen name="sp_77">96.6274sp</dimen>
+	<dimen name="sp_78">97.8824sp</dimen>
+	<dimen name="sp_79">99.1373sp</dimen>
+	<dimen name="sp_80">100.3922sp</dimen>
+	<dimen name="sp_81">101.6471sp</dimen>
+	<dimen name="sp_82">102.9020sp</dimen>
+	<dimen name="sp_83">104.1569sp</dimen>
+	<dimen name="sp_84">105.4118sp</dimen>
+	<dimen name="sp_85">106.6667sp</dimen>
+	<dimen name="sp_86">107.9216sp</dimen>
+	<dimen name="sp_87">109.1765sp</dimen>
+	<dimen name="sp_88">110.4314sp</dimen>
+	<dimen name="sp_89">111.6863sp</dimen>
+	<dimen name="sp_90">112.9412sp</dimen>
+	<dimen name="sp_91">114.1961sp</dimen>
+	<dimen name="sp_92">115.4510sp</dimen>
+	<dimen name="sp_93">116.7059sp</dimen>
+	<dimen name="sp_94">117.9608sp</dimen>
+	<dimen name="sp_95">119.2157sp</dimen>
+	<dimen name="sp_96">120.4706sp</dimen>
+	<dimen name="sp_97">121.7255sp</dimen>
+	<dimen name="sp_98">122.9804sp</dimen>
+	<dimen name="sp_99">124.2353sp</dimen>
+	<dimen name="sp_100">125.4902sp</dimen>
 </resources>
diff --git a/app/src/main/res/values-sw480dp/dimens.xml b/app/src/main/res/values-sw480dp/dimens.xml
index 178ee32..2222890 100644
--- a/app/src/main/res/values-sw480dp/dimens.xml
+++ b/app/src/main/res/values-sw480dp/dimens.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-	<dimen name="activity_horizontal_margin">21.3333dp</dimen>
-	<dimen name="activity_vertical_margin">21.3333dp</dimen>
-	<dimen name="actions_item_font">24.0000sp</dimen>
-	<dimen name="actions_item_drawablePaddding">13.3333dp</dimen>
 	<dimen name="dp_m_60">-80.0000dp</dimen>
 	<dimen name="dp_m_30">-40.0000dp</dimen>
 	<dimen name="dp_m_20">-26.6667dp</dimen>
@@ -520,9 +516,206 @@
 	<dimen name="dp_498">664.0000dp</dimen>
 	<dimen name="dp_499">665.3333dp</dimen>
 	<dimen name="dp_500">666.6667dp</dimen>
+	<dimen name="dp_501">668.0000dp</dimen>
+	<dimen name="dp_502">669.3333dp</dimen>
+	<dimen name="dp_503">670.6667dp</dimen>
+	<dimen name="dp_504">672.0000dp</dimen>
+	<dimen name="dp_505">673.3333dp</dimen>
+	<dimen name="dp_506">674.6667dp</dimen>
+	<dimen name="dp_507">676.0000dp</dimen>
+	<dimen name="dp_508">677.3333dp</dimen>
+	<dimen name="dp_509">678.6667dp</dimen>
+	<dimen name="dp_510">680.0000dp</dimen>
+	<dimen name="dp_511">681.3333dp</dimen>
+	<dimen name="dp_512">682.6667dp</dimen>
+	<dimen name="dp_513">684.0000dp</dimen>
+	<dimen name="dp_514">685.3333dp</dimen>
+	<dimen name="dp_515">686.6667dp</dimen>
+	<dimen name="dp_516">688.0000dp</dimen>
+	<dimen name="dp_517">689.3333dp</dimen>
+	<dimen name="dp_518">690.6667dp</dimen>
+	<dimen name="dp_519">692.0000dp</dimen>
+	<dimen name="dp_520">693.3333dp</dimen>
+	<dimen name="dp_521">694.6667dp</dimen>
+	<dimen name="dp_522">696.0000dp</dimen>
+	<dimen name="dp_523">697.3333dp</dimen>
+	<dimen name="dp_524">698.6667dp</dimen>
+	<dimen name="dp_525">700.0000dp</dimen>
+	<dimen name="dp_526">701.3333dp</dimen>
+	<dimen name="dp_527">702.6667dp</dimen>
+	<dimen name="dp_528">704.0000dp</dimen>
+	<dimen name="dp_529">705.3333dp</dimen>
+	<dimen name="dp_530">706.6667dp</dimen>
+	<dimen name="dp_531">708.0000dp</dimen>
+	<dimen name="dp_532">709.3333dp</dimen>
+	<dimen name="dp_533">710.6667dp</dimen>
+	<dimen name="dp_534">712.0000dp</dimen>
+	<dimen name="dp_535">713.3333dp</dimen>
+	<dimen name="dp_536">714.6667dp</dimen>
+	<dimen name="dp_537">716.0000dp</dimen>
+	<dimen name="dp_538">717.3333dp</dimen>
+	<dimen name="dp_539">718.6667dp</dimen>
+	<dimen name="dp_540">720.0000dp</dimen>
+	<dimen name="dp_541">721.3333dp</dimen>
+	<dimen name="dp_542">722.6667dp</dimen>
+	<dimen name="dp_543">724.0000dp</dimen>
+	<dimen name="dp_544">725.3333dp</dimen>
+	<dimen name="dp_545">726.6667dp</dimen>
+	<dimen name="dp_546">728.0000dp</dimen>
+	<dimen name="dp_547">729.3333dp</dimen>
+	<dimen name="dp_548">730.6667dp</dimen>
+	<dimen name="dp_549">732.0000dp</dimen>
+	<dimen name="dp_550">733.3333dp</dimen>
+	<dimen name="dp_551">734.6667dp</dimen>
+	<dimen name="dp_552">736.0000dp</dimen>
+	<dimen name="dp_553">737.3333dp</dimen>
+	<dimen name="dp_554">738.6667dp</dimen>
+	<dimen name="dp_555">740.0000dp</dimen>
+	<dimen name="dp_556">741.3333dp</dimen>
+	<dimen name="dp_557">742.6667dp</dimen>
+	<dimen name="dp_558">744.0000dp</dimen>
+	<dimen name="dp_559">745.3333dp</dimen>
+	<dimen name="dp_560">746.6667dp</dimen>
+	<dimen name="dp_561">748.0000dp</dimen>
+	<dimen name="dp_562">749.3333dp</dimen>
+	<dimen name="dp_563">750.6667dp</dimen>
+	<dimen name="dp_564">752.0000dp</dimen>
+	<dimen name="dp_565">753.3333dp</dimen>
+	<dimen name="dp_566">754.6667dp</dimen>
+	<dimen name="dp_567">756.0000dp</dimen>
+	<dimen name="dp_568">757.3333dp</dimen>
+	<dimen name="dp_569">758.6667dp</dimen>
+	<dimen name="dp_570">760.0000dp</dimen>
+	<dimen name="dp_571">761.3333dp</dimen>
+	<dimen name="dp_572">762.6667dp</dimen>
+	<dimen name="dp_573">764.0000dp</dimen>
+	<dimen name="dp_574">765.3333dp</dimen>
+	<dimen name="dp_575">766.6667dp</dimen>
+	<dimen name="dp_576">768.0000dp</dimen>
+	<dimen name="dp_577">769.3333dp</dimen>
+	<dimen name="dp_578">770.6667dp</dimen>
+	<dimen name="dp_579">772.0000dp</dimen>
+	<dimen name="dp_580">773.3333dp</dimen>
+	<dimen name="dp_581">774.6667dp</dimen>
+	<dimen name="dp_582">776.0000dp</dimen>
+	<dimen name="dp_583">777.3333dp</dimen>
+	<dimen name="dp_584">778.6667dp</dimen>
+	<dimen name="dp_585">780.0000dp</dimen>
+	<dimen name="dp_586">781.3333dp</dimen>
+	<dimen name="dp_587">782.6667dp</dimen>
+	<dimen name="dp_588">784.0000dp</dimen>
+	<dimen name="dp_589">785.3333dp</dimen>
+	<dimen name="dp_590">786.6667dp</dimen>
+	<dimen name="dp_591">788.0000dp</dimen>
+	<dimen name="dp_592">789.3333dp</dimen>
+	<dimen name="dp_593">790.6667dp</dimen>
+	<dimen name="dp_594">792.0000dp</dimen>
+	<dimen name="dp_595">793.3333dp</dimen>
+	<dimen name="dp_596">794.6667dp</dimen>
+	<dimen name="dp_597">796.0000dp</dimen>
+	<dimen name="dp_598">797.3333dp</dimen>
+	<dimen name="dp_599">798.6667dp</dimen>
 	<dimen name="dp_600">800.0000dp</dimen>
+	<dimen name="dp_601">801.3333dp</dimen>
+	<dimen name="dp_602">802.6667dp</dimen>
+	<dimen name="dp_603">804.0000dp</dimen>
+	<dimen name="dp_604">805.3333dp</dimen>
+	<dimen name="dp_605">806.6667dp</dimen>
+	<dimen name="dp_606">808.0000dp</dimen>
+	<dimen name="dp_607">809.3333dp</dimen>
+	<dimen name="dp_608">810.6667dp</dimen>
+	<dimen name="dp_609">812.0000dp</dimen>
+	<dimen name="dp_610">813.3333dp</dimen>
+	<dimen name="dp_611">814.6667dp</dimen>
+	<dimen name="dp_612">816.0000dp</dimen>
+	<dimen name="dp_613">817.3333dp</dimen>
+	<dimen name="dp_614">818.6667dp</dimen>
+	<dimen name="dp_615">820.0000dp</dimen>
+	<dimen name="dp_616">821.3333dp</dimen>
+	<dimen name="dp_617">822.6667dp</dimen>
+	<dimen name="dp_618">824.0000dp</dimen>
+	<dimen name="dp_619">825.3333dp</dimen>
+	<dimen name="dp_620">826.6667dp</dimen>
+	<dimen name="dp_621">828.0000dp</dimen>
+	<dimen name="dp_622">829.3333dp</dimen>
+	<dimen name="dp_623">830.6667dp</dimen>
+	<dimen name="dp_624">832.0000dp</dimen>
+	<dimen name="dp_625">833.3333dp</dimen>
+	<dimen name="dp_626">834.6667dp</dimen>
+	<dimen name="dp_627">836.0000dp</dimen>
+	<dimen name="dp_628">837.3333dp</dimen>
+	<dimen name="dp_629">838.6667dp</dimen>
+	<dimen name="dp_630">840.0000dp</dimen>
+	<dimen name="dp_631">841.3333dp</dimen>
+	<dimen name="dp_632">842.6667dp</dimen>
+	<dimen name="dp_633">844.0000dp</dimen>
+	<dimen name="dp_634">845.3333dp</dimen>
+	<dimen name="dp_635">846.6667dp</dimen>
+	<dimen name="dp_636">848.0000dp</dimen>
+	<dimen name="dp_637">849.3333dp</dimen>
+	<dimen name="dp_638">850.6667dp</dimen>
+	<dimen name="dp_639">852.0000dp</dimen>
 	<dimen name="dp_640">853.3333dp</dimen>
-	<dimen name="dp_720">960.0000dp</dimen>
+	<dimen name="dp_641">854.6667dp</dimen>
+	<dimen name="dp_642">856.0000dp</dimen>
+	<dimen name="dp_643">857.3333dp</dimen>
+	<dimen name="dp_644">858.6667dp</dimen>
+	<dimen name="dp_645">860.0000dp</dimen>
+	<dimen name="dp_646">861.3333dp</dimen>
+	<dimen name="dp_647">862.6667dp</dimen>
+	<dimen name="dp_648">864.0000dp</dimen>
+	<dimen name="dp_649">865.3333dp</dimen>
+	<dimen name="dp_650">866.6667dp</dimen>
+	<dimen name="dp_651">868.0000dp</dimen>
+	<dimen name="dp_652">869.3333dp</dimen>
+	<dimen name="dp_653">870.6667dp</dimen>
+	<dimen name="dp_654">872.0000dp</dimen>
+	<dimen name="dp_655">873.3333dp</dimen>
+	<dimen name="dp_656">874.6667dp</dimen>
+	<dimen name="dp_657">876.0000dp</dimen>
+	<dimen name="dp_658">877.3333dp</dimen>
+	<dimen name="dp_659">878.6667dp</dimen>
+	<dimen name="dp_660">880.0000dp</dimen>
+	<dimen name="dp_661">881.3333dp</dimen>
+	<dimen name="dp_662">882.6667dp</dimen>
+	<dimen name="dp_663">884.0000dp</dimen>
+	<dimen name="dp_664">885.3333dp</dimen>
+	<dimen name="dp_665">886.6667dp</dimen>
+	<dimen name="dp_666">888.0000dp</dimen>
+	<dimen name="dp_667">889.3333dp</dimen>
+	<dimen name="dp_668">890.6667dp</dimen>
+	<dimen name="dp_669">892.0000dp</dimen>
+	<dimen name="dp_670">893.3333dp</dimen>
+	<dimen name="dp_671">894.6667dp</dimen>
+	<dimen name="dp_672">896.0000dp</dimen>
+	<dimen name="dp_673">897.3333dp</dimen>
+	<dimen name="dp_674">898.6667dp</dimen>
+	<dimen name="dp_675">900.0000dp</dimen>
+	<dimen name="dp_676">901.3333dp</dimen>
+	<dimen name="dp_677">902.6667dp</dimen>
+	<dimen name="dp_678">904.0000dp</dimen>
+	<dimen name="dp_679">905.3333dp</dimen>
+	<dimen name="dp_680">906.6667dp</dimen>
+	<dimen name="dp_681">908.0000dp</dimen>
+	<dimen name="dp_682">909.3333dp</dimen>
+	<dimen name="dp_683">910.6667dp</dimen>
+	<dimen name="dp_684">912.0000dp</dimen>
+	<dimen name="dp_685">913.3333dp</dimen>
+	<dimen name="dp_686">914.6667dp</dimen>
+	<dimen name="dp_687">916.0000dp</dimen>
+	<dimen name="dp_688">917.3333dp</dimen>
+	<dimen name="dp_689">918.6667dp</dimen>
+	<dimen name="dp_690">920.0000dp</dimen>
+	<dimen name="dp_691">921.3333dp</dimen>
+	<dimen name="dp_692">922.6667dp</dimen>
+	<dimen name="dp_693">924.0000dp</dimen>
+	<dimen name="dp_694">925.3333dp</dimen>
+	<dimen name="dp_695">926.6667dp</dimen>
+	<dimen name="dp_696">928.0000dp</dimen>
+	<dimen name="dp_697">929.3333dp</dimen>
+	<dimen name="dp_698">930.6667dp</dimen>
+	<dimen name="dp_699">932.0000dp</dimen>
+	<dimen name="dp_700">933.3333dp</dimen>
 	<dimen name="sp_1">1.3333sp</dimen>
 	<dimen name="sp_2">2.6667sp</dimen>
 	<dimen name="sp_3">4.0000sp</dimen>
@@ -573,4 +766,54 @@
 	<dimen name="sp_48">64.0000sp</dimen>
 	<dimen name="sp_49">65.3333sp</dimen>
 	<dimen name="sp_50">66.6667sp</dimen>
+	<dimen name="sp_51">68.0000sp</dimen>
+	<dimen name="sp_52">69.3333sp</dimen>
+	<dimen name="sp_53">70.6667sp</dimen>
+	<dimen name="sp_54">72.0000sp</dimen>
+	<dimen name="sp_55">73.3333sp</dimen>
+	<dimen name="sp_56">74.6667sp</dimen>
+	<dimen name="sp_57">76.0000sp</dimen>
+	<dimen name="sp_58">77.3333sp</dimen>
+	<dimen name="sp_59">78.6667sp</dimen>
+	<dimen name="sp_60">80.0000sp</dimen>
+	<dimen name="sp_61">81.3333sp</dimen>
+	<dimen name="sp_62">82.6667sp</dimen>
+	<dimen name="sp_63">84.0000sp</dimen>
+	<dimen name="sp_64">85.3333sp</dimen>
+	<dimen name="sp_65">86.6667sp</dimen>
+	<dimen name="sp_66">88.0000sp</dimen>
+	<dimen name="sp_67">89.3333sp</dimen>
+	<dimen name="sp_68">90.6667sp</dimen>
+	<dimen name="sp_69">92.0000sp</dimen>
+	<dimen name="sp_70">93.3333sp</dimen>
+	<dimen name="sp_71">94.6667sp</dimen>
+	<dimen name="sp_72">96.0000sp</dimen>
+	<dimen name="sp_73">97.3333sp</dimen>
+	<dimen name="sp_74">98.6667sp</dimen>
+	<dimen name="sp_75">100.0000sp</dimen>
+	<dimen name="sp_76">101.3333sp</dimen>
+	<dimen name="sp_77">102.6667sp</dimen>
+	<dimen name="sp_78">104.0000sp</dimen>
+	<dimen name="sp_79">105.3333sp</dimen>
+	<dimen name="sp_80">106.6667sp</dimen>
+	<dimen name="sp_81">108.0000sp</dimen>
+	<dimen name="sp_82">109.3333sp</dimen>
+	<dimen name="sp_83">110.6667sp</dimen>
+	<dimen name="sp_84">112.0000sp</dimen>
+	<dimen name="sp_85">113.3333sp</dimen>
+	<dimen name="sp_86">114.6667sp</dimen>
+	<dimen name="sp_87">116.0000sp</dimen>
+	<dimen name="sp_88">117.3333sp</dimen>
+	<dimen name="sp_89">118.6667sp</dimen>
+	<dimen name="sp_90">120.0000sp</dimen>
+	<dimen name="sp_91">121.3333sp</dimen>
+	<dimen name="sp_92">122.6667sp</dimen>
+	<dimen name="sp_93">124.0000sp</dimen>
+	<dimen name="sp_94">125.3333sp</dimen>
+	<dimen name="sp_95">126.6667sp</dimen>
+	<dimen name="sp_96">128.0000sp</dimen>
+	<dimen name="sp_97">129.3333sp</dimen>
+	<dimen name="sp_98">130.6667sp</dimen>
+	<dimen name="sp_99">132.0000sp</dimen>
+	<dimen name="sp_100">133.3333sp</dimen>
 </resources>
diff --git a/app/src/main/res/values-sw533dp/dimens.xml b/app/src/main/res/values-sw533dp/dimens.xml
index 0bb8f98..d8b6f01 100644
--- a/app/src/main/res/values-sw533dp/dimens.xml
+++ b/app/src/main/res/values-sw533dp/dimens.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-	<dimen name="activity_horizontal_margin">23.6889dp</dimen>
-	<dimen name="activity_vertical_margin">23.6889dp</dimen>
-	<dimen name="actions_item_font">26.6500sp</dimen>
-	<dimen name="actions_item_drawablePaddding">14.8056dp</dimen>
 	<dimen name="dp_m_60">-88.8333dp</dimen>
 	<dimen name="dp_m_30">-44.4167dp</dimen>
 	<dimen name="dp_m_20">-29.6111dp</dimen>
@@ -520,9 +516,206 @@
 	<dimen name="dp_498">737.3167dp</dimen>
 	<dimen name="dp_499">738.7972dp</dimen>
 	<dimen name="dp_500">740.2778dp</dimen>
+	<dimen name="dp_501">741.7583dp</dimen>
+	<dimen name="dp_502">743.2389dp</dimen>
+	<dimen name="dp_503">744.7194dp</dimen>
+	<dimen name="dp_504">746.2000dp</dimen>
+	<dimen name="dp_505">747.6806dp</dimen>
+	<dimen name="dp_506">749.1611dp</dimen>
+	<dimen name="dp_507">750.6417dp</dimen>
+	<dimen name="dp_508">752.1222dp</dimen>
+	<dimen name="dp_509">753.6028dp</dimen>
+	<dimen name="dp_510">755.0833dp</dimen>
+	<dimen name="dp_511">756.5639dp</dimen>
+	<dimen name="dp_512">758.0444dp</dimen>
+	<dimen name="dp_513">759.5250dp</dimen>
+	<dimen name="dp_514">761.0056dp</dimen>
+	<dimen name="dp_515">762.4861dp</dimen>
+	<dimen name="dp_516">763.9667dp</dimen>
+	<dimen name="dp_517">765.4472dp</dimen>
+	<dimen name="dp_518">766.9278dp</dimen>
+	<dimen name="dp_519">768.4083dp</dimen>
+	<dimen name="dp_520">769.8889dp</dimen>
+	<dimen name="dp_521">771.3694dp</dimen>
+	<dimen name="dp_522">772.8500dp</dimen>
+	<dimen name="dp_523">774.3306dp</dimen>
+	<dimen name="dp_524">775.8111dp</dimen>
+	<dimen name="dp_525">777.2917dp</dimen>
+	<dimen name="dp_526">778.7722dp</dimen>
+	<dimen name="dp_527">780.2528dp</dimen>
+	<dimen name="dp_528">781.7333dp</dimen>
+	<dimen name="dp_529">783.2139dp</dimen>
+	<dimen name="dp_530">784.6944dp</dimen>
+	<dimen name="dp_531">786.1750dp</dimen>
+	<dimen name="dp_532">787.6556dp</dimen>
+	<dimen name="dp_533">789.1361dp</dimen>
+	<dimen name="dp_534">790.6167dp</dimen>
+	<dimen name="dp_535">792.0972dp</dimen>
+	<dimen name="dp_536">793.5778dp</dimen>
+	<dimen name="dp_537">795.0583dp</dimen>
+	<dimen name="dp_538">796.5389dp</dimen>
+	<dimen name="dp_539">798.0194dp</dimen>
+	<dimen name="dp_540">799.5000dp</dimen>
+	<dimen name="dp_541">800.9806dp</dimen>
+	<dimen name="dp_542">802.4611dp</dimen>
+	<dimen name="dp_543">803.9417dp</dimen>
+	<dimen name="dp_544">805.4222dp</dimen>
+	<dimen name="dp_545">806.9028dp</dimen>
+	<dimen name="dp_546">808.3833dp</dimen>
+	<dimen name="dp_547">809.8639dp</dimen>
+	<dimen name="dp_548">811.3444dp</dimen>
+	<dimen name="dp_549">812.8250dp</dimen>
+	<dimen name="dp_550">814.3056dp</dimen>
+	<dimen name="dp_551">815.7861dp</dimen>
+	<dimen name="dp_552">817.2667dp</dimen>
+	<dimen name="dp_553">818.7472dp</dimen>
+	<dimen name="dp_554">820.2278dp</dimen>
+	<dimen name="dp_555">821.7083dp</dimen>
+	<dimen name="dp_556">823.1889dp</dimen>
+	<dimen name="dp_557">824.6694dp</dimen>
+	<dimen name="dp_558">826.1500dp</dimen>
+	<dimen name="dp_559">827.6306dp</dimen>
+	<dimen name="dp_560">829.1111dp</dimen>
+	<dimen name="dp_561">830.5917dp</dimen>
+	<dimen name="dp_562">832.0722dp</dimen>
+	<dimen name="dp_563">833.5528dp</dimen>
+	<dimen name="dp_564">835.0333dp</dimen>
+	<dimen name="dp_565">836.5139dp</dimen>
+	<dimen name="dp_566">837.9944dp</dimen>
+	<dimen name="dp_567">839.4750dp</dimen>
+	<dimen name="dp_568">840.9556dp</dimen>
+	<dimen name="dp_569">842.4361dp</dimen>
+	<dimen name="dp_570">843.9167dp</dimen>
+	<dimen name="dp_571">845.3972dp</dimen>
+	<dimen name="dp_572">846.8778dp</dimen>
+	<dimen name="dp_573">848.3583dp</dimen>
+	<dimen name="dp_574">849.8389dp</dimen>
+	<dimen name="dp_575">851.3194dp</dimen>
+	<dimen name="dp_576">852.8000dp</dimen>
+	<dimen name="dp_577">854.2806dp</dimen>
+	<dimen name="dp_578">855.7611dp</dimen>
+	<dimen name="dp_579">857.2417dp</dimen>
+	<dimen name="dp_580">858.7222dp</dimen>
+	<dimen name="dp_581">860.2028dp</dimen>
+	<dimen name="dp_582">861.6833dp</dimen>
+	<dimen name="dp_583">863.1639dp</dimen>
+	<dimen name="dp_584">864.6444dp</dimen>
+	<dimen name="dp_585">866.1250dp</dimen>
+	<dimen name="dp_586">867.6056dp</dimen>
+	<dimen name="dp_587">869.0861dp</dimen>
+	<dimen name="dp_588">870.5667dp</dimen>
+	<dimen name="dp_589">872.0472dp</dimen>
+	<dimen name="dp_590">873.5278dp</dimen>
+	<dimen name="dp_591">875.0083dp</dimen>
+	<dimen name="dp_592">876.4889dp</dimen>
+	<dimen name="dp_593">877.9694dp</dimen>
+	<dimen name="dp_594">879.4500dp</dimen>
+	<dimen name="dp_595">880.9306dp</dimen>
+	<dimen name="dp_596">882.4111dp</dimen>
+	<dimen name="dp_597">883.8917dp</dimen>
+	<dimen name="dp_598">885.3722dp</dimen>
+	<dimen name="dp_599">886.8528dp</dimen>
 	<dimen name="dp_600">888.3333dp</dimen>
+	<dimen name="dp_601">889.8139dp</dimen>
+	<dimen name="dp_602">891.2944dp</dimen>
+	<dimen name="dp_603">892.7750dp</dimen>
+	<dimen name="dp_604">894.2556dp</dimen>
+	<dimen name="dp_605">895.7361dp</dimen>
+	<dimen name="dp_606">897.2167dp</dimen>
+	<dimen name="dp_607">898.6972dp</dimen>
+	<dimen name="dp_608">900.1778dp</dimen>
+	<dimen name="dp_609">901.6583dp</dimen>
+	<dimen name="dp_610">903.1389dp</dimen>
+	<dimen name="dp_611">904.6194dp</dimen>
+	<dimen name="dp_612">906.1000dp</dimen>
+	<dimen name="dp_613">907.5806dp</dimen>
+	<dimen name="dp_614">909.0611dp</dimen>
+	<dimen name="dp_615">910.5417dp</dimen>
+	<dimen name="dp_616">912.0222dp</dimen>
+	<dimen name="dp_617">913.5028dp</dimen>
+	<dimen name="dp_618">914.9833dp</dimen>
+	<dimen name="dp_619">916.4639dp</dimen>
+	<dimen name="dp_620">917.9444dp</dimen>
+	<dimen name="dp_621">919.4250dp</dimen>
+	<dimen name="dp_622">920.9056dp</dimen>
+	<dimen name="dp_623">922.3861dp</dimen>
+	<dimen name="dp_624">923.8667dp</dimen>
+	<dimen name="dp_625">925.3472dp</dimen>
+	<dimen name="dp_626">926.8278dp</dimen>
+	<dimen name="dp_627">928.3083dp</dimen>
+	<dimen name="dp_628">929.7889dp</dimen>
+	<dimen name="dp_629">931.2694dp</dimen>
+	<dimen name="dp_630">932.7500dp</dimen>
+	<dimen name="dp_631">934.2306dp</dimen>
+	<dimen name="dp_632">935.7111dp</dimen>
+	<dimen name="dp_633">937.1917dp</dimen>
+	<dimen name="dp_634">938.6722dp</dimen>
+	<dimen name="dp_635">940.1528dp</dimen>
+	<dimen name="dp_636">941.6333dp</dimen>
+	<dimen name="dp_637">943.1139dp</dimen>
+	<dimen name="dp_638">944.5944dp</dimen>
+	<dimen name="dp_639">946.0750dp</dimen>
 	<dimen name="dp_640">947.5556dp</dimen>
-	<dimen name="dp_720">1066.0000dp</dimen>
+	<dimen name="dp_641">949.0361dp</dimen>
+	<dimen name="dp_642">950.5167dp</dimen>
+	<dimen name="dp_643">951.9972dp</dimen>
+	<dimen name="dp_644">953.4778dp</dimen>
+	<dimen name="dp_645">954.9583dp</dimen>
+	<dimen name="dp_646">956.4389dp</dimen>
+	<dimen name="dp_647">957.9194dp</dimen>
+	<dimen name="dp_648">959.4000dp</dimen>
+	<dimen name="dp_649">960.8806dp</dimen>
+	<dimen name="dp_650">962.3611dp</dimen>
+	<dimen name="dp_651">963.8417dp</dimen>
+	<dimen name="dp_652">965.3222dp</dimen>
+	<dimen name="dp_653">966.8028dp</dimen>
+	<dimen name="dp_654">968.2833dp</dimen>
+	<dimen name="dp_655">969.7639dp</dimen>
+	<dimen name="dp_656">971.2444dp</dimen>
+	<dimen name="dp_657">972.7250dp</dimen>
+	<dimen name="dp_658">974.2056dp</dimen>
+	<dimen name="dp_659">975.6861dp</dimen>
+	<dimen name="dp_660">977.1667dp</dimen>
+	<dimen name="dp_661">978.6472dp</dimen>
+	<dimen name="dp_662">980.1278dp</dimen>
+	<dimen name="dp_663">981.6083dp</dimen>
+	<dimen name="dp_664">983.0889dp</dimen>
+	<dimen name="dp_665">984.5694dp</dimen>
+	<dimen name="dp_666">986.0500dp</dimen>
+	<dimen name="dp_667">987.5306dp</dimen>
+	<dimen name="dp_668">989.0111dp</dimen>
+	<dimen name="dp_669">990.4917dp</dimen>
+	<dimen name="dp_670">991.9722dp</dimen>
+	<dimen name="dp_671">993.4528dp</dimen>
+	<dimen name="dp_672">994.9333dp</dimen>
+	<dimen name="dp_673">996.4139dp</dimen>
+	<dimen name="dp_674">997.8944dp</dimen>
+	<dimen name="dp_675">999.3750dp</dimen>
+	<dimen name="dp_676">1000.8556dp</dimen>
+	<dimen name="dp_677">1002.3361dp</dimen>
+	<dimen name="dp_678">1003.8167dp</dimen>
+	<dimen name="dp_679">1005.2972dp</dimen>
+	<dimen name="dp_680">1006.7778dp</dimen>
+	<dimen name="dp_681">1008.2583dp</dimen>
+	<dimen name="dp_682">1009.7389dp</dimen>
+	<dimen name="dp_683">1011.2194dp</dimen>
+	<dimen name="dp_684">1012.7000dp</dimen>
+	<dimen name="dp_685">1014.1806dp</dimen>
+	<dimen name="dp_686">1015.6611dp</dimen>
+	<dimen name="dp_687">1017.1417dp</dimen>
+	<dimen name="dp_688">1018.6222dp</dimen>
+	<dimen name="dp_689">1020.1028dp</dimen>
+	<dimen name="dp_690">1021.5833dp</dimen>
+	<dimen name="dp_691">1023.0639dp</dimen>
+	<dimen name="dp_692">1024.5444dp</dimen>
+	<dimen name="dp_693">1026.0250dp</dimen>
+	<dimen name="dp_694">1027.5056dp</dimen>
+	<dimen name="dp_695">1028.9861dp</dimen>
+	<dimen name="dp_696">1030.4667dp</dimen>
+	<dimen name="dp_697">1031.9472dp</dimen>
+	<dimen name="dp_698">1033.4278dp</dimen>
+	<dimen name="dp_699">1034.9083dp</dimen>
+	<dimen name="dp_700">1036.3889dp</dimen>
 	<dimen name="sp_1">1.4806sp</dimen>
 	<dimen name="sp_2">2.9611sp</dimen>
 	<dimen name="sp_3">4.4417sp</dimen>
@@ -573,4 +766,54 @@
 	<dimen name="sp_48">71.0667sp</dimen>
 	<dimen name="sp_49">72.5472sp</dimen>
 	<dimen name="sp_50">74.0278sp</dimen>
+	<dimen name="sp_51">75.5083sp</dimen>
+	<dimen name="sp_52">76.9889sp</dimen>
+	<dimen name="sp_53">78.4694sp</dimen>
+	<dimen name="sp_54">79.9500sp</dimen>
+	<dimen name="sp_55">81.4306sp</dimen>
+	<dimen name="sp_56">82.9111sp</dimen>
+	<dimen name="sp_57">84.3917sp</dimen>
+	<dimen name="sp_58">85.8722sp</dimen>
+	<dimen name="sp_59">87.3528sp</dimen>
+	<dimen name="sp_60">88.8333sp</dimen>
+	<dimen name="sp_61">90.3139sp</dimen>
+	<dimen name="sp_62">91.7944sp</dimen>
+	<dimen name="sp_63">93.2750sp</dimen>
+	<dimen name="sp_64">94.7556sp</dimen>
+	<dimen name="sp_65">96.2361sp</dimen>
+	<dimen name="sp_66">97.7167sp</dimen>
+	<dimen name="sp_67">99.1972sp</dimen>
+	<dimen name="sp_68">100.6778sp</dimen>
+	<dimen name="sp_69">102.1583sp</dimen>
+	<dimen name="sp_70">103.6389sp</dimen>
+	<dimen name="sp_71">105.1194sp</dimen>
+	<dimen name="sp_72">106.6000sp</dimen>
+	<dimen name="sp_73">108.0806sp</dimen>
+	<dimen name="sp_74">109.5611sp</dimen>
+	<dimen name="sp_75">111.0417sp</dimen>
+	<dimen name="sp_76">112.5222sp</dimen>
+	<dimen name="sp_77">114.0028sp</dimen>
+	<dimen name="sp_78">115.4833sp</dimen>
+	<dimen name="sp_79">116.9639sp</dimen>
+	<dimen name="sp_80">118.4444sp</dimen>
+	<dimen name="sp_81">119.9250sp</dimen>
+	<dimen name="sp_82">121.4056sp</dimen>
+	<dimen name="sp_83">122.8861sp</dimen>
+	<dimen name="sp_84">124.3667sp</dimen>
+	<dimen name="sp_85">125.8472sp</dimen>
+	<dimen name="sp_86">127.3278sp</dimen>
+	<dimen name="sp_87">128.8083sp</dimen>
+	<dimen name="sp_88">130.2889sp</dimen>
+	<dimen name="sp_89">131.7694sp</dimen>
+	<dimen name="sp_90">133.2500sp</dimen>
+	<dimen name="sp_91">134.7306sp</dimen>
+	<dimen name="sp_92">136.2111sp</dimen>
+	<dimen name="sp_93">137.6917sp</dimen>
+	<dimen name="sp_94">139.1722sp</dimen>
+	<dimen name="sp_95">140.6528sp</dimen>
+	<dimen name="sp_96">142.1333sp</dimen>
+	<dimen name="sp_97">143.6139sp</dimen>
+	<dimen name="sp_98">145.0944sp</dimen>
+	<dimen name="sp_99">146.5750sp</dimen>
+	<dimen name="sp_100">148.0556sp</dimen>
 </resources>
diff --git a/app/src/main/res/values-sw540dp/dimens.xml b/app/src/main/res/values-sw540dp/dimens.xml
index 324eea6..a0a3c9d 100644
--- a/app/src/main/res/values-sw540dp/dimens.xml
+++ b/app/src/main/res/values-sw540dp/dimens.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-	<dimen name="activity_horizontal_margin">24.0000dp</dimen>
-	<dimen name="activity_vertical_margin">24.0000dp</dimen>
-	<dimen name="actions_item_font">27.0000sp</dimen>
-	<dimen name="actions_item_drawablePaddding">15.0000dp</dimen>
 	<dimen name="dp_m_60">-90.0000dp</dimen>
 	<dimen name="dp_m_30">-45.0000dp</dimen>
 	<dimen name="dp_m_20">-30.0000dp</dimen>
@@ -520,9 +516,206 @@
 	<dimen name="dp_498">747.0000dp</dimen>
 	<dimen name="dp_499">748.5000dp</dimen>
 	<dimen name="dp_500">750.0000dp</dimen>
+	<dimen name="dp_501">751.5000dp</dimen>
+	<dimen name="dp_502">753.0000dp</dimen>
+	<dimen name="dp_503">754.5000dp</dimen>
+	<dimen name="dp_504">756.0000dp</dimen>
+	<dimen name="dp_505">757.5000dp</dimen>
+	<dimen name="dp_506">759.0000dp</dimen>
+	<dimen name="dp_507">760.5000dp</dimen>
+	<dimen name="dp_508">762.0000dp</dimen>
+	<dimen name="dp_509">763.5000dp</dimen>
+	<dimen name="dp_510">765.0000dp</dimen>
+	<dimen name="dp_511">766.5000dp</dimen>
+	<dimen name="dp_512">768.0000dp</dimen>
+	<dimen name="dp_513">769.5000dp</dimen>
+	<dimen name="dp_514">771.0000dp</dimen>
+	<dimen name="dp_515">772.5000dp</dimen>
+	<dimen name="dp_516">774.0000dp</dimen>
+	<dimen name="dp_517">775.5000dp</dimen>
+	<dimen name="dp_518">777.0000dp</dimen>
+	<dimen name="dp_519">778.5000dp</dimen>
+	<dimen name="dp_520">780.0000dp</dimen>
+	<dimen name="dp_521">781.5000dp</dimen>
+	<dimen name="dp_522">783.0000dp</dimen>
+	<dimen name="dp_523">784.5000dp</dimen>
+	<dimen name="dp_524">786.0000dp</dimen>
+	<dimen name="dp_525">787.5000dp</dimen>
+	<dimen name="dp_526">789.0000dp</dimen>
+	<dimen name="dp_527">790.5000dp</dimen>
+	<dimen name="dp_528">792.0000dp</dimen>
+	<dimen name="dp_529">793.5000dp</dimen>
+	<dimen name="dp_530">795.0000dp</dimen>
+	<dimen name="dp_531">796.5000dp</dimen>
+	<dimen name="dp_532">798.0000dp</dimen>
+	<dimen name="dp_533">799.5000dp</dimen>
+	<dimen name="dp_534">801.0000dp</dimen>
+	<dimen name="dp_535">802.5000dp</dimen>
+	<dimen name="dp_536">804.0000dp</dimen>
+	<dimen name="dp_537">805.5000dp</dimen>
+	<dimen name="dp_538">807.0000dp</dimen>
+	<dimen name="dp_539">808.5000dp</dimen>
+	<dimen name="dp_540">810.0000dp</dimen>
+	<dimen name="dp_541">811.5000dp</dimen>
+	<dimen name="dp_542">813.0000dp</dimen>
+	<dimen name="dp_543">814.5000dp</dimen>
+	<dimen name="dp_544">816.0000dp</dimen>
+	<dimen name="dp_545">817.5000dp</dimen>
+	<dimen name="dp_546">819.0000dp</dimen>
+	<dimen name="dp_547">820.5000dp</dimen>
+	<dimen name="dp_548">822.0000dp</dimen>
+	<dimen name="dp_549">823.5000dp</dimen>
+	<dimen name="dp_550">825.0000dp</dimen>
+	<dimen name="dp_551">826.5000dp</dimen>
+	<dimen name="dp_552">828.0000dp</dimen>
+	<dimen name="dp_553">829.5000dp</dimen>
+	<dimen name="dp_554">831.0000dp</dimen>
+	<dimen name="dp_555">832.5000dp</dimen>
+	<dimen name="dp_556">834.0000dp</dimen>
+	<dimen name="dp_557">835.5000dp</dimen>
+	<dimen name="dp_558">837.0000dp</dimen>
+	<dimen name="dp_559">838.5000dp</dimen>
+	<dimen name="dp_560">840.0000dp</dimen>
+	<dimen name="dp_561">841.5000dp</dimen>
+	<dimen name="dp_562">843.0000dp</dimen>
+	<dimen name="dp_563">844.5000dp</dimen>
+	<dimen name="dp_564">846.0000dp</dimen>
+	<dimen name="dp_565">847.5000dp</dimen>
+	<dimen name="dp_566">849.0000dp</dimen>
+	<dimen name="dp_567">850.5000dp</dimen>
+	<dimen name="dp_568">852.0000dp</dimen>
+	<dimen name="dp_569">853.5000dp</dimen>
+	<dimen name="dp_570">855.0000dp</dimen>
+	<dimen name="dp_571">856.5000dp</dimen>
+	<dimen name="dp_572">858.0000dp</dimen>
+	<dimen name="dp_573">859.5000dp</dimen>
+	<dimen name="dp_574">861.0000dp</dimen>
+	<dimen name="dp_575">862.5000dp</dimen>
+	<dimen name="dp_576">864.0000dp</dimen>
+	<dimen name="dp_577">865.5000dp</dimen>
+	<dimen name="dp_578">867.0000dp</dimen>
+	<dimen name="dp_579">868.5000dp</dimen>
+	<dimen name="dp_580">870.0000dp</dimen>
+	<dimen name="dp_581">871.5000dp</dimen>
+	<dimen name="dp_582">873.0000dp</dimen>
+	<dimen name="dp_583">874.5000dp</dimen>
+	<dimen name="dp_584">876.0000dp</dimen>
+	<dimen name="dp_585">877.5000dp</dimen>
+	<dimen name="dp_586">879.0000dp</dimen>
+	<dimen name="dp_587">880.5000dp</dimen>
+	<dimen name="dp_588">882.0000dp</dimen>
+	<dimen name="dp_589">883.5000dp</dimen>
+	<dimen name="dp_590">885.0000dp</dimen>
+	<dimen name="dp_591">886.5000dp</dimen>
+	<dimen name="dp_592">888.0000dp</dimen>
+	<dimen name="dp_593">889.5000dp</dimen>
+	<dimen name="dp_594">891.0000dp</dimen>
+	<dimen name="dp_595">892.5000dp</dimen>
+	<dimen name="dp_596">894.0000dp</dimen>
+	<dimen name="dp_597">895.5000dp</dimen>
+	<dimen name="dp_598">897.0000dp</dimen>
+	<dimen name="dp_599">898.5000dp</dimen>
 	<dimen name="dp_600">900.0000dp</dimen>
+	<dimen name="dp_601">901.5000dp</dimen>
+	<dimen name="dp_602">903.0000dp</dimen>
+	<dimen name="dp_603">904.5000dp</dimen>
+	<dimen name="dp_604">906.0000dp</dimen>
+	<dimen name="dp_605">907.5000dp</dimen>
+	<dimen name="dp_606">909.0000dp</dimen>
+	<dimen name="dp_607">910.5000dp</dimen>
+	<dimen name="dp_608">912.0000dp</dimen>
+	<dimen name="dp_609">913.5000dp</dimen>
+	<dimen name="dp_610">915.0000dp</dimen>
+	<dimen name="dp_611">916.5000dp</dimen>
+	<dimen name="dp_612">918.0000dp</dimen>
+	<dimen name="dp_613">919.5000dp</dimen>
+	<dimen name="dp_614">921.0000dp</dimen>
+	<dimen name="dp_615">922.5000dp</dimen>
+	<dimen name="dp_616">924.0000dp</dimen>
+	<dimen name="dp_617">925.5000dp</dimen>
+	<dimen name="dp_618">927.0000dp</dimen>
+	<dimen name="dp_619">928.5000dp</dimen>
+	<dimen name="dp_620">930.0000dp</dimen>
+	<dimen name="dp_621">931.5000dp</dimen>
+	<dimen name="dp_622">933.0000dp</dimen>
+	<dimen name="dp_623">934.5000dp</dimen>
+	<dimen name="dp_624">936.0000dp</dimen>
+	<dimen name="dp_625">937.5000dp</dimen>
+	<dimen name="dp_626">939.0000dp</dimen>
+	<dimen name="dp_627">940.5000dp</dimen>
+	<dimen name="dp_628">942.0000dp</dimen>
+	<dimen name="dp_629">943.5000dp</dimen>
+	<dimen name="dp_630">945.0000dp</dimen>
+	<dimen name="dp_631">946.5000dp</dimen>
+	<dimen name="dp_632">948.0000dp</dimen>
+	<dimen name="dp_633">949.5000dp</dimen>
+	<dimen name="dp_634">951.0000dp</dimen>
+	<dimen name="dp_635">952.5000dp</dimen>
+	<dimen name="dp_636">954.0000dp</dimen>
+	<dimen name="dp_637">955.5000dp</dimen>
+	<dimen name="dp_638">957.0000dp</dimen>
+	<dimen name="dp_639">958.5000dp</dimen>
 	<dimen name="dp_640">960.0000dp</dimen>
-	<dimen name="dp_720">1080.0000dp</dimen>
+	<dimen name="dp_641">961.5000dp</dimen>
+	<dimen name="dp_642">963.0000dp</dimen>
+	<dimen name="dp_643">964.5000dp</dimen>
+	<dimen name="dp_644">966.0000dp</dimen>
+	<dimen name="dp_645">967.5000dp</dimen>
+	<dimen name="dp_646">969.0000dp</dimen>
+	<dimen name="dp_647">970.5000dp</dimen>
+	<dimen name="dp_648">972.0000dp</dimen>
+	<dimen name="dp_649">973.5000dp</dimen>
+	<dimen name="dp_650">975.0000dp</dimen>
+	<dimen name="dp_651">976.5000dp</dimen>
+	<dimen name="dp_652">978.0000dp</dimen>
+	<dimen name="dp_653">979.5000dp</dimen>
+	<dimen name="dp_654">981.0000dp</dimen>
+	<dimen name="dp_655">982.5000dp</dimen>
+	<dimen name="dp_656">984.0000dp</dimen>
+	<dimen name="dp_657">985.5000dp</dimen>
+	<dimen name="dp_658">987.0000dp</dimen>
+	<dimen name="dp_659">988.5000dp</dimen>
+	<dimen name="dp_660">990.0000dp</dimen>
+	<dimen name="dp_661">991.5000dp</dimen>
+	<dimen name="dp_662">993.0000dp</dimen>
+	<dimen name="dp_663">994.5000dp</dimen>
+	<dimen name="dp_664">996.0000dp</dimen>
+	<dimen name="dp_665">997.5000dp</dimen>
+	<dimen name="dp_666">999.0000dp</dimen>
+	<dimen name="dp_667">1000.5000dp</dimen>
+	<dimen name="dp_668">1002.0000dp</dimen>
+	<dimen name="dp_669">1003.5000dp</dimen>
+	<dimen name="dp_670">1005.0000dp</dimen>
+	<dimen name="dp_671">1006.5000dp</dimen>
+	<dimen name="dp_672">1008.0000dp</dimen>
+	<dimen name="dp_673">1009.5000dp</dimen>
+	<dimen name="dp_674">1011.0000dp</dimen>
+	<dimen name="dp_675">1012.5000dp</dimen>
+	<dimen name="dp_676">1014.0000dp</dimen>
+	<dimen name="dp_677">1015.5000dp</dimen>
+	<dimen name="dp_678">1017.0000dp</dimen>
+	<dimen name="dp_679">1018.5000dp</dimen>
+	<dimen name="dp_680">1020.0000dp</dimen>
+	<dimen name="dp_681">1021.5000dp</dimen>
+	<dimen name="dp_682">1023.0000dp</dimen>
+	<dimen name="dp_683">1024.5000dp</dimen>
+	<dimen name="dp_684">1026.0000dp</dimen>
+	<dimen name="dp_685">1027.5000dp</dimen>
+	<dimen name="dp_686">1029.0000dp</dimen>
+	<dimen name="dp_687">1030.5000dp</dimen>
+	<dimen name="dp_688">1032.0000dp</dimen>
+	<dimen name="dp_689">1033.5000dp</dimen>
+	<dimen name="dp_690">1035.0000dp</dimen>
+	<dimen name="dp_691">1036.5000dp</dimen>
+	<dimen name="dp_692">1038.0000dp</dimen>
+	<dimen name="dp_693">1039.5000dp</dimen>
+	<dimen name="dp_694">1041.0000dp</dimen>
+	<dimen name="dp_695">1042.5000dp</dimen>
+	<dimen name="dp_696">1044.0000dp</dimen>
+	<dimen name="dp_697">1045.5000dp</dimen>
+	<dimen name="dp_698">1047.0000dp</dimen>
+	<dimen name="dp_699">1048.5000dp</dimen>
+	<dimen name="dp_700">1050.0000dp</dimen>
 	<dimen name="sp_1">1.5000sp</dimen>
 	<dimen name="sp_2">3.0000sp</dimen>
 	<dimen name="sp_3">4.5000sp</dimen>
@@ -573,4 +766,54 @@
 	<dimen name="sp_48">72.0000sp</dimen>
 	<dimen name="sp_49">73.5000sp</dimen>
 	<dimen name="sp_50">75.0000sp</dimen>
+	<dimen name="sp_51">76.5000sp</dimen>
+	<dimen name="sp_52">78.0000sp</dimen>
+	<dimen name="sp_53">79.5000sp</dimen>
+	<dimen name="sp_54">81.0000sp</dimen>
+	<dimen name="sp_55">82.5000sp</dimen>
+	<dimen name="sp_56">84.0000sp</dimen>
+	<dimen name="sp_57">85.5000sp</dimen>
+	<dimen name="sp_58">87.0000sp</dimen>
+	<dimen name="sp_59">88.5000sp</dimen>
+	<dimen name="sp_60">90.0000sp</dimen>
+	<dimen name="sp_61">91.5000sp</dimen>
+	<dimen name="sp_62">93.0000sp</dimen>
+	<dimen name="sp_63">94.5000sp</dimen>
+	<dimen name="sp_64">96.0000sp</dimen>
+	<dimen name="sp_65">97.5000sp</dimen>
+	<dimen name="sp_66">99.0000sp</dimen>
+	<dimen name="sp_67">100.5000sp</dimen>
+	<dimen name="sp_68">102.0000sp</dimen>
+	<dimen name="sp_69">103.5000sp</dimen>
+	<dimen name="sp_70">105.0000sp</dimen>
+	<dimen name="sp_71">106.5000sp</dimen>
+	<dimen name="sp_72">108.0000sp</dimen>
+	<dimen name="sp_73">109.5000sp</dimen>
+	<dimen name="sp_74">111.0000sp</dimen>
+	<dimen name="sp_75">112.5000sp</dimen>
+	<dimen name="sp_76">114.0000sp</dimen>
+	<dimen name="sp_77">115.5000sp</dimen>
+	<dimen name="sp_78">117.0000sp</dimen>
+	<dimen name="sp_79">118.5000sp</dimen>
+	<dimen name="sp_80">120.0000sp</dimen>
+	<dimen name="sp_81">121.5000sp</dimen>
+	<dimen name="sp_82">123.0000sp</dimen>
+	<dimen name="sp_83">124.5000sp</dimen>
+	<dimen name="sp_84">126.0000sp</dimen>
+	<dimen name="sp_85">127.5000sp</dimen>
+	<dimen name="sp_86">129.0000sp</dimen>
+	<dimen name="sp_87">130.5000sp</dimen>
+	<dimen name="sp_88">132.0000sp</dimen>
+	<dimen name="sp_89">133.5000sp</dimen>
+	<dimen name="sp_90">135.0000sp</dimen>
+	<dimen name="sp_91">136.5000sp</dimen>
+	<dimen name="sp_92">138.0000sp</dimen>
+	<dimen name="sp_93">139.5000sp</dimen>
+	<dimen name="sp_94">141.0000sp</dimen>
+	<dimen name="sp_95">142.5000sp</dimen>
+	<dimen name="sp_96">144.0000sp</dimen>
+	<dimen name="sp_97">145.5000sp</dimen>
+	<dimen name="sp_98">147.0000sp</dimen>
+	<dimen name="sp_99">148.5000sp</dimen>
+	<dimen name="sp_100">150.0000sp</dimen>
 </resources>
diff --git a/app/src/main/res/values-sw592dp/dimens.xml b/app/src/main/res/values-sw592dp/dimens.xml
index b544a34..3ca793e 100644
--- a/app/src/main/res/values-sw592dp/dimens.xml
+++ b/app/src/main/res/values-sw592dp/dimens.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-	<dimen name="activity_horizontal_margin">26.3111dp</dimen>
-	<dimen name="activity_vertical_margin">26.3111dp</dimen>
-	<dimen name="actions_item_font">29.6000sp</dimen>
-	<dimen name="actions_item_drawablePaddding">16.4444dp</dimen>
 	<dimen name="dp_m_60">-98.6667dp</dimen>
 	<dimen name="dp_m_30">-49.3333dp</dimen>
 	<dimen name="dp_m_20">-32.8889dp</dimen>
@@ -520,9 +516,206 @@
 	<dimen name="dp_498">818.9333dp</dimen>
 	<dimen name="dp_499">820.5778dp</dimen>
 	<dimen name="dp_500">822.2222dp</dimen>
+	<dimen name="dp_501">823.8667dp</dimen>
+	<dimen name="dp_502">825.5111dp</dimen>
+	<dimen name="dp_503">827.1556dp</dimen>
+	<dimen name="dp_504">828.8000dp</dimen>
+	<dimen name="dp_505">830.4444dp</dimen>
+	<dimen name="dp_506">832.0889dp</dimen>
+	<dimen name="dp_507">833.7333dp</dimen>
+	<dimen name="dp_508">835.3778dp</dimen>
+	<dimen name="dp_509">837.0222dp</dimen>
+	<dimen name="dp_510">838.6667dp</dimen>
+	<dimen name="dp_511">840.3111dp</dimen>
+	<dimen name="dp_512">841.9556dp</dimen>
+	<dimen name="dp_513">843.6000dp</dimen>
+	<dimen name="dp_514">845.2444dp</dimen>
+	<dimen name="dp_515">846.8889dp</dimen>
+	<dimen name="dp_516">848.5333dp</dimen>
+	<dimen name="dp_517">850.1778dp</dimen>
+	<dimen name="dp_518">851.8222dp</dimen>
+	<dimen name="dp_519">853.4667dp</dimen>
+	<dimen name="dp_520">855.1111dp</dimen>
+	<dimen name="dp_521">856.7556dp</dimen>
+	<dimen name="dp_522">858.4000dp</dimen>
+	<dimen name="dp_523">860.0444dp</dimen>
+	<dimen name="dp_524">861.6889dp</dimen>
+	<dimen name="dp_525">863.3333dp</dimen>
+	<dimen name="dp_526">864.9778dp</dimen>
+	<dimen name="dp_527">866.6222dp</dimen>
+	<dimen name="dp_528">868.2667dp</dimen>
+	<dimen name="dp_529">869.9111dp</dimen>
+	<dimen name="dp_530">871.5556dp</dimen>
+	<dimen name="dp_531">873.2000dp</dimen>
+	<dimen name="dp_532">874.8444dp</dimen>
+	<dimen name="dp_533">876.4889dp</dimen>
+	<dimen name="dp_534">878.1333dp</dimen>
+	<dimen name="dp_535">879.7778dp</dimen>
+	<dimen name="dp_536">881.4222dp</dimen>
+	<dimen name="dp_537">883.0667dp</dimen>
+	<dimen name="dp_538">884.7111dp</dimen>
+	<dimen name="dp_539">886.3556dp</dimen>
+	<dimen name="dp_540">888.0000dp</dimen>
+	<dimen name="dp_541">889.6444dp</dimen>
+	<dimen name="dp_542">891.2889dp</dimen>
+	<dimen name="dp_543">892.9333dp</dimen>
+	<dimen name="dp_544">894.5778dp</dimen>
+	<dimen name="dp_545">896.2222dp</dimen>
+	<dimen name="dp_546">897.8667dp</dimen>
+	<dimen name="dp_547">899.5111dp</dimen>
+	<dimen name="dp_548">901.1556dp</dimen>
+	<dimen name="dp_549">902.8000dp</dimen>
+	<dimen name="dp_550">904.4444dp</dimen>
+	<dimen name="dp_551">906.0889dp</dimen>
+	<dimen name="dp_552">907.7333dp</dimen>
+	<dimen name="dp_553">909.3778dp</dimen>
+	<dimen name="dp_554">911.0222dp</dimen>
+	<dimen name="dp_555">912.6667dp</dimen>
+	<dimen name="dp_556">914.3111dp</dimen>
+	<dimen name="dp_557">915.9556dp</dimen>
+	<dimen name="dp_558">917.6000dp</dimen>
+	<dimen name="dp_559">919.2444dp</dimen>
+	<dimen name="dp_560">920.8889dp</dimen>
+	<dimen name="dp_561">922.5333dp</dimen>
+	<dimen name="dp_562">924.1778dp</dimen>
+	<dimen name="dp_563">925.8222dp</dimen>
+	<dimen name="dp_564">927.4667dp</dimen>
+	<dimen name="dp_565">929.1111dp</dimen>
+	<dimen name="dp_566">930.7556dp</dimen>
+	<dimen name="dp_567">932.4000dp</dimen>
+	<dimen name="dp_568">934.0444dp</dimen>
+	<dimen name="dp_569">935.6889dp</dimen>
+	<dimen name="dp_570">937.3333dp</dimen>
+	<dimen name="dp_571">938.9778dp</dimen>
+	<dimen name="dp_572">940.6222dp</dimen>
+	<dimen name="dp_573">942.2667dp</dimen>
+	<dimen name="dp_574">943.9111dp</dimen>
+	<dimen name="dp_575">945.5556dp</dimen>
+	<dimen name="dp_576">947.2000dp</dimen>
+	<dimen name="dp_577">948.8444dp</dimen>
+	<dimen name="dp_578">950.4889dp</dimen>
+	<dimen name="dp_579">952.1333dp</dimen>
+	<dimen name="dp_580">953.7778dp</dimen>
+	<dimen name="dp_581">955.4222dp</dimen>
+	<dimen name="dp_582">957.0667dp</dimen>
+	<dimen name="dp_583">958.7111dp</dimen>
+	<dimen name="dp_584">960.3556dp</dimen>
+	<dimen name="dp_585">962.0000dp</dimen>
+	<dimen name="dp_586">963.6444dp</dimen>
+	<dimen name="dp_587">965.2889dp</dimen>
+	<dimen name="dp_588">966.9333dp</dimen>
+	<dimen name="dp_589">968.5778dp</dimen>
+	<dimen name="dp_590">970.2222dp</dimen>
+	<dimen name="dp_591">971.8667dp</dimen>
+	<dimen name="dp_592">973.5111dp</dimen>
+	<dimen name="dp_593">975.1556dp</dimen>
+	<dimen name="dp_594">976.8000dp</dimen>
+	<dimen name="dp_595">978.4444dp</dimen>
+	<dimen name="dp_596">980.0889dp</dimen>
+	<dimen name="dp_597">981.7333dp</dimen>
+	<dimen name="dp_598">983.3778dp</dimen>
+	<dimen name="dp_599">985.0222dp</dimen>
 	<dimen name="dp_600">986.6667dp</dimen>
+	<dimen name="dp_601">988.3111dp</dimen>
+	<dimen name="dp_602">989.9556dp</dimen>
+	<dimen name="dp_603">991.6000dp</dimen>
+	<dimen name="dp_604">993.2444dp</dimen>
+	<dimen name="dp_605">994.8889dp</dimen>
+	<dimen name="dp_606">996.5333dp</dimen>
+	<dimen name="dp_607">998.1778dp</dimen>
+	<dimen name="dp_608">999.8222dp</dimen>
+	<dimen name="dp_609">1001.4667dp</dimen>
+	<dimen name="dp_610">1003.1111dp</dimen>
+	<dimen name="dp_611">1004.7556dp</dimen>
+	<dimen name="dp_612">1006.4000dp</dimen>
+	<dimen name="dp_613">1008.0444dp</dimen>
+	<dimen name="dp_614">1009.6889dp</dimen>
+	<dimen name="dp_615">1011.3333dp</dimen>
+	<dimen name="dp_616">1012.9778dp</dimen>
+	<dimen name="dp_617">1014.6222dp</dimen>
+	<dimen name="dp_618">1016.2667dp</dimen>
+	<dimen name="dp_619">1017.9111dp</dimen>
+	<dimen name="dp_620">1019.5556dp</dimen>
+	<dimen name="dp_621">1021.2000dp</dimen>
+	<dimen name="dp_622">1022.8444dp</dimen>
+	<dimen name="dp_623">1024.4889dp</dimen>
+	<dimen name="dp_624">1026.1333dp</dimen>
+	<dimen name="dp_625">1027.7778dp</dimen>
+	<dimen name="dp_626">1029.4222dp</dimen>
+	<dimen name="dp_627">1031.0667dp</dimen>
+	<dimen name="dp_628">1032.7111dp</dimen>
+	<dimen name="dp_629">1034.3556dp</dimen>
+	<dimen name="dp_630">1036.0000dp</dimen>
+	<dimen name="dp_631">1037.6444dp</dimen>
+	<dimen name="dp_632">1039.2889dp</dimen>
+	<dimen name="dp_633">1040.9333dp</dimen>
+	<dimen name="dp_634">1042.5778dp</dimen>
+	<dimen name="dp_635">1044.2222dp</dimen>
+	<dimen name="dp_636">1045.8667dp</dimen>
+	<dimen name="dp_637">1047.5111dp</dimen>
+	<dimen name="dp_638">1049.1556dp</dimen>
+	<dimen name="dp_639">1050.8000dp</dimen>
 	<dimen name="dp_640">1052.4444dp</dimen>
-	<dimen name="dp_720">1184.0000dp</dimen>
+	<dimen name="dp_641">1054.0889dp</dimen>
+	<dimen name="dp_642">1055.7333dp</dimen>
+	<dimen name="dp_643">1057.3778dp</dimen>
+	<dimen name="dp_644">1059.0222dp</dimen>
+	<dimen name="dp_645">1060.6667dp</dimen>
+	<dimen name="dp_646">1062.3111dp</dimen>
+	<dimen name="dp_647">1063.9556dp</dimen>
+	<dimen name="dp_648">1065.6000dp</dimen>
+	<dimen name="dp_649">1067.2444dp</dimen>
+	<dimen name="dp_650">1068.8889dp</dimen>
+	<dimen name="dp_651">1070.5333dp</dimen>
+	<dimen name="dp_652">1072.1778dp</dimen>
+	<dimen name="dp_653">1073.8222dp</dimen>
+	<dimen name="dp_654">1075.4667dp</dimen>
+	<dimen name="dp_655">1077.1111dp</dimen>
+	<dimen name="dp_656">1078.7556dp</dimen>
+	<dimen name="dp_657">1080.4000dp</dimen>
+	<dimen name="dp_658">1082.0444dp</dimen>
+	<dimen name="dp_659">1083.6889dp</dimen>
+	<dimen name="dp_660">1085.3333dp</dimen>
+	<dimen name="dp_661">1086.9778dp</dimen>
+	<dimen name="dp_662">1088.6222dp</dimen>
+	<dimen name="dp_663">1090.2667dp</dimen>
+	<dimen name="dp_664">1091.9111dp</dimen>
+	<dimen name="dp_665">1093.5556dp</dimen>
+	<dimen name="dp_666">1095.2000dp</dimen>
+	<dimen name="dp_667">1096.8444dp</dimen>
+	<dimen name="dp_668">1098.4889dp</dimen>
+	<dimen name="dp_669">1100.1333dp</dimen>
+	<dimen name="dp_670">1101.7778dp</dimen>
+	<dimen name="dp_671">1103.4222dp</dimen>
+	<dimen name="dp_672">1105.0667dp</dimen>
+	<dimen name="dp_673">1106.7111dp</dimen>
+	<dimen name="dp_674">1108.3556dp</dimen>
+	<dimen name="dp_675">1110.0000dp</dimen>
+	<dimen name="dp_676">1111.6444dp</dimen>
+	<dimen name="dp_677">1113.2889dp</dimen>
+	<dimen name="dp_678">1114.9333dp</dimen>
+	<dimen name="dp_679">1116.5778dp</dimen>
+	<dimen name="dp_680">1118.2222dp</dimen>
+	<dimen name="dp_681">1119.8667dp</dimen>
+	<dimen name="dp_682">1121.5111dp</dimen>
+	<dimen name="dp_683">1123.1556dp</dimen>
+	<dimen name="dp_684">1124.8000dp</dimen>
+	<dimen name="dp_685">1126.4444dp</dimen>
+	<dimen name="dp_686">1128.0889dp</dimen>
+	<dimen name="dp_687">1129.7333dp</dimen>
+	<dimen name="dp_688">1131.3778dp</dimen>
+	<dimen name="dp_689">1133.0222dp</dimen>
+	<dimen name="dp_690">1134.6667dp</dimen>
+	<dimen name="dp_691">1136.3111dp</dimen>
+	<dimen name="dp_692">1137.9556dp</dimen>
+	<dimen name="dp_693">1139.6000dp</dimen>
+	<dimen name="dp_694">1141.2444dp</dimen>
+	<dimen name="dp_695">1142.8889dp</dimen>
+	<dimen name="dp_696">1144.5333dp</dimen>
+	<dimen name="dp_697">1146.1778dp</dimen>
+	<dimen name="dp_698">1147.8222dp</dimen>
+	<dimen name="dp_699">1149.4667dp</dimen>
+	<dimen name="dp_700">1151.1111dp</dimen>
 	<dimen name="sp_1">1.6444sp</dimen>
 	<dimen name="sp_2">3.2889sp</dimen>
 	<dimen name="sp_3">4.9333sp</dimen>
@@ -573,4 +766,54 @@
 	<dimen name="sp_48">78.9333sp</dimen>
 	<dimen name="sp_49">80.5778sp</dimen>
 	<dimen name="sp_50">82.2222sp</dimen>
+	<dimen name="sp_51">83.8667sp</dimen>
+	<dimen name="sp_52">85.5111sp</dimen>
+	<dimen name="sp_53">87.1556sp</dimen>
+	<dimen name="sp_54">88.8000sp</dimen>
+	<dimen name="sp_55">90.4444sp</dimen>
+	<dimen name="sp_56">92.0889sp</dimen>
+	<dimen name="sp_57">93.7333sp</dimen>
+	<dimen name="sp_58">95.3778sp</dimen>
+	<dimen name="sp_59">97.0222sp</dimen>
+	<dimen name="sp_60">98.6667sp</dimen>
+	<dimen name="sp_61">100.3111sp</dimen>
+	<dimen name="sp_62">101.9556sp</dimen>
+	<dimen name="sp_63">103.6000sp</dimen>
+	<dimen name="sp_64">105.2444sp</dimen>
+	<dimen name="sp_65">106.8889sp</dimen>
+	<dimen name="sp_66">108.5333sp</dimen>
+	<dimen name="sp_67">110.1778sp</dimen>
+	<dimen name="sp_68">111.8222sp</dimen>
+	<dimen name="sp_69">113.4667sp</dimen>
+	<dimen name="sp_70">115.1111sp</dimen>
+	<dimen name="sp_71">116.7556sp</dimen>
+	<dimen name="sp_72">118.4000sp</dimen>
+	<dimen name="sp_73">120.0444sp</dimen>
+	<dimen name="sp_74">121.6889sp</dimen>
+	<dimen name="sp_75">123.3333sp</dimen>
+	<dimen name="sp_76">124.9778sp</dimen>
+	<dimen name="sp_77">126.6222sp</dimen>
+	<dimen name="sp_78">128.2667sp</dimen>
+	<dimen name="sp_79">129.9111sp</dimen>
+	<dimen name="sp_80">131.5556sp</dimen>
+	<dimen name="sp_81">133.2000sp</dimen>
+	<dimen name="sp_82">134.8444sp</dimen>
+	<dimen name="sp_83">136.4889sp</dimen>
+	<dimen name="sp_84">138.1333sp</dimen>
+	<dimen name="sp_85">139.7778sp</dimen>
+	<dimen name="sp_86">141.4222sp</dimen>
+	<dimen name="sp_87">143.0667sp</dimen>
+	<dimen name="sp_88">144.7111sp</dimen>
+	<dimen name="sp_89">146.3556sp</dimen>
+	<dimen name="sp_90">148.0000sp</dimen>
+	<dimen name="sp_91">149.6444sp</dimen>
+	<dimen name="sp_92">151.2889sp</dimen>
+	<dimen name="sp_93">152.9333sp</dimen>
+	<dimen name="sp_94">154.5778sp</dimen>
+	<dimen name="sp_95">156.2222sp</dimen>
+	<dimen name="sp_96">157.8667sp</dimen>
+	<dimen name="sp_97">159.5111sp</dimen>
+	<dimen name="sp_98">161.1556sp</dimen>
+	<dimen name="sp_99">162.8000sp</dimen>
+	<dimen name="sp_100">164.4444sp</dimen>
 </resources>
diff --git a/app/src/main/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml
index a11c179..955f07e 100644
--- a/app/src/main/res/values-sw600dp/dimens.xml
+++ b/app/src/main/res/values-sw600dp/dimens.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-	<dimen name="activity_horizontal_margin">26.6667dp</dimen>
-	<dimen name="activity_vertical_margin">26.6667dp</dimen>
-	<dimen name="actions_item_font">30.0000sp</dimen>
-	<dimen name="actions_item_drawablePaddding">16.6667dp</dimen>
 	<dimen name="dp_m_60">-100.0000dp</dimen>
 	<dimen name="dp_m_30">-50.0000dp</dimen>
 	<dimen name="dp_m_20">-33.3333dp</dimen>
@@ -520,9 +516,206 @@
 	<dimen name="dp_498">830.0000dp</dimen>
 	<dimen name="dp_499">831.6667dp</dimen>
 	<dimen name="dp_500">833.3333dp</dimen>
+	<dimen name="dp_501">835.0000dp</dimen>
+	<dimen name="dp_502">836.6667dp</dimen>
+	<dimen name="dp_503">838.3333dp</dimen>
+	<dimen name="dp_504">840.0000dp</dimen>
+	<dimen name="dp_505">841.6667dp</dimen>
+	<dimen name="dp_506">843.3333dp</dimen>
+	<dimen name="dp_507">845.0000dp</dimen>
+	<dimen name="dp_508">846.6667dp</dimen>
+	<dimen name="dp_509">848.3333dp</dimen>
+	<dimen name="dp_510">850.0000dp</dimen>
+	<dimen name="dp_511">851.6667dp</dimen>
+	<dimen name="dp_512">853.3333dp</dimen>
+	<dimen name="dp_513">855.0000dp</dimen>
+	<dimen name="dp_514">856.6667dp</dimen>
+	<dimen name="dp_515">858.3333dp</dimen>
+	<dimen name="dp_516">860.0000dp</dimen>
+	<dimen name="dp_517">861.6667dp</dimen>
+	<dimen name="dp_518">863.3333dp</dimen>
+	<dimen name="dp_519">865.0000dp</dimen>
+	<dimen name="dp_520">866.6667dp</dimen>
+	<dimen name="dp_521">868.3333dp</dimen>
+	<dimen name="dp_522">870.0000dp</dimen>
+	<dimen name="dp_523">871.6667dp</dimen>
+	<dimen name="dp_524">873.3333dp</dimen>
+	<dimen name="dp_525">875.0000dp</dimen>
+	<dimen name="dp_526">876.6667dp</dimen>
+	<dimen name="dp_527">878.3333dp</dimen>
+	<dimen name="dp_528">880.0000dp</dimen>
+	<dimen name="dp_529">881.6667dp</dimen>
+	<dimen name="dp_530">883.3333dp</dimen>
+	<dimen name="dp_531">885.0000dp</dimen>
+	<dimen name="dp_532">886.6667dp</dimen>
+	<dimen name="dp_533">888.3333dp</dimen>
+	<dimen name="dp_534">890.0000dp</dimen>
+	<dimen name="dp_535">891.6667dp</dimen>
+	<dimen name="dp_536">893.3333dp</dimen>
+	<dimen name="dp_537">895.0000dp</dimen>
+	<dimen name="dp_538">896.6667dp</dimen>
+	<dimen name="dp_539">898.3333dp</dimen>
+	<dimen name="dp_540">900.0000dp</dimen>
+	<dimen name="dp_541">901.6667dp</dimen>
+	<dimen name="dp_542">903.3333dp</dimen>
+	<dimen name="dp_543">905.0000dp</dimen>
+	<dimen name="dp_544">906.6667dp</dimen>
+	<dimen name="dp_545">908.3333dp</dimen>
+	<dimen name="dp_546">910.0000dp</dimen>
+	<dimen name="dp_547">911.6667dp</dimen>
+	<dimen name="dp_548">913.3333dp</dimen>
+	<dimen name="dp_549">915.0000dp</dimen>
+	<dimen name="dp_550">916.6667dp</dimen>
+	<dimen name="dp_551">918.3333dp</dimen>
+	<dimen name="dp_552">920.0000dp</dimen>
+	<dimen name="dp_553">921.6667dp</dimen>
+	<dimen name="dp_554">923.3333dp</dimen>
+	<dimen name="dp_555">925.0000dp</dimen>
+	<dimen name="dp_556">926.6667dp</dimen>
+	<dimen name="dp_557">928.3333dp</dimen>
+	<dimen name="dp_558">930.0000dp</dimen>
+	<dimen name="dp_559">931.6667dp</dimen>
+	<dimen name="dp_560">933.3333dp</dimen>
+	<dimen name="dp_561">935.0000dp</dimen>
+	<dimen name="dp_562">936.6667dp</dimen>
+	<dimen name="dp_563">938.3333dp</dimen>
+	<dimen name="dp_564">940.0000dp</dimen>
+	<dimen name="dp_565">941.6667dp</dimen>
+	<dimen name="dp_566">943.3333dp</dimen>
+	<dimen name="dp_567">945.0000dp</dimen>
+	<dimen name="dp_568">946.6667dp</dimen>
+	<dimen name="dp_569">948.3333dp</dimen>
+	<dimen name="dp_570">950.0000dp</dimen>
+	<dimen name="dp_571">951.6667dp</dimen>
+	<dimen name="dp_572">953.3333dp</dimen>
+	<dimen name="dp_573">955.0000dp</dimen>
+	<dimen name="dp_574">956.6667dp</dimen>
+	<dimen name="dp_575">958.3333dp</dimen>
+	<dimen name="dp_576">960.0000dp</dimen>
+	<dimen name="dp_577">961.6667dp</dimen>
+	<dimen name="dp_578">963.3333dp</dimen>
+	<dimen name="dp_579">965.0000dp</dimen>
+	<dimen name="dp_580">966.6667dp</dimen>
+	<dimen name="dp_581">968.3333dp</dimen>
+	<dimen name="dp_582">970.0000dp</dimen>
+	<dimen name="dp_583">971.6667dp</dimen>
+	<dimen name="dp_584">973.3333dp</dimen>
+	<dimen name="dp_585">975.0000dp</dimen>
+	<dimen name="dp_586">976.6667dp</dimen>
+	<dimen name="dp_587">978.3333dp</dimen>
+	<dimen name="dp_588">980.0000dp</dimen>
+	<dimen name="dp_589">981.6667dp</dimen>
+	<dimen name="dp_590">983.3333dp</dimen>
+	<dimen name="dp_591">985.0000dp</dimen>
+	<dimen name="dp_592">986.6667dp</dimen>
+	<dimen name="dp_593">988.3333dp</dimen>
+	<dimen name="dp_594">990.0000dp</dimen>
+	<dimen name="dp_595">991.6667dp</dimen>
+	<dimen name="dp_596">993.3333dp</dimen>
+	<dimen name="dp_597">995.0000dp</dimen>
+	<dimen name="dp_598">996.6667dp</dimen>
+	<dimen name="dp_599">998.3333dp</dimen>
 	<dimen name="dp_600">1000.0000dp</dimen>
+	<dimen name="dp_601">1001.6667dp</dimen>
+	<dimen name="dp_602">1003.3333dp</dimen>
+	<dimen name="dp_603">1005.0000dp</dimen>
+	<dimen name="dp_604">1006.6667dp</dimen>
+	<dimen name="dp_605">1008.3333dp</dimen>
+	<dimen name="dp_606">1010.0000dp</dimen>
+	<dimen name="dp_607">1011.6667dp</dimen>
+	<dimen name="dp_608">1013.3333dp</dimen>
+	<dimen name="dp_609">1015.0000dp</dimen>
+	<dimen name="dp_610">1016.6667dp</dimen>
+	<dimen name="dp_611">1018.3333dp</dimen>
+	<dimen name="dp_612">1020.0000dp</dimen>
+	<dimen name="dp_613">1021.6667dp</dimen>
+	<dimen name="dp_614">1023.3333dp</dimen>
+	<dimen name="dp_615">1025.0000dp</dimen>
+	<dimen name="dp_616">1026.6667dp</dimen>
+	<dimen name="dp_617">1028.3333dp</dimen>
+	<dimen name="dp_618">1030.0000dp</dimen>
+	<dimen name="dp_619">1031.6667dp</dimen>
+	<dimen name="dp_620">1033.3333dp</dimen>
+	<dimen name="dp_621">1035.0000dp</dimen>
+	<dimen name="dp_622">1036.6667dp</dimen>
+	<dimen name="dp_623">1038.3333dp</dimen>
+	<dimen name="dp_624">1040.0000dp</dimen>
+	<dimen name="dp_625">1041.6667dp</dimen>
+	<dimen name="dp_626">1043.3333dp</dimen>
+	<dimen name="dp_627">1045.0000dp</dimen>
+	<dimen name="dp_628">1046.6667dp</dimen>
+	<dimen name="dp_629">1048.3333dp</dimen>
+	<dimen name="dp_630">1050.0000dp</dimen>
+	<dimen name="dp_631">1051.6667dp</dimen>
+	<dimen name="dp_632">1053.3333dp</dimen>
+	<dimen name="dp_633">1055.0000dp</dimen>
+	<dimen name="dp_634">1056.6667dp</dimen>
+	<dimen name="dp_635">1058.3333dp</dimen>
+	<dimen name="dp_636">1060.0000dp</dimen>
+	<dimen name="dp_637">1061.6667dp</dimen>
+	<dimen name="dp_638">1063.3333dp</dimen>
+	<dimen name="dp_639">1065.0000dp</dimen>
 	<dimen name="dp_640">1066.6667dp</dimen>
-	<dimen name="dp_720">1200.0000dp</dimen>
+	<dimen name="dp_641">1068.3333dp</dimen>
+	<dimen name="dp_642">1070.0000dp</dimen>
+	<dimen name="dp_643">1071.6667dp</dimen>
+	<dimen name="dp_644">1073.3333dp</dimen>
+	<dimen name="dp_645">1075.0000dp</dimen>
+	<dimen name="dp_646">1076.6667dp</dimen>
+	<dimen name="dp_647">1078.3333dp</dimen>
+	<dimen name="dp_648">1080.0000dp</dimen>
+	<dimen name="dp_649">1081.6667dp</dimen>
+	<dimen name="dp_650">1083.3333dp</dimen>
+	<dimen name="dp_651">1085.0000dp</dimen>
+	<dimen name="dp_652">1086.6667dp</dimen>
+	<dimen name="dp_653">1088.3333dp</dimen>
+	<dimen name="dp_654">1090.0000dp</dimen>
+	<dimen name="dp_655">1091.6667dp</dimen>
+	<dimen name="dp_656">1093.3333dp</dimen>
+	<dimen name="dp_657">1095.0000dp</dimen>
+	<dimen name="dp_658">1096.6667dp</dimen>
+	<dimen name="dp_659">1098.3333dp</dimen>
+	<dimen name="dp_660">1100.0000dp</dimen>
+	<dimen name="dp_661">1101.6667dp</dimen>
+	<dimen name="dp_662">1103.3333dp</dimen>
+	<dimen name="dp_663">1105.0000dp</dimen>
+	<dimen name="dp_664">1106.6667dp</dimen>
+	<dimen name="dp_665">1108.3333dp</dimen>
+	<dimen name="dp_666">1110.0000dp</dimen>
+	<dimen name="dp_667">1111.6667dp</dimen>
+	<dimen name="dp_668">1113.3333dp</dimen>
+	<dimen name="dp_669">1115.0000dp</dimen>
+	<dimen name="dp_670">1116.6667dp</dimen>
+	<dimen name="dp_671">1118.3333dp</dimen>
+	<dimen name="dp_672">1120.0000dp</dimen>
+	<dimen name="dp_673">1121.6667dp</dimen>
+	<dimen name="dp_674">1123.3333dp</dimen>
+	<dimen name="dp_675">1125.0000dp</dimen>
+	<dimen name="dp_676">1126.6667dp</dimen>
+	<dimen name="dp_677">1128.3333dp</dimen>
+	<dimen name="dp_678">1130.0000dp</dimen>
+	<dimen name="dp_679">1131.6667dp</dimen>
+	<dimen name="dp_680">1133.3333dp</dimen>
+	<dimen name="dp_681">1135.0000dp</dimen>
+	<dimen name="dp_682">1136.6667dp</dimen>
+	<dimen name="dp_683">1138.3333dp</dimen>
+	<dimen name="dp_684">1140.0000dp</dimen>
+	<dimen name="dp_685">1141.6667dp</dimen>
+	<dimen name="dp_686">1143.3333dp</dimen>
+	<dimen name="dp_687">1145.0000dp</dimen>
+	<dimen name="dp_688">1146.6667dp</dimen>
+	<dimen name="dp_689">1148.3333dp</dimen>
+	<dimen name="dp_690">1150.0000dp</dimen>
+	<dimen name="dp_691">1151.6667dp</dimen>
+	<dimen name="dp_692">1153.3333dp</dimen>
+	<dimen name="dp_693">1155.0000dp</dimen>
+	<dimen name="dp_694">1156.6667dp</dimen>
+	<dimen name="dp_695">1158.3333dp</dimen>
+	<dimen name="dp_696">1160.0000dp</dimen>
+	<dimen name="dp_697">1161.6667dp</dimen>
+	<dimen name="dp_698">1163.3333dp</dimen>
+	<dimen name="dp_699">1165.0000dp</dimen>
+	<dimen name="dp_700">1166.6667dp</dimen>
 	<dimen name="sp_1">1.6667sp</dimen>
 	<dimen name="sp_2">3.3333sp</dimen>
 	<dimen name="sp_3">5.0000sp</dimen>
@@ -573,4 +766,54 @@
 	<dimen name="sp_48">80.0000sp</dimen>
 	<dimen name="sp_49">81.6667sp</dimen>
 	<dimen name="sp_50">83.3333sp</dimen>
+	<dimen name="sp_51">85.0000sp</dimen>
+	<dimen name="sp_52">86.6667sp</dimen>
+	<dimen name="sp_53">88.3333sp</dimen>
+	<dimen name="sp_54">90.0000sp</dimen>
+	<dimen name="sp_55">91.6667sp</dimen>
+	<dimen name="sp_56">93.3333sp</dimen>
+	<dimen name="sp_57">95.0000sp</dimen>
+	<dimen name="sp_58">96.6667sp</dimen>
+	<dimen name="sp_59">98.3333sp</dimen>
+	<dimen name="sp_60">100.0000sp</dimen>
+	<dimen name="sp_61">101.6667sp</dimen>
+	<dimen name="sp_62">103.3333sp</dimen>
+	<dimen name="sp_63">105.0000sp</dimen>
+	<dimen name="sp_64">106.6667sp</dimen>
+	<dimen name="sp_65">108.3333sp</dimen>
+	<dimen name="sp_66">110.0000sp</dimen>
+	<dimen name="sp_67">111.6667sp</dimen>
+	<dimen name="sp_68">113.3333sp</dimen>
+	<dimen name="sp_69">115.0000sp</dimen>
+	<dimen name="sp_70">116.6667sp</dimen>
+	<dimen name="sp_71">118.3333sp</dimen>
+	<dimen name="sp_72">120.0000sp</dimen>
+	<dimen name="sp_73">121.6667sp</dimen>
+	<dimen name="sp_74">123.3333sp</dimen>
+	<dimen name="sp_75">125.0000sp</dimen>
+	<dimen name="sp_76">126.6667sp</dimen>
+	<dimen name="sp_77">128.3333sp</dimen>
+	<dimen name="sp_78">130.0000sp</dimen>
+	<dimen name="sp_79">131.6667sp</dimen>
+	<dimen name="sp_80">133.3333sp</dimen>
+	<dimen name="sp_81">135.0000sp</dimen>
+	<dimen name="sp_82">136.6667sp</dimen>
+	<dimen name="sp_83">138.3333sp</dimen>
+	<dimen name="sp_84">140.0000sp</dimen>
+	<dimen name="sp_85">141.6667sp</dimen>
+	<dimen name="sp_86">143.3333sp</dimen>
+	<dimen name="sp_87">145.0000sp</dimen>
+	<dimen name="sp_88">146.6667sp</dimen>
+	<dimen name="sp_89">148.3333sp</dimen>
+	<dimen name="sp_90">150.0000sp</dimen>
+	<dimen name="sp_91">151.6667sp</dimen>
+	<dimen name="sp_92">153.3333sp</dimen>
+	<dimen name="sp_93">155.0000sp</dimen>
+	<dimen name="sp_94">156.6667sp</dimen>
+	<dimen name="sp_95">158.3333sp</dimen>
+	<dimen name="sp_96">160.0000sp</dimen>
+	<dimen name="sp_97">161.6667sp</dimen>
+	<dimen name="sp_98">163.3333sp</dimen>
+	<dimen name="sp_99">165.0000sp</dimen>
+	<dimen name="sp_100">166.6667sp</dimen>
 </resources>
diff --git a/app/src/main/res/values-sw640dp/dimens.xml b/app/src/main/res/values-sw640dp/dimens.xml
index a47d9d6..f804e6c 100644
--- a/app/src/main/res/values-sw640dp/dimens.xml
+++ b/app/src/main/res/values-sw640dp/dimens.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-	<dimen name="activity_horizontal_margin">28.4444dp</dimen>
-	<dimen name="activity_vertical_margin">28.4444dp</dimen>
-	<dimen name="actions_item_font">32.0000sp</dimen>
-	<dimen name="actions_item_drawablePaddding">17.7778dp</dimen>
 	<dimen name="dp_m_60">-106.6667dp</dimen>
 	<dimen name="dp_m_30">-53.3333dp</dimen>
 	<dimen name="dp_m_20">-35.5556dp</dimen>
@@ -520,9 +516,206 @@
 	<dimen name="dp_498">885.3333dp</dimen>
 	<dimen name="dp_499">887.1111dp</dimen>
 	<dimen name="dp_500">888.8889dp</dimen>
+	<dimen name="dp_501">890.6667dp</dimen>
+	<dimen name="dp_502">892.4444dp</dimen>
+	<dimen name="dp_503">894.2222dp</dimen>
+	<dimen name="dp_504">896.0000dp</dimen>
+	<dimen name="dp_505">897.7778dp</dimen>
+	<dimen name="dp_506">899.5556dp</dimen>
+	<dimen name="dp_507">901.3333dp</dimen>
+	<dimen name="dp_508">903.1111dp</dimen>
+	<dimen name="dp_509">904.8889dp</dimen>
+	<dimen name="dp_510">906.6667dp</dimen>
+	<dimen name="dp_511">908.4444dp</dimen>
+	<dimen name="dp_512">910.2222dp</dimen>
+	<dimen name="dp_513">912.0000dp</dimen>
+	<dimen name="dp_514">913.7778dp</dimen>
+	<dimen name="dp_515">915.5556dp</dimen>
+	<dimen name="dp_516">917.3333dp</dimen>
+	<dimen name="dp_517">919.1111dp</dimen>
+	<dimen name="dp_518">920.8889dp</dimen>
+	<dimen name="dp_519">922.6667dp</dimen>
+	<dimen name="dp_520">924.4444dp</dimen>
+	<dimen name="dp_521">926.2222dp</dimen>
+	<dimen name="dp_522">928.0000dp</dimen>
+	<dimen name="dp_523">929.7778dp</dimen>
+	<dimen name="dp_524">931.5556dp</dimen>
+	<dimen name="dp_525">933.3333dp</dimen>
+	<dimen name="dp_526">935.1111dp</dimen>
+	<dimen name="dp_527">936.8889dp</dimen>
+	<dimen name="dp_528">938.6667dp</dimen>
+	<dimen name="dp_529">940.4444dp</dimen>
+	<dimen name="dp_530">942.2222dp</dimen>
+	<dimen name="dp_531">944.0000dp</dimen>
+	<dimen name="dp_532">945.7778dp</dimen>
+	<dimen name="dp_533">947.5556dp</dimen>
+	<dimen name="dp_534">949.3333dp</dimen>
+	<dimen name="dp_535">951.1111dp</dimen>
+	<dimen name="dp_536">952.8889dp</dimen>
+	<dimen name="dp_537">954.6667dp</dimen>
+	<dimen name="dp_538">956.4444dp</dimen>
+	<dimen name="dp_539">958.2222dp</dimen>
+	<dimen name="dp_540">960.0000dp</dimen>
+	<dimen name="dp_541">961.7778dp</dimen>
+	<dimen name="dp_542">963.5556dp</dimen>
+	<dimen name="dp_543">965.3333dp</dimen>
+	<dimen name="dp_544">967.1111dp</dimen>
+	<dimen name="dp_545">968.8889dp</dimen>
+	<dimen name="dp_546">970.6667dp</dimen>
+	<dimen name="dp_547">972.4444dp</dimen>
+	<dimen name="dp_548">974.2222dp</dimen>
+	<dimen name="dp_549">976.0000dp</dimen>
+	<dimen name="dp_550">977.7778dp</dimen>
+	<dimen name="dp_551">979.5556dp</dimen>
+	<dimen name="dp_552">981.3333dp</dimen>
+	<dimen name="dp_553">983.1111dp</dimen>
+	<dimen name="dp_554">984.8889dp</dimen>
+	<dimen name="dp_555">986.6667dp</dimen>
+	<dimen name="dp_556">988.4444dp</dimen>
+	<dimen name="dp_557">990.2222dp</dimen>
+	<dimen name="dp_558">992.0000dp</dimen>
+	<dimen name="dp_559">993.7778dp</dimen>
+	<dimen name="dp_560">995.5556dp</dimen>
+	<dimen name="dp_561">997.3333dp</dimen>
+	<dimen name="dp_562">999.1111dp</dimen>
+	<dimen name="dp_563">1000.8889dp</dimen>
+	<dimen name="dp_564">1002.6667dp</dimen>
+	<dimen name="dp_565">1004.4444dp</dimen>
+	<dimen name="dp_566">1006.2222dp</dimen>
+	<dimen name="dp_567">1008.0000dp</dimen>
+	<dimen name="dp_568">1009.7778dp</dimen>
+	<dimen name="dp_569">1011.5556dp</dimen>
+	<dimen name="dp_570">1013.3333dp</dimen>
+	<dimen name="dp_571">1015.1111dp</dimen>
+	<dimen name="dp_572">1016.8889dp</dimen>
+	<dimen name="dp_573">1018.6667dp</dimen>
+	<dimen name="dp_574">1020.4444dp</dimen>
+	<dimen name="dp_575">1022.2222dp</dimen>
+	<dimen name="dp_576">1024.0000dp</dimen>
+	<dimen name="dp_577">1025.7778dp</dimen>
+	<dimen name="dp_578">1027.5556dp</dimen>
+	<dimen name="dp_579">1029.3333dp</dimen>
+	<dimen name="dp_580">1031.1111dp</dimen>
+	<dimen name="dp_581">1032.8889dp</dimen>
+	<dimen name="dp_582">1034.6667dp</dimen>
+	<dimen name="dp_583">1036.4444dp</dimen>
+	<dimen name="dp_584">1038.2222dp</dimen>
+	<dimen name="dp_585">1040.0000dp</dimen>
+	<dimen name="dp_586">1041.7778dp</dimen>
+	<dimen name="dp_587">1043.5556dp</dimen>
+	<dimen name="dp_588">1045.3333dp</dimen>
+	<dimen name="dp_589">1047.1111dp</dimen>
+	<dimen name="dp_590">1048.8889dp</dimen>
+	<dimen name="dp_591">1050.6667dp</dimen>
+	<dimen name="dp_592">1052.4444dp</dimen>
+	<dimen name="dp_593">1054.2222dp</dimen>
+	<dimen name="dp_594">1056.0000dp</dimen>
+	<dimen name="dp_595">1057.7778dp</dimen>
+	<dimen name="dp_596">1059.5556dp</dimen>
+	<dimen name="dp_597">1061.3333dp</dimen>
+	<dimen name="dp_598">1063.1111dp</dimen>
+	<dimen name="dp_599">1064.8889dp</dimen>
 	<dimen name="dp_600">1066.6667dp</dimen>
+	<dimen name="dp_601">1068.4444dp</dimen>
+	<dimen name="dp_602">1070.2222dp</dimen>
+	<dimen name="dp_603">1072.0000dp</dimen>
+	<dimen name="dp_604">1073.7778dp</dimen>
+	<dimen name="dp_605">1075.5556dp</dimen>
+	<dimen name="dp_606">1077.3333dp</dimen>
+	<dimen name="dp_607">1079.1111dp</dimen>
+	<dimen name="dp_608">1080.8889dp</dimen>
+	<dimen name="dp_609">1082.6667dp</dimen>
+	<dimen name="dp_610">1084.4444dp</dimen>
+	<dimen name="dp_611">1086.2222dp</dimen>
+	<dimen name="dp_612">1088.0000dp</dimen>
+	<dimen name="dp_613">1089.7778dp</dimen>
+	<dimen name="dp_614">1091.5556dp</dimen>
+	<dimen name="dp_615">1093.3333dp</dimen>
+	<dimen name="dp_616">1095.1111dp</dimen>
+	<dimen name="dp_617">1096.8889dp</dimen>
+	<dimen name="dp_618">1098.6667dp</dimen>
+	<dimen name="dp_619">1100.4444dp</dimen>
+	<dimen name="dp_620">1102.2222dp</dimen>
+	<dimen name="dp_621">1104.0000dp</dimen>
+	<dimen name="dp_622">1105.7778dp</dimen>
+	<dimen name="dp_623">1107.5556dp</dimen>
+	<dimen name="dp_624">1109.3333dp</dimen>
+	<dimen name="dp_625">1111.1111dp</dimen>
+	<dimen name="dp_626">1112.8889dp</dimen>
+	<dimen name="dp_627">1114.6667dp</dimen>
+	<dimen name="dp_628">1116.4444dp</dimen>
+	<dimen name="dp_629">1118.2222dp</dimen>
+	<dimen name="dp_630">1120.0000dp</dimen>
+	<dimen name="dp_631">1121.7778dp</dimen>
+	<dimen name="dp_632">1123.5556dp</dimen>
+	<dimen name="dp_633">1125.3333dp</dimen>
+	<dimen name="dp_634">1127.1111dp</dimen>
+	<dimen name="dp_635">1128.8889dp</dimen>
+	<dimen name="dp_636">1130.6667dp</dimen>
+	<dimen name="dp_637">1132.4444dp</dimen>
+	<dimen name="dp_638">1134.2222dp</dimen>
+	<dimen name="dp_639">1136.0000dp</dimen>
 	<dimen name="dp_640">1137.7778dp</dimen>
-	<dimen name="dp_720">1280.0000dp</dimen>
+	<dimen name="dp_641">1139.5556dp</dimen>
+	<dimen name="dp_642">1141.3333dp</dimen>
+	<dimen name="dp_643">1143.1111dp</dimen>
+	<dimen name="dp_644">1144.8889dp</dimen>
+	<dimen name="dp_645">1146.6667dp</dimen>
+	<dimen name="dp_646">1148.4444dp</dimen>
+	<dimen name="dp_647">1150.2222dp</dimen>
+	<dimen name="dp_648">1152.0000dp</dimen>
+	<dimen name="dp_649">1153.7778dp</dimen>
+	<dimen name="dp_650">1155.5556dp</dimen>
+	<dimen name="dp_651">1157.3333dp</dimen>
+	<dimen name="dp_652">1159.1111dp</dimen>
+	<dimen name="dp_653">1160.8889dp</dimen>
+	<dimen name="dp_654">1162.6667dp</dimen>
+	<dimen name="dp_655">1164.4444dp</dimen>
+	<dimen name="dp_656">1166.2222dp</dimen>
+	<dimen name="dp_657">1168.0000dp</dimen>
+	<dimen name="dp_658">1169.7778dp</dimen>
+	<dimen name="dp_659">1171.5556dp</dimen>
+	<dimen name="dp_660">1173.3333dp</dimen>
+	<dimen name="dp_661">1175.1111dp</dimen>
+	<dimen name="dp_662">1176.8889dp</dimen>
+	<dimen name="dp_663">1178.6667dp</dimen>
+	<dimen name="dp_664">1180.4444dp</dimen>
+	<dimen name="dp_665">1182.2222dp</dimen>
+	<dimen name="dp_666">1184.0000dp</dimen>
+	<dimen name="dp_667">1185.7778dp</dimen>
+	<dimen name="dp_668">1187.5556dp</dimen>
+	<dimen name="dp_669">1189.3333dp</dimen>
+	<dimen name="dp_670">1191.1111dp</dimen>
+	<dimen name="dp_671">1192.8889dp</dimen>
+	<dimen name="dp_672">1194.6667dp</dimen>
+	<dimen name="dp_673">1196.4444dp</dimen>
+	<dimen name="dp_674">1198.2222dp</dimen>
+	<dimen name="dp_675">1200.0000dp</dimen>
+	<dimen name="dp_676">1201.7778dp</dimen>
+	<dimen name="dp_677">1203.5556dp</dimen>
+	<dimen name="dp_678">1205.3333dp</dimen>
+	<dimen name="dp_679">1207.1111dp</dimen>
+	<dimen name="dp_680">1208.8889dp</dimen>
+	<dimen name="dp_681">1210.6667dp</dimen>
+	<dimen name="dp_682">1212.4444dp</dimen>
+	<dimen name="dp_683">1214.2222dp</dimen>
+	<dimen name="dp_684">1216.0000dp</dimen>
+	<dimen name="dp_685">1217.7778dp</dimen>
+	<dimen name="dp_686">1219.5556dp</dimen>
+	<dimen name="dp_687">1221.3333dp</dimen>
+	<dimen name="dp_688">1223.1111dp</dimen>
+	<dimen name="dp_689">1224.8889dp</dimen>
+	<dimen name="dp_690">1226.6667dp</dimen>
+	<dimen name="dp_691">1228.4444dp</dimen>
+	<dimen name="dp_692">1230.2222dp</dimen>
+	<dimen name="dp_693">1232.0000dp</dimen>
+	<dimen name="dp_694">1233.7778dp</dimen>
+	<dimen name="dp_695">1235.5556dp</dimen>
+	<dimen name="dp_696">1237.3333dp</dimen>
+	<dimen name="dp_697">1239.1111dp</dimen>
+	<dimen name="dp_698">1240.8889dp</dimen>
+	<dimen name="dp_699">1242.6667dp</dimen>
+	<dimen name="dp_700">1244.4444dp</dimen>
 	<dimen name="sp_1">1.7778sp</dimen>
 	<dimen name="sp_2">3.5556sp</dimen>
 	<dimen name="sp_3">5.3333sp</dimen>
@@ -573,4 +766,54 @@
 	<dimen name="sp_48">85.3333sp</dimen>
 	<dimen name="sp_49">87.1111sp</dimen>
 	<dimen name="sp_50">88.8889sp</dimen>
+	<dimen name="sp_51">90.6667sp</dimen>
+	<dimen name="sp_52">92.4444sp</dimen>
+	<dimen name="sp_53">94.2222sp</dimen>
+	<dimen name="sp_54">96.0000sp</dimen>
+	<dimen name="sp_55">97.7778sp</dimen>
+	<dimen name="sp_56">99.5556sp</dimen>
+	<dimen name="sp_57">101.3333sp</dimen>
+	<dimen name="sp_58">103.1111sp</dimen>
+	<dimen name="sp_59">104.8889sp</dimen>
+	<dimen name="sp_60">106.6667sp</dimen>
+	<dimen name="sp_61">108.4444sp</dimen>
+	<dimen name="sp_62">110.2222sp</dimen>
+	<dimen name="sp_63">112.0000sp</dimen>
+	<dimen name="sp_64">113.7778sp</dimen>
+	<dimen name="sp_65">115.5556sp</dimen>
+	<dimen name="sp_66">117.3333sp</dimen>
+	<dimen name="sp_67">119.1111sp</dimen>
+	<dimen name="sp_68">120.8889sp</dimen>
+	<dimen name="sp_69">122.6667sp</dimen>
+	<dimen name="sp_70">124.4444sp</dimen>
+	<dimen name="sp_71">126.2222sp</dimen>
+	<dimen name="sp_72">128.0000sp</dimen>
+	<dimen name="sp_73">129.7778sp</dimen>
+	<dimen name="sp_74">131.5556sp</dimen>
+	<dimen name="sp_75">133.3333sp</dimen>
+	<dimen name="sp_76">135.1111sp</dimen>
+	<dimen name="sp_77">136.8889sp</dimen>
+	<dimen name="sp_78">138.6667sp</dimen>
+	<dimen name="sp_79">140.4444sp</dimen>
+	<dimen name="sp_80">142.2222sp</dimen>
+	<dimen name="sp_81">144.0000sp</dimen>
+	<dimen name="sp_82">145.7778sp</dimen>
+	<dimen name="sp_83">147.5556sp</dimen>
+	<dimen name="sp_84">149.3333sp</dimen>
+	<dimen name="sp_85">151.1111sp</dimen>
+	<dimen name="sp_86">152.8889sp</dimen>
+	<dimen name="sp_87">154.6667sp</dimen>
+	<dimen name="sp_88">156.4444sp</dimen>
+	<dimen name="sp_89">158.2222sp</dimen>
+	<dimen name="sp_90">160.0000sp</dimen>
+	<dimen name="sp_91">161.7778sp</dimen>
+	<dimen name="sp_92">163.5556sp</dimen>
+	<dimen name="sp_93">165.3333sp</dimen>
+	<dimen name="sp_94">167.1111sp</dimen>
+	<dimen name="sp_95">168.8889sp</dimen>
+	<dimen name="sp_96">170.6667sp</dimen>
+	<dimen name="sp_97">172.4444sp</dimen>
+	<dimen name="sp_98">174.2222sp</dimen>
+	<dimen name="sp_99">176.0000sp</dimen>
+	<dimen name="sp_100">177.7778sp</dimen>
 </resources>
diff --git a/app/src/main/res/values-sw662dp/dimens.xml b/app/src/main/res/values-sw662dp/dimens.xml
index d36e683..ab06727 100644
--- a/app/src/main/res/values-sw662dp/dimens.xml
+++ b/app/src/main/res/values-sw662dp/dimens.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-	<dimen name="activity_horizontal_margin">29.4222dp</dimen>
-	<dimen name="activity_vertical_margin">29.4222dp</dimen>
-	<dimen name="actions_item_font">33.1000sp</dimen>
-	<dimen name="actions_item_drawablePaddding">18.3889dp</dimen>
 	<dimen name="dp_m_60">-110.3333dp</dimen>
 	<dimen name="dp_m_30">-55.1667dp</dimen>
 	<dimen name="dp_m_20">-36.7778dp</dimen>
@@ -520,9 +516,206 @@
 	<dimen name="dp_498">915.7667dp</dimen>
 	<dimen name="dp_499">917.6056dp</dimen>
 	<dimen name="dp_500">919.4444dp</dimen>
+	<dimen name="dp_501">921.2833dp</dimen>
+	<dimen name="dp_502">923.1222dp</dimen>
+	<dimen name="dp_503">924.9611dp</dimen>
+	<dimen name="dp_504">926.8000dp</dimen>
+	<dimen name="dp_505">928.6389dp</dimen>
+	<dimen name="dp_506">930.4778dp</dimen>
+	<dimen name="dp_507">932.3167dp</dimen>
+	<dimen name="dp_508">934.1556dp</dimen>
+	<dimen name="dp_509">935.9944dp</dimen>
+	<dimen name="dp_510">937.8333dp</dimen>
+	<dimen name="dp_511">939.6722dp</dimen>
+	<dimen name="dp_512">941.5111dp</dimen>
+	<dimen name="dp_513">943.3500dp</dimen>
+	<dimen name="dp_514">945.1889dp</dimen>
+	<dimen name="dp_515">947.0278dp</dimen>
+	<dimen name="dp_516">948.8667dp</dimen>
+	<dimen name="dp_517">950.7056dp</dimen>
+	<dimen name="dp_518">952.5444dp</dimen>
+	<dimen name="dp_519">954.3833dp</dimen>
+	<dimen name="dp_520">956.2222dp</dimen>
+	<dimen name="dp_521">958.0611dp</dimen>
+	<dimen name="dp_522">959.9000dp</dimen>
+	<dimen name="dp_523">961.7389dp</dimen>
+	<dimen name="dp_524">963.5778dp</dimen>
+	<dimen name="dp_525">965.4167dp</dimen>
+	<dimen name="dp_526">967.2556dp</dimen>
+	<dimen name="dp_527">969.0944dp</dimen>
+	<dimen name="dp_528">970.9333dp</dimen>
+	<dimen name="dp_529">972.7722dp</dimen>
+	<dimen name="dp_530">974.6111dp</dimen>
+	<dimen name="dp_531">976.4500dp</dimen>
+	<dimen name="dp_532">978.2889dp</dimen>
+	<dimen name="dp_533">980.1278dp</dimen>
+	<dimen name="dp_534">981.9667dp</dimen>
+	<dimen name="dp_535">983.8056dp</dimen>
+	<dimen name="dp_536">985.6444dp</dimen>
+	<dimen name="dp_537">987.4833dp</dimen>
+	<dimen name="dp_538">989.3222dp</dimen>
+	<dimen name="dp_539">991.1611dp</dimen>
+	<dimen name="dp_540">993.0000dp</dimen>
+	<dimen name="dp_541">994.8389dp</dimen>
+	<dimen name="dp_542">996.6778dp</dimen>
+	<dimen name="dp_543">998.5167dp</dimen>
+	<dimen name="dp_544">1000.3556dp</dimen>
+	<dimen name="dp_545">1002.1944dp</dimen>
+	<dimen name="dp_546">1004.0333dp</dimen>
+	<dimen name="dp_547">1005.8722dp</dimen>
+	<dimen name="dp_548">1007.7111dp</dimen>
+	<dimen name="dp_549">1009.5500dp</dimen>
+	<dimen name="dp_550">1011.3889dp</dimen>
+	<dimen name="dp_551">1013.2278dp</dimen>
+	<dimen name="dp_552">1015.0667dp</dimen>
+	<dimen name="dp_553">1016.9056dp</dimen>
+	<dimen name="dp_554">1018.7444dp</dimen>
+	<dimen name="dp_555">1020.5833dp</dimen>
+	<dimen name="dp_556">1022.4222dp</dimen>
+	<dimen name="dp_557">1024.2611dp</dimen>
+	<dimen name="dp_558">1026.1000dp</dimen>
+	<dimen name="dp_559">1027.9389dp</dimen>
+	<dimen name="dp_560">1029.7778dp</dimen>
+	<dimen name="dp_561">1031.6167dp</dimen>
+	<dimen name="dp_562">1033.4556dp</dimen>
+	<dimen name="dp_563">1035.2944dp</dimen>
+	<dimen name="dp_564">1037.1333dp</dimen>
+	<dimen name="dp_565">1038.9722dp</dimen>
+	<dimen name="dp_566">1040.8111dp</dimen>
+	<dimen name="dp_567">1042.6500dp</dimen>
+	<dimen name="dp_568">1044.4889dp</dimen>
+	<dimen name="dp_569">1046.3278dp</dimen>
+	<dimen name="dp_570">1048.1667dp</dimen>
+	<dimen name="dp_571">1050.0056dp</dimen>
+	<dimen name="dp_572">1051.8444dp</dimen>
+	<dimen name="dp_573">1053.6833dp</dimen>
+	<dimen name="dp_574">1055.5222dp</dimen>
+	<dimen name="dp_575">1057.3611dp</dimen>
+	<dimen name="dp_576">1059.2000dp</dimen>
+	<dimen name="dp_577">1061.0389dp</dimen>
+	<dimen name="dp_578">1062.8778dp</dimen>
+	<dimen name="dp_579">1064.7167dp</dimen>
+	<dimen name="dp_580">1066.5556dp</dimen>
+	<dimen name="dp_581">1068.3944dp</dimen>
+	<dimen name="dp_582">1070.2333dp</dimen>
+	<dimen name="dp_583">1072.0722dp</dimen>
+	<dimen name="dp_584">1073.9111dp</dimen>
+	<dimen name="dp_585">1075.7500dp</dimen>
+	<dimen name="dp_586">1077.5889dp</dimen>
+	<dimen name="dp_587">1079.4278dp</dimen>
+	<dimen name="dp_588">1081.2667dp</dimen>
+	<dimen name="dp_589">1083.1056dp</dimen>
+	<dimen name="dp_590">1084.9444dp</dimen>
+	<dimen name="dp_591">1086.7833dp</dimen>
+	<dimen name="dp_592">1088.6222dp</dimen>
+	<dimen name="dp_593">1090.4611dp</dimen>
+	<dimen name="dp_594">1092.3000dp</dimen>
+	<dimen name="dp_595">1094.1389dp</dimen>
+	<dimen name="dp_596">1095.9778dp</dimen>
+	<dimen name="dp_597">1097.8167dp</dimen>
+	<dimen name="dp_598">1099.6556dp</dimen>
+	<dimen name="dp_599">1101.4944dp</dimen>
 	<dimen name="dp_600">1103.3333dp</dimen>
+	<dimen name="dp_601">1105.1722dp</dimen>
+	<dimen name="dp_602">1107.0111dp</dimen>
+	<dimen name="dp_603">1108.8500dp</dimen>
+	<dimen name="dp_604">1110.6889dp</dimen>
+	<dimen name="dp_605">1112.5278dp</dimen>
+	<dimen name="dp_606">1114.3667dp</dimen>
+	<dimen name="dp_607">1116.2056dp</dimen>
+	<dimen name="dp_608">1118.0444dp</dimen>
+	<dimen name="dp_609">1119.8833dp</dimen>
+	<dimen name="dp_610">1121.7222dp</dimen>
+	<dimen name="dp_611">1123.5611dp</dimen>
+	<dimen name="dp_612">1125.4000dp</dimen>
+	<dimen name="dp_613">1127.2389dp</dimen>
+	<dimen name="dp_614">1129.0778dp</dimen>
+	<dimen name="dp_615">1130.9167dp</dimen>
+	<dimen name="dp_616">1132.7556dp</dimen>
+	<dimen name="dp_617">1134.5944dp</dimen>
+	<dimen name="dp_618">1136.4333dp</dimen>
+	<dimen name="dp_619">1138.2722dp</dimen>
+	<dimen name="dp_620">1140.1111dp</dimen>
+	<dimen name="dp_621">1141.9500dp</dimen>
+	<dimen name="dp_622">1143.7889dp</dimen>
+	<dimen name="dp_623">1145.6278dp</dimen>
+	<dimen name="dp_624">1147.4667dp</dimen>
+	<dimen name="dp_625">1149.3056dp</dimen>
+	<dimen name="dp_626">1151.1444dp</dimen>
+	<dimen name="dp_627">1152.9833dp</dimen>
+	<dimen name="dp_628">1154.8222dp</dimen>
+	<dimen name="dp_629">1156.6611dp</dimen>
+	<dimen name="dp_630">1158.5000dp</dimen>
+	<dimen name="dp_631">1160.3389dp</dimen>
+	<dimen name="dp_632">1162.1778dp</dimen>
+	<dimen name="dp_633">1164.0167dp</dimen>
+	<dimen name="dp_634">1165.8556dp</dimen>
+	<dimen name="dp_635">1167.6944dp</dimen>
+	<dimen name="dp_636">1169.5333dp</dimen>
+	<dimen name="dp_637">1171.3722dp</dimen>
+	<dimen name="dp_638">1173.2111dp</dimen>
+	<dimen name="dp_639">1175.0500dp</dimen>
 	<dimen name="dp_640">1176.8889dp</dimen>
-	<dimen name="dp_720">1324.0000dp</dimen>
+	<dimen name="dp_641">1178.7278dp</dimen>
+	<dimen name="dp_642">1180.5667dp</dimen>
+	<dimen name="dp_643">1182.4056dp</dimen>
+	<dimen name="dp_644">1184.2444dp</dimen>
+	<dimen name="dp_645">1186.0833dp</dimen>
+	<dimen name="dp_646">1187.9222dp</dimen>
+	<dimen name="dp_647">1189.7611dp</dimen>
+	<dimen name="dp_648">1191.6000dp</dimen>
+	<dimen name="dp_649">1193.4389dp</dimen>
+	<dimen name="dp_650">1195.2778dp</dimen>
+	<dimen name="dp_651">1197.1167dp</dimen>
+	<dimen name="dp_652">1198.9556dp</dimen>
+	<dimen name="dp_653">1200.7944dp</dimen>
+	<dimen name="dp_654">1202.6333dp</dimen>
+	<dimen name="dp_655">1204.4722dp</dimen>
+	<dimen name="dp_656">1206.3111dp</dimen>
+	<dimen name="dp_657">1208.1500dp</dimen>
+	<dimen name="dp_658">1209.9889dp</dimen>
+	<dimen name="dp_659">1211.8278dp</dimen>
+	<dimen name="dp_660">1213.6667dp</dimen>
+	<dimen name="dp_661">1215.5056dp</dimen>
+	<dimen name="dp_662">1217.3444dp</dimen>
+	<dimen name="dp_663">1219.1833dp</dimen>
+	<dimen name="dp_664">1221.0222dp</dimen>
+	<dimen name="dp_665">1222.8611dp</dimen>
+	<dimen name="dp_666">1224.7000dp</dimen>
+	<dimen name="dp_667">1226.5389dp</dimen>
+	<dimen name="dp_668">1228.3778dp</dimen>
+	<dimen name="dp_669">1230.2167dp</dimen>
+	<dimen name="dp_670">1232.0556dp</dimen>
+	<dimen name="dp_671">1233.8944dp</dimen>
+	<dimen name="dp_672">1235.7333dp</dimen>
+	<dimen name="dp_673">1237.5722dp</dimen>
+	<dimen name="dp_674">1239.4111dp</dimen>
+	<dimen name="dp_675">1241.2500dp</dimen>
+	<dimen name="dp_676">1243.0889dp</dimen>
+	<dimen name="dp_677">1244.9278dp</dimen>
+	<dimen name="dp_678">1246.7667dp</dimen>
+	<dimen name="dp_679">1248.6056dp</dimen>
+	<dimen name="dp_680">1250.4444dp</dimen>
+	<dimen name="dp_681">1252.2833dp</dimen>
+	<dimen name="dp_682">1254.1222dp</dimen>
+	<dimen name="dp_683">1255.9611dp</dimen>
+	<dimen name="dp_684">1257.8000dp</dimen>
+	<dimen name="dp_685">1259.6389dp</dimen>
+	<dimen name="dp_686">1261.4778dp</dimen>
+	<dimen name="dp_687">1263.3167dp</dimen>
+	<dimen name="dp_688">1265.1556dp</dimen>
+	<dimen name="dp_689">1266.9944dp</dimen>
+	<dimen name="dp_690">1268.8333dp</dimen>
+	<dimen name="dp_691">1270.6722dp</dimen>
+	<dimen name="dp_692">1272.5111dp</dimen>
+	<dimen name="dp_693">1274.3500dp</dimen>
+	<dimen name="dp_694">1276.1889dp</dimen>
+	<dimen name="dp_695">1278.0278dp</dimen>
+	<dimen name="dp_696">1279.8667dp</dimen>
+	<dimen name="dp_697">1281.7056dp</dimen>
+	<dimen name="dp_698">1283.5444dp</dimen>
+	<dimen name="dp_699">1285.3833dp</dimen>
+	<dimen name="dp_700">1287.2222dp</dimen>
 	<dimen name="sp_1">1.8389sp</dimen>
 	<dimen name="sp_2">3.6778sp</dimen>
 	<dimen name="sp_3">5.5167sp</dimen>
@@ -573,4 +766,54 @@
 	<dimen name="sp_48">88.2667sp</dimen>
 	<dimen name="sp_49">90.1056sp</dimen>
 	<dimen name="sp_50">91.9444sp</dimen>
+	<dimen name="sp_51">93.7833sp</dimen>
+	<dimen name="sp_52">95.6222sp</dimen>
+	<dimen name="sp_53">97.4611sp</dimen>
+	<dimen name="sp_54">99.3000sp</dimen>
+	<dimen name="sp_55">101.1389sp</dimen>
+	<dimen name="sp_56">102.9778sp</dimen>
+	<dimen name="sp_57">104.8167sp</dimen>
+	<dimen name="sp_58">106.6556sp</dimen>
+	<dimen name="sp_59">108.4944sp</dimen>
+	<dimen name="sp_60">110.3333sp</dimen>
+	<dimen name="sp_61">112.1722sp</dimen>
+	<dimen name="sp_62">114.0111sp</dimen>
+	<dimen name="sp_63">115.8500sp</dimen>
+	<dimen name="sp_64">117.6889sp</dimen>
+	<dimen name="sp_65">119.5278sp</dimen>
+	<dimen name="sp_66">121.3667sp</dimen>
+	<dimen name="sp_67">123.2056sp</dimen>
+	<dimen name="sp_68">125.0444sp</dimen>
+	<dimen name="sp_69">126.8833sp</dimen>
+	<dimen name="sp_70">128.7222sp</dimen>
+	<dimen name="sp_71">130.5611sp</dimen>
+	<dimen name="sp_72">132.4000sp</dimen>
+	<dimen name="sp_73">134.2389sp</dimen>
+	<dimen name="sp_74">136.0778sp</dimen>
+	<dimen name="sp_75">137.9167sp</dimen>
+	<dimen name="sp_76">139.7556sp</dimen>
+	<dimen name="sp_77">141.5944sp</dimen>
+	<dimen name="sp_78">143.4333sp</dimen>
+	<dimen name="sp_79">145.2722sp</dimen>
+	<dimen name="sp_80">147.1111sp</dimen>
+	<dimen name="sp_81">148.9500sp</dimen>
+	<dimen name="sp_82">150.7889sp</dimen>
+	<dimen name="sp_83">152.6278sp</dimen>
+	<dimen name="sp_84">154.4667sp</dimen>
+	<dimen name="sp_85">156.3056sp</dimen>
+	<dimen name="sp_86">158.1444sp</dimen>
+	<dimen name="sp_87">159.9833sp</dimen>
+	<dimen name="sp_88">161.8222sp</dimen>
+	<dimen name="sp_89">163.6611sp</dimen>
+	<dimen name="sp_90">165.5000sp</dimen>
+	<dimen name="sp_91">167.3389sp</dimen>
+	<dimen name="sp_92">169.1778sp</dimen>
+	<dimen name="sp_93">171.0167sp</dimen>
+	<dimen name="sp_94">172.8556sp</dimen>
+	<dimen name="sp_95">174.6944sp</dimen>
+	<dimen name="sp_96">176.5333sp</dimen>
+	<dimen name="sp_97">178.3722sp</dimen>
+	<dimen name="sp_98">180.2111sp</dimen>
+	<dimen name="sp_99">182.0500sp</dimen>
+	<dimen name="sp_100">183.8889sp</dimen>
 </resources>
diff --git a/app/src/main/res/values-sw720dp/dimens.xml b/app/src/main/res/values-sw720dp/dimens.xml
index ddb023c..7732609 100644
--- a/app/src/main/res/values-sw720dp/dimens.xml
+++ b/app/src/main/res/values-sw720dp/dimens.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-	<dimen name="activity_horizontal_margin">32.0000dp</dimen>
-	<dimen name="activity_vertical_margin">32.0000dp</dimen>
-	<dimen name="actions_item_font">36.0000sp</dimen>
-	<dimen name="actions_item_drawablePaddding">20.0000dp</dimen>
 	<dimen name="dp_m_60">-120.0000dp</dimen>
 	<dimen name="dp_m_30">-60.0000dp</dimen>
 	<dimen name="dp_m_20">-40.0000dp</dimen>
@@ -520,9 +516,206 @@
 	<dimen name="dp_498">996.0000dp</dimen>
 	<dimen name="dp_499">998.0000dp</dimen>
 	<dimen name="dp_500">1000.0000dp</dimen>
+	<dimen name="dp_501">1002.0000dp</dimen>
+	<dimen name="dp_502">1004.0000dp</dimen>
+	<dimen name="dp_503">1006.0000dp</dimen>
+	<dimen name="dp_504">1008.0000dp</dimen>
+	<dimen name="dp_505">1010.0000dp</dimen>
+	<dimen name="dp_506">1012.0000dp</dimen>
+	<dimen name="dp_507">1014.0000dp</dimen>
+	<dimen name="dp_508">1016.0000dp</dimen>
+	<dimen name="dp_509">1018.0000dp</dimen>
+	<dimen name="dp_510">1020.0000dp</dimen>
+	<dimen name="dp_511">1022.0000dp</dimen>
+	<dimen name="dp_512">1024.0000dp</dimen>
+	<dimen name="dp_513">1026.0000dp</dimen>
+	<dimen name="dp_514">1028.0000dp</dimen>
+	<dimen name="dp_515">1030.0000dp</dimen>
+	<dimen name="dp_516">1032.0000dp</dimen>
+	<dimen name="dp_517">1034.0000dp</dimen>
+	<dimen name="dp_518">1036.0000dp</dimen>
+	<dimen name="dp_519">1038.0000dp</dimen>
+	<dimen name="dp_520">1040.0000dp</dimen>
+	<dimen name="dp_521">1042.0000dp</dimen>
+	<dimen name="dp_522">1044.0000dp</dimen>
+	<dimen name="dp_523">1046.0000dp</dimen>
+	<dimen name="dp_524">1048.0000dp</dimen>
+	<dimen name="dp_525">1050.0000dp</dimen>
+	<dimen name="dp_526">1052.0000dp</dimen>
+	<dimen name="dp_527">1054.0000dp</dimen>
+	<dimen name="dp_528">1056.0000dp</dimen>
+	<dimen name="dp_529">1058.0000dp</dimen>
+	<dimen name="dp_530">1060.0000dp</dimen>
+	<dimen name="dp_531">1062.0000dp</dimen>
+	<dimen name="dp_532">1064.0000dp</dimen>
+	<dimen name="dp_533">1066.0000dp</dimen>
+	<dimen name="dp_534">1068.0000dp</dimen>
+	<dimen name="dp_535">1070.0000dp</dimen>
+	<dimen name="dp_536">1072.0000dp</dimen>
+	<dimen name="dp_537">1074.0000dp</dimen>
+	<dimen name="dp_538">1076.0000dp</dimen>
+	<dimen name="dp_539">1078.0000dp</dimen>
+	<dimen name="dp_540">1080.0000dp</dimen>
+	<dimen name="dp_541">1082.0000dp</dimen>
+	<dimen name="dp_542">1084.0000dp</dimen>
+	<dimen name="dp_543">1086.0000dp</dimen>
+	<dimen name="dp_544">1088.0000dp</dimen>
+	<dimen name="dp_545">1090.0000dp</dimen>
+	<dimen name="dp_546">1092.0000dp</dimen>
+	<dimen name="dp_547">1094.0000dp</dimen>
+	<dimen name="dp_548">1096.0000dp</dimen>
+	<dimen name="dp_549">1098.0000dp</dimen>
+	<dimen name="dp_550">1100.0000dp</dimen>
+	<dimen name="dp_551">1102.0000dp</dimen>
+	<dimen name="dp_552">1104.0000dp</dimen>
+	<dimen name="dp_553">1106.0000dp</dimen>
+	<dimen name="dp_554">1108.0000dp</dimen>
+	<dimen name="dp_555">1110.0000dp</dimen>
+	<dimen name="dp_556">1112.0000dp</dimen>
+	<dimen name="dp_557">1114.0000dp</dimen>
+	<dimen name="dp_558">1116.0000dp</dimen>
+	<dimen name="dp_559">1118.0000dp</dimen>
+	<dimen name="dp_560">1120.0000dp</dimen>
+	<dimen name="dp_561">1122.0000dp</dimen>
+	<dimen name="dp_562">1124.0000dp</dimen>
+	<dimen name="dp_563">1126.0000dp</dimen>
+	<dimen name="dp_564">1128.0000dp</dimen>
+	<dimen name="dp_565">1130.0000dp</dimen>
+	<dimen name="dp_566">1132.0000dp</dimen>
+	<dimen name="dp_567">1134.0000dp</dimen>
+	<dimen name="dp_568">1136.0000dp</dimen>
+	<dimen name="dp_569">1138.0000dp</dimen>
+	<dimen name="dp_570">1140.0000dp</dimen>
+	<dimen name="dp_571">1142.0000dp</dimen>
+	<dimen name="dp_572">1144.0000dp</dimen>
+	<dimen name="dp_573">1146.0000dp</dimen>
+	<dimen name="dp_574">1148.0000dp</dimen>
+	<dimen name="dp_575">1150.0000dp</dimen>
+	<dimen name="dp_576">1152.0000dp</dimen>
+	<dimen name="dp_577">1154.0000dp</dimen>
+	<dimen name="dp_578">1156.0000dp</dimen>
+	<dimen name="dp_579">1158.0000dp</dimen>
+	<dimen name="dp_580">1160.0000dp</dimen>
+	<dimen name="dp_581">1162.0000dp</dimen>
+	<dimen name="dp_582">1164.0000dp</dimen>
+	<dimen name="dp_583">1166.0000dp</dimen>
+	<dimen name="dp_584">1168.0000dp</dimen>
+	<dimen name="dp_585">1170.0000dp</dimen>
+	<dimen name="dp_586">1172.0000dp</dimen>
+	<dimen name="dp_587">1174.0000dp</dimen>
+	<dimen name="dp_588">1176.0000dp</dimen>
+	<dimen name="dp_589">1178.0000dp</dimen>
+	<dimen name="dp_590">1180.0000dp</dimen>
+	<dimen name="dp_591">1182.0000dp</dimen>
+	<dimen name="dp_592">1184.0000dp</dimen>
+	<dimen name="dp_593">1186.0000dp</dimen>
+	<dimen name="dp_594">1188.0000dp</dimen>
+	<dimen name="dp_595">1190.0000dp</dimen>
+	<dimen name="dp_596">1192.0000dp</dimen>
+	<dimen name="dp_597">1194.0000dp</dimen>
+	<dimen name="dp_598">1196.0000dp</dimen>
+	<dimen name="dp_599">1198.0000dp</dimen>
 	<dimen name="dp_600">1200.0000dp</dimen>
+	<dimen name="dp_601">1202.0000dp</dimen>
+	<dimen name="dp_602">1204.0000dp</dimen>
+	<dimen name="dp_603">1206.0000dp</dimen>
+	<dimen name="dp_604">1208.0000dp</dimen>
+	<dimen name="dp_605">1210.0000dp</dimen>
+	<dimen name="dp_606">1212.0000dp</dimen>
+	<dimen name="dp_607">1214.0000dp</dimen>
+	<dimen name="dp_608">1216.0000dp</dimen>
+	<dimen name="dp_609">1218.0000dp</dimen>
+	<dimen name="dp_610">1220.0000dp</dimen>
+	<dimen name="dp_611">1222.0000dp</dimen>
+	<dimen name="dp_612">1224.0000dp</dimen>
+	<dimen name="dp_613">1226.0000dp</dimen>
+	<dimen name="dp_614">1228.0000dp</dimen>
+	<dimen name="dp_615">1230.0000dp</dimen>
+	<dimen name="dp_616">1232.0000dp</dimen>
+	<dimen name="dp_617">1234.0000dp</dimen>
+	<dimen name="dp_618">1236.0000dp</dimen>
+	<dimen name="dp_619">1238.0000dp</dimen>
+	<dimen name="dp_620">1240.0000dp</dimen>
+	<dimen name="dp_621">1242.0000dp</dimen>
+	<dimen name="dp_622">1244.0000dp</dimen>
+	<dimen name="dp_623">1246.0000dp</dimen>
+	<dimen name="dp_624">1248.0000dp</dimen>
+	<dimen name="dp_625">1250.0000dp</dimen>
+	<dimen name="dp_626">1252.0000dp</dimen>
+	<dimen name="dp_627">1254.0000dp</dimen>
+	<dimen name="dp_628">1256.0000dp</dimen>
+	<dimen name="dp_629">1258.0000dp</dimen>
+	<dimen name="dp_630">1260.0000dp</dimen>
+	<dimen name="dp_631">1262.0000dp</dimen>
+	<dimen name="dp_632">1264.0000dp</dimen>
+	<dimen name="dp_633">1266.0000dp</dimen>
+	<dimen name="dp_634">1268.0000dp</dimen>
+	<dimen name="dp_635">1270.0000dp</dimen>
+	<dimen name="dp_636">1272.0000dp</dimen>
+	<dimen name="dp_637">1274.0000dp</dimen>
+	<dimen name="dp_638">1276.0000dp</dimen>
+	<dimen name="dp_639">1278.0000dp</dimen>
 	<dimen name="dp_640">1280.0000dp</dimen>
-	<dimen name="dp_720">1440.0000dp</dimen>
+	<dimen name="dp_641">1282.0000dp</dimen>
+	<dimen name="dp_642">1284.0000dp</dimen>
+	<dimen name="dp_643">1286.0000dp</dimen>
+	<dimen name="dp_644">1288.0000dp</dimen>
+	<dimen name="dp_645">1290.0000dp</dimen>
+	<dimen name="dp_646">1292.0000dp</dimen>
+	<dimen name="dp_647">1294.0000dp</dimen>
+	<dimen name="dp_648">1296.0000dp</dimen>
+	<dimen name="dp_649">1298.0000dp</dimen>
+	<dimen name="dp_650">1300.0000dp</dimen>
+	<dimen name="dp_651">1302.0000dp</dimen>
+	<dimen name="dp_652">1304.0000dp</dimen>
+	<dimen name="dp_653">1306.0000dp</dimen>
+	<dimen name="dp_654">1308.0000dp</dimen>
+	<dimen name="dp_655">1310.0000dp</dimen>
+	<dimen name="dp_656">1312.0000dp</dimen>
+	<dimen name="dp_657">1314.0000dp</dimen>
+	<dimen name="dp_658">1316.0000dp</dimen>
+	<dimen name="dp_659">1318.0000dp</dimen>
+	<dimen name="dp_660">1320.0000dp</dimen>
+	<dimen name="dp_661">1322.0000dp</dimen>
+	<dimen name="dp_662">1324.0000dp</dimen>
+	<dimen name="dp_663">1326.0000dp</dimen>
+	<dimen name="dp_664">1328.0000dp</dimen>
+	<dimen name="dp_665">1330.0000dp</dimen>
+	<dimen name="dp_666">1332.0000dp</dimen>
+	<dimen name="dp_667">1334.0000dp</dimen>
+	<dimen name="dp_668">1336.0000dp</dimen>
+	<dimen name="dp_669">1338.0000dp</dimen>
+	<dimen name="dp_670">1340.0000dp</dimen>
+	<dimen name="dp_671">1342.0000dp</dimen>
+	<dimen name="dp_672">1344.0000dp</dimen>
+	<dimen name="dp_673">1346.0000dp</dimen>
+	<dimen name="dp_674">1348.0000dp</dimen>
+	<dimen name="dp_675">1350.0000dp</dimen>
+	<dimen name="dp_676">1352.0000dp</dimen>
+	<dimen name="dp_677">1354.0000dp</dimen>
+	<dimen name="dp_678">1356.0000dp</dimen>
+	<dimen name="dp_679">1358.0000dp</dimen>
+	<dimen name="dp_680">1360.0000dp</dimen>
+	<dimen name="dp_681">1362.0000dp</dimen>
+	<dimen name="dp_682">1364.0000dp</dimen>
+	<dimen name="dp_683">1366.0000dp</dimen>
+	<dimen name="dp_684">1368.0000dp</dimen>
+	<dimen name="dp_685">1370.0000dp</dimen>
+	<dimen name="dp_686">1372.0000dp</dimen>
+	<dimen name="dp_687">1374.0000dp</dimen>
+	<dimen name="dp_688">1376.0000dp</dimen>
+	<dimen name="dp_689">1378.0000dp</dimen>
+	<dimen name="dp_690">1380.0000dp</dimen>
+	<dimen name="dp_691">1382.0000dp</dimen>
+	<dimen name="dp_692">1384.0000dp</dimen>
+	<dimen name="dp_693">1386.0000dp</dimen>
+	<dimen name="dp_694">1388.0000dp</dimen>
+	<dimen name="dp_695">1390.0000dp</dimen>
+	<dimen name="dp_696">1392.0000dp</dimen>
+	<dimen name="dp_697">1394.0000dp</dimen>
+	<dimen name="dp_698">1396.0000dp</dimen>
+	<dimen name="dp_699">1398.0000dp</dimen>
+	<dimen name="dp_700">1400.0000dp</dimen>
 	<dimen name="sp_1">2.0000sp</dimen>
 	<dimen name="sp_2">4.0000sp</dimen>
 	<dimen name="sp_3">6.0000sp</dimen>
@@ -573,4 +766,54 @@
 	<dimen name="sp_48">96.0000sp</dimen>
 	<dimen name="sp_49">98.0000sp</dimen>
 	<dimen name="sp_50">100.0000sp</dimen>
+	<dimen name="sp_51">102.0000sp</dimen>
+	<dimen name="sp_52">104.0000sp</dimen>
+	<dimen name="sp_53">106.0000sp</dimen>
+	<dimen name="sp_54">108.0000sp</dimen>
+	<dimen name="sp_55">110.0000sp</dimen>
+	<dimen name="sp_56">112.0000sp</dimen>
+	<dimen name="sp_57">114.0000sp</dimen>
+	<dimen name="sp_58">116.0000sp</dimen>
+	<dimen name="sp_59">118.0000sp</dimen>
+	<dimen name="sp_60">120.0000sp</dimen>
+	<dimen name="sp_61">122.0000sp</dimen>
+	<dimen name="sp_62">124.0000sp</dimen>
+	<dimen name="sp_63">126.0000sp</dimen>
+	<dimen name="sp_64">128.0000sp</dimen>
+	<dimen name="sp_65">130.0000sp</dimen>
+	<dimen name="sp_66">132.0000sp</dimen>
+	<dimen name="sp_67">134.0000sp</dimen>
+	<dimen name="sp_68">136.0000sp</dimen>
+	<dimen name="sp_69">138.0000sp</dimen>
+	<dimen name="sp_70">140.0000sp</dimen>
+	<dimen name="sp_71">142.0000sp</dimen>
+	<dimen name="sp_72">144.0000sp</dimen>
+	<dimen name="sp_73">146.0000sp</dimen>
+	<dimen name="sp_74">148.0000sp</dimen>
+	<dimen name="sp_75">150.0000sp</dimen>
+	<dimen name="sp_76">152.0000sp</dimen>
+	<dimen name="sp_77">154.0000sp</dimen>
+	<dimen name="sp_78">156.0000sp</dimen>
+	<dimen name="sp_79">158.0000sp</dimen>
+	<dimen name="sp_80">160.0000sp</dimen>
+	<dimen name="sp_81">162.0000sp</dimen>
+	<dimen name="sp_82">164.0000sp</dimen>
+	<dimen name="sp_83">166.0000sp</dimen>
+	<dimen name="sp_84">168.0000sp</dimen>
+	<dimen name="sp_85">170.0000sp</dimen>
+	<dimen name="sp_86">172.0000sp</dimen>
+	<dimen name="sp_87">174.0000sp</dimen>
+	<dimen name="sp_88">176.0000sp</dimen>
+	<dimen name="sp_89">178.0000sp</dimen>
+	<dimen name="sp_90">180.0000sp</dimen>
+	<dimen name="sp_91">182.0000sp</dimen>
+	<dimen name="sp_92">184.0000sp</dimen>
+	<dimen name="sp_93">186.0000sp</dimen>
+	<dimen name="sp_94">188.0000sp</dimen>
+	<dimen name="sp_95">190.0000sp</dimen>
+	<dimen name="sp_96">192.0000sp</dimen>
+	<dimen name="sp_97">194.0000sp</dimen>
+	<dimen name="sp_98">196.0000sp</dimen>
+	<dimen name="sp_99">198.0000sp</dimen>
+	<dimen name="sp_100">200.0000sp</dimen>
 </resources>
diff --git a/app/src/main/res/values-sw768dp/dimens.xml b/app/src/main/res/values-sw768dp/dimens.xml
index 6e14bb9..e388585 100644
--- a/app/src/main/res/values-sw768dp/dimens.xml
+++ b/app/src/main/res/values-sw768dp/dimens.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-	<dimen name="activity_horizontal_margin">34.1333dp</dimen>
-	<dimen name="activity_vertical_margin">34.1333dp</dimen>
-	<dimen name="actions_item_font">38.4000sp</dimen>
-	<dimen name="actions_item_drawablePaddding">21.3333dp</dimen>
 	<dimen name="dp_m_60">-128.0000dp</dimen>
 	<dimen name="dp_m_30">-64.0000dp</dimen>
 	<dimen name="dp_m_20">-42.6667dp</dimen>
@@ -520,9 +516,206 @@
 	<dimen name="dp_498">1062.4000dp</dimen>
 	<dimen name="dp_499">1064.5333dp</dimen>
 	<dimen name="dp_500">1066.6667dp</dimen>
+	<dimen name="dp_501">1068.8000dp</dimen>
+	<dimen name="dp_502">1070.9333dp</dimen>
+	<dimen name="dp_503">1073.0667dp</dimen>
+	<dimen name="dp_504">1075.2000dp</dimen>
+	<dimen name="dp_505">1077.3333dp</dimen>
+	<dimen name="dp_506">1079.4667dp</dimen>
+	<dimen name="dp_507">1081.6000dp</dimen>
+	<dimen name="dp_508">1083.7333dp</dimen>
+	<dimen name="dp_509">1085.8667dp</dimen>
+	<dimen name="dp_510">1088.0000dp</dimen>
+	<dimen name="dp_511">1090.1333dp</dimen>
+	<dimen name="dp_512">1092.2667dp</dimen>
+	<dimen name="dp_513">1094.4000dp</dimen>
+	<dimen name="dp_514">1096.5333dp</dimen>
+	<dimen name="dp_515">1098.6667dp</dimen>
+	<dimen name="dp_516">1100.8000dp</dimen>
+	<dimen name="dp_517">1102.9333dp</dimen>
+	<dimen name="dp_518">1105.0667dp</dimen>
+	<dimen name="dp_519">1107.2000dp</dimen>
+	<dimen name="dp_520">1109.3333dp</dimen>
+	<dimen name="dp_521">1111.4667dp</dimen>
+	<dimen name="dp_522">1113.6000dp</dimen>
+	<dimen name="dp_523">1115.7333dp</dimen>
+	<dimen name="dp_524">1117.8667dp</dimen>
+	<dimen name="dp_525">1120.0000dp</dimen>
+	<dimen name="dp_526">1122.1333dp</dimen>
+	<dimen name="dp_527">1124.2667dp</dimen>
+	<dimen name="dp_528">1126.4000dp</dimen>
+	<dimen name="dp_529">1128.5333dp</dimen>
+	<dimen name="dp_530">1130.6667dp</dimen>
+	<dimen name="dp_531">1132.8000dp</dimen>
+	<dimen name="dp_532">1134.9333dp</dimen>
+	<dimen name="dp_533">1137.0667dp</dimen>
+	<dimen name="dp_534">1139.2000dp</dimen>
+	<dimen name="dp_535">1141.3333dp</dimen>
+	<dimen name="dp_536">1143.4667dp</dimen>
+	<dimen name="dp_537">1145.6000dp</dimen>
+	<dimen name="dp_538">1147.7333dp</dimen>
+	<dimen name="dp_539">1149.8667dp</dimen>
+	<dimen name="dp_540">1152.0000dp</dimen>
+	<dimen name="dp_541">1154.1333dp</dimen>
+	<dimen name="dp_542">1156.2667dp</dimen>
+	<dimen name="dp_543">1158.4000dp</dimen>
+	<dimen name="dp_544">1160.5333dp</dimen>
+	<dimen name="dp_545">1162.6667dp</dimen>
+	<dimen name="dp_546">1164.8000dp</dimen>
+	<dimen name="dp_547">1166.9333dp</dimen>
+	<dimen name="dp_548">1169.0667dp</dimen>
+	<dimen name="dp_549">1171.2000dp</dimen>
+	<dimen name="dp_550">1173.3333dp</dimen>
+	<dimen name="dp_551">1175.4667dp</dimen>
+	<dimen name="dp_552">1177.6000dp</dimen>
+	<dimen name="dp_553">1179.7333dp</dimen>
+	<dimen name="dp_554">1181.8667dp</dimen>
+	<dimen name="dp_555">1184.0000dp</dimen>
+	<dimen name="dp_556">1186.1333dp</dimen>
+	<dimen name="dp_557">1188.2667dp</dimen>
+	<dimen name="dp_558">1190.4000dp</dimen>
+	<dimen name="dp_559">1192.5333dp</dimen>
+	<dimen name="dp_560">1194.6667dp</dimen>
+	<dimen name="dp_561">1196.8000dp</dimen>
+	<dimen name="dp_562">1198.9333dp</dimen>
+	<dimen name="dp_563">1201.0667dp</dimen>
+	<dimen name="dp_564">1203.2000dp</dimen>
+	<dimen name="dp_565">1205.3333dp</dimen>
+	<dimen name="dp_566">1207.4667dp</dimen>
+	<dimen name="dp_567">1209.6000dp</dimen>
+	<dimen name="dp_568">1211.7333dp</dimen>
+	<dimen name="dp_569">1213.8667dp</dimen>
+	<dimen name="dp_570">1216.0000dp</dimen>
+	<dimen name="dp_571">1218.1333dp</dimen>
+	<dimen name="dp_572">1220.2667dp</dimen>
+	<dimen name="dp_573">1222.4000dp</dimen>
+	<dimen name="dp_574">1224.5333dp</dimen>
+	<dimen name="dp_575">1226.6667dp</dimen>
+	<dimen name="dp_576">1228.8000dp</dimen>
+	<dimen name="dp_577">1230.9333dp</dimen>
+	<dimen name="dp_578">1233.0667dp</dimen>
+	<dimen name="dp_579">1235.2000dp</dimen>
+	<dimen name="dp_580">1237.3333dp</dimen>
+	<dimen name="dp_581">1239.4667dp</dimen>
+	<dimen name="dp_582">1241.6000dp</dimen>
+	<dimen name="dp_583">1243.7333dp</dimen>
+	<dimen name="dp_584">1245.8667dp</dimen>
+	<dimen name="dp_585">1248.0000dp</dimen>
+	<dimen name="dp_586">1250.1333dp</dimen>
+	<dimen name="dp_587">1252.2667dp</dimen>
+	<dimen name="dp_588">1254.4000dp</dimen>
+	<dimen name="dp_589">1256.5333dp</dimen>
+	<dimen name="dp_590">1258.6667dp</dimen>
+	<dimen name="dp_591">1260.8000dp</dimen>
+	<dimen name="dp_592">1262.9333dp</dimen>
+	<dimen name="dp_593">1265.0667dp</dimen>
+	<dimen name="dp_594">1267.2000dp</dimen>
+	<dimen name="dp_595">1269.3333dp</dimen>
+	<dimen name="dp_596">1271.4667dp</dimen>
+	<dimen name="dp_597">1273.6000dp</dimen>
+	<dimen name="dp_598">1275.7333dp</dimen>
+	<dimen name="dp_599">1277.8667dp</dimen>
 	<dimen name="dp_600">1280.0000dp</dimen>
+	<dimen name="dp_601">1282.1333dp</dimen>
+	<dimen name="dp_602">1284.2667dp</dimen>
+	<dimen name="dp_603">1286.4000dp</dimen>
+	<dimen name="dp_604">1288.5333dp</dimen>
+	<dimen name="dp_605">1290.6667dp</dimen>
+	<dimen name="dp_606">1292.8000dp</dimen>
+	<dimen name="dp_607">1294.9333dp</dimen>
+	<dimen name="dp_608">1297.0667dp</dimen>
+	<dimen name="dp_609">1299.2000dp</dimen>
+	<dimen name="dp_610">1301.3333dp</dimen>
+	<dimen name="dp_611">1303.4667dp</dimen>
+	<dimen name="dp_612">1305.6000dp</dimen>
+	<dimen name="dp_613">1307.7333dp</dimen>
+	<dimen name="dp_614">1309.8667dp</dimen>
+	<dimen name="dp_615">1312.0000dp</dimen>
+	<dimen name="dp_616">1314.1333dp</dimen>
+	<dimen name="dp_617">1316.2667dp</dimen>
+	<dimen name="dp_618">1318.4000dp</dimen>
+	<dimen name="dp_619">1320.5333dp</dimen>
+	<dimen name="dp_620">1322.6667dp</dimen>
+	<dimen name="dp_621">1324.8000dp</dimen>
+	<dimen name="dp_622">1326.9333dp</dimen>
+	<dimen name="dp_623">1329.0667dp</dimen>
+	<dimen name="dp_624">1331.2000dp</dimen>
+	<dimen name="dp_625">1333.3333dp</dimen>
+	<dimen name="dp_626">1335.4667dp</dimen>
+	<dimen name="dp_627">1337.6000dp</dimen>
+	<dimen name="dp_628">1339.7333dp</dimen>
+	<dimen name="dp_629">1341.8667dp</dimen>
+	<dimen name="dp_630">1344.0000dp</dimen>
+	<dimen name="dp_631">1346.1333dp</dimen>
+	<dimen name="dp_632">1348.2667dp</dimen>
+	<dimen name="dp_633">1350.4000dp</dimen>
+	<dimen name="dp_634">1352.5333dp</dimen>
+	<dimen name="dp_635">1354.6667dp</dimen>
+	<dimen name="dp_636">1356.8000dp</dimen>
+	<dimen name="dp_637">1358.9333dp</dimen>
+	<dimen name="dp_638">1361.0667dp</dimen>
+	<dimen name="dp_639">1363.2000dp</dimen>
 	<dimen name="dp_640">1365.3333dp</dimen>
-	<dimen name="dp_720">1536.0000dp</dimen>
+	<dimen name="dp_641">1367.4667dp</dimen>
+	<dimen name="dp_642">1369.6000dp</dimen>
+	<dimen name="dp_643">1371.7333dp</dimen>
+	<dimen name="dp_644">1373.8667dp</dimen>
+	<dimen name="dp_645">1376.0000dp</dimen>
+	<dimen name="dp_646">1378.1333dp</dimen>
+	<dimen name="dp_647">1380.2667dp</dimen>
+	<dimen name="dp_648">1382.4000dp</dimen>
+	<dimen name="dp_649">1384.5333dp</dimen>
+	<dimen name="dp_650">1386.6667dp</dimen>
+	<dimen name="dp_651">1388.8000dp</dimen>
+	<dimen name="dp_652">1390.9333dp</dimen>
+	<dimen name="dp_653">1393.0667dp</dimen>
+	<dimen name="dp_654">1395.2000dp</dimen>
+	<dimen name="dp_655">1397.3333dp</dimen>
+	<dimen name="dp_656">1399.4667dp</dimen>
+	<dimen name="dp_657">1401.6000dp</dimen>
+	<dimen name="dp_658">1403.7333dp</dimen>
+	<dimen name="dp_659">1405.8667dp</dimen>
+	<dimen name="dp_660">1408.0000dp</dimen>
+	<dimen name="dp_661">1410.1333dp</dimen>
+	<dimen name="dp_662">1412.2667dp</dimen>
+	<dimen name="dp_663">1414.4000dp</dimen>
+	<dimen name="dp_664">1416.5333dp</dimen>
+	<dimen name="dp_665">1418.6667dp</dimen>
+	<dimen name="dp_666">1420.8000dp</dimen>
+	<dimen name="dp_667">1422.9333dp</dimen>
+	<dimen name="dp_668">1425.0667dp</dimen>
+	<dimen name="dp_669">1427.2000dp</dimen>
+	<dimen name="dp_670">1429.3333dp</dimen>
+	<dimen name="dp_671">1431.4667dp</dimen>
+	<dimen name="dp_672">1433.6000dp</dimen>
+	<dimen name="dp_673">1435.7333dp</dimen>
+	<dimen name="dp_674">1437.8667dp</dimen>
+	<dimen name="dp_675">1440.0000dp</dimen>
+	<dimen name="dp_676">1442.1333dp</dimen>
+	<dimen name="dp_677">1444.2667dp</dimen>
+	<dimen name="dp_678">1446.4000dp</dimen>
+	<dimen name="dp_679">1448.5333dp</dimen>
+	<dimen name="dp_680">1450.6667dp</dimen>
+	<dimen name="dp_681">1452.8000dp</dimen>
+	<dimen name="dp_682">1454.9333dp</dimen>
+	<dimen name="dp_683">1457.0667dp</dimen>
+	<dimen name="dp_684">1459.2000dp</dimen>
+	<dimen name="dp_685">1461.3333dp</dimen>
+	<dimen name="dp_686">1463.4667dp</dimen>
+	<dimen name="dp_687">1465.6000dp</dimen>
+	<dimen name="dp_688">1467.7333dp</dimen>
+	<dimen name="dp_689">1469.8667dp</dimen>
+	<dimen name="dp_690">1472.0000dp</dimen>
+	<dimen name="dp_691">1474.1333dp</dimen>
+	<dimen name="dp_692">1476.2667dp</dimen>
+	<dimen name="dp_693">1478.4000dp</dimen>
+	<dimen name="dp_694">1480.5333dp</dimen>
+	<dimen name="dp_695">1482.6667dp</dimen>
+	<dimen name="dp_696">1484.8000dp</dimen>
+	<dimen name="dp_697">1486.9333dp</dimen>
+	<dimen name="dp_698">1489.0667dp</dimen>
+	<dimen name="dp_699">1491.2000dp</dimen>
+	<dimen name="dp_700">1493.3333dp</dimen>
 	<dimen name="sp_1">2.1333sp</dimen>
 	<dimen name="sp_2">4.2667sp</dimen>
 	<dimen name="sp_3">6.4000sp</dimen>
@@ -573,4 +766,54 @@
 	<dimen name="sp_48">102.4000sp</dimen>
 	<dimen name="sp_49">104.5333sp</dimen>
 	<dimen name="sp_50">106.6667sp</dimen>
+	<dimen name="sp_51">108.8000sp</dimen>
+	<dimen name="sp_52">110.9333sp</dimen>
+	<dimen name="sp_53">113.0667sp</dimen>
+	<dimen name="sp_54">115.2000sp</dimen>
+	<dimen name="sp_55">117.3333sp</dimen>
+	<dimen name="sp_56">119.4667sp</dimen>
+	<dimen name="sp_57">121.6000sp</dimen>
+	<dimen name="sp_58">123.7333sp</dimen>
+	<dimen name="sp_59">125.8667sp</dimen>
+	<dimen name="sp_60">128.0000sp</dimen>
+	<dimen name="sp_61">130.1333sp</dimen>
+	<dimen name="sp_62">132.2667sp</dimen>
+	<dimen name="sp_63">134.4000sp</dimen>
+	<dimen name="sp_64">136.5333sp</dimen>
+	<dimen name="sp_65">138.6667sp</dimen>
+	<dimen name="sp_66">140.8000sp</dimen>
+	<dimen name="sp_67">142.9333sp</dimen>
+	<dimen name="sp_68">145.0667sp</dimen>
+	<dimen name="sp_69">147.2000sp</dimen>
+	<dimen name="sp_70">149.3333sp</dimen>
+	<dimen name="sp_71">151.4667sp</dimen>
+	<dimen name="sp_72">153.6000sp</dimen>
+	<dimen name="sp_73">155.7333sp</dimen>
+	<dimen name="sp_74">157.8667sp</dimen>
+	<dimen name="sp_75">160.0000sp</dimen>
+	<dimen name="sp_76">162.1333sp</dimen>
+	<dimen name="sp_77">164.2667sp</dimen>
+	<dimen name="sp_78">166.4000sp</dimen>
+	<dimen name="sp_79">168.5333sp</dimen>
+	<dimen name="sp_80">170.6667sp</dimen>
+	<dimen name="sp_81">172.8000sp</dimen>
+	<dimen name="sp_82">174.9333sp</dimen>
+	<dimen name="sp_83">177.0667sp</dimen>
+	<dimen name="sp_84">179.2000sp</dimen>
+	<dimen name="sp_85">181.3333sp</dimen>
+	<dimen name="sp_86">183.4667sp</dimen>
+	<dimen name="sp_87">185.6000sp</dimen>
+	<dimen name="sp_88">187.7333sp</dimen>
+	<dimen name="sp_89">189.8667sp</dimen>
+	<dimen name="sp_90">192.0000sp</dimen>
+	<dimen name="sp_91">194.1333sp</dimen>
+	<dimen name="sp_92">196.2667sp</dimen>
+	<dimen name="sp_93">198.4000sp</dimen>
+	<dimen name="sp_94">200.5333sp</dimen>
+	<dimen name="sp_95">202.6667sp</dimen>
+	<dimen name="sp_96">204.8000sp</dimen>
+	<dimen name="sp_97">206.9333sp</dimen>
+	<dimen name="sp_98">209.0667sp</dimen>
+	<dimen name="sp_99">211.2000sp</dimen>
+	<dimen name="sp_100">213.3333sp</dimen>
 </resources>
diff --git a/app/src/main/res/values-sw800dp/dimens.xml b/app/src/main/res/values-sw800dp/dimens.xml
index a47636d..93d072f 100644
--- a/app/src/main/res/values-sw800dp/dimens.xml
+++ b/app/src/main/res/values-sw800dp/dimens.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-	<dimen name="activity_horizontal_margin">35.5556dp</dimen>
-	<dimen name="activity_vertical_margin">35.5556dp</dimen>
-	<dimen name="actions_item_font">40.0000sp</dimen>
-	<dimen name="actions_item_drawablePaddding">22.2222dp</dimen>
 	<dimen name="dp_m_60">-133.3333dp</dimen>
 	<dimen name="dp_m_30">-66.6667dp</dimen>
 	<dimen name="dp_m_20">-44.4444dp</dimen>
@@ -520,9 +516,206 @@
 	<dimen name="dp_498">1106.6667dp</dimen>
 	<dimen name="dp_499">1108.8889dp</dimen>
 	<dimen name="dp_500">1111.1111dp</dimen>
+	<dimen name="dp_501">1113.3333dp</dimen>
+	<dimen name="dp_502">1115.5556dp</dimen>
+	<dimen name="dp_503">1117.7778dp</dimen>
+	<dimen name="dp_504">1120.0000dp</dimen>
+	<dimen name="dp_505">1122.2222dp</dimen>
+	<dimen name="dp_506">1124.4444dp</dimen>
+	<dimen name="dp_507">1126.6667dp</dimen>
+	<dimen name="dp_508">1128.8889dp</dimen>
+	<dimen name="dp_509">1131.1111dp</dimen>
+	<dimen name="dp_510">1133.3333dp</dimen>
+	<dimen name="dp_511">1135.5556dp</dimen>
+	<dimen name="dp_512">1137.7778dp</dimen>
+	<dimen name="dp_513">1140.0000dp</dimen>
+	<dimen name="dp_514">1142.2222dp</dimen>
+	<dimen name="dp_515">1144.4444dp</dimen>
+	<dimen name="dp_516">1146.6667dp</dimen>
+	<dimen name="dp_517">1148.8889dp</dimen>
+	<dimen name="dp_518">1151.1111dp</dimen>
+	<dimen name="dp_519">1153.3333dp</dimen>
+	<dimen name="dp_520">1155.5556dp</dimen>
+	<dimen name="dp_521">1157.7778dp</dimen>
+	<dimen name="dp_522">1160.0000dp</dimen>
+	<dimen name="dp_523">1162.2222dp</dimen>
+	<dimen name="dp_524">1164.4444dp</dimen>
+	<dimen name="dp_525">1166.6667dp</dimen>
+	<dimen name="dp_526">1168.8889dp</dimen>
+	<dimen name="dp_527">1171.1111dp</dimen>
+	<dimen name="dp_528">1173.3333dp</dimen>
+	<dimen name="dp_529">1175.5556dp</dimen>
+	<dimen name="dp_530">1177.7778dp</dimen>
+	<dimen name="dp_531">1180.0000dp</dimen>
+	<dimen name="dp_532">1182.2222dp</dimen>
+	<dimen name="dp_533">1184.4444dp</dimen>
+	<dimen name="dp_534">1186.6667dp</dimen>
+	<dimen name="dp_535">1188.8889dp</dimen>
+	<dimen name="dp_536">1191.1111dp</dimen>
+	<dimen name="dp_537">1193.3333dp</dimen>
+	<dimen name="dp_538">1195.5556dp</dimen>
+	<dimen name="dp_539">1197.7778dp</dimen>
+	<dimen name="dp_540">1200.0000dp</dimen>
+	<dimen name="dp_541">1202.2222dp</dimen>
+	<dimen name="dp_542">1204.4444dp</dimen>
+	<dimen name="dp_543">1206.6667dp</dimen>
+	<dimen name="dp_544">1208.8889dp</dimen>
+	<dimen name="dp_545">1211.1111dp</dimen>
+	<dimen name="dp_546">1213.3333dp</dimen>
+	<dimen name="dp_547">1215.5556dp</dimen>
+	<dimen name="dp_548">1217.7778dp</dimen>
+	<dimen name="dp_549">1220.0000dp</dimen>
+	<dimen name="dp_550">1222.2222dp</dimen>
+	<dimen name="dp_551">1224.4444dp</dimen>
+	<dimen name="dp_552">1226.6667dp</dimen>
+	<dimen name="dp_553">1228.8889dp</dimen>
+	<dimen name="dp_554">1231.1111dp</dimen>
+	<dimen name="dp_555">1233.3333dp</dimen>
+	<dimen name="dp_556">1235.5556dp</dimen>
+	<dimen name="dp_557">1237.7778dp</dimen>
+	<dimen name="dp_558">1240.0000dp</dimen>
+	<dimen name="dp_559">1242.2222dp</dimen>
+	<dimen name="dp_560">1244.4444dp</dimen>
+	<dimen name="dp_561">1246.6667dp</dimen>
+	<dimen name="dp_562">1248.8889dp</dimen>
+	<dimen name="dp_563">1251.1111dp</dimen>
+	<dimen name="dp_564">1253.3333dp</dimen>
+	<dimen name="dp_565">1255.5556dp</dimen>
+	<dimen name="dp_566">1257.7778dp</dimen>
+	<dimen name="dp_567">1260.0000dp</dimen>
+	<dimen name="dp_568">1262.2222dp</dimen>
+	<dimen name="dp_569">1264.4444dp</dimen>
+	<dimen name="dp_570">1266.6667dp</dimen>
+	<dimen name="dp_571">1268.8889dp</dimen>
+	<dimen name="dp_572">1271.1111dp</dimen>
+	<dimen name="dp_573">1273.3333dp</dimen>
+	<dimen name="dp_574">1275.5556dp</dimen>
+	<dimen name="dp_575">1277.7778dp</dimen>
+	<dimen name="dp_576">1280.0000dp</dimen>
+	<dimen name="dp_577">1282.2222dp</dimen>
+	<dimen name="dp_578">1284.4444dp</dimen>
+	<dimen name="dp_579">1286.6667dp</dimen>
+	<dimen name="dp_580">1288.8889dp</dimen>
+	<dimen name="dp_581">1291.1111dp</dimen>
+	<dimen name="dp_582">1293.3333dp</dimen>
+	<dimen name="dp_583">1295.5556dp</dimen>
+	<dimen name="dp_584">1297.7778dp</dimen>
+	<dimen name="dp_585">1300.0000dp</dimen>
+	<dimen name="dp_586">1302.2222dp</dimen>
+	<dimen name="dp_587">1304.4444dp</dimen>
+	<dimen name="dp_588">1306.6667dp</dimen>
+	<dimen name="dp_589">1308.8889dp</dimen>
+	<dimen name="dp_590">1311.1111dp</dimen>
+	<dimen name="dp_591">1313.3333dp</dimen>
+	<dimen name="dp_592">1315.5556dp</dimen>
+	<dimen name="dp_593">1317.7778dp</dimen>
+	<dimen name="dp_594">1320.0000dp</dimen>
+	<dimen name="dp_595">1322.2222dp</dimen>
+	<dimen name="dp_596">1324.4444dp</dimen>
+	<dimen name="dp_597">1326.6667dp</dimen>
+	<dimen name="dp_598">1328.8889dp</dimen>
+	<dimen name="dp_599">1331.1111dp</dimen>
 	<dimen name="dp_600">1333.3333dp</dimen>
+	<dimen name="dp_601">1335.5556dp</dimen>
+	<dimen name="dp_602">1337.7778dp</dimen>
+	<dimen name="dp_603">1340.0000dp</dimen>
+	<dimen name="dp_604">1342.2222dp</dimen>
+	<dimen name="dp_605">1344.4444dp</dimen>
+	<dimen name="dp_606">1346.6667dp</dimen>
+	<dimen name="dp_607">1348.8889dp</dimen>
+	<dimen name="dp_608">1351.1111dp</dimen>
+	<dimen name="dp_609">1353.3333dp</dimen>
+	<dimen name="dp_610">1355.5556dp</dimen>
+	<dimen name="dp_611">1357.7778dp</dimen>
+	<dimen name="dp_612">1360.0000dp</dimen>
+	<dimen name="dp_613">1362.2222dp</dimen>
+	<dimen name="dp_614">1364.4444dp</dimen>
+	<dimen name="dp_615">1366.6667dp</dimen>
+	<dimen name="dp_616">1368.8889dp</dimen>
+	<dimen name="dp_617">1371.1111dp</dimen>
+	<dimen name="dp_618">1373.3333dp</dimen>
+	<dimen name="dp_619">1375.5556dp</dimen>
+	<dimen name="dp_620">1377.7778dp</dimen>
+	<dimen name="dp_621">1380.0000dp</dimen>
+	<dimen name="dp_622">1382.2222dp</dimen>
+	<dimen name="dp_623">1384.4444dp</dimen>
+	<dimen name="dp_624">1386.6667dp</dimen>
+	<dimen name="dp_625">1388.8889dp</dimen>
+	<dimen name="dp_626">1391.1111dp</dimen>
+	<dimen name="dp_627">1393.3333dp</dimen>
+	<dimen name="dp_628">1395.5556dp</dimen>
+	<dimen name="dp_629">1397.7778dp</dimen>
+	<dimen name="dp_630">1400.0000dp</dimen>
+	<dimen name="dp_631">1402.2222dp</dimen>
+	<dimen name="dp_632">1404.4444dp</dimen>
+	<dimen name="dp_633">1406.6667dp</dimen>
+	<dimen name="dp_634">1408.8889dp</dimen>
+	<dimen name="dp_635">1411.1111dp</dimen>
+	<dimen name="dp_636">1413.3333dp</dimen>
+	<dimen name="dp_637">1415.5556dp</dimen>
+	<dimen name="dp_638">1417.7778dp</dimen>
+	<dimen name="dp_639">1420.0000dp</dimen>
 	<dimen name="dp_640">1422.2222dp</dimen>
-	<dimen name="dp_720">1600.0000dp</dimen>
+	<dimen name="dp_641">1424.4444dp</dimen>
+	<dimen name="dp_642">1426.6667dp</dimen>
+	<dimen name="dp_643">1428.8889dp</dimen>
+	<dimen name="dp_644">1431.1111dp</dimen>
+	<dimen name="dp_645">1433.3333dp</dimen>
+	<dimen name="dp_646">1435.5556dp</dimen>
+	<dimen name="dp_647">1437.7778dp</dimen>
+	<dimen name="dp_648">1440.0000dp</dimen>
+	<dimen name="dp_649">1442.2222dp</dimen>
+	<dimen name="dp_650">1444.4444dp</dimen>
+	<dimen name="dp_651">1446.6667dp</dimen>
+	<dimen name="dp_652">1448.8889dp</dimen>
+	<dimen name="dp_653">1451.1111dp</dimen>
+	<dimen name="dp_654">1453.3333dp</dimen>
+	<dimen name="dp_655">1455.5556dp</dimen>
+	<dimen name="dp_656">1457.7778dp</dimen>
+	<dimen name="dp_657">1460.0000dp</dimen>
+	<dimen name="dp_658">1462.2222dp</dimen>
+	<dimen name="dp_659">1464.4444dp</dimen>
+	<dimen name="dp_660">1466.6667dp</dimen>
+	<dimen name="dp_661">1468.8889dp</dimen>
+	<dimen name="dp_662">1471.1111dp</dimen>
+	<dimen name="dp_663">1473.3333dp</dimen>
+	<dimen name="dp_664">1475.5556dp</dimen>
+	<dimen name="dp_665">1477.7778dp</dimen>
+	<dimen name="dp_666">1480.0000dp</dimen>
+	<dimen name="dp_667">1482.2222dp</dimen>
+	<dimen name="dp_668">1484.4444dp</dimen>
+	<dimen name="dp_669">1486.6667dp</dimen>
+	<dimen name="dp_670">1488.8889dp</dimen>
+	<dimen name="dp_671">1491.1111dp</dimen>
+	<dimen name="dp_672">1493.3333dp</dimen>
+	<dimen name="dp_673">1495.5556dp</dimen>
+	<dimen name="dp_674">1497.7778dp</dimen>
+	<dimen name="dp_675">1500.0000dp</dimen>
+	<dimen name="dp_676">1502.2222dp</dimen>
+	<dimen name="dp_677">1504.4444dp</dimen>
+	<dimen name="dp_678">1506.6667dp</dimen>
+	<dimen name="dp_679">1508.8889dp</dimen>
+	<dimen name="dp_680">1511.1111dp</dimen>
+	<dimen name="dp_681">1513.3333dp</dimen>
+	<dimen name="dp_682">1515.5556dp</dimen>
+	<dimen name="dp_683">1517.7778dp</dimen>
+	<dimen name="dp_684">1520.0000dp</dimen>
+	<dimen name="dp_685">1522.2222dp</dimen>
+	<dimen name="dp_686">1524.4444dp</dimen>
+	<dimen name="dp_687">1526.6667dp</dimen>
+	<dimen name="dp_688">1528.8889dp</dimen>
+	<dimen name="dp_689">1531.1111dp</dimen>
+	<dimen name="dp_690">1533.3333dp</dimen>
+	<dimen name="dp_691">1535.5556dp</dimen>
+	<dimen name="dp_692">1537.7778dp</dimen>
+	<dimen name="dp_693">1540.0000dp</dimen>
+	<dimen name="dp_694">1542.2222dp</dimen>
+	<dimen name="dp_695">1544.4444dp</dimen>
+	<dimen name="dp_696">1546.6667dp</dimen>
+	<dimen name="dp_697">1548.8889dp</dimen>
+	<dimen name="dp_698">1551.1111dp</dimen>
+	<dimen name="dp_699">1553.3333dp</dimen>
+	<dimen name="dp_700">1555.5556dp</dimen>
 	<dimen name="sp_1">2.2222sp</dimen>
 	<dimen name="sp_2">4.4444sp</dimen>
 	<dimen name="sp_3">6.6667sp</dimen>
@@ -573,4 +766,54 @@
 	<dimen name="sp_48">106.6667sp</dimen>
 	<dimen name="sp_49">108.8889sp</dimen>
 	<dimen name="sp_50">111.1111sp</dimen>
+	<dimen name="sp_51">113.3333sp</dimen>
+	<dimen name="sp_52">115.5556sp</dimen>
+	<dimen name="sp_53">117.7778sp</dimen>
+	<dimen name="sp_54">120.0000sp</dimen>
+	<dimen name="sp_55">122.2222sp</dimen>
+	<dimen name="sp_56">124.4444sp</dimen>
+	<dimen name="sp_57">126.6667sp</dimen>
+	<dimen name="sp_58">128.8889sp</dimen>
+	<dimen name="sp_59">131.1111sp</dimen>
+	<dimen name="sp_60">133.3333sp</dimen>
+	<dimen name="sp_61">135.5556sp</dimen>
+	<dimen name="sp_62">137.7778sp</dimen>
+	<dimen name="sp_63">140.0000sp</dimen>
+	<dimen name="sp_64">142.2222sp</dimen>
+	<dimen name="sp_65">144.4444sp</dimen>
+	<dimen name="sp_66">146.6667sp</dimen>
+	<dimen name="sp_67">148.8889sp</dimen>
+	<dimen name="sp_68">151.1111sp</dimen>
+	<dimen name="sp_69">153.3333sp</dimen>
+	<dimen name="sp_70">155.5556sp</dimen>
+	<dimen name="sp_71">157.7778sp</dimen>
+	<dimen name="sp_72">160.0000sp</dimen>
+	<dimen name="sp_73">162.2222sp</dimen>
+	<dimen name="sp_74">164.4444sp</dimen>
+	<dimen name="sp_75">166.6667sp</dimen>
+	<dimen name="sp_76">168.8889sp</dimen>
+	<dimen name="sp_77">171.1111sp</dimen>
+	<dimen name="sp_78">173.3333sp</dimen>
+	<dimen name="sp_79">175.5556sp</dimen>
+	<dimen name="sp_80">177.7778sp</dimen>
+	<dimen name="sp_81">180.0000sp</dimen>
+	<dimen name="sp_82">182.2222sp</dimen>
+	<dimen name="sp_83">184.4444sp</dimen>
+	<dimen name="sp_84">186.6667sp</dimen>
+	<dimen name="sp_85">188.8889sp</dimen>
+	<dimen name="sp_86">191.1111sp</dimen>
+	<dimen name="sp_87">193.3333sp</dimen>
+	<dimen name="sp_88">195.5556sp</dimen>
+	<dimen name="sp_89">197.7778sp</dimen>
+	<dimen name="sp_90">200.0000sp</dimen>
+	<dimen name="sp_91">202.2222sp</dimen>
+	<dimen name="sp_92">204.4444sp</dimen>
+	<dimen name="sp_93">206.6667sp</dimen>
+	<dimen name="sp_94">208.8889sp</dimen>
+	<dimen name="sp_95">211.1111sp</dimen>
+	<dimen name="sp_96">213.3333sp</dimen>
+	<dimen name="sp_97">215.5556sp</dimen>
+	<dimen name="sp_98">217.7778sp</dimen>
+	<dimen name="sp_99">220.0000sp</dimen>
+	<dimen name="sp_100">222.2222sp</dimen>
 </resources>
diff --git a/app/src/main/res/values-sw811dp/dimens.xml b/app/src/main/res/values-sw811dp/dimens.xml
index e892ed0..7648753 100644
--- a/app/src/main/res/values-sw811dp/dimens.xml
+++ b/app/src/main/res/values-sw811dp/dimens.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-	<dimen name="activity_horizontal_margin">36.0444dp</dimen>
-	<dimen name="activity_vertical_margin">36.0444dp</dimen>
-	<dimen name="actions_item_font">40.5500sp</dimen>
-	<dimen name="actions_item_drawablePaddding">22.5278dp</dimen>
 	<dimen name="dp_m_60">-135.1667dp</dimen>
 	<dimen name="dp_m_30">-67.5833dp</dimen>
 	<dimen name="dp_m_20">-45.0556dp</dimen>
@@ -520,9 +516,206 @@
 	<dimen name="dp_498">1121.8833dp</dimen>
 	<dimen name="dp_499">1124.1361dp</dimen>
 	<dimen name="dp_500">1126.3889dp</dimen>
+	<dimen name="dp_501">1128.6417dp</dimen>
+	<dimen name="dp_502">1130.8944dp</dimen>
+	<dimen name="dp_503">1133.1472dp</dimen>
+	<dimen name="dp_504">1135.4000dp</dimen>
+	<dimen name="dp_505">1137.6528dp</dimen>
+	<dimen name="dp_506">1139.9056dp</dimen>
+	<dimen name="dp_507">1142.1583dp</dimen>
+	<dimen name="dp_508">1144.4111dp</dimen>
+	<dimen name="dp_509">1146.6639dp</dimen>
+	<dimen name="dp_510">1148.9167dp</dimen>
+	<dimen name="dp_511">1151.1694dp</dimen>
+	<dimen name="dp_512">1153.4222dp</dimen>
+	<dimen name="dp_513">1155.6750dp</dimen>
+	<dimen name="dp_514">1157.9278dp</dimen>
+	<dimen name="dp_515">1160.1806dp</dimen>
+	<dimen name="dp_516">1162.4333dp</dimen>
+	<dimen name="dp_517">1164.6861dp</dimen>
+	<dimen name="dp_518">1166.9389dp</dimen>
+	<dimen name="dp_519">1169.1917dp</dimen>
+	<dimen name="dp_520">1171.4444dp</dimen>
+	<dimen name="dp_521">1173.6972dp</dimen>
+	<dimen name="dp_522">1175.9500dp</dimen>
+	<dimen name="dp_523">1178.2028dp</dimen>
+	<dimen name="dp_524">1180.4556dp</dimen>
+	<dimen name="dp_525">1182.7083dp</dimen>
+	<dimen name="dp_526">1184.9611dp</dimen>
+	<dimen name="dp_527">1187.2139dp</dimen>
+	<dimen name="dp_528">1189.4667dp</dimen>
+	<dimen name="dp_529">1191.7194dp</dimen>
+	<dimen name="dp_530">1193.9722dp</dimen>
+	<dimen name="dp_531">1196.2250dp</dimen>
+	<dimen name="dp_532">1198.4778dp</dimen>
+	<dimen name="dp_533">1200.7306dp</dimen>
+	<dimen name="dp_534">1202.9833dp</dimen>
+	<dimen name="dp_535">1205.2361dp</dimen>
+	<dimen name="dp_536">1207.4889dp</dimen>
+	<dimen name="dp_537">1209.7417dp</dimen>
+	<dimen name="dp_538">1211.9944dp</dimen>
+	<dimen name="dp_539">1214.2472dp</dimen>
+	<dimen name="dp_540">1216.5000dp</dimen>
+	<dimen name="dp_541">1218.7528dp</dimen>
+	<dimen name="dp_542">1221.0056dp</dimen>
+	<dimen name="dp_543">1223.2583dp</dimen>
+	<dimen name="dp_544">1225.5111dp</dimen>
+	<dimen name="dp_545">1227.7639dp</dimen>
+	<dimen name="dp_546">1230.0167dp</dimen>
+	<dimen name="dp_547">1232.2694dp</dimen>
+	<dimen name="dp_548">1234.5222dp</dimen>
+	<dimen name="dp_549">1236.7750dp</dimen>
+	<dimen name="dp_550">1239.0278dp</dimen>
+	<dimen name="dp_551">1241.2806dp</dimen>
+	<dimen name="dp_552">1243.5333dp</dimen>
+	<dimen name="dp_553">1245.7861dp</dimen>
+	<dimen name="dp_554">1248.0389dp</dimen>
+	<dimen name="dp_555">1250.2917dp</dimen>
+	<dimen name="dp_556">1252.5444dp</dimen>
+	<dimen name="dp_557">1254.7972dp</dimen>
+	<dimen name="dp_558">1257.0500dp</dimen>
+	<dimen name="dp_559">1259.3028dp</dimen>
+	<dimen name="dp_560">1261.5556dp</dimen>
+	<dimen name="dp_561">1263.8083dp</dimen>
+	<dimen name="dp_562">1266.0611dp</dimen>
+	<dimen name="dp_563">1268.3139dp</dimen>
+	<dimen name="dp_564">1270.5667dp</dimen>
+	<dimen name="dp_565">1272.8194dp</dimen>
+	<dimen name="dp_566">1275.0722dp</dimen>
+	<dimen name="dp_567">1277.3250dp</dimen>
+	<dimen name="dp_568">1279.5778dp</dimen>
+	<dimen name="dp_569">1281.8306dp</dimen>
+	<dimen name="dp_570">1284.0833dp</dimen>
+	<dimen name="dp_571">1286.3361dp</dimen>
+	<dimen name="dp_572">1288.5889dp</dimen>
+	<dimen name="dp_573">1290.8417dp</dimen>
+	<dimen name="dp_574">1293.0944dp</dimen>
+	<dimen name="dp_575">1295.3472dp</dimen>
+	<dimen name="dp_576">1297.6000dp</dimen>
+	<dimen name="dp_577">1299.8528dp</dimen>
+	<dimen name="dp_578">1302.1056dp</dimen>
+	<dimen name="dp_579">1304.3583dp</dimen>
+	<dimen name="dp_580">1306.6111dp</dimen>
+	<dimen name="dp_581">1308.8639dp</dimen>
+	<dimen name="dp_582">1311.1167dp</dimen>
+	<dimen name="dp_583">1313.3694dp</dimen>
+	<dimen name="dp_584">1315.6222dp</dimen>
+	<dimen name="dp_585">1317.8750dp</dimen>
+	<dimen name="dp_586">1320.1278dp</dimen>
+	<dimen name="dp_587">1322.3806dp</dimen>
+	<dimen name="dp_588">1324.6333dp</dimen>
+	<dimen name="dp_589">1326.8861dp</dimen>
+	<dimen name="dp_590">1329.1389dp</dimen>
+	<dimen name="dp_591">1331.3917dp</dimen>
+	<dimen name="dp_592">1333.6444dp</dimen>
+	<dimen name="dp_593">1335.8972dp</dimen>
+	<dimen name="dp_594">1338.1500dp</dimen>
+	<dimen name="dp_595">1340.4028dp</dimen>
+	<dimen name="dp_596">1342.6556dp</dimen>
+	<dimen name="dp_597">1344.9083dp</dimen>
+	<dimen name="dp_598">1347.1611dp</dimen>
+	<dimen name="dp_599">1349.4139dp</dimen>
 	<dimen name="dp_600">1351.6667dp</dimen>
+	<dimen name="dp_601">1353.9194dp</dimen>
+	<dimen name="dp_602">1356.1722dp</dimen>
+	<dimen name="dp_603">1358.4250dp</dimen>
+	<dimen name="dp_604">1360.6778dp</dimen>
+	<dimen name="dp_605">1362.9306dp</dimen>
+	<dimen name="dp_606">1365.1833dp</dimen>
+	<dimen name="dp_607">1367.4361dp</dimen>
+	<dimen name="dp_608">1369.6889dp</dimen>
+	<dimen name="dp_609">1371.9417dp</dimen>
+	<dimen name="dp_610">1374.1944dp</dimen>
+	<dimen name="dp_611">1376.4472dp</dimen>
+	<dimen name="dp_612">1378.7000dp</dimen>
+	<dimen name="dp_613">1380.9528dp</dimen>
+	<dimen name="dp_614">1383.2056dp</dimen>
+	<dimen name="dp_615">1385.4583dp</dimen>
+	<dimen name="dp_616">1387.7111dp</dimen>
+	<dimen name="dp_617">1389.9639dp</dimen>
+	<dimen name="dp_618">1392.2167dp</dimen>
+	<dimen name="dp_619">1394.4694dp</dimen>
+	<dimen name="dp_620">1396.7222dp</dimen>
+	<dimen name="dp_621">1398.9750dp</dimen>
+	<dimen name="dp_622">1401.2278dp</dimen>
+	<dimen name="dp_623">1403.4806dp</dimen>
+	<dimen name="dp_624">1405.7333dp</dimen>
+	<dimen name="dp_625">1407.9861dp</dimen>
+	<dimen name="dp_626">1410.2389dp</dimen>
+	<dimen name="dp_627">1412.4917dp</dimen>
+	<dimen name="dp_628">1414.7444dp</dimen>
+	<dimen name="dp_629">1416.9972dp</dimen>
+	<dimen name="dp_630">1419.2500dp</dimen>
+	<dimen name="dp_631">1421.5028dp</dimen>
+	<dimen name="dp_632">1423.7556dp</dimen>
+	<dimen name="dp_633">1426.0083dp</dimen>
+	<dimen name="dp_634">1428.2611dp</dimen>
+	<dimen name="dp_635">1430.5139dp</dimen>
+	<dimen name="dp_636">1432.7667dp</dimen>
+	<dimen name="dp_637">1435.0194dp</dimen>
+	<dimen name="dp_638">1437.2722dp</dimen>
+	<dimen name="dp_639">1439.5250dp</dimen>
 	<dimen name="dp_640">1441.7778dp</dimen>
-	<dimen name="dp_720">1622.0000dp</dimen>
+	<dimen name="dp_641">1444.0306dp</dimen>
+	<dimen name="dp_642">1446.2833dp</dimen>
+	<dimen name="dp_643">1448.5361dp</dimen>
+	<dimen name="dp_644">1450.7889dp</dimen>
+	<dimen name="dp_645">1453.0417dp</dimen>
+	<dimen name="dp_646">1455.2944dp</dimen>
+	<dimen name="dp_647">1457.5472dp</dimen>
+	<dimen name="dp_648">1459.8000dp</dimen>
+	<dimen name="dp_649">1462.0528dp</dimen>
+	<dimen name="dp_650">1464.3056dp</dimen>
+	<dimen name="dp_651">1466.5583dp</dimen>
+	<dimen name="dp_652">1468.8111dp</dimen>
+	<dimen name="dp_653">1471.0639dp</dimen>
+	<dimen name="dp_654">1473.3167dp</dimen>
+	<dimen name="dp_655">1475.5694dp</dimen>
+	<dimen name="dp_656">1477.8222dp</dimen>
+	<dimen name="dp_657">1480.0750dp</dimen>
+	<dimen name="dp_658">1482.3278dp</dimen>
+	<dimen name="dp_659">1484.5806dp</dimen>
+	<dimen name="dp_660">1486.8333dp</dimen>
+	<dimen name="dp_661">1489.0861dp</dimen>
+	<dimen name="dp_662">1491.3389dp</dimen>
+	<dimen name="dp_663">1493.5917dp</dimen>
+	<dimen name="dp_664">1495.8444dp</dimen>
+	<dimen name="dp_665">1498.0972dp</dimen>
+	<dimen name="dp_666">1500.3500dp</dimen>
+	<dimen name="dp_667">1502.6028dp</dimen>
+	<dimen name="dp_668">1504.8556dp</dimen>
+	<dimen name="dp_669">1507.1083dp</dimen>
+	<dimen name="dp_670">1509.3611dp</dimen>
+	<dimen name="dp_671">1511.6139dp</dimen>
+	<dimen name="dp_672">1513.8667dp</dimen>
+	<dimen name="dp_673">1516.1194dp</dimen>
+	<dimen name="dp_674">1518.3722dp</dimen>
+	<dimen name="dp_675">1520.6250dp</dimen>
+	<dimen name="dp_676">1522.8778dp</dimen>
+	<dimen name="dp_677">1525.1306dp</dimen>
+	<dimen name="dp_678">1527.3833dp</dimen>
+	<dimen name="dp_679">1529.6361dp</dimen>
+	<dimen name="dp_680">1531.8889dp</dimen>
+	<dimen name="dp_681">1534.1417dp</dimen>
+	<dimen name="dp_682">1536.3944dp</dimen>
+	<dimen name="dp_683">1538.6472dp</dimen>
+	<dimen name="dp_684">1540.9000dp</dimen>
+	<dimen name="dp_685">1543.1528dp</dimen>
+	<dimen name="dp_686">1545.4056dp</dimen>
+	<dimen name="dp_687">1547.6583dp</dimen>
+	<dimen name="dp_688">1549.9111dp</dimen>
+	<dimen name="dp_689">1552.1639dp</dimen>
+	<dimen name="dp_690">1554.4167dp</dimen>
+	<dimen name="dp_691">1556.6694dp</dimen>
+	<dimen name="dp_692">1558.9222dp</dimen>
+	<dimen name="dp_693">1561.1750dp</dimen>
+	<dimen name="dp_694">1563.4278dp</dimen>
+	<dimen name="dp_695">1565.6806dp</dimen>
+	<dimen name="dp_696">1567.9333dp</dimen>
+	<dimen name="dp_697">1570.1861dp</dimen>
+	<dimen name="dp_698">1572.4389dp</dimen>
+	<dimen name="dp_699">1574.6917dp</dimen>
+	<dimen name="dp_700">1576.9444dp</dimen>
 	<dimen name="sp_1">2.2528sp</dimen>
 	<dimen name="sp_2">4.5056sp</dimen>
 	<dimen name="sp_3">6.7583sp</dimen>
@@ -573,4 +766,54 @@
 	<dimen name="sp_48">108.1333sp</dimen>
 	<dimen name="sp_49">110.3861sp</dimen>
 	<dimen name="sp_50">112.6389sp</dimen>
+	<dimen name="sp_51">114.8917sp</dimen>
+	<dimen name="sp_52">117.1444sp</dimen>
+	<dimen name="sp_53">119.3972sp</dimen>
+	<dimen name="sp_54">121.6500sp</dimen>
+	<dimen name="sp_55">123.9028sp</dimen>
+	<dimen name="sp_56">126.1556sp</dimen>
+	<dimen name="sp_57">128.4083sp</dimen>
+	<dimen name="sp_58">130.6611sp</dimen>
+	<dimen name="sp_59">132.9139sp</dimen>
+	<dimen name="sp_60">135.1667sp</dimen>
+	<dimen name="sp_61">137.4194sp</dimen>
+	<dimen name="sp_62">139.6722sp</dimen>
+	<dimen name="sp_63">141.9250sp</dimen>
+	<dimen name="sp_64">144.1778sp</dimen>
+	<dimen name="sp_65">146.4306sp</dimen>
+	<dimen name="sp_66">148.6833sp</dimen>
+	<dimen name="sp_67">150.9361sp</dimen>
+	<dimen name="sp_68">153.1889sp</dimen>
+	<dimen name="sp_69">155.4417sp</dimen>
+	<dimen name="sp_70">157.6944sp</dimen>
+	<dimen name="sp_71">159.9472sp</dimen>
+	<dimen name="sp_72">162.2000sp</dimen>
+	<dimen name="sp_73">164.4528sp</dimen>
+	<dimen name="sp_74">166.7056sp</dimen>
+	<dimen name="sp_75">168.9583sp</dimen>
+	<dimen name="sp_76">171.2111sp</dimen>
+	<dimen name="sp_77">173.4639sp</dimen>
+	<dimen name="sp_78">175.7167sp</dimen>
+	<dimen name="sp_79">177.9694sp</dimen>
+	<dimen name="sp_80">180.2222sp</dimen>
+	<dimen name="sp_81">182.4750sp</dimen>
+	<dimen name="sp_82">184.7278sp</dimen>
+	<dimen name="sp_83">186.9806sp</dimen>
+	<dimen name="sp_84">189.2333sp</dimen>
+	<dimen name="sp_85">191.4861sp</dimen>
+	<dimen name="sp_86">193.7389sp</dimen>
+	<dimen name="sp_87">195.9917sp</dimen>
+	<dimen name="sp_88">198.2444sp</dimen>
+	<dimen name="sp_89">200.4972sp</dimen>
+	<dimen name="sp_90">202.7500sp</dimen>
+	<dimen name="sp_91">205.0028sp</dimen>
+	<dimen name="sp_92">207.2556sp</dimen>
+	<dimen name="sp_93">209.5083sp</dimen>
+	<dimen name="sp_94">211.7611sp</dimen>
+	<dimen name="sp_95">214.0139sp</dimen>
+	<dimen name="sp_96">216.2667sp</dimen>
+	<dimen name="sp_97">218.5194sp</dimen>
+	<dimen name="sp_98">220.7722sp</dimen>
+	<dimen name="sp_99">223.0250sp</dimen>
+	<dimen name="sp_100">225.2778sp</dimen>
 </resources>
diff --git a/app/src/main/res/values-sw820dp/dimens.xml b/app/src/main/res/values-sw820dp/dimens.xml
index c0b784e..08c6d5e 100644
--- a/app/src/main/res/values-sw820dp/dimens.xml
+++ b/app/src/main/res/values-sw820dp/dimens.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-	<dimen name="activity_horizontal_margin">36.4444dp</dimen>
-	<dimen name="activity_vertical_margin">36.4444dp</dimen>
-	<dimen name="actions_item_font">41.0000sp</dimen>
-	<dimen name="actions_item_drawablePaddding">22.7778dp</dimen>
 	<dimen name="dp_m_60">-136.6667dp</dimen>
 	<dimen name="dp_m_30">-68.3333dp</dimen>
 	<dimen name="dp_m_20">-45.5556dp</dimen>
@@ -520,9 +516,206 @@
 	<dimen name="dp_498">1134.3333dp</dimen>
 	<dimen name="dp_499">1136.6111dp</dimen>
 	<dimen name="dp_500">1138.8889dp</dimen>
+	<dimen name="dp_501">1141.1667dp</dimen>
+	<dimen name="dp_502">1143.4444dp</dimen>
+	<dimen name="dp_503">1145.7222dp</dimen>
+	<dimen name="dp_504">1148.0000dp</dimen>
+	<dimen name="dp_505">1150.2778dp</dimen>
+	<dimen name="dp_506">1152.5556dp</dimen>
+	<dimen name="dp_507">1154.8333dp</dimen>
+	<dimen name="dp_508">1157.1111dp</dimen>
+	<dimen name="dp_509">1159.3889dp</dimen>
+	<dimen name="dp_510">1161.6667dp</dimen>
+	<dimen name="dp_511">1163.9444dp</dimen>
+	<dimen name="dp_512">1166.2222dp</dimen>
+	<dimen name="dp_513">1168.5000dp</dimen>
+	<dimen name="dp_514">1170.7778dp</dimen>
+	<dimen name="dp_515">1173.0556dp</dimen>
+	<dimen name="dp_516">1175.3333dp</dimen>
+	<dimen name="dp_517">1177.6111dp</dimen>
+	<dimen name="dp_518">1179.8889dp</dimen>
+	<dimen name="dp_519">1182.1667dp</dimen>
+	<dimen name="dp_520">1184.4444dp</dimen>
+	<dimen name="dp_521">1186.7222dp</dimen>
+	<dimen name="dp_522">1189.0000dp</dimen>
+	<dimen name="dp_523">1191.2778dp</dimen>
+	<dimen name="dp_524">1193.5556dp</dimen>
+	<dimen name="dp_525">1195.8333dp</dimen>
+	<dimen name="dp_526">1198.1111dp</dimen>
+	<dimen name="dp_527">1200.3889dp</dimen>
+	<dimen name="dp_528">1202.6667dp</dimen>
+	<dimen name="dp_529">1204.9444dp</dimen>
+	<dimen name="dp_530">1207.2222dp</dimen>
+	<dimen name="dp_531">1209.5000dp</dimen>
+	<dimen name="dp_532">1211.7778dp</dimen>
+	<dimen name="dp_533">1214.0556dp</dimen>
+	<dimen name="dp_534">1216.3333dp</dimen>
+	<dimen name="dp_535">1218.6111dp</dimen>
+	<dimen name="dp_536">1220.8889dp</dimen>
+	<dimen name="dp_537">1223.1667dp</dimen>
+	<dimen name="dp_538">1225.4444dp</dimen>
+	<dimen name="dp_539">1227.7222dp</dimen>
+	<dimen name="dp_540">1230.0000dp</dimen>
+	<dimen name="dp_541">1232.2778dp</dimen>
+	<dimen name="dp_542">1234.5556dp</dimen>
+	<dimen name="dp_543">1236.8333dp</dimen>
+	<dimen name="dp_544">1239.1111dp</dimen>
+	<dimen name="dp_545">1241.3889dp</dimen>
+	<dimen name="dp_546">1243.6667dp</dimen>
+	<dimen name="dp_547">1245.9444dp</dimen>
+	<dimen name="dp_548">1248.2222dp</dimen>
+	<dimen name="dp_549">1250.5000dp</dimen>
+	<dimen name="dp_550">1252.7778dp</dimen>
+	<dimen name="dp_551">1255.0556dp</dimen>
+	<dimen name="dp_552">1257.3333dp</dimen>
+	<dimen name="dp_553">1259.6111dp</dimen>
+	<dimen name="dp_554">1261.8889dp</dimen>
+	<dimen name="dp_555">1264.1667dp</dimen>
+	<dimen name="dp_556">1266.4444dp</dimen>
+	<dimen name="dp_557">1268.7222dp</dimen>
+	<dimen name="dp_558">1271.0000dp</dimen>
+	<dimen name="dp_559">1273.2778dp</dimen>
+	<dimen name="dp_560">1275.5556dp</dimen>
+	<dimen name="dp_561">1277.8333dp</dimen>
+	<dimen name="dp_562">1280.1111dp</dimen>
+	<dimen name="dp_563">1282.3889dp</dimen>
+	<dimen name="dp_564">1284.6667dp</dimen>
+	<dimen name="dp_565">1286.9444dp</dimen>
+	<dimen name="dp_566">1289.2222dp</dimen>
+	<dimen name="dp_567">1291.5000dp</dimen>
+	<dimen name="dp_568">1293.7778dp</dimen>
+	<dimen name="dp_569">1296.0556dp</dimen>
+	<dimen name="dp_570">1298.3333dp</dimen>
+	<dimen name="dp_571">1300.6111dp</dimen>
+	<dimen name="dp_572">1302.8889dp</dimen>
+	<dimen name="dp_573">1305.1667dp</dimen>
+	<dimen name="dp_574">1307.4444dp</dimen>
+	<dimen name="dp_575">1309.7222dp</dimen>
+	<dimen name="dp_576">1312.0000dp</dimen>
+	<dimen name="dp_577">1314.2778dp</dimen>
+	<dimen name="dp_578">1316.5556dp</dimen>
+	<dimen name="dp_579">1318.8333dp</dimen>
+	<dimen name="dp_580">1321.1111dp</dimen>
+	<dimen name="dp_581">1323.3889dp</dimen>
+	<dimen name="dp_582">1325.6667dp</dimen>
+	<dimen name="dp_583">1327.9444dp</dimen>
+	<dimen name="dp_584">1330.2222dp</dimen>
+	<dimen name="dp_585">1332.5000dp</dimen>
+	<dimen name="dp_586">1334.7778dp</dimen>
+	<dimen name="dp_587">1337.0556dp</dimen>
+	<dimen name="dp_588">1339.3333dp</dimen>
+	<dimen name="dp_589">1341.6111dp</dimen>
+	<dimen name="dp_590">1343.8889dp</dimen>
+	<dimen name="dp_591">1346.1667dp</dimen>
+	<dimen name="dp_592">1348.4444dp</dimen>
+	<dimen name="dp_593">1350.7222dp</dimen>
+	<dimen name="dp_594">1353.0000dp</dimen>
+	<dimen name="dp_595">1355.2778dp</dimen>
+	<dimen name="dp_596">1357.5556dp</dimen>
+	<dimen name="dp_597">1359.8333dp</dimen>
+	<dimen name="dp_598">1362.1111dp</dimen>
+	<dimen name="dp_599">1364.3889dp</dimen>
 	<dimen name="dp_600">1366.6667dp</dimen>
+	<dimen name="dp_601">1368.9444dp</dimen>
+	<dimen name="dp_602">1371.2222dp</dimen>
+	<dimen name="dp_603">1373.5000dp</dimen>
+	<dimen name="dp_604">1375.7778dp</dimen>
+	<dimen name="dp_605">1378.0556dp</dimen>
+	<dimen name="dp_606">1380.3333dp</dimen>
+	<dimen name="dp_607">1382.6111dp</dimen>
+	<dimen name="dp_608">1384.8889dp</dimen>
+	<dimen name="dp_609">1387.1667dp</dimen>
+	<dimen name="dp_610">1389.4444dp</dimen>
+	<dimen name="dp_611">1391.7222dp</dimen>
+	<dimen name="dp_612">1394.0000dp</dimen>
+	<dimen name="dp_613">1396.2778dp</dimen>
+	<dimen name="dp_614">1398.5556dp</dimen>
+	<dimen name="dp_615">1400.8333dp</dimen>
+	<dimen name="dp_616">1403.1111dp</dimen>
+	<dimen name="dp_617">1405.3889dp</dimen>
+	<dimen name="dp_618">1407.6667dp</dimen>
+	<dimen name="dp_619">1409.9444dp</dimen>
+	<dimen name="dp_620">1412.2222dp</dimen>
+	<dimen name="dp_621">1414.5000dp</dimen>
+	<dimen name="dp_622">1416.7778dp</dimen>
+	<dimen name="dp_623">1419.0556dp</dimen>
+	<dimen name="dp_624">1421.3333dp</dimen>
+	<dimen name="dp_625">1423.6111dp</dimen>
+	<dimen name="dp_626">1425.8889dp</dimen>
+	<dimen name="dp_627">1428.1667dp</dimen>
+	<dimen name="dp_628">1430.4444dp</dimen>
+	<dimen name="dp_629">1432.7222dp</dimen>
+	<dimen name="dp_630">1435.0000dp</dimen>
+	<dimen name="dp_631">1437.2778dp</dimen>
+	<dimen name="dp_632">1439.5556dp</dimen>
+	<dimen name="dp_633">1441.8333dp</dimen>
+	<dimen name="dp_634">1444.1111dp</dimen>
+	<dimen name="dp_635">1446.3889dp</dimen>
+	<dimen name="dp_636">1448.6667dp</dimen>
+	<dimen name="dp_637">1450.9444dp</dimen>
+	<dimen name="dp_638">1453.2222dp</dimen>
+	<dimen name="dp_639">1455.5000dp</dimen>
 	<dimen name="dp_640">1457.7778dp</dimen>
-	<dimen name="dp_720">1640.0000dp</dimen>
+	<dimen name="dp_641">1460.0556dp</dimen>
+	<dimen name="dp_642">1462.3333dp</dimen>
+	<dimen name="dp_643">1464.6111dp</dimen>
+	<dimen name="dp_644">1466.8889dp</dimen>
+	<dimen name="dp_645">1469.1667dp</dimen>
+	<dimen name="dp_646">1471.4444dp</dimen>
+	<dimen name="dp_647">1473.7222dp</dimen>
+	<dimen name="dp_648">1476.0000dp</dimen>
+	<dimen name="dp_649">1478.2778dp</dimen>
+	<dimen name="dp_650">1480.5556dp</dimen>
+	<dimen name="dp_651">1482.8333dp</dimen>
+	<dimen name="dp_652">1485.1111dp</dimen>
+	<dimen name="dp_653">1487.3889dp</dimen>
+	<dimen name="dp_654">1489.6667dp</dimen>
+	<dimen name="dp_655">1491.9444dp</dimen>
+	<dimen name="dp_656">1494.2222dp</dimen>
+	<dimen name="dp_657">1496.5000dp</dimen>
+	<dimen name="dp_658">1498.7778dp</dimen>
+	<dimen name="dp_659">1501.0556dp</dimen>
+	<dimen name="dp_660">1503.3333dp</dimen>
+	<dimen name="dp_661">1505.6111dp</dimen>
+	<dimen name="dp_662">1507.8889dp</dimen>
+	<dimen name="dp_663">1510.1667dp</dimen>
+	<dimen name="dp_664">1512.4444dp</dimen>
+	<dimen name="dp_665">1514.7222dp</dimen>
+	<dimen name="dp_666">1517.0000dp</dimen>
+	<dimen name="dp_667">1519.2778dp</dimen>
+	<dimen name="dp_668">1521.5556dp</dimen>
+	<dimen name="dp_669">1523.8333dp</dimen>
+	<dimen name="dp_670">1526.1111dp</dimen>
+	<dimen name="dp_671">1528.3889dp</dimen>
+	<dimen name="dp_672">1530.6667dp</dimen>
+	<dimen name="dp_673">1532.9444dp</dimen>
+	<dimen name="dp_674">1535.2222dp</dimen>
+	<dimen name="dp_675">1537.5000dp</dimen>
+	<dimen name="dp_676">1539.7778dp</dimen>
+	<dimen name="dp_677">1542.0556dp</dimen>
+	<dimen name="dp_678">1544.3333dp</dimen>
+	<dimen name="dp_679">1546.6111dp</dimen>
+	<dimen name="dp_680">1548.8889dp</dimen>
+	<dimen name="dp_681">1551.1667dp</dimen>
+	<dimen name="dp_682">1553.4444dp</dimen>
+	<dimen name="dp_683">1555.7222dp</dimen>
+	<dimen name="dp_684">1558.0000dp</dimen>
+	<dimen name="dp_685">1560.2778dp</dimen>
+	<dimen name="dp_686">1562.5556dp</dimen>
+	<dimen name="dp_687">1564.8333dp</dimen>
+	<dimen name="dp_688">1567.1111dp</dimen>
+	<dimen name="dp_689">1569.3889dp</dimen>
+	<dimen name="dp_690">1571.6667dp</dimen>
+	<dimen name="dp_691">1573.9444dp</dimen>
+	<dimen name="dp_692">1576.2222dp</dimen>
+	<dimen name="dp_693">1578.5000dp</dimen>
+	<dimen name="dp_694">1580.7778dp</dimen>
+	<dimen name="dp_695">1583.0556dp</dimen>
+	<dimen name="dp_696">1585.3333dp</dimen>
+	<dimen name="dp_697">1587.6111dp</dimen>
+	<dimen name="dp_698">1589.8889dp</dimen>
+	<dimen name="dp_699">1592.1667dp</dimen>
+	<dimen name="dp_700">1594.4444dp</dimen>
 	<dimen name="sp_1">2.2778sp</dimen>
 	<dimen name="sp_2">4.5556sp</dimen>
 	<dimen name="sp_3">6.8333sp</dimen>
@@ -573,4 +766,54 @@
 	<dimen name="sp_48">109.3333sp</dimen>
 	<dimen name="sp_49">111.6111sp</dimen>
 	<dimen name="sp_50">113.8889sp</dimen>
+	<dimen name="sp_51">116.1667sp</dimen>
+	<dimen name="sp_52">118.4444sp</dimen>
+	<dimen name="sp_53">120.7222sp</dimen>
+	<dimen name="sp_54">123.0000sp</dimen>
+	<dimen name="sp_55">125.2778sp</dimen>
+	<dimen name="sp_56">127.5556sp</dimen>
+	<dimen name="sp_57">129.8333sp</dimen>
+	<dimen name="sp_58">132.1111sp</dimen>
+	<dimen name="sp_59">134.3889sp</dimen>
+	<dimen name="sp_60">136.6667sp</dimen>
+	<dimen name="sp_61">138.9444sp</dimen>
+	<dimen name="sp_62">141.2222sp</dimen>
+	<dimen name="sp_63">143.5000sp</dimen>
+	<dimen name="sp_64">145.7778sp</dimen>
+	<dimen name="sp_65">148.0556sp</dimen>
+	<dimen name="sp_66">150.3333sp</dimen>
+	<dimen name="sp_67">152.6111sp</dimen>
+	<dimen name="sp_68">154.8889sp</dimen>
+	<dimen name="sp_69">157.1667sp</dimen>
+	<dimen name="sp_70">159.4444sp</dimen>
+	<dimen name="sp_71">161.7222sp</dimen>
+	<dimen name="sp_72">164.0000sp</dimen>
+	<dimen name="sp_73">166.2778sp</dimen>
+	<dimen name="sp_74">168.5556sp</dimen>
+	<dimen name="sp_75">170.8333sp</dimen>
+	<dimen name="sp_76">173.1111sp</dimen>
+	<dimen name="sp_77">175.3889sp</dimen>
+	<dimen name="sp_78">177.6667sp</dimen>
+	<dimen name="sp_79">179.9444sp</dimen>
+	<dimen name="sp_80">182.2222sp</dimen>
+	<dimen name="sp_81">184.5000sp</dimen>
+	<dimen name="sp_82">186.7778sp</dimen>
+	<dimen name="sp_83">189.0556sp</dimen>
+	<dimen name="sp_84">191.3333sp</dimen>
+	<dimen name="sp_85">193.6111sp</dimen>
+	<dimen name="sp_86">195.8889sp</dimen>
+	<dimen name="sp_87">198.1667sp</dimen>
+	<dimen name="sp_88">200.4444sp</dimen>
+	<dimen name="sp_89">202.7222sp</dimen>
+	<dimen name="sp_90">205.0000sp</dimen>
+	<dimen name="sp_91">207.2778sp</dimen>
+	<dimen name="sp_92">209.5556sp</dimen>
+	<dimen name="sp_93">211.8333sp</dimen>
+	<dimen name="sp_94">214.1111sp</dimen>
+	<dimen name="sp_95">216.3889sp</dimen>
+	<dimen name="sp_96">218.6667sp</dimen>
+	<dimen name="sp_97">220.9444sp</dimen>
+	<dimen name="sp_98">223.2222sp</dimen>
+	<dimen name="sp_99">225.5000sp</dimen>
+	<dimen name="sp_100">227.7778sp</dimen>
 </resources>
diff --git a/app/src/main/res/values-sw960dp/dimens.xml b/app/src/main/res/values-sw960dp/dimens.xml
index 0169b6a..5defeb1 100644
--- a/app/src/main/res/values-sw960dp/dimens.xml
+++ b/app/src/main/res/values-sw960dp/dimens.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-	<dimen name="activity_horizontal_margin">42.6667dp</dimen>
-	<dimen name="activity_vertical_margin">42.6667dp</dimen>
-	<dimen name="actions_item_font">48.0000sp</dimen>
-	<dimen name="actions_item_drawablePaddding">26.6667dp</dimen>
 	<dimen name="dp_m_60">-160.0000dp</dimen>
 	<dimen name="dp_m_30">-80.0000dp</dimen>
 	<dimen name="dp_m_20">-53.3333dp</dimen>
@@ -520,9 +516,206 @@
 	<dimen name="dp_498">1328.0000dp</dimen>
 	<dimen name="dp_499">1330.6667dp</dimen>
 	<dimen name="dp_500">1333.3333dp</dimen>
+	<dimen name="dp_501">1336.0000dp</dimen>
+	<dimen name="dp_502">1338.6667dp</dimen>
+	<dimen name="dp_503">1341.3333dp</dimen>
+	<dimen name="dp_504">1344.0000dp</dimen>
+	<dimen name="dp_505">1346.6667dp</dimen>
+	<dimen name="dp_506">1349.3333dp</dimen>
+	<dimen name="dp_507">1352.0000dp</dimen>
+	<dimen name="dp_508">1354.6667dp</dimen>
+	<dimen name="dp_509">1357.3333dp</dimen>
+	<dimen name="dp_510">1360.0000dp</dimen>
+	<dimen name="dp_511">1362.6667dp</dimen>
+	<dimen name="dp_512">1365.3333dp</dimen>
+	<dimen name="dp_513">1368.0000dp</dimen>
+	<dimen name="dp_514">1370.6667dp</dimen>
+	<dimen name="dp_515">1373.3333dp</dimen>
+	<dimen name="dp_516">1376.0000dp</dimen>
+	<dimen name="dp_517">1378.6667dp</dimen>
+	<dimen name="dp_518">1381.3333dp</dimen>
+	<dimen name="dp_519">1384.0000dp</dimen>
+	<dimen name="dp_520">1386.6667dp</dimen>
+	<dimen name="dp_521">1389.3333dp</dimen>
+	<dimen name="dp_522">1392.0000dp</dimen>
+	<dimen name="dp_523">1394.6667dp</dimen>
+	<dimen name="dp_524">1397.3333dp</dimen>
+	<dimen name="dp_525">1400.0000dp</dimen>
+	<dimen name="dp_526">1402.6667dp</dimen>
+	<dimen name="dp_527">1405.3333dp</dimen>
+	<dimen name="dp_528">1408.0000dp</dimen>
+	<dimen name="dp_529">1410.6667dp</dimen>
+	<dimen name="dp_530">1413.3333dp</dimen>
+	<dimen name="dp_531">1416.0000dp</dimen>
+	<dimen name="dp_532">1418.6667dp</dimen>
+	<dimen name="dp_533">1421.3333dp</dimen>
+	<dimen name="dp_534">1424.0000dp</dimen>
+	<dimen name="dp_535">1426.6667dp</dimen>
+	<dimen name="dp_536">1429.3333dp</dimen>
+	<dimen name="dp_537">1432.0000dp</dimen>
+	<dimen name="dp_538">1434.6667dp</dimen>
+	<dimen name="dp_539">1437.3333dp</dimen>
+	<dimen name="dp_540">1440.0000dp</dimen>
+	<dimen name="dp_541">1442.6667dp</dimen>
+	<dimen name="dp_542">1445.3333dp</dimen>
+	<dimen name="dp_543">1448.0000dp</dimen>
+	<dimen name="dp_544">1450.6667dp</dimen>
+	<dimen name="dp_545">1453.3333dp</dimen>
+	<dimen name="dp_546">1456.0000dp</dimen>
+	<dimen name="dp_547">1458.6667dp</dimen>
+	<dimen name="dp_548">1461.3333dp</dimen>
+	<dimen name="dp_549">1464.0000dp</dimen>
+	<dimen name="dp_550">1466.6667dp</dimen>
+	<dimen name="dp_551">1469.3333dp</dimen>
+	<dimen name="dp_552">1472.0000dp</dimen>
+	<dimen name="dp_553">1474.6667dp</dimen>
+	<dimen name="dp_554">1477.3333dp</dimen>
+	<dimen name="dp_555">1480.0000dp</dimen>
+	<dimen name="dp_556">1482.6667dp</dimen>
+	<dimen name="dp_557">1485.3333dp</dimen>
+	<dimen name="dp_558">1488.0000dp</dimen>
+	<dimen name="dp_559">1490.6667dp</dimen>
+	<dimen name="dp_560">1493.3333dp</dimen>
+	<dimen name="dp_561">1496.0000dp</dimen>
+	<dimen name="dp_562">1498.6667dp</dimen>
+	<dimen name="dp_563">1501.3333dp</dimen>
+	<dimen name="dp_564">1504.0000dp</dimen>
+	<dimen name="dp_565">1506.6667dp</dimen>
+	<dimen name="dp_566">1509.3333dp</dimen>
+	<dimen name="dp_567">1512.0000dp</dimen>
+	<dimen name="dp_568">1514.6667dp</dimen>
+	<dimen name="dp_569">1517.3333dp</dimen>
+	<dimen name="dp_570">1520.0000dp</dimen>
+	<dimen name="dp_571">1522.6667dp</dimen>
+	<dimen name="dp_572">1525.3333dp</dimen>
+	<dimen name="dp_573">1528.0000dp</dimen>
+	<dimen name="dp_574">1530.6667dp</dimen>
+	<dimen name="dp_575">1533.3333dp</dimen>
+	<dimen name="dp_576">1536.0000dp</dimen>
+	<dimen name="dp_577">1538.6667dp</dimen>
+	<dimen name="dp_578">1541.3333dp</dimen>
+	<dimen name="dp_579">1544.0000dp</dimen>
+	<dimen name="dp_580">1546.6667dp</dimen>
+	<dimen name="dp_581">1549.3333dp</dimen>
+	<dimen name="dp_582">1552.0000dp</dimen>
+	<dimen name="dp_583">1554.6667dp</dimen>
+	<dimen name="dp_584">1557.3333dp</dimen>
+	<dimen name="dp_585">1560.0000dp</dimen>
+	<dimen name="dp_586">1562.6667dp</dimen>
+	<dimen name="dp_587">1565.3333dp</dimen>
+	<dimen name="dp_588">1568.0000dp</dimen>
+	<dimen name="dp_589">1570.6667dp</dimen>
+	<dimen name="dp_590">1573.3333dp</dimen>
+	<dimen name="dp_591">1576.0000dp</dimen>
+	<dimen name="dp_592">1578.6667dp</dimen>
+	<dimen name="dp_593">1581.3333dp</dimen>
+	<dimen name="dp_594">1584.0000dp</dimen>
+	<dimen name="dp_595">1586.6667dp</dimen>
+	<dimen name="dp_596">1589.3333dp</dimen>
+	<dimen name="dp_597">1592.0000dp</dimen>
+	<dimen name="dp_598">1594.6667dp</dimen>
+	<dimen name="dp_599">1597.3333dp</dimen>
 	<dimen name="dp_600">1600.0000dp</dimen>
+	<dimen name="dp_601">1602.6667dp</dimen>
+	<dimen name="dp_602">1605.3333dp</dimen>
+	<dimen name="dp_603">1608.0000dp</dimen>
+	<dimen name="dp_604">1610.6667dp</dimen>
+	<dimen name="dp_605">1613.3333dp</dimen>
+	<dimen name="dp_606">1616.0000dp</dimen>
+	<dimen name="dp_607">1618.6667dp</dimen>
+	<dimen name="dp_608">1621.3333dp</dimen>
+	<dimen name="dp_609">1624.0000dp</dimen>
+	<dimen name="dp_610">1626.6667dp</dimen>
+	<dimen name="dp_611">1629.3333dp</dimen>
+	<dimen name="dp_612">1632.0000dp</dimen>
+	<dimen name="dp_613">1634.6667dp</dimen>
+	<dimen name="dp_614">1637.3333dp</dimen>
+	<dimen name="dp_615">1640.0000dp</dimen>
+	<dimen name="dp_616">1642.6667dp</dimen>
+	<dimen name="dp_617">1645.3333dp</dimen>
+	<dimen name="dp_618">1648.0000dp</dimen>
+	<dimen name="dp_619">1650.6667dp</dimen>
+	<dimen name="dp_620">1653.3333dp</dimen>
+	<dimen name="dp_621">1656.0000dp</dimen>
+	<dimen name="dp_622">1658.6667dp</dimen>
+	<dimen name="dp_623">1661.3333dp</dimen>
+	<dimen name="dp_624">1664.0000dp</dimen>
+	<dimen name="dp_625">1666.6667dp</dimen>
+	<dimen name="dp_626">1669.3333dp</dimen>
+	<dimen name="dp_627">1672.0000dp</dimen>
+	<dimen name="dp_628">1674.6667dp</dimen>
+	<dimen name="dp_629">1677.3333dp</dimen>
+	<dimen name="dp_630">1680.0000dp</dimen>
+	<dimen name="dp_631">1682.6667dp</dimen>
+	<dimen name="dp_632">1685.3333dp</dimen>
+	<dimen name="dp_633">1688.0000dp</dimen>
+	<dimen name="dp_634">1690.6667dp</dimen>
+	<dimen name="dp_635">1693.3333dp</dimen>
+	<dimen name="dp_636">1696.0000dp</dimen>
+	<dimen name="dp_637">1698.6667dp</dimen>
+	<dimen name="dp_638">1701.3333dp</dimen>
+	<dimen name="dp_639">1704.0000dp</dimen>
 	<dimen name="dp_640">1706.6667dp</dimen>
-	<dimen name="dp_720">1920.0000dp</dimen>
+	<dimen name="dp_641">1709.3333dp</dimen>
+	<dimen name="dp_642">1712.0000dp</dimen>
+	<dimen name="dp_643">1714.6667dp</dimen>
+	<dimen name="dp_644">1717.3333dp</dimen>
+	<dimen name="dp_645">1720.0000dp</dimen>
+	<dimen name="dp_646">1722.6667dp</dimen>
+	<dimen name="dp_647">1725.3333dp</dimen>
+	<dimen name="dp_648">1728.0000dp</dimen>
+	<dimen name="dp_649">1730.6667dp</dimen>
+	<dimen name="dp_650">1733.3333dp</dimen>
+	<dimen name="dp_651">1736.0000dp</dimen>
+	<dimen name="dp_652">1738.6667dp</dimen>
+	<dimen name="dp_653">1741.3333dp</dimen>
+	<dimen name="dp_654">1744.0000dp</dimen>
+	<dimen name="dp_655">1746.6667dp</dimen>
+	<dimen name="dp_656">1749.3333dp</dimen>
+	<dimen name="dp_657">1752.0000dp</dimen>
+	<dimen name="dp_658">1754.6667dp</dimen>
+	<dimen name="dp_659">1757.3333dp</dimen>
+	<dimen name="dp_660">1760.0000dp</dimen>
+	<dimen name="dp_661">1762.6667dp</dimen>
+	<dimen name="dp_662">1765.3333dp</dimen>
+	<dimen name="dp_663">1768.0000dp</dimen>
+	<dimen name="dp_664">1770.6667dp</dimen>
+	<dimen name="dp_665">1773.3333dp</dimen>
+	<dimen name="dp_666">1776.0000dp</dimen>
+	<dimen name="dp_667">1778.6667dp</dimen>
+	<dimen name="dp_668">1781.3333dp</dimen>
+	<dimen name="dp_669">1784.0000dp</dimen>
+	<dimen name="dp_670">1786.6667dp</dimen>
+	<dimen name="dp_671">1789.3333dp</dimen>
+	<dimen name="dp_672">1792.0000dp</dimen>
+	<dimen name="dp_673">1794.6667dp</dimen>
+	<dimen name="dp_674">1797.3333dp</dimen>
+	<dimen name="dp_675">1800.0000dp</dimen>
+	<dimen name="dp_676">1802.6667dp</dimen>
+	<dimen name="dp_677">1805.3333dp</dimen>
+	<dimen name="dp_678">1808.0000dp</dimen>
+	<dimen name="dp_679">1810.6667dp</dimen>
+	<dimen name="dp_680">1813.3333dp</dimen>
+	<dimen name="dp_681">1816.0000dp</dimen>
+	<dimen name="dp_682">1818.6667dp</dimen>
+	<dimen name="dp_683">1821.3333dp</dimen>
+	<dimen name="dp_684">1824.0000dp</dimen>
+	<dimen name="dp_685">1826.6667dp</dimen>
+	<dimen name="dp_686">1829.3333dp</dimen>
+	<dimen name="dp_687">1832.0000dp</dimen>
+	<dimen name="dp_688">1834.6667dp</dimen>
+	<dimen name="dp_689">1837.3333dp</dimen>
+	<dimen name="dp_690">1840.0000dp</dimen>
+	<dimen name="dp_691">1842.6667dp</dimen>
+	<dimen name="dp_692">1845.3333dp</dimen>
+	<dimen name="dp_693">1848.0000dp</dimen>
+	<dimen name="dp_694">1850.6667dp</dimen>
+	<dimen name="dp_695">1853.3333dp</dimen>
+	<dimen name="dp_696">1856.0000dp</dimen>
+	<dimen name="dp_697">1858.6667dp</dimen>
+	<dimen name="dp_698">1861.3333dp</dimen>
+	<dimen name="dp_699">1864.0000dp</dimen>
+	<dimen name="dp_700">1866.6667dp</dimen>
 	<dimen name="sp_1">2.6667sp</dimen>
 	<dimen name="sp_2">5.3333sp</dimen>
 	<dimen name="sp_3">8.0000sp</dimen>
@@ -573,4 +766,54 @@
 	<dimen name="sp_48">128.0000sp</dimen>
 	<dimen name="sp_49">130.6667sp</dimen>
 	<dimen name="sp_50">133.3333sp</dimen>
+	<dimen name="sp_51">136.0000sp</dimen>
+	<dimen name="sp_52">138.6667sp</dimen>
+	<dimen name="sp_53">141.3333sp</dimen>
+	<dimen name="sp_54">144.0000sp</dimen>
+	<dimen name="sp_55">146.6667sp</dimen>
+	<dimen name="sp_56">149.3333sp</dimen>
+	<dimen name="sp_57">152.0000sp</dimen>
+	<dimen name="sp_58">154.6667sp</dimen>
+	<dimen name="sp_59">157.3333sp</dimen>
+	<dimen name="sp_60">160.0000sp</dimen>
+	<dimen name="sp_61">162.6667sp</dimen>
+	<dimen name="sp_62">165.3333sp</dimen>
+	<dimen name="sp_63">168.0000sp</dimen>
+	<dimen name="sp_64">170.6667sp</dimen>
+	<dimen name="sp_65">173.3333sp</dimen>
+	<dimen name="sp_66">176.0000sp</dimen>
+	<dimen name="sp_67">178.6667sp</dimen>
+	<dimen name="sp_68">181.3333sp</dimen>
+	<dimen name="sp_69">184.0000sp</dimen>
+	<dimen name="sp_70">186.6667sp</dimen>
+	<dimen name="sp_71">189.3333sp</dimen>
+	<dimen name="sp_72">192.0000sp</dimen>
+	<dimen name="sp_73">194.6667sp</dimen>
+	<dimen name="sp_74">197.3333sp</dimen>
+	<dimen name="sp_75">200.0000sp</dimen>
+	<dimen name="sp_76">202.6667sp</dimen>
+	<dimen name="sp_77">205.3333sp</dimen>
+	<dimen name="sp_78">208.0000sp</dimen>
+	<dimen name="sp_79">210.6667sp</dimen>
+	<dimen name="sp_80">213.3333sp</dimen>
+	<dimen name="sp_81">216.0000sp</dimen>
+	<dimen name="sp_82">218.6667sp</dimen>
+	<dimen name="sp_83">221.3333sp</dimen>
+	<dimen name="sp_84">224.0000sp</dimen>
+	<dimen name="sp_85">226.6667sp</dimen>
+	<dimen name="sp_86">229.3333sp</dimen>
+	<dimen name="sp_87">232.0000sp</dimen>
+	<dimen name="sp_88">234.6667sp</dimen>
+	<dimen name="sp_89">237.3333sp</dimen>
+	<dimen name="sp_90">240.0000sp</dimen>
+	<dimen name="sp_91">242.6667sp</dimen>
+	<dimen name="sp_92">245.3333sp</dimen>
+	<dimen name="sp_93">248.0000sp</dimen>
+	<dimen name="sp_94">250.6667sp</dimen>
+	<dimen name="sp_95">253.3333sp</dimen>
+	<dimen name="sp_96">256.0000sp</dimen>
+	<dimen name="sp_97">258.6667sp</dimen>
+	<dimen name="sp_98">261.3333sp</dimen>
+	<dimen name="sp_99">264.0000sp</dimen>
+	<dimen name="sp_100">266.6667sp</dimen>
 </resources>
diff --git a/app/src/main/res/values-sw961dp/dimens.xml b/app/src/main/res/values-sw961dp/dimens.xml
index 7fb69d7..f7a22c9 100644
--- a/app/src/main/res/values-sw961dp/dimens.xml
+++ b/app/src/main/res/values-sw961dp/dimens.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-	<dimen name="activity_horizontal_margin">42.7111dp</dimen>
-	<dimen name="activity_vertical_margin">42.7111dp</dimen>
-	<dimen name="actions_item_font">48.0500sp</dimen>
-	<dimen name="actions_item_drawablePaddding">26.6944dp</dimen>
 	<dimen name="dp_m_60">-160.1667dp</dimen>
 	<dimen name="dp_m_30">-80.0833dp</dimen>
 	<dimen name="dp_m_20">-53.3889dp</dimen>
@@ -520,9 +516,206 @@
 	<dimen name="dp_498">1329.3833dp</dimen>
 	<dimen name="dp_499">1332.0528dp</dimen>
 	<dimen name="dp_500">1334.7222dp</dimen>
+	<dimen name="dp_501">1337.3917dp</dimen>
+	<dimen name="dp_502">1340.0611dp</dimen>
+	<dimen name="dp_503">1342.7306dp</dimen>
+	<dimen name="dp_504">1345.4000dp</dimen>
+	<dimen name="dp_505">1348.0694dp</dimen>
+	<dimen name="dp_506">1350.7389dp</dimen>
+	<dimen name="dp_507">1353.4083dp</dimen>
+	<dimen name="dp_508">1356.0778dp</dimen>
+	<dimen name="dp_509">1358.7472dp</dimen>
+	<dimen name="dp_510">1361.4167dp</dimen>
+	<dimen name="dp_511">1364.0861dp</dimen>
+	<dimen name="dp_512">1366.7556dp</dimen>
+	<dimen name="dp_513">1369.4250dp</dimen>
+	<dimen name="dp_514">1372.0944dp</dimen>
+	<dimen name="dp_515">1374.7639dp</dimen>
+	<dimen name="dp_516">1377.4333dp</dimen>
+	<dimen name="dp_517">1380.1028dp</dimen>
+	<dimen name="dp_518">1382.7722dp</dimen>
+	<dimen name="dp_519">1385.4417dp</dimen>
+	<dimen name="dp_520">1388.1111dp</dimen>
+	<dimen name="dp_521">1390.7806dp</dimen>
+	<dimen name="dp_522">1393.4500dp</dimen>
+	<dimen name="dp_523">1396.1194dp</dimen>
+	<dimen name="dp_524">1398.7889dp</dimen>
+	<dimen name="dp_525">1401.4583dp</dimen>
+	<dimen name="dp_526">1404.1278dp</dimen>
+	<dimen name="dp_527">1406.7972dp</dimen>
+	<dimen name="dp_528">1409.4667dp</dimen>
+	<dimen name="dp_529">1412.1361dp</dimen>
+	<dimen name="dp_530">1414.8056dp</dimen>
+	<dimen name="dp_531">1417.4750dp</dimen>
+	<dimen name="dp_532">1420.1444dp</dimen>
+	<dimen name="dp_533">1422.8139dp</dimen>
+	<dimen name="dp_534">1425.4833dp</dimen>
+	<dimen name="dp_535">1428.1528dp</dimen>
+	<dimen name="dp_536">1430.8222dp</dimen>
+	<dimen name="dp_537">1433.4917dp</dimen>
+	<dimen name="dp_538">1436.1611dp</dimen>
+	<dimen name="dp_539">1438.8306dp</dimen>
+	<dimen name="dp_540">1441.5000dp</dimen>
+	<dimen name="dp_541">1444.1694dp</dimen>
+	<dimen name="dp_542">1446.8389dp</dimen>
+	<dimen name="dp_543">1449.5083dp</dimen>
+	<dimen name="dp_544">1452.1778dp</dimen>
+	<dimen name="dp_545">1454.8472dp</dimen>
+	<dimen name="dp_546">1457.5167dp</dimen>
+	<dimen name="dp_547">1460.1861dp</dimen>
+	<dimen name="dp_548">1462.8556dp</dimen>
+	<dimen name="dp_549">1465.5250dp</dimen>
+	<dimen name="dp_550">1468.1944dp</dimen>
+	<dimen name="dp_551">1470.8639dp</dimen>
+	<dimen name="dp_552">1473.5333dp</dimen>
+	<dimen name="dp_553">1476.2028dp</dimen>
+	<dimen name="dp_554">1478.8722dp</dimen>
+	<dimen name="dp_555">1481.5417dp</dimen>
+	<dimen name="dp_556">1484.2111dp</dimen>
+	<dimen name="dp_557">1486.8806dp</dimen>
+	<dimen name="dp_558">1489.5500dp</dimen>
+	<dimen name="dp_559">1492.2194dp</dimen>
+	<dimen name="dp_560">1494.8889dp</dimen>
+	<dimen name="dp_561">1497.5583dp</dimen>
+	<dimen name="dp_562">1500.2278dp</dimen>
+	<dimen name="dp_563">1502.8972dp</dimen>
+	<dimen name="dp_564">1505.5667dp</dimen>
+	<dimen name="dp_565">1508.2361dp</dimen>
+	<dimen name="dp_566">1510.9056dp</dimen>
+	<dimen name="dp_567">1513.5750dp</dimen>
+	<dimen name="dp_568">1516.2444dp</dimen>
+	<dimen name="dp_569">1518.9139dp</dimen>
+	<dimen name="dp_570">1521.5833dp</dimen>
+	<dimen name="dp_571">1524.2528dp</dimen>
+	<dimen name="dp_572">1526.9222dp</dimen>
+	<dimen name="dp_573">1529.5917dp</dimen>
+	<dimen name="dp_574">1532.2611dp</dimen>
+	<dimen name="dp_575">1534.9306dp</dimen>
+	<dimen name="dp_576">1537.6000dp</dimen>
+	<dimen name="dp_577">1540.2694dp</dimen>
+	<dimen name="dp_578">1542.9389dp</dimen>
+	<dimen name="dp_579">1545.6083dp</dimen>
+	<dimen name="dp_580">1548.2778dp</dimen>
+	<dimen name="dp_581">1550.9472dp</dimen>
+	<dimen name="dp_582">1553.6167dp</dimen>
+	<dimen name="dp_583">1556.2861dp</dimen>
+	<dimen name="dp_584">1558.9556dp</dimen>
+	<dimen name="dp_585">1561.6250dp</dimen>
+	<dimen name="dp_586">1564.2944dp</dimen>
+	<dimen name="dp_587">1566.9639dp</dimen>
+	<dimen name="dp_588">1569.6333dp</dimen>
+	<dimen name="dp_589">1572.3028dp</dimen>
+	<dimen name="dp_590">1574.9722dp</dimen>
+	<dimen name="dp_591">1577.6417dp</dimen>
+	<dimen name="dp_592">1580.3111dp</dimen>
+	<dimen name="dp_593">1582.9806dp</dimen>
+	<dimen name="dp_594">1585.6500dp</dimen>
+	<dimen name="dp_595">1588.3194dp</dimen>
+	<dimen name="dp_596">1590.9889dp</dimen>
+	<dimen name="dp_597">1593.6583dp</dimen>
+	<dimen name="dp_598">1596.3278dp</dimen>
+	<dimen name="dp_599">1598.9972dp</dimen>
 	<dimen name="dp_600">1601.6667dp</dimen>
+	<dimen name="dp_601">1604.3361dp</dimen>
+	<dimen name="dp_602">1607.0056dp</dimen>
+	<dimen name="dp_603">1609.6750dp</dimen>
+	<dimen name="dp_604">1612.3444dp</dimen>
+	<dimen name="dp_605">1615.0139dp</dimen>
+	<dimen name="dp_606">1617.6833dp</dimen>
+	<dimen name="dp_607">1620.3528dp</dimen>
+	<dimen name="dp_608">1623.0222dp</dimen>
+	<dimen name="dp_609">1625.6917dp</dimen>
+	<dimen name="dp_610">1628.3611dp</dimen>
+	<dimen name="dp_611">1631.0306dp</dimen>
+	<dimen name="dp_612">1633.7000dp</dimen>
+	<dimen name="dp_613">1636.3694dp</dimen>
+	<dimen name="dp_614">1639.0389dp</dimen>
+	<dimen name="dp_615">1641.7083dp</dimen>
+	<dimen name="dp_616">1644.3778dp</dimen>
+	<dimen name="dp_617">1647.0472dp</dimen>
+	<dimen name="dp_618">1649.7167dp</dimen>
+	<dimen name="dp_619">1652.3861dp</dimen>
+	<dimen name="dp_620">1655.0556dp</dimen>
+	<dimen name="dp_621">1657.7250dp</dimen>
+	<dimen name="dp_622">1660.3944dp</dimen>
+	<dimen name="dp_623">1663.0639dp</dimen>
+	<dimen name="dp_624">1665.7333dp</dimen>
+	<dimen name="dp_625">1668.4028dp</dimen>
+	<dimen name="dp_626">1671.0722dp</dimen>
+	<dimen name="dp_627">1673.7417dp</dimen>
+	<dimen name="dp_628">1676.4111dp</dimen>
+	<dimen name="dp_629">1679.0806dp</dimen>
+	<dimen name="dp_630">1681.7500dp</dimen>
+	<dimen name="dp_631">1684.4194dp</dimen>
+	<dimen name="dp_632">1687.0889dp</dimen>
+	<dimen name="dp_633">1689.7583dp</dimen>
+	<dimen name="dp_634">1692.4278dp</dimen>
+	<dimen name="dp_635">1695.0972dp</dimen>
+	<dimen name="dp_636">1697.7667dp</dimen>
+	<dimen name="dp_637">1700.4361dp</dimen>
+	<dimen name="dp_638">1703.1056dp</dimen>
+	<dimen name="dp_639">1705.7750dp</dimen>
 	<dimen name="dp_640">1708.4444dp</dimen>
-	<dimen name="dp_720">1922.0000dp</dimen>
+	<dimen name="dp_641">1711.1139dp</dimen>
+	<dimen name="dp_642">1713.7833dp</dimen>
+	<dimen name="dp_643">1716.4528dp</dimen>
+	<dimen name="dp_644">1719.1222dp</dimen>
+	<dimen name="dp_645">1721.7917dp</dimen>
+	<dimen name="dp_646">1724.4611dp</dimen>
+	<dimen name="dp_647">1727.1306dp</dimen>
+	<dimen name="dp_648">1729.8000dp</dimen>
+	<dimen name="dp_649">1732.4694dp</dimen>
+	<dimen name="dp_650">1735.1389dp</dimen>
+	<dimen name="dp_651">1737.8083dp</dimen>
+	<dimen name="dp_652">1740.4778dp</dimen>
+	<dimen name="dp_653">1743.1472dp</dimen>
+	<dimen name="dp_654">1745.8167dp</dimen>
+	<dimen name="dp_655">1748.4861dp</dimen>
+	<dimen name="dp_656">1751.1556dp</dimen>
+	<dimen name="dp_657">1753.8250dp</dimen>
+	<dimen name="dp_658">1756.4944dp</dimen>
+	<dimen name="dp_659">1759.1639dp</dimen>
+	<dimen name="dp_660">1761.8333dp</dimen>
+	<dimen name="dp_661">1764.5028dp</dimen>
+	<dimen name="dp_662">1767.1722dp</dimen>
+	<dimen name="dp_663">1769.8417dp</dimen>
+	<dimen name="dp_664">1772.5111dp</dimen>
+	<dimen name="dp_665">1775.1806dp</dimen>
+	<dimen name="dp_666">1777.8500dp</dimen>
+	<dimen name="dp_667">1780.5194dp</dimen>
+	<dimen name="dp_668">1783.1889dp</dimen>
+	<dimen name="dp_669">1785.8583dp</dimen>
+	<dimen name="dp_670">1788.5278dp</dimen>
+	<dimen name="dp_671">1791.1972dp</dimen>
+	<dimen name="dp_672">1793.8667dp</dimen>
+	<dimen name="dp_673">1796.5361dp</dimen>
+	<dimen name="dp_674">1799.2056dp</dimen>
+	<dimen name="dp_675">1801.8750dp</dimen>
+	<dimen name="dp_676">1804.5444dp</dimen>
+	<dimen name="dp_677">1807.2139dp</dimen>
+	<dimen name="dp_678">1809.8833dp</dimen>
+	<dimen name="dp_679">1812.5528dp</dimen>
+	<dimen name="dp_680">1815.2222dp</dimen>
+	<dimen name="dp_681">1817.8917dp</dimen>
+	<dimen name="dp_682">1820.5611dp</dimen>
+	<dimen name="dp_683">1823.2306dp</dimen>
+	<dimen name="dp_684">1825.9000dp</dimen>
+	<dimen name="dp_685">1828.5694dp</dimen>
+	<dimen name="dp_686">1831.2389dp</dimen>
+	<dimen name="dp_687">1833.9083dp</dimen>
+	<dimen name="dp_688">1836.5778dp</dimen>
+	<dimen name="dp_689">1839.2472dp</dimen>
+	<dimen name="dp_690">1841.9167dp</dimen>
+	<dimen name="dp_691">1844.5861dp</dimen>
+	<dimen name="dp_692">1847.2556dp</dimen>
+	<dimen name="dp_693">1849.9250dp</dimen>
+	<dimen name="dp_694">1852.5944dp</dimen>
+	<dimen name="dp_695">1855.2639dp</dimen>
+	<dimen name="dp_696">1857.9333dp</dimen>
+	<dimen name="dp_697">1860.6028dp</dimen>
+	<dimen name="dp_698">1863.2722dp</dimen>
+	<dimen name="dp_699">1865.9417dp</dimen>
+	<dimen name="dp_700">1868.6111dp</dimen>
 	<dimen name="sp_1">2.6694sp</dimen>
 	<dimen name="sp_2">5.3389sp</dimen>
 	<dimen name="sp_3">8.0083sp</dimen>
@@ -573,4 +766,54 @@
 	<dimen name="sp_48">128.1333sp</dimen>
 	<dimen name="sp_49">130.8028sp</dimen>
 	<dimen name="sp_50">133.4722sp</dimen>
+	<dimen name="sp_51">136.1417sp</dimen>
+	<dimen name="sp_52">138.8111sp</dimen>
+	<dimen name="sp_53">141.4806sp</dimen>
+	<dimen name="sp_54">144.1500sp</dimen>
+	<dimen name="sp_55">146.8194sp</dimen>
+	<dimen name="sp_56">149.4889sp</dimen>
+	<dimen name="sp_57">152.1583sp</dimen>
+	<dimen name="sp_58">154.8278sp</dimen>
+	<dimen name="sp_59">157.4972sp</dimen>
+	<dimen name="sp_60">160.1667sp</dimen>
+	<dimen name="sp_61">162.8361sp</dimen>
+	<dimen name="sp_62">165.5056sp</dimen>
+	<dimen name="sp_63">168.1750sp</dimen>
+	<dimen name="sp_64">170.8444sp</dimen>
+	<dimen name="sp_65">173.5139sp</dimen>
+	<dimen name="sp_66">176.1833sp</dimen>
+	<dimen name="sp_67">178.8528sp</dimen>
+	<dimen name="sp_68">181.5222sp</dimen>
+	<dimen name="sp_69">184.1917sp</dimen>
+	<dimen name="sp_70">186.8611sp</dimen>
+	<dimen name="sp_71">189.5306sp</dimen>
+	<dimen name="sp_72">192.2000sp</dimen>
+	<dimen name="sp_73">194.8694sp</dimen>
+	<dimen name="sp_74">197.5389sp</dimen>
+	<dimen name="sp_75">200.2083sp</dimen>
+	<dimen name="sp_76">202.8778sp</dimen>
+	<dimen name="sp_77">205.5472sp</dimen>
+	<dimen name="sp_78">208.2167sp</dimen>
+	<dimen name="sp_79">210.8861sp</dimen>
+	<dimen name="sp_80">213.5556sp</dimen>
+	<dimen name="sp_81">216.2250sp</dimen>
+	<dimen name="sp_82">218.8944sp</dimen>
+	<dimen name="sp_83">221.5639sp</dimen>
+	<dimen name="sp_84">224.2333sp</dimen>
+	<dimen name="sp_85">226.9028sp</dimen>
+	<dimen name="sp_86">229.5722sp</dimen>
+	<dimen name="sp_87">232.2417sp</dimen>
+	<dimen name="sp_88">234.9111sp</dimen>
+	<dimen name="sp_89">237.5806sp</dimen>
+	<dimen name="sp_90">240.2500sp</dimen>
+	<dimen name="sp_91">242.9194sp</dimen>
+	<dimen name="sp_92">245.5889sp</dimen>
+	<dimen name="sp_93">248.2583sp</dimen>
+	<dimen name="sp_94">250.9278sp</dimen>
+	<dimen name="sp_95">253.5972sp</dimen>
+	<dimen name="sp_96">256.2667sp</dimen>
+	<dimen name="sp_97">258.9361sp</dimen>
+	<dimen name="sp_98">261.6056sp</dimen>
+	<dimen name="sp_99">264.2750sp</dimen>
+	<dimen name="sp_100">266.9444sp</dimen>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 853f30c..8d245b2 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-    <!-- Default screen margins, per the Android Design guidelines. -->
-    <dimen name="activity_horizontal_margin">16dp</dimen>
-    <dimen name="activity_vertical_margin">16dp</dimen>
-    <dimen name="actions_item_font">18sp</dimen>
-    <dimen name="actions_item_drawablePaddding">10dip</dimen>
-
     <!-- dp and sp values, must be defind in this file! -->
     <!-- view size,you can add if there is no one -->
     <dimen name="dp_m_60">-60dp</dimen>
@@ -524,9 +518,206 @@
     <dimen name="dp_498">498dp</dimen>
     <dimen name="dp_499">499dp</dimen>
     <dimen name="dp_500">500dp</dimen>
+    <dimen name="dp_501">501dp</dimen>
+    <dimen name="dp_502">502dp</dimen>
+    <dimen name="dp_503">503dp</dimen>
+    <dimen name="dp_504">504dp</dimen>
+    <dimen name="dp_505">505dp</dimen>
+    <dimen name="dp_506">506dp</dimen>
+    <dimen name="dp_507">507dp</dimen>
+    <dimen name="dp_508">508dp</dimen>
+    <dimen name="dp_509">509dp</dimen>
+    <dimen name="dp_510">510dp</dimen>
+    <dimen name="dp_511">511dp</dimen>
+    <dimen name="dp_512">512dp</dimen>
+    <dimen name="dp_513">513dp</dimen>
+    <dimen name="dp_514">514dp</dimen>
+    <dimen name="dp_515">515dp</dimen>
+    <dimen name="dp_516">516dp</dimen>
+    <dimen name="dp_517">517dp</dimen>
+    <dimen name="dp_518">518dp</dimen>
+    <dimen name="dp_519">519dp</dimen>
+    <dimen name="dp_520">520dp</dimen>
+    <dimen name="dp_521">521dp</dimen>
+    <dimen name="dp_522">522dp</dimen>
+    <dimen name="dp_523">523dp</dimen>
+    <dimen name="dp_524">524dp</dimen>
+    <dimen name="dp_525">525dp</dimen>
+    <dimen name="dp_526">526dp</dimen>
+    <dimen name="dp_527">527dp</dimen>
+    <dimen name="dp_528">528dp</dimen>
+    <dimen name="dp_529">529dp</dimen>
+    <dimen name="dp_530">530dp</dimen>
+    <dimen name="dp_531">531dp</dimen>
+    <dimen name="dp_532">532dp</dimen>
+    <dimen name="dp_533">533dp</dimen>
+    <dimen name="dp_534">534dp</dimen>
+    <dimen name="dp_535">535dp</dimen>
+    <dimen name="dp_536">536dp</dimen>
+    <dimen name="dp_537">537dp</dimen>
+    <dimen name="dp_538">538dp</dimen>
+    <dimen name="dp_539">539dp</dimen>
+    <dimen name="dp_540">540dp</dimen>
+    <dimen name="dp_541">541dp</dimen>
+    <dimen name="dp_542">542dp</dimen>
+    <dimen name="dp_543">543dp</dimen>
+    <dimen name="dp_544">544dp</dimen>
+    <dimen name="dp_545">545dp</dimen>
+    <dimen name="dp_546">546dp</dimen>
+    <dimen name="dp_547">547dp</dimen>
+    <dimen name="dp_548">548dp</dimen>
+    <dimen name="dp_549">549dp</dimen>
+    <dimen name="dp_550">550dp</dimen>
+    <dimen name="dp_551">551dp</dimen>
+    <dimen name="dp_552">552dp</dimen>
+    <dimen name="dp_553">553dp</dimen>
+    <dimen name="dp_554">554dp</dimen>
+    <dimen name="dp_555">555dp</dimen>
+    <dimen name="dp_556">556dp</dimen>
+    <dimen name="dp_557">557dp</dimen>
+    <dimen name="dp_558">558dp</dimen>
+    <dimen name="dp_559">559dp</dimen>
+    <dimen name="dp_560">560dp</dimen>
+    <dimen name="dp_561">561dp</dimen>
+    <dimen name="dp_562">562dp</dimen>
+    <dimen name="dp_563">563dp</dimen>
+    <dimen name="dp_564">564dp</dimen>
+    <dimen name="dp_565">565dp</dimen>
+    <dimen name="dp_566">566dp</dimen>
+    <dimen name="dp_567">567dp</dimen>
+    <dimen name="dp_568">568dp</dimen>
+    <dimen name="dp_569">569dp</dimen>
+    <dimen name="dp_570">570dp</dimen>
+    <dimen name="dp_571">571dp</dimen>
+    <dimen name="dp_572">572dp</dimen>
+    <dimen name="dp_573">573dp</dimen>
+    <dimen name="dp_574">574dp</dimen>
+    <dimen name="dp_575">575dp</dimen>
+    <dimen name="dp_576">576dp</dimen>
+    <dimen name="dp_577">577dp</dimen>
+    <dimen name="dp_578">578dp</dimen>
+    <dimen name="dp_579">579dp</dimen>
+    <dimen name="dp_580">580dp</dimen>
+    <dimen name="dp_581">581dp</dimen>
+    <dimen name="dp_582">582dp</dimen>
+    <dimen name="dp_583">583dp</dimen>
+    <dimen name="dp_584">584dp</dimen>
+    <dimen name="dp_585">585dp</dimen>
+    <dimen name="dp_586">586dp</dimen>
+    <dimen name="dp_587">587dp</dimen>
+    <dimen name="dp_588">588dp</dimen>
+    <dimen name="dp_589">589dp</dimen>
+    <dimen name="dp_590">590dp</dimen>
+    <dimen name="dp_591">591dp</dimen>
+    <dimen name="dp_592">592dp</dimen>
+    <dimen name="dp_593">593dp</dimen>
+    <dimen name="dp_594">594dp</dimen>
+    <dimen name="dp_595">595dp</dimen>
+    <dimen name="dp_596">596dp</dimen>
+    <dimen name="dp_597">597dp</dimen>
+    <dimen name="dp_598">598dp</dimen>
+    <dimen name="dp_599">599dp</dimen>
     <dimen name="dp_600">600dp</dimen>
+    <dimen name="dp_601">601dp</dimen>
+    <dimen name="dp_602">602dp</dimen>
+    <dimen name="dp_603">603dp</dimen>
+    <dimen name="dp_604">604dp</dimen>
+    <dimen name="dp_605">605dp</dimen>
+    <dimen name="dp_606">606dp</dimen>
+    <dimen name="dp_607">607dp</dimen>
+    <dimen name="dp_608">608dp</dimen>
+    <dimen name="dp_609">609dp</dimen>
+    <dimen name="dp_610">610dp</dimen>
+    <dimen name="dp_611">611dp</dimen>
+    <dimen name="dp_612">612dp</dimen>
+    <dimen name="dp_613">613dp</dimen>
+    <dimen name="dp_614">614dp</dimen>
+    <dimen name="dp_615">615dp</dimen>
+    <dimen name="dp_616">616dp</dimen>
+    <dimen name="dp_617">617dp</dimen>
+    <dimen name="dp_618">618dp</dimen>
+    <dimen name="dp_619">619dp</dimen>
+    <dimen name="dp_620">620dp</dimen>
+    <dimen name="dp_621">621dp</dimen>
+    <dimen name="dp_622">622dp</dimen>
+    <dimen name="dp_623">623dp</dimen>
+    <dimen name="dp_624">624dp</dimen>
+    <dimen name="dp_625">625dp</dimen>
+    <dimen name="dp_626">626dp</dimen>
+    <dimen name="dp_627">627dp</dimen>
+    <dimen name="dp_628">628dp</dimen>
+    <dimen name="dp_629">629dp</dimen>
+    <dimen name="dp_630">630dp</dimen>
+    <dimen name="dp_631">631dp</dimen>
+    <dimen name="dp_632">632dp</dimen>
+    <dimen name="dp_633">633dp</dimen>
+    <dimen name="dp_634">634dp</dimen>
+    <dimen name="dp_635">635dp</dimen>
+    <dimen name="dp_636">636dp</dimen>
+    <dimen name="dp_637">637dp</dimen>
+    <dimen name="dp_638">638dp</dimen>
+    <dimen name="dp_639">639dp</dimen>
     <dimen name="dp_640">640dp</dimen>
-    <dimen name="dp_720">720dp</dimen>
+    <dimen name="dp_641">641dp</dimen>
+    <dimen name="dp_642">642dp</dimen>
+    <dimen name="dp_643">643dp</dimen>
+    <dimen name="dp_644">644dp</dimen>
+    <dimen name="dp_645">645dp</dimen>
+    <dimen name="dp_646">646dp</dimen>
+    <dimen name="dp_647">647dp</dimen>
+    <dimen name="dp_648">648dp</dimen>
+    <dimen name="dp_649">649dp</dimen>
+    <dimen name="dp_650">650dp</dimen>
+    <dimen name="dp_651">651dp</dimen>
+    <dimen name="dp_652">652dp</dimen>
+    <dimen name="dp_653">653dp</dimen>
+    <dimen name="dp_654">654dp</dimen>
+    <dimen name="dp_655">655dp</dimen>
+    <dimen name="dp_656">656dp</dimen>
+    <dimen name="dp_657">657dp</dimen>
+    <dimen name="dp_658">658dp</dimen>
+    <dimen name="dp_659">659dp</dimen>
+    <dimen name="dp_660">660dp</dimen>
+    <dimen name="dp_661">661dp</dimen>
+    <dimen name="dp_662">662dp</dimen>
+    <dimen name="dp_663">663dp</dimen>
+    <dimen name="dp_664">664dp</dimen>
+    <dimen name="dp_665">665dp</dimen>
+    <dimen name="dp_666">666dp</dimen>
+    <dimen name="dp_667">667dp</dimen>
+    <dimen name="dp_668">668dp</dimen>
+    <dimen name="dp_669">669dp</dimen>
+    <dimen name="dp_670">670dp</dimen>
+    <dimen name="dp_671">671dp</dimen>
+    <dimen name="dp_672">672dp</dimen>
+    <dimen name="dp_673">673dp</dimen>
+    <dimen name="dp_674">674dp</dimen>
+    <dimen name="dp_675">675dp</dimen>
+    <dimen name="dp_676">676dp</dimen>
+    <dimen name="dp_677">677dp</dimen>
+    <dimen name="dp_678">678dp</dimen>
+    <dimen name="dp_679">679dp</dimen>
+    <dimen name="dp_680">680dp</dimen>
+    <dimen name="dp_681">681dp</dimen>
+    <dimen name="dp_682">682dp</dimen>
+    <dimen name="dp_683">683dp</dimen>
+    <dimen name="dp_684">684dp</dimen>
+    <dimen name="dp_685">685dp</dimen>
+    <dimen name="dp_686">686dp</dimen>
+    <dimen name="dp_687">687dp</dimen>
+    <dimen name="dp_688">688dp</dimen>
+    <dimen name="dp_689">689dp</dimen>
+    <dimen name="dp_690">690dp</dimen>
+    <dimen name="dp_691">691dp</dimen>
+    <dimen name="dp_692">692dp</dimen>
+    <dimen name="dp_693">693dp</dimen>
+    <dimen name="dp_694">694dp</dimen>
+    <dimen name="dp_695">695dp</dimen>
+    <dimen name="dp_696">696dp</dimen>
+    <dimen name="dp_697">697dp</dimen>
+    <dimen name="dp_698">698dp</dimen>
+    <dimen name="dp_699">699dp</dimen>
+    <dimen name="dp_700">700dp</dimen>
 
     <!-- font size,you can add if there is no one -->
     <dimen name="sp_1">1sp</dimen>
@@ -579,4 +770,55 @@
     <dimen name="sp_48">48sp</dimen>
     <dimen name="sp_49">49sp</dimen>
     <dimen name="sp_50">50sp</dimen>
+    <dimen name="sp_51">51sp</dimen>
+    <dimen name="sp_52">52sp</dimen>
+    <dimen name="sp_53">53sp</dimen>
+    <dimen name="sp_54">54sp</dimen>
+    <dimen name="sp_55">55sp</dimen>
+    <dimen name="sp_56">56sp</dimen>
+    <dimen name="sp_57">57sp</dimen>
+    <dimen name="sp_58">58sp</dimen>
+    <dimen name="sp_59">59sp</dimen>
+    <dimen name="sp_60">60sp</dimen>
+    <dimen name="sp_61">61sp</dimen>
+    <dimen name="sp_62">62sp</dimen>
+    <dimen name="sp_63">63sp</dimen>
+    <dimen name="sp_64">64sp</dimen>
+    <dimen name="sp_65">65sp</dimen>
+    <dimen name="sp_66">66sp</dimen>
+    <dimen name="sp_67">67sp</dimen>
+    <dimen name="sp_68">68sp</dimen>
+    <dimen name="sp_69">69sp</dimen>
+    <dimen name="sp_70">70sp</dimen>
+    <dimen name="sp_71">71sp</dimen>
+    <dimen name="sp_72">72sp</dimen>
+    <dimen name="sp_73">73sp</dimen>
+    <dimen name="sp_74">74sp</dimen>
+    <dimen name="sp_75">75sp</dimen>
+    <dimen name="sp_76">76sp</dimen>
+    <dimen name="sp_77">77sp</dimen>
+    <dimen name="sp_78">78sp</dimen>
+    <dimen name="sp_79">79sp</dimen>
+    <dimen name="sp_80">80sp</dimen>
+    <dimen name="sp_81">81sp</dimen>
+    <dimen name="sp_82">82sp</dimen>
+    <dimen name="sp_83">83sp</dimen>
+    <dimen name="sp_84">84sp</dimen>
+    <dimen name="sp_85">85sp</dimen>
+    <dimen name="sp_86">86sp</dimen>
+    <dimen name="sp_87">87sp</dimen>
+    <dimen name="sp_88">88sp</dimen>
+    <dimen name="sp_89">89sp</dimen>
+    <dimen name="sp_90">90sp</dimen>
+    <dimen name="sp_91">91sp</dimen>
+    <dimen name="sp_92">92sp</dimen>
+    <dimen name="sp_93">93sp</dimen>
+    <dimen name="sp_94">94sp</dimen>
+    <dimen name="sp_95">95sp</dimen>
+    <dimen name="sp_96">96sp</dimen>
+    <dimen name="sp_97">97sp</dimen>
+    <dimen name="sp_98">98sp</dimen>
+    <dimen name="sp_99">99sp</dimen>
+    <dimen name="sp_100">100sp</dimen>
+
 </resources>