diff --git a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/BrowsePresenter.java b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/BrowsePresenter.java
index 4da8638a44..bb2afdb3e4 100644
--- a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/BrowsePresenter.java
+++ b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/BrowsePresenter.java
@@ -1080,10 +1080,10 @@ private void handleLoadError() {
             getView().showError(new CategoryEmptyError(getContext()));
             Utils.postDelayed(mRefreshSection, 30_000);
         }
-        if (isHomeSection()) { // maybe the history turned off?
-            MediaServiceManager.instance().enableHistory(true);
-            mGeneralData.enableHistory(true);
-        }
+        //if (isHomeSection()) { // maybe the history turned off?
+        //    MediaServiceManager.instance().enableHistory(true);
+        //    mGeneralData.enableHistory(true);
+        //}
     }
 
     private void appendLocalHistory(@NonNull VideoGroup videoGroup) {
diff --git a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/browse/BaseBrowsePresenter.java b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/browse/BaseBrowsePresenter.java
deleted file mode 100644
index 489a7291ed..0000000000
--- a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/browse/BaseBrowsePresenter.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.liskovsoft.smartyoutubetv2.common.app.presenters.browse;
-
-import android.content.Context;
-
-import com.liskovsoft.mediaserviceinterfaces.yt.data.Account;
-import com.liskovsoft.smartyoutubetv2.common.app.models.data.BrowseSection;
-import com.liskovsoft.smartyoutubetv2.common.app.models.data.Video;
-import com.liskovsoft.smartyoutubetv2.common.app.models.errors.ErrorFragmentData;
-import com.liskovsoft.smartyoutubetv2.common.app.presenters.browse.BrowsePresenter;
-import com.liskovsoft.smartyoutubetv2.common.app.presenters.interfaces.SectionPresenter;
-import com.liskovsoft.smartyoutubetv2.common.app.presenters.interfaces.VideoGroupPresenter;
-import com.liskovsoft.smartyoutubetv2.common.app.views.BrowseView;
-import com.liskovsoft.smartyoutubetv2.common.misc.MediaServiceManager.AccountChangeListener;
-
-public abstract class BaseBrowsePresenter implements SectionPresenter, VideoGroupPresenter, AccountChangeListener {
-    private final BrowsePresenter mBrowsePresenter;
-
-    public BaseBrowsePresenter(BrowsePresenter root) {
-        mBrowsePresenter = root;
-    }
-
-    public void updateSections() {}
-    public void updateChannelSorting() {}
-    public void updatePlaylistsStyle() {}
-    public boolean isItemPinned(Video item) { return false; }
-    public void moveSectionUp(BrowseSection section) {}
-    public void moveSectionDown(BrowseSection section) {}
-    public void renameSection(BrowseSection section) {}
-    public void enableAllSections(boolean enable) {}
-    public void enableSection(int sectionId, boolean enable) {}
-    public void pinItem(Video item) {}
-    public void pinItem(String title, int resId, ErrorFragmentData data) {}
-    public void unpinItem(Video item) {}
-    public void refresh() {}
-    public void refresh(boolean focusOnContent) {}
-    public boolean isMultiGridChannelUploadsSection() { return false; }
-    public boolean isSettingsSection() { return false; }
-    public boolean isPlaylistsSection() { return false; }
-    public boolean isHomeSection() { return false; }
-    public boolean isHistorySection() { return false; }
-    public boolean isSubscriptionsSection() { return false; }
-    public boolean isPinnedSection() { return false; }
-    public void selectSection(int sectionId) {}
-    public boolean inForeground() { return false; }
-
-    public void onSectionFocused(int sectionId) {}
-    public void onSectionLongPressed(int sectionId) {}
-
-    public void onVideoItemSelected(Video item) {}
-    public void onVideoItemClicked(Video item) {}
-    public void onVideoItemLongClicked(Video item) {}
-    public void onScrollEnd(Video item) {}
-    public boolean hasPendingActions() { return false; }
-
-    public void onAccountChanged(Account account) {}
-
-    // BasePresenter
-
-    final public Video getCurrentVideo() { return getRoot().getCurrentVideo(); }
-
-    final public BrowsePresenter getRoot() {
-        return mBrowsePresenter;
-    }
-
-    public void onViewInitialized() {}
-
-    public void onViewPaused() {}
-
-    public void onViewDestroyed() {}
-
-    final public Context getContext() {
-        return getRoot().getContext();
-    }
-
-    final public void syncItem(Video video) {
-        getRoot().syncItem(video);
-    }
-
-    final public BrowseView getView() {
-        return getRoot().getView();
-    }
-
-    final public void removeItem(Video item) {
-        getRoot().removeItem(item);
-    }
-
-    final public void removeItemAuthor(Video item) {
-        getRoot().removeItemAuthor(item);
-    }
-}
diff --git a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/browse/BrowsePresenter.java b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/browse/BrowsePresenter.java
deleted file mode 100644
index 6e1b80daef..0000000000
--- a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/browse/BrowsePresenter.java
+++ /dev/null
@@ -1,248 +0,0 @@
-package com.liskovsoft.smartyoutubetv2.common.app.presenters.browse;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-
-import com.liskovsoft.mediaserviceinterfaces.yt.data.Account;
-import com.liskovsoft.sharedutils.mylogger.Log;
-import com.liskovsoft.smartyoutubetv2.common.app.models.data.BrowseSection;
-import com.liskovsoft.smartyoutubetv2.common.app.models.data.Video;
-import com.liskovsoft.smartyoutubetv2.common.app.models.errors.ErrorFragmentData;
-import com.liskovsoft.smartyoutubetv2.common.app.presenters.base.BasePresenter;
-import com.liskovsoft.smartyoutubetv2.common.app.presenters.browse.BaseBrowsePresenter;
-import com.liskovsoft.smartyoutubetv2.common.app.presenters.browse.PocketTubePresenter;
-import com.liskovsoft.smartyoutubetv2.common.app.presenters.browse.SectionsPresenter;
-import com.liskovsoft.smartyoutubetv2.common.app.presenters.interfaces.SectionPresenter;
-import com.liskovsoft.smartyoutubetv2.common.app.presenters.interfaces.VideoGroupPresenter;
-import com.liskovsoft.smartyoutubetv2.common.app.views.BrowseView;
-import com.liskovsoft.smartyoutubetv2.common.misc.MediaServiceManager.AccountChangeListener;
-import com.liskovsoft.smartyoutubetv2.common.utils.Utils;
-
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-public class BrowsePresenter extends BasePresenter<BrowseView> implements SectionPresenter, VideoGroupPresenter, AccountChangeListener {
-    private static final String TAG = BrowsePresenter.class.getSimpleName();
-    @SuppressLint("StaticFieldLeak")
-    private static BrowsePresenter sInstance;
-    private final List<BaseBrowsePresenter> mListeners = new CopyOnWriteArrayList<>();
-    private Video mCurrentVideo;
-
-    private BrowsePresenter(Context context) {
-        super(context);
-
-        mListeners.add(new SectionsPresenter(this));
-        mListeners.add(new PocketTubePresenter(this));
-    }
-
-    public static BrowsePresenter instance(Context context) {
-        if (sInstance == null) {
-            sInstance = new BrowsePresenter(context);
-        }
-
-        sInstance.setContext(context);
-
-        return sInstance;
-    }
-
-    public static void unhold() {
-        sInstance = null;
-    }
-
-    @Override
-    public void onViewInitialized() {
-        super.onViewInitialized();
-
-        Utils.process(mListeners, BaseBrowsePresenter::onViewInitialized);
-    }
-
-    @Override
-    public void onViewPaused() {
-        super.onViewPaused();
-
-        Utils.process(mListeners, BaseBrowsePresenter::onViewPaused);
-    }
-
-    public void updateSections() {
-        if (getView() == null) {
-            return;
-        }
-
-        Utils.process(mListeners, BaseBrowsePresenter::updateSections);
-    }
-
-    public void updateChannelSorting() {
-        Utils.process(mListeners, BaseBrowsePresenter::updateChannelSorting);
-    }
-
-    public void updatePlaylistsStyle() {
-        Utils.process(mListeners, BaseBrowsePresenter::updatePlaylistsStyle);
-    }
-
-    @Override
-    public void onViewDestroyed() {
-        super.onViewDestroyed();
-
-        Utils.process(mListeners, BaseBrowsePresenter::onViewDestroyed);
-    }
-
-    @Override
-    public void onVideoItemSelected(Video item) {
-        if (getView() == null) {
-            return;
-        }
-
-        mCurrentVideo = item;
-
-        Utils.process(mListeners, listener -> listener.onVideoItemSelected(item));
-    }
-
-    @Override
-    public void onVideoItemClicked(Video item) {
-        if (getContext() == null) {
-            return;
-        }
-
-        Utils.process(mListeners, listener -> listener.onVideoItemClicked(item));
-    }
-
-    @Override
-    public void onVideoItemLongClicked(Video item) {
-        if (getContext() == null) {
-            return;
-        }
-
-        Utils.process(mListeners, listener -> listener.onVideoItemLongClicked(item));
-    }
-
-    @Override
-    public void onScrollEnd(Video item) {
-        if (item == null) {
-            Log.e(TAG, "Can't scroll. Video is null.");
-            return;
-        }
-
-        Utils.process(mListeners, listener -> listener.onScrollEnd(item));
-    }
-
-    @Override
-    public void onSectionFocused(int sectionId) {
-        mCurrentVideo = null; // fast scroll through the sections (fix empty selected item)
-
-        Utils.process(mListeners, listener -> listener.onSectionFocused(sectionId));
-    }
-
-    @Override
-    public void onSectionLongPressed(int sectionId) {
-        Utils.process(mListeners, listener -> listener.onSectionLongPressed(sectionId));
-    }
-
-    @Override
-    public boolean hasPendingActions() {
-        return Utils.chainProcess(mListeners, BaseBrowsePresenter::hasPendingActions);
-    }
-
-    public boolean isItemPinned(Video item) {
-        return Utils.chainProcess(mListeners, listener -> listener.isItemPinned(item));
-    }
-
-    public void moveSectionUp(BrowseSection section) {
-        Utils.process(mListeners, listener -> listener.moveSectionUp(section));
-    }
-
-    public void moveSectionDown(BrowseSection section) {
-        Utils.process(mListeners, listener -> listener.moveSectionDown(section));
-    }
-
-    public void renameSection(BrowseSection section) {
-        Utils.process(mListeners, listener -> listener.renameSection(section));
-    }
-
-    public void enableAllSections(boolean enable) {
-        Utils.process(mListeners, listener -> listener.enableAllSections(enable));
-    }
-
-    public void enableSection(int sectionId, boolean enable) {
-        Utils.process(mListeners, listener -> listener.enableSection(sectionId, enable));
-    }
-
-    public void pinItem(Video item) {
-        if (getView() == null) {
-            return;
-        }
-
-        Utils.process(mListeners, listener -> listener.pinItem(item));
-    }
-
-    public void pinItem(String title, int resId, ErrorFragmentData data) {
-        if (getView() == null) {
-            return;
-        }
-
-        Utils.process(mListeners, listener -> listener.pinItem(title, resId, data));
-    }
-
-    public void unpinItem(Video item) {
-        Utils.process(mListeners, listener -> listener.unpinItem(item));
-    }
-
-    public void refresh() {
-        Utils.process(mListeners, BaseBrowsePresenter::refresh);
-    }
-
-    public void refresh(boolean focusOnContent) {
-        Utils.process(mListeners, listener -> listener.refresh(focusOnContent));
-    }
-
-    /**
-     * Is Channels new look enabled?
-     */
-    public boolean isMultiGridChannelUploadsSection() {
-        return Utils.chainProcess(mListeners, BaseBrowsePresenter::isMultiGridChannelUploadsSection);
-    }
-
-    public boolean isSettingsSection() {
-        return Utils.chainProcess(mListeners, BaseBrowsePresenter::isSettingsSection);
-    }
-
-    public boolean isPlaylistsSection() {
-        return Utils.chainProcess(mListeners, BaseBrowsePresenter::isPlaylistsSection);
-    }
-
-    public boolean isHomeSection() {
-        return Utils.chainProcess(mListeners, BaseBrowsePresenter::isHomeSection);
-    }
-
-    public boolean isHistorySection() {
-        return Utils.chainProcess(mListeners, BaseBrowsePresenter::isHistorySection);
-    }
-
-    public boolean isSubscriptionsSection() {
-        return Utils.chainProcess(mListeners, BaseBrowsePresenter::isSubscriptionsSection);
-    }
-
-    public boolean isPinnedSection() {
-        return Utils.chainProcess(mListeners, BaseBrowsePresenter::isPinnedSection);
-    }
-
-    public void selectSection(int sectionId) {
-        Utils.process(mListeners, listener -> listener.selectSection(sectionId));
-    }
-
-    public boolean inForeground() {
-        return Utils.chainProcess(mListeners, BaseBrowsePresenter::inForeground);
-    }
-
-    //private boolean isGridSection() {
-    //    return mCurrentSection != null && mCurrentSection.getType() != BrowseSection.TYPE_ROW;
-    //}
-
-    @Override
-    public void onAccountChanged(Account account) {
-        Utils.process(mListeners, listener -> listener.onAccountChanged(account));
-    }
-
-    public Video getCurrentVideo() {
-        return mCurrentVideo;
-    }
-}
diff --git a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/browse/PocketTubePresenter.java b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/browse/PocketTubePresenter.java
deleted file mode 100644
index 8a40873f25..0000000000
--- a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/browse/PocketTubePresenter.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.liskovsoft.smartyoutubetv2.common.app.presenters.browse;
-
-import com.liskovsoft.smartyoutubetv2.common.app.presenters.browse.BrowsePresenter;
-
-public class PocketTubePresenter extends BaseBrowsePresenter {
-    public PocketTubePresenter(BrowsePresenter root) {
-        super(root);
-    }
-}
diff --git a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/browse/SectionsPresenter.java b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/browse/SectionsPresenter.java
deleted file mode 100644
index f63075e93f..0000000000
--- a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/browse/SectionsPresenter.java
+++ /dev/null
@@ -1,1092 +0,0 @@
-package com.liskovsoft.smartyoutubetv2.common.app.presenters.browse;
-
-import android.content.Context;
-
-import com.liskovsoft.mediaserviceinterfaces.yt.ContentService;
-import com.liskovsoft.mediaserviceinterfaces.yt.MediaItemService;
-import com.liskovsoft.mediaserviceinterfaces.yt.NotificationsService;
-import com.liskovsoft.mediaserviceinterfaces.yt.ServiceManager;
-import com.liskovsoft.mediaserviceinterfaces.yt.SignInService;
-import com.liskovsoft.mediaserviceinterfaces.yt.data.Account;
-import com.liskovsoft.mediaserviceinterfaces.yt.data.MediaGroup;
-import com.liskovsoft.sharedutils.helpers.Helpers;
-import com.liskovsoft.sharedutils.helpers.ScreenHelper;
-import com.liskovsoft.sharedutils.locale.LocaleUtility;
-import com.liskovsoft.sharedutils.mylogger.Log;
-import com.liskovsoft.sharedutils.rx.RxHelper;
-import com.liskovsoft.smartyoutubetv2.common.R;
-import com.liskovsoft.smartyoutubetv2.common.app.models.data.BrowseSection;
-import com.liskovsoft.smartyoutubetv2.common.app.models.data.SettingsGroup;
-import com.liskovsoft.smartyoutubetv2.common.app.models.data.SettingsItem;
-import com.liskovsoft.smartyoutubetv2.common.app.models.data.Video;
-import com.liskovsoft.smartyoutubetv2.common.app.models.data.VideoGroup;
-import com.liskovsoft.smartyoutubetv2.common.app.models.errors.CategoryEmptyError;
-import com.liskovsoft.smartyoutubetv2.common.app.models.errors.ErrorFragmentData;
-import com.liskovsoft.smartyoutubetv2.common.app.models.errors.PasswordError;
-import com.liskovsoft.smartyoutubetv2.common.app.models.errors.SignInError;
-import com.liskovsoft.smartyoutubetv2.common.app.presenters.browse.BrowsePresenter;
-import com.liskovsoft.smartyoutubetv2.common.app.presenters.ChannelPresenter;
-import com.liskovsoft.smartyoutubetv2.common.app.presenters.ChannelUploadsPresenter;
-import com.liskovsoft.smartyoutubetv2.common.app.presenters.dialogs.VideoActionPresenter;
-import com.liskovsoft.smartyoutubetv2.common.app.presenters.dialogs.menu.ChannelUploadsMenuPresenter;
-import com.liskovsoft.smartyoutubetv2.common.app.presenters.dialogs.menu.SectionMenuPresenter;
-import com.liskovsoft.smartyoutubetv2.common.app.presenters.dialogs.menu.VideoMenuPresenter;
-import com.liskovsoft.smartyoutubetv2.common.app.presenters.dialogs.menu.VideoMenuPresenter.VideoMenuCallback;
-import com.liskovsoft.smartyoutubetv2.common.app.views.BrowseView;
-import com.liskovsoft.smartyoutubetv2.common.app.views.ViewManager;
-import com.liskovsoft.smartyoutubetv2.common.misc.AppDataSourceManager;
-import com.liskovsoft.smartyoutubetv2.common.misc.DeArrowProcessor;
-import com.liskovsoft.smartyoutubetv2.common.misc.MediaServiceManager;
-import com.liskovsoft.smartyoutubetv2.common.prefs.AccountsData;
-import com.liskovsoft.smartyoutubetv2.common.prefs.GeneralData;
-import com.liskovsoft.smartyoutubetv2.common.prefs.MainUIData;
-import com.liskovsoft.smartyoutubetv2.common.utils.Utils;
-import com.liskovsoft.youtubeapi.service.YouTubeServiceManager;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Callable;
-
-import io.reactivex.Observable;
-import io.reactivex.disposables.Disposable;
-
-public class SectionsPresenter extends BaseBrowsePresenter {
-    private static final String TAG = SectionsPresenter.class.getSimpleName();
-    private static final long HEADER_REFRESH_PERIOD_MS = 120 * 60 * 1_000;
-    private final MainUIData mMainUIData;
-    private final GeneralData mGeneralData;
-    private final List<BrowseSection> mSections;
-    private final List<BrowseSection> mErrorSections;
-    private final Map<Integer, Observable<MediaGroup>> mGridMapping;
-    private final Map<Integer, Observable<List<MediaGroup>>> mRowMapping;
-    private final Map<Integer, Callable<List<SettingsItem>>> mSettingsGridMapping;
-    private final Map<Integer, BrowseSection> mSectionsMapping;
-    private final AppDataSourceManager mDataSourcePresenter;
-    private final ContentService mContentService;
-    private final MediaItemService mItemService;
-    private final SignInService mSignInService;
-    private final NotificationsService mNotificationsService;
-    private final DeArrowProcessor mDeArrowProcessor;
-    private final List<Disposable> mActions;
-    private final Runnable mRefreshSection = this::refresh;
-    private BrowseSection mCurrentSection;
-    private long mLastUpdateTimeMs;
-    private int mBootSectionIndex;
-    private int mBootstrapSectionId = -1;
-
-    public SectionsPresenter(BrowsePresenter root) {
-        super(root);
-        mDataSourcePresenter = AppDataSourceManager.instance();
-        mSections = new ArrayList<>();
-        mErrorSections = new ArrayList<>();
-        mGridMapping = new HashMap<>();
-        mRowMapping = new HashMap<>();
-        mSettingsGridMapping = new HashMap<>();
-        mSectionsMapping = new HashMap<>();
-        mMainUIData = MainUIData.instance(getContext());
-        mGeneralData = GeneralData.instance(getContext());
-        MediaServiceManager.instance().addAccountListener(this);
-        ScreenHelper.updateScreenInfo(getContext());
-
-        ServiceManager service = YouTubeServiceManager.instance();
-        mContentService = service.getContentService();
-        mItemService = service.getMediaItemService();
-        mSignInService = service.getSignInService();
-        mNotificationsService = service.getNotificationsService();
-        mDeArrowProcessor = new DeArrowProcessor(getContext(), this::syncItem);
-        mActions = new ArrayList<>();
-
-        initSections();
-    }
-
-    @Override
-    public void onViewInitialized() {
-        super.onViewInitialized();
-
-        if (getView() == null) {
-            return;
-        }
-
-        updateChannelSorting();
-        updatePlaylistsStyle();
-        updateSections();
-        Utils.updateRemoteControlService(getContext());
-
-        // Move default focus
-        int selectedSectionIndex = findSectionIndex(mCurrentSection != null ? mCurrentSection.getId() : mBootstrapSectionId);
-        mBootstrapSectionId = -1;
-        getView().selectSection(selectedSectionIndex != -1 ? selectedSectionIndex : mBootSectionIndex, true);
-    }
-
-    @Override
-    public void onViewPaused() {
-        super.onViewPaused();
-
-        saveSelectedItems();
-    }
-
-    private void saveSelectedItems() {
-        // Fix position reset when jumping between sections
-        if (getCurrentVideo() != null && getCurrentVideo().getPositionInsideGroup() == 0 && (System.currentTimeMillis() - getCurrentVideo().timestamp) < 10_000) {
-            return;
-        }
-
-        if ((isSubscriptionsSection() && mGeneralData.isRememberSubscriptionsPositionEnabled()) ||
-                (isPinnedSection() && mGeneralData.isRememberPinnedPositionEnabled())) {
-            mGeneralData.setSelectedItem(mCurrentSection.getId(), getCurrentVideo());
-        }
-    }
-
-    private void restoreSelectedItems() {
-        if ((isSubscriptionsSection() && mGeneralData.isRememberSubscriptionsPositionEnabled()) ||
-                (isPinnedSection() && mGeneralData.isRememberPinnedPositionEnabled())) {
-            getView().selectSectionItem(mGeneralData.getSelectedItem(mCurrentSection.getId()));
-        }
-    }
-
-    private void initSections() {
-        initSectionMapping();
-
-        initSectionCallbacks();
-
-        initSettingsSubCategories();
-    }
-
-    private void initSectionMapping() {
-        String country = LocaleUtility.getCurrentLocale(getContext()).getCountry();
-        int uploadsType = mMainUIData.isUploadsOldLookEnabled() ? BrowseSection.TYPE_GRID : BrowseSection.TYPE_MULTI_GRID;
-
-        mSectionsMapping.put(MediaGroup.TYPE_HOME, new BrowseSection(MediaGroup.TYPE_HOME, getContext().getString(R.string.header_home), BrowseSection.TYPE_ROW, R.drawable.icon_home));
-        mSectionsMapping.put(MediaGroup.TYPE_SHORTS, new BrowseSection(MediaGroup.TYPE_SHORTS, getContext().getString(R.string.header_shorts), BrowseSection.TYPE_SHORTS_GRID, R.drawable.icon_shorts));
-        mSectionsMapping.put(MediaGroup.TYPE_TRENDING, new BrowseSection(MediaGroup.TYPE_TRENDING, getContext().getString(R.string.header_trending), BrowseSection.TYPE_ROW, R.drawable.icon_trending));
-        mSectionsMapping.put(MediaGroup.TYPE_KIDS_HOME, new BrowseSection(MediaGroup.TYPE_KIDS_HOME, getContext().getString(R.string.header_kids_home), BrowseSection.TYPE_ROW, R.drawable.icon_kids_home));
-        mSectionsMapping.put(MediaGroup.TYPE_SPORTS, new BrowseSection(MediaGroup.TYPE_SPORTS, getContext().getString(R.string.header_sports), BrowseSection.TYPE_ROW, R.drawable.icon_sports));
-        mSectionsMapping.put(MediaGroup.TYPE_GAMING, new BrowseSection(MediaGroup.TYPE_GAMING, getContext().getString(R.string.header_gaming), BrowseSection.TYPE_ROW, R.drawable.icon_gaming));
-        if (!Helpers.equalsAny(country, "RU", "BY")) {
-            mSectionsMapping.put(MediaGroup.TYPE_NEWS, new BrowseSection(MediaGroup.TYPE_NEWS, getContext().getString(R.string.header_news), BrowseSection.TYPE_ROW, R.drawable.icon_news));
-        }
-        mSectionsMapping.put(MediaGroup.TYPE_MUSIC, new BrowseSection(MediaGroup.TYPE_MUSIC, getContext().getString(R.string.header_music), BrowseSection.TYPE_ROW, R.drawable.icon_music));
-        mSectionsMapping.put(MediaGroup.TYPE_CHANNEL_UPLOADS, new BrowseSection(MediaGroup.TYPE_CHANNEL_UPLOADS, getContext().getString(R.string.header_channels), uploadsType, R.drawable.icon_channels, true));
-        mSectionsMapping.put(MediaGroup.TYPE_SUBSCRIPTIONS, new BrowseSection(MediaGroup.TYPE_SUBSCRIPTIONS, getContext().getString(R.string.header_subscriptions), BrowseSection.TYPE_GRID, R.drawable.icon_subscriptions, true));
-        mSectionsMapping.put(MediaGroup.TYPE_HISTORY, new BrowseSection(MediaGroup.TYPE_HISTORY, getContext().getString(R.string.header_history), BrowseSection.TYPE_GRID, R.drawable.icon_history, true));
-        mSectionsMapping.put(MediaGroup.TYPE_USER_PLAYLISTS, new BrowseSection(MediaGroup.TYPE_USER_PLAYLISTS, getContext().getString(R.string.header_playlists), BrowseSection.TYPE_ROW, R.drawable.icon_playlist, true));
-        mSectionsMapping.put(MediaGroup.TYPE_NOTIFICATIONS, new BrowseSection(MediaGroup.TYPE_NOTIFICATIONS, getContext().getString(R.string.header_notifications), BrowseSection.TYPE_GRID, R.drawable.icon_notification, true));
-
-        if (mGeneralData.isSettingsSectionEnabled()) {
-            mSectionsMapping.put(MediaGroup.TYPE_SETTINGS, new BrowseSection(MediaGroup.TYPE_SETTINGS, getContext().getString(R.string.header_settings), BrowseSection.TYPE_SETTINGS_GRID, R.drawable.icon_settings));
-        }
-    }
-
-    private void initSectionCallbacks() {
-        mRowMapping.put(MediaGroup.TYPE_HOME, mGeneralData.isOldHomeLookEnabled() ? mContentService.getHomeV1Observe() : mContentService.getHomeObserve());
-        mRowMapping.put(MediaGroup.TYPE_TRENDING, mContentService.getTrendingObserve());
-        mRowMapping.put(MediaGroup.TYPE_KIDS_HOME, mContentService.getKidsHomeObserve());
-        mRowMapping.put(MediaGroup.TYPE_SPORTS, mContentService.getSportsObserve());
-        mRowMapping.put(MediaGroup.TYPE_NEWS, mContentService.getNewsObserve());
-        mRowMapping.put(MediaGroup.TYPE_MUSIC, mContentService.getMusicObserve());
-        mRowMapping.put(MediaGroup.TYPE_GAMING, mContentService.getGamingObserve());
-        mRowMapping.put(MediaGroup.TYPE_USER_PLAYLISTS, mContentService.getPlaylistsObserve());
-
-        mGridMapping.put(MediaGroup.TYPE_SHORTS, mContentService.getShortsObserve());
-        mGridMapping.put(MediaGroup.TYPE_SUBSCRIPTIONS, mContentService.getSubscriptionsObserve());
-        mGridMapping.put(MediaGroup.TYPE_HISTORY, mContentService.getHistoryObserve());
-        mGridMapping.put(MediaGroup.TYPE_CHANNEL_UPLOADS, mContentService.getSubscribedChannelsByUpdateObserve());
-        mGridMapping.put(MediaGroup.TYPE_NOTIFICATIONS, mNotificationsService.getNotificationItemsObserve());
-    }
-
-    private void initPinnedSections() {
-        mSections.clear();
-
-        Collection<Video> pinnedItems = mGeneralData.getPinnedItems();
-
-        for (Video item : pinnedItems) {
-            if (item != null) {
-                if (item.sectionId == -1) { // pinned channel or playlist
-                    BrowseSection section = createPinnedSection(item);
-                    mSections.add(section);
-                } else {
-                    BrowseSection section = mSectionsMapping.get(item.sectionId);
-
-                    if (section != null) {
-                        mSections.add(section);
-                    }
-                }
-            }
-        }
-    }
-
-    private void initPinnedCallbacks() {
-        Collection<Video> pinnedItems = mGeneralData.getPinnedItems();
-
-        for (Video item : pinnedItems) {
-            if (item != null && item.sectionId == -1) {
-                createPinnedMapping(item);
-            }
-        }
-    }
-
-    private void initSettingsSubCategories() {
-        mSettingsGridMapping.put(MediaGroup.TYPE_SETTINGS, () -> mDataSourcePresenter.getSettingItems(getContext()));
-    }
-
-    @Override
-    public void updateSections() {
-        if (getView() == null) {
-            return;
-        }
-
-        // clean up (profile changed etc)
-        getView().removeAllSections();
-
-        initPinnedSections();
-        initPinnedCallbacks();
-        initPasswordSection();
-
-        int index = 0;
-
-        for (BrowseSection section : mErrorSections) {
-            getView().addSection(index++, section);
-        }
-
-        for (BrowseSection section : mSections) { // contains sections and pinned items!
-            if (section.getId() == MediaGroup.TYPE_SETTINGS) {
-                section.setEnabled(true);
-            }
-            //section.setEnabled(section.getId() == MediaGroup.TYPE_SETTINGS || mGeneralData.isSectionPinned(section.getId()));
-
-            if (section.isEnabled()) {
-                if (section.getId() == mGeneralData.getBootSectionId()) {
-                    mBootSectionIndex = index;
-                }
-                getView().addSection(index++, section);
-            } else {
-                getView().removeSection(section);
-            }
-        }
-
-        // Refresh and restore last focus
-        int selectedSectionIndex = findSectionIndex(mCurrentSection != null ? mCurrentSection.getId() : -1);
-        getView().selectSection(selectedSectionIndex != -1 ? selectedSectionIndex : mBootSectionIndex, false);
-    }
-
-    private void sortSections() {
-        // NOTE: Comparator.comparingInt API >= 24
-        Collections.sort(mSections, (o1, o2) -> {
-            return mGeneralData.getSectionIndex(o1.getId()) - mGeneralData.getSectionIndex(o2.getId());
-        });
-    }
-
-    @Override
-    public void updateChannelSorting() {
-        int sortingType = mMainUIData.getChannelCategorySorting();
-
-        switch (sortingType) {
-            case MainUIData.CHANNEL_SORTING_DEFAULT:
-                mGridMapping.put(MediaGroup.TYPE_CHANNEL_UPLOADS, mContentService.getSubscribedChannelsObserve());
-                break;
-            case MainUIData.CHANNEL_SORTING_NAME2:
-                mGridMapping.put(MediaGroup.TYPE_CHANNEL_UPLOADS, mContentService.getSubscribedChannelsByName2Observe());
-                break;
-            case MainUIData.CHANNEL_SORTING_NAME:
-                mGridMapping.put(MediaGroup.TYPE_CHANNEL_UPLOADS, mContentService.getSubscribedChannelsByNameObserve());
-                break;
-            case MainUIData.CHANNEL_SORTING_NEW_CONTENT:
-                mGridMapping.put(MediaGroup.TYPE_CHANNEL_UPLOADS, mContentService.getSubscribedChannelsByUpdateObserve());
-                break;
-            case MainUIData.CHANNEL_SORTING_LAST_VIEWED:
-                mGridMapping.put(MediaGroup.TYPE_CHANNEL_UPLOADS, mContentService.getSubscribedChannelsByViewedObserve());
-                break;
-        }
-    }
-
-    @Override
-    public void updatePlaylistsStyle() {
-        int playlistsStyle = mMainUIData.getPlaylistsStyle();
-
-        switch (playlistsStyle) {
-            case MainUIData.PLAYLISTS_STYLE_GRID:
-                mRowMapping.remove(MediaGroup.TYPE_USER_PLAYLISTS);
-                mGridMapping.put(MediaGroup.TYPE_USER_PLAYLISTS, mContentService.getEmptyPlaylistsObserve());
-                updateCategoryType(MediaGroup.TYPE_USER_PLAYLISTS, BrowseSection.TYPE_GRID);
-                break;
-            case MainUIData.PLAYLISTS_STYLE_ROWS:
-                mGridMapping.remove(MediaGroup.TYPE_USER_PLAYLISTS);
-                mRowMapping.put(MediaGroup.TYPE_USER_PLAYLISTS, mContentService.getPlaylistsObserve());
-                updateCategoryType(MediaGroup.TYPE_USER_PLAYLISTS, BrowseSection.TYPE_ROW);
-                break;
-        }
-    }
-
-    private void updateCategoryType(int categoryId, int categoryType) {
-        if (categoryType == -1 || categoryId == -1 || mSections == null) {
-            return;
-        }
-
-        BrowseSection section = mSectionsMapping.get(categoryId);
-
-        if (section != null) {
-            section.setType(categoryType);
-        }
-
-        for (BrowseSection category : mSections) {
-            if (category.getId() == categoryId) {
-                category.setType(categoryType);
-                break;
-            }
-        }
-    }
-
-    @Override
-    public void onViewDestroyed() {
-        super.onViewDestroyed();
-        disposeActions();
-        saveSelectedItems();
-    }
-
-    @Override
-    public void onVideoItemSelected(Video item) {
-        if (getView() == null) {
-            return;
-        }
-
-        if (belongsToChannelUploadsMultiGrid(item)) {
-            if (mMainUIData.isUploadsAutoLoadEnabled()) {
-                updateChannelUploadsMultiGrid(item);
-            } else {
-                updateChannelUploadsMultiGrid(null); // clear
-            }
-        }
-    }
-
-    @Override
-    public void onVideoItemClicked(Video item) {
-        if (getContext() == null) {
-            return;
-        }
-
-        // Check that channels new look enabled and we're on the first column
-        if (belongsToChannelUploadsMultiGrid(item)) {
-            updateChannelUploadsMultiGrid(item);
-        } else {
-            VideoActionPresenter.instance(getContext()).apply(item);
-        }
-
-        updateRefreshTime();
-    }
-
-    @Override
-    public void onVideoItemLongClicked(Video item) {
-        if (getContext() == null) {
-            return;
-        }
-
-        if (belongsToChannelUploads(item)) { // We need to be sure we exactly on Channels section
-            ChannelUploadsMenuPresenter.instance(getContext()).showMenu(item, (videoItem, action) -> {
-                if (action == VideoMenuCallback.ACTION_UNSUBSCRIBE) { // works with any uploads section look
-                    removeItem(item);
-                }
-            });
-        } else {
-            VideoMenuPresenter.instance(getContext()).showMenu(item, (videoItem, action) -> {
-                if (action == VideoMenuCallback.ACTION_REMOVE ||
-                    action == VideoMenuCallback.ACTION_REMOVE_FROM_PLAYLIST) {
-                    removeItem(videoItem);
-                } else if (action == VideoMenuCallback.ACTION_UNSUBSCRIBE && isMultiGridChannelUploadsSection()) {
-                    removeItem(getCurrentVideo());
-                    VideoMenuPresenter.instance(getContext()).closeDialog();
-                } else if (action == VideoMenuCallback.ACTION_UNSUBSCRIBE && isSubscriptionsSection()) {
-                    removeItemAuthor(videoItem);
-                    VideoMenuPresenter.instance(getContext()).closeDialog();
-                }
-            });
-        }
-
-        updateRefreshTime();
-    }
-
-    @Override
-    public void onScrollEnd(Video item) {
-        if (item == null) {
-            Log.e(TAG, "Can't scroll. Video is null.");
-            return;
-        }
-
-        VideoGroup group = item.getGroup();
-
-        continueGroup(group);
-    }
-
-    @Override
-    public void onSectionFocused(int sectionId) {
-        saveSelectedItems(); // save previous state
-        mCurrentSection = findSectionById(sectionId);
-        updateCurrentSection();
-    }
-
-    @Override
-    public void onSectionLongPressed(int sectionId) {
-        SectionMenuPresenter.instance(getContext()).showMenu(findSectionById(sectionId));
-    }
-
-    @Override
-    public boolean hasPendingActions() {
-        return RxHelper.isAnyActionRunning(mActions);
-    }
-
-    @Override
-    public boolean isItemPinned(Video item) {
-        Collection<Video> items = mGeneralData.getPinnedItems();
-
-        return items.contains(item);
-    }
-
-    @Override
-    public void moveSectionUp(BrowseSection section) {
-        mCurrentSection = section; // move current focus
-        mGeneralData.moveSectionUp(section.getId());
-        updateSections();
-    }
-
-    @Override
-    public void moveSectionDown(BrowseSection section) {
-        mCurrentSection = section; // move current focus
-        mGeneralData.moveSectionDown(section.getId());
-        updateSections();
-    }
-
-    @Override
-    public void renameSection(BrowseSection section) {
-        mCurrentSection = section; // move current focus
-        mGeneralData.renameSection(section.getId(), section.getTitle());
-        updateSections();
-    }
-
-    @Override
-    public void enableAllSections(boolean enable) {
-        enableSection(MediaGroup.TYPE_HISTORY, enable);
-        enableSection(MediaGroup.TYPE_USER_PLAYLISTS, enable);
-        enableSection(MediaGroup.TYPE_SUBSCRIPTIONS, enable);
-        enableSection(MediaGroup.TYPE_CHANNEL_UPLOADS, enable);
-        enableSection(MediaGroup.TYPE_GAMING, enable);
-        enableSection(MediaGroup.TYPE_MUSIC, enable);
-        enableSection(MediaGroup.TYPE_NEWS, enable);
-        enableSection(MediaGroup.TYPE_HOME, enable);
-        enableSection(MediaGroup.TYPE_TRENDING, enable);
-        enableSection(MediaGroup.TYPE_SHORTS, enable);
-    }
-
-    @Override
-    public void enableSection(int sectionId, boolean enable) {
-        mGeneralData.enableSection(sectionId, enable);
-
-        if (!enable && mCurrentSection != null && mCurrentSection.getId() == sectionId) {
-            mCurrentSection = findNearestSection(sectionId);
-        }
-
-        updateSections();
-    }
-
-    @Override
-    public void pinItem(Video item) {
-        if (getView() == null) {
-            return;
-        }
-
-        mGeneralData.addPinnedItem(item);
-
-        createPinnedMapping(item);
-
-        BrowseSection newSection = createPinnedSection(item);
-        Helpers.removeIf(mSections, section -> section.getId() == newSection.getId());
-        mSections.add(newSection);
-        getView().addSection(-1, newSection);
-    }
-
-    @Override
-    public void pinItem(String title, int resId, ErrorFragmentData data) {
-        if (getView() == null) {
-            return;
-        }
-
-        BrowseSection newSection = new BrowseSection(title.hashCode(), title, BrowseSection.TYPE_ERROR, resId, false, data);
-        Helpers.removeIf(mErrorSections, section -> section.getId() == newSection.getId());
-        mErrorSections.add(newSection);
-        getView().addSection(0, newSection);
-    }
-
-    private void appendToSections(String title, int resId, ErrorFragmentData data) {
-        int id = title.hashCode();
-        Helpers.removeIf(mSections, section -> section.getId() == id);
-        mSections.add(new BrowseSection(id, title, BrowseSection.TYPE_ERROR, resId, false, data));
-    }
-
-    @Override
-    public void unpinItem(Video item) {
-        mGeneralData.removePinnedItem(item);
-        mGeneralData.removeSelectedItem(item.hashCode());
-
-        BrowseSection section = null;
-
-        for (BrowseSection cat : mSections) {
-            if (cat.getId() == item.hashCode()) {
-                section = cat;
-                break;
-            }
-        }
-
-        mGridMapping.remove(item.hashCode());
-
-        if (getView() != null) {
-            getView().removeSection(section);
-        }
-    }
-
-    private void maybeRefreshHeader() {
-        long timeAfterPauseMs = System.currentTimeMillis() - mLastUpdateTimeMs;
-        if (timeAfterPauseMs > HEADER_REFRESH_PERIOD_MS) { // update header every n minutes
-            refresh();
-        }
-    }
-
-    @Override
-    public void refresh() {
-        refresh(true);
-    }
-
-    @Override
-    public void refresh(boolean focusOnContent) {
-        updateCurrentSection();
-        if (focusOnContent && getView() != null) {
-            getView().focusOnContent();
-        }
-    }
-
-    private void updateRefreshTime() {
-        mLastUpdateTimeMs = System.currentTimeMillis();
-    }
-
-    private void updateCurrentSection() {
-        disposeActions();
-
-        if (getView() == null || mCurrentSection == null) {
-            return;
-        }
-
-        Log.d(TAG, "Update section %s", mCurrentSection.getTitle());
-        updateSection(mCurrentSection);
-    }
-
-    private void updateSection(BrowseSection section) {
-        switch (section.getType()) {
-            case BrowseSection.TYPE_GRID:
-            case BrowseSection.TYPE_SHORTS_GRID:
-                Observable<MediaGroup> group = mGridMapping.get(section.getId());
-                updateVideoGrid(section, group, section.isAuthOnly());
-                break;
-            case BrowseSection.TYPE_ROW:
-                Observable<List<MediaGroup>> groups = mRowMapping.get(section.getId());
-                updateVideoRows(section, groups, section.isAuthOnly());
-                break;
-            case BrowseSection.TYPE_SETTINGS_GRID:
-                Callable<List<SettingsItem>> items = mSettingsGridMapping.get(section.getId());
-                updateSettingsGrid(section, items);
-                break;
-            case BrowseSection.TYPE_MULTI_GRID:
-                Observable<MediaGroup> group2 = mGridMapping.get(section.getId());
-                updateVideoGrid(section, group2, 0, section.isAuthOnly());
-                break;
-            case BrowseSection.TYPE_ERROR:
-                getView().showProgressBar(false);
-                break;
-        }
-
-        updateRefreshTime();
-    }
-
-    private void updateSettingsGrid(BrowseSection section, Callable<List<SettingsItem>> items) {
-        getView().updateSection(SettingsGroup.from(Helpers.get(items), section));
-        getView().showProgressBar(false);
-    }
-
-    private void updateVideoRows(BrowseSection section, Observable<List<MediaGroup>> groups, boolean authCheck) {
-        Log.d(TAG, "loadRowsHeader: Start loading section: " + section.getTitle());
-
-        authCheck(authCheck, () -> updateVideoRows(section, groups));
-    }
-
-    private void updateVideoGrid(BrowseSection section, Observable<MediaGroup> group, boolean authCheck) {
-        updateVideoGrid(section, group, -1, authCheck);
-    }
-
-    private void updateVideoGrid(BrowseSection section, Observable<MediaGroup> group, int position, boolean authCheck) {
-        Log.d(TAG, "loadMultiGridHeader: Start loading section: " + section.getTitle());
-
-        authCheck(authCheck, () -> updateVideoGrid(section, group, position));
-    }
-
-    private void updateVideoRows(BrowseSection section, Observable<List<MediaGroup>> groups) {
-        Log.d(TAG, "updateRowsHeader: Start loading section: " + section.getTitle());
-
-        disposeActions();
-
-        if (getView() == null) {
-            Log.e(TAG, "Browse view has been unloaded from the memory. Low RAM?");
-            ViewManager.instance(getContext()).startView(BrowseView.class);
-            return;
-        }
-        
-        getView().showProgressBar(true);
-
-        VideoGroup firstGroup = VideoGroup.from(section);
-        firstGroup.setAction(VideoGroup.ACTION_REPLACE);
-        getView().updateSection(firstGroup);
-
-        Disposable updateAction = groups
-                .subscribe(
-                        mediaGroups -> {
-                            getView().showProgressBar(false);
-
-                            filterHomeIfNeeded(mediaGroups);
-
-                            for (MediaGroup mediaGroup : mediaGroups) {
-                                if (mediaGroup.isEmpty()) {
-                                    Log.e(TAG, "loadRowsHeader: MediaGroup is empty. Group Name: " + mediaGroup.getTitle());
-                                    continue;
-                                }
-
-                                VideoGroup videoGroup = VideoGroup.from(mediaGroup, section);
-
-                                getView().updateSection(videoGroup);
-                                mDeArrowProcessor.process(videoGroup);
-
-                                continueGroupIfNeeded(videoGroup, false);
-                            }
-                        },
-                        error -> {
-                            Log.e(TAG, "updateRowsHeader error: %s", error.getMessage());
-                            if (getView() != null) {
-                                getView().showProgressBar(false);
-                            }
-                            if (getView() != null && getView().isEmpty()) {
-                                getView().showError(new CategoryEmptyError(getContext()));
-                                Utils.postDelayed(mRefreshSection, 30_000);
-                            }
-                            if (isHomeSection()) { // maybe the history turned off?
-                                MediaServiceManager.instance().enableHistory(true);
-                                mGeneralData.enableHistory(true);
-                            }
-                        });
-
-        mActions.add(updateAction);
-    }
-
-    private void updateVideoGrid(BrowseSection section, Observable<MediaGroup> group, int position) {
-        disposeActions();
-
-        if (getView() == null) {
-            Log.e(TAG, "Browse view has been unloaded from the memory. Low RAM?");
-            ViewManager.instance(getContext()).startView(BrowseView.class);
-            return;
-        }
-
-        Log.d(TAG, "updateGridHeader: Start loading section: " + section.getTitle());
-
-        getView().showProgressBar(true);
-
-        VideoGroup firstGroup = VideoGroup.from(section, position);
-        firstGroup.setAction(VideoGroup.ACTION_REPLACE);
-        getView().updateSection(firstGroup);
-
-        if (group == null) {
-            // No group. Maybe just clear.
-            getView().showProgressBar(false);
-            return;
-        }
-
-        restoreSelectedItems();
-
-        Disposable updateAction = group
-                .subscribe(
-                        mediaGroup -> {
-                            getView().showProgressBar(false);
-
-                            if (getView() == null) {
-                                Log.e(TAG, "Browse view has been unloaded from the memory. Low RAM?");
-                                ViewManager.instance(getContext()).startView(BrowseView.class);
-                                return;
-                            }
-
-                            VideoGroup videoGroup = VideoGroup.from(mediaGroup, section, position);
-                            getView().updateSection(videoGroup);
-                            mDeArrowProcessor.process(videoGroup);
-
-                            continueGroupIfNeeded(videoGroup);
-                        },
-                        error -> {
-                            Log.e(TAG, "updateGridHeader error: %s", error.getMessage());
-                            if (getView() != null) {
-                                getView().showProgressBar(false);
-                            }
-                            if (getView() != null && getView().isEmpty()) {
-                                getView().showError(new CategoryEmptyError(getContext()));
-                                Utils.postDelayed(mRefreshSection, 30_000);
-                            }
-                        });
-
-        mActions.add(updateAction);
-    }
-
-    private void continueGroup(VideoGroup group) {
-        continueGroup(group, true);
-    }
-
-    private void continueGroup(VideoGroup group, boolean showLoading) {
-        if (getView() == null) {
-            Log.e(TAG, "Can't continue group. The view is null.");
-            return;
-        }
-
-        if (group == null) {
-            Log.e(TAG, "Can't continue group. The group is null.");
-            return;
-        }
-
-        Log.d(TAG, "continueGroup: start continue group: " + group.getTitle());
-
-        // Small amount of items == small load time. Loading bar are useless?
-        if (showLoading) {
-            getView().showProgressBar(true);
-        }
-
-        MediaGroup mediaGroup = group.getMediaGroup();
-
-        Observable<MediaGroup> continuation;
-
-        //if (mediaGroup.getType() == MediaGroup.TYPE_SUGGESTIONS) { // Pinned playlist
-        //    continuation = mItemService.continueGroupObserve(mediaGroup);
-        //} else {
-        //    continuation = mContentService.continueGroupObserve(mediaGroup);
-        //}
-
-        continuation = mContentService.continueGroupObserve(mediaGroup);
-
-        Disposable continueAction = continuation
-                .subscribe(
-                        continueGroup -> {
-                            getView().showProgressBar(false);
-
-                            VideoGroup videoGroup = VideoGroup.from(group, continueGroup);
-                            getView().updateSection(videoGroup);
-                            mDeArrowProcessor.process(videoGroup);
-
-                            continueGroupIfNeeded(videoGroup, showLoading);
-                        },
-                        error -> {
-                            Log.e(TAG, "continueGroup error: %s", error.getMessage());
-                            if (getView() != null) {
-                                getView().showProgressBar(false);
-                            }
-                        }
-                );
-
-        mActions.add(continueAction);
-    }
-
-    private void authCheck(boolean check, Runnable callback) {
-        if (!check) {
-            callback.run();
-            return;
-        }
-
-        getView().showProgressBar(true);
-
-        Disposable signCheckAction = mSignInService.isSignedObserve()
-                .subscribe(
-                        isSigned -> {
-                            if (isSigned) {
-                                callback.run();
-                            } else {
-                                if (getView().isProgressBarShowing()) {
-                                    getView().showProgressBar(false);
-                                    getView().showError(new SignInError(getContext()));
-                                }
-                            }
-                        },
-                        error -> Log.e(TAG, "authCheck error: %s", error.getMessage())
-                );
-
-        mActions.add(signCheckAction);
-    }
-
-    /**
-     * Most tiny ui has 8 cards in a row or 24 in grid.
-     */
-    private void continueGroupIfNeeded(VideoGroup group) {
-        continueGroupIfNeeded(group, true);
-    }
-
-    /**
-     * Most tiny ui has 8 cards in a row or 24 in grid.
-     */
-    private void continueGroupIfNeeded(VideoGroup group, boolean showLoading) {
-        if (MediaServiceManager.instance().shouldContinueTheGroup(getContext(), group, isGridSection())) {
-            continueGroup(group, showLoading);
-        }
-    }
-
-    private void disposeActions() {
-        RxHelper.disposeActions(mActions);
-        Utils.removeCallbacks(mRefreshSection);
-        mLastUpdateTimeMs = 0;
-    }
-
-    private void updateChannelUploadsMultiGrid(Video item) {
-        if (mCurrentSection == null) {
-            return;
-        }
-
-        updateVideoGrid(mCurrentSection, ChannelUploadsPresenter.instance(getContext()).obtainUploadsObservable(item), 1, true);
-        //ChannelPresenter.instance(getContext()).obtainUploadsRowObservable(item, row -> updateVideoGrid(mCurrentSection, row, 1, true));
-    }
-
-    private boolean belongsToChannelUploadsMultiGrid(Video item) {
-        return isMultiGridChannelUploadsSection() && belongsToChannelUploads(item);
-    }
-
-    private boolean belongsToChannelUploads(Video item) {
-        return item.belongsToChannelUploads() && !item.hasVideo();
-    }
-
-    private BrowseSection findSectionById(int sectionId) {
-        for (BrowseSection section : mErrorSections) {
-            if (section.getId() == sectionId) {
-                return section;
-            }
-        }
-
-        for (BrowseSection section : mSections) {
-            if (section.getId() == sectionId) {
-                return section;
-            }
-        }
-
-        return null;
-    }
-
-    private int findSectionIndex(int sectionId) {
-        if (sectionId == -1) {
-            return -1;
-        }
-
-        int sectionIndex = -1;
-
-        for (BrowseSection section : mErrorSections) {
-            if (section.isEnabled()) {
-                sectionIndex++;
-                if (section.getId() == sectionId) {
-                    return sectionIndex;
-                }
-            }
-        }
-
-        for (BrowseSection section : mSections) {
-            if (section.isEnabled()) {
-                sectionIndex++;
-                if (section.getId() == sectionId) {
-                    return sectionIndex;
-                }
-            }
-        }
-
-        return -1;
-    }
-
-    private BrowseSection findNearestSection(int sectionId) {
-        BrowseSection result = findNearestSection(mErrorSections, sectionId);
-
-        if (result == null) {
-            result = findNearestSection(mSections, sectionId);
-        }
-
-        return result;
-    }
-
-    private BrowseSection findNearestSection(List<BrowseSection> sections, int sectionId) {
-        BrowseSection result = null;
-        BrowseSection previousSection = null;
-        boolean found = false;
-        for (BrowseSection section : sections) {
-            if (section.getId() == sectionId) {
-                found = true;
-                continue;
-            }
-            if (section.isEnabled()) {
-                if (found) {
-                    result = section;
-                    break;
-                }
-                previousSection = section;
-            }
-        }
-
-        return result != null ? result : previousSection;
-    }
-
-    private void filterHomeIfNeeded(List<MediaGroup> mediaGroups) {
-        if (mediaGroups == null || !isHomeSection()) {
-            return;
-        }
-
-        Helpers.removeIf(mediaGroups, value -> Helpers.containsAny(
-                value.getTitle(),
-                "Primetime", // Free movies and shows row
-                "News", // Top news
-                "news" // Top news
-        ) || Helpers.equalsAny(
-                value.getTitle(),
-                //getContext().getString(R.string.news_row_name),
-                getContext().getString(R.string.breaking_news_row_name),
-                getContext().getString(R.string.covid_news_row_name)
-        ));
-    }
-
-    private int moveToTopIfNeeded(MediaGroup mediaGroup) {
-        if (mediaGroup == null) {
-            return -1;
-        }
-
-        return Helpers.equalsAny(mediaGroup.getTitle(), getContext().getString(R.string.trending_row_name)) ? 0 : -1;
-    }
-
-    private Observable<MediaGroup> createPinnedGridAction(Video item) {
-        return ChannelUploadsPresenter.instance(getContext()).obtainUploadsObservable(item);
-    }
-
-    private Observable<List<MediaGroup>> createPinnedRowAction(Video item) {
-        return ChannelPresenter.instance(getContext()).obtainChannelObservable(item.channelId);
-    }
-
-    /**
-     * Is Channels new look enabled?
-     */
-    @Override
-    public boolean isMultiGridChannelUploadsSection() {
-        return mCurrentSection != null && mCurrentSection.getType() == BrowseSection.TYPE_MULTI_GRID && mCurrentSection.getId() == MediaGroup.TYPE_CHANNEL_UPLOADS;
-    }
-
-    @Override
-    public boolean isSettingsSection() {
-        return isSection(MediaGroup.TYPE_SETTINGS);
-    }
-
-    @Override
-    public boolean isPlaylistsSection() {
-        return isSection(MediaGroup.TYPE_USER_PLAYLISTS);
-    }
-
-    @Override
-    public boolean isHomeSection() {
-        return isSection(MediaGroup.TYPE_HOME);
-    }
-
-    @Override
-    public boolean isHistorySection() {
-        return isSection(MediaGroup.TYPE_HISTORY);
-    }
-
-    @Override
-    public boolean isSubscriptionsSection() {
-        return isSection(MediaGroup.TYPE_SUBSCRIPTIONS);
-    }
-
-    @Override
-    public boolean isPinnedSection() {
-        return mCurrentSection != null && isPinnedId(mCurrentSection.getId());
-    }
-
-    private boolean isPinnedId(int id) {
-        return id > 100;
-    }
-
-    private boolean isSection(int sectionId) {
-        return mCurrentSection != null && mCurrentSection.getId() == sectionId;
-    }
-
-    @Override
-    public void selectSection(int sectionId) {
-        ViewManager.instance(getContext()).startView(BrowseView.class); // focus view
-
-        if (getView() == null) {
-            mBootstrapSectionId = sectionId;
-            return;
-        }
-
-        int sectionIndex = findSectionIndex(sectionId);
-
-        if (sectionIndex == -1) {
-            enableSection(sectionId, true);
-            sectionIndex = findSectionIndex(sectionId);
-            mGeneralData.enableSection(sectionId, false); // enable temporally (till restart)
-        }
-
-        if (sectionIndex != -1) {
-            getView().selectSection(sectionIndex, true);
-        }
-    }
-
-    @Override
-    public boolean inForeground() {
-        return ViewManager.instance(getContext()).getTopView() == BrowseView.class;
-    }
-
-    private boolean isGridSection() {
-        return mCurrentSection != null && mCurrentSection.getType() != BrowseSection.TYPE_ROW;
-    }
-
-    @Override
-    public void onAccountChanged(Account account) {
-        Log.d(TAG, "On account changed");
-
-        if (getView() == null) {
-            return;
-        }
-
-        updateSections();
-    }
-
-    //@Override
-    //public Video getCurrentVideo() {
-    //    return mCurrentVideo;
-    //}
-
-    private void initPasswordSection() {
-        AccountsData accountsData = AccountsData.instance(getContext());
-        if (accountsData.getAccountPassword() == null || accountsData.isPasswordAccepted()) {
-            return;
-        }
-
-        mSections.clear();
-        appendToSections(getContext().getString(R.string.header_notifications), R.drawable.icon_notification, new PasswordError(getContext()));
-    }
-
-    private void createPinnedMapping(Video item) {
-        if (enableRows(item)) {
-            mRowMapping.put(item.hashCode(), createPinnedRowAction(item));
-        } else {
-            mGridMapping.put(item.hashCode(), createPinnedGridAction(item));
-        }
-    }
-
-    private BrowseSection createPinnedSection(Video item) {
-        return new BrowseSection(
-                item.hashCode(), item.getTitle(), enableRows(item) ? BrowseSection.TYPE_ROW : BrowseSection.TYPE_GRID, item.getCardImageUrl(), false, item);
-    }
-
-    private boolean enableRows(Video item) {
-        return mMainUIData.isPinnedChannelRowsEnabled() && item.hasChannel() && !item.isPlaylistAsChannel();
-    }
-}