diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index a6f575ec5fc6..98147e59085d 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -48,31 +48,6 @@
       <option name="CONTINUATION_INDENT_IN_PARAMETER_LISTS" value="false" />
       <option name="WRAP_EXPRESSION_BODY_FUNCTIONS" value="1" />
     </JetCodeStyleSettings>
-    <Objective-C-extensions>
-      <file>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
-      </file>
-      <class>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
-      </class>
-      <extensions>
-        <pair source="cpp" header="h" fileNamingConvention="NONE" />
-        <pair source="c" header="h" fileNamingConvention="NONE" />
-      </extensions>
-    </Objective-C-extensions>
     <XML>
       <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
     </XML>
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 62bb2dfe3a0f..7b666b330f79 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -15,6 +15,8 @@
 * Updated color scheme to Classic Bright
 * Adds support for .blog subdomains for the new site creation flow
 
+* New Insights Management for selecting the most relevant stats
+
 12.1
 -----
 * Design improvements for the new site creation flow
diff --git a/WordPress/src/main/AndroidManifest.xml b/WordPress/src/main/AndroidManifest.xml
index b0703fb7894a..44a83a641bf0 100644
--- a/WordPress/src/main/AndroidManifest.xml
+++ b/WordPress/src/main/AndroidManifest.xml
@@ -292,7 +292,7 @@
             android:theme="@style/Calypso.NoActionBar" />
         <activity
             android:name=".ui.stats.refresh.lists.sections.insights.management.InsightsManagementActivity"
-            android:label="@string/manage_insights"
+            android:label="@string/stats_manage_insights"
             android:launchMode="singleTop"
             android:theme="@style/CalypsoTheme" />
         <activity
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/BlockDiffCallback.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/BlockDiffCallback.kt
index 16c3df8d201b..f6345be554d2 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/BlockDiffCallback.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/BlockDiffCallback.kt
@@ -21,6 +21,7 @@ import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.HEADER
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.INFO
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.LINK
+import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.LINK_BUTTON
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.LIST_ITEM
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.LIST_ITEM_WITH_ICON
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.LOADING_ITEM
@@ -65,6 +66,7 @@ class BlockDiffCallback(
                 CHART_LEGEND,
                 REFERRED_ITEM,
                 QUICK_SCAN_ITEM,
+                LINK_BUTTON,
                 EMPTY -> oldItem == newItem
             }
         } else {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsFragment.kt
index cf568f6cf8d7..cbb6788fcaea 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsFragment.kt
@@ -14,9 +14,6 @@ import android.support.v4.app.FragmentManager
 import android.support.v4.app.FragmentPagerAdapter
 import android.support.v4.view.ViewCompat
 import android.view.LayoutInflater
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
 import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
@@ -55,35 +52,13 @@ class StatsFragment : DaggerFragment() {
     private lateinit var swipeToRefreshHelper: SwipeToRefreshHelper
     @Inject lateinit var navigator: StatsNavigator
 
-    private var menu: Menu? = null
-
     private var restorePreviousSearch = false
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setHasOptionsMenu(true)
-    }
-
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         setHasOptionsMenu(true)
-
         return inflater.inflate(R.layout.stats_fragment, container, false)
     }
 
-    override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) {
-        super.onCreateOptionsMenu(menu, inflater)
-
-        inflater?.inflate(R.menu.menu_stats_insights, menu)
-        this.menu = menu
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        if (item.itemId == R.id.manage_insights) {
-            viewModel.onManageInsightsButtonTapped()
-        }
-        return true
-    }
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
@@ -198,18 +173,6 @@ class StatsFragment : DaggerFragment() {
         viewModel.siteChanged.observe(this, Observer {
             viewModel.refreshData()
         })
-
-        viewModel.isMenuVisible.observe(this, Observer { isMenuVisible ->
-            isMenuVisible?.let {
-                menu?.findItem(R.id.manage_insights)?.isVisible = isMenuVisible
-            }
-        })
-
-        viewModel.navigationTarget.observe(this, Observer { event ->
-            event?.getContentIfNotHandled()?.let { target ->
-                navigator.navigate(activity, target)
-            }
-        })
     }
 }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsModule.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsModule.kt
index c4d382bb5428..669ec27507a9 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsModule.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsModule.kt
@@ -209,7 +209,7 @@ class StatsModule {
                 mainDispatcher,
                 statsSiteProvider,
                 useCases,
-                { statsStore.getInsights(statsSiteProvider.siteModel) },
+                { statsStore.getAddedInsights(statsSiteProvider.siteModel) },
                 uiModelMapper::mapInsights
         )
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllFragment.kt
index 58d901c27cd7..16deb3b4dadd 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllFragment.kt
@@ -84,7 +84,7 @@ class StatsViewAllFragment : DaggerFragment() {
         super.onSaveInstanceState(outState)
     }
 
-    private fun initializeViews(savedInstanceState: Bundle?) {
+        private fun initializeViews(savedInstanceState: Bundle?) {
         val layoutManager = LinearLayoutManager(activity, LinearLayoutManager.VERTICAL, false)
 
         savedInstanceState?.getParcelable<Parcelable>(listStateKey)?.let {
@@ -98,10 +98,10 @@ class StatsViewAllFragment : DaggerFragment() {
             viewModel.onPullToRefresh()
         }
 
-        select_next_date.setOnClickListener {
+        nextDateButton.setOnClickListener {
             viewModel.onNextDateSelected()
         }
-        select_previous_date.setOnClickListener {
+        previousDateButton.setOnClickListener {
             viewModel.onPreviousDateSelected()
         }
     }
@@ -174,8 +174,8 @@ class StatsViewAllFragment : DaggerFragment() {
             if (it != null) {
                 recyclerView.visibility = if (it is StatsBlock.Success) View.VISIBLE else View.GONE
                 loadingContainer.visibility = if (it is StatsBlock.Loading) View.VISIBLE else View.GONE
-                actionable_error_view.visibility = if (it is StatsBlock.Error) View.VISIBLE else View.GONE
-                actionable_empty_view.visibility = if (it is StatsBlock.EmptyBlock) View.VISIBLE else View.GONE
+                statsErrorView.visibility = if (it is StatsBlock.Error) View.VISIBLE else View.GONE
+                statsEmptyView.visibility = if (it is StatsBlock.EmptyBlock) View.VISIBLE else View.GONE
                 when (it) {
                     is StatsBlock.Success -> {
                         loadData(recyclerView, prepareLayout(it.data, it.type))
@@ -184,7 +184,7 @@ class StatsViewAllFragment : DaggerFragment() {
                         loadData(loadingRecyclerView, prepareLayout(it.data, it.type))
                     }
                     is StatsBlock.Error -> {
-                        actionable_error_view.button.setOnClickListener {
+                        statsErrorView.button.setOnClickListener {
                             viewModel.onRetryClick()
                         }
                     }
@@ -202,14 +202,14 @@ class StatsViewAllFragment : DaggerFragment() {
             if (date_selection_toolbar.visibility != dateSelectorVisibility) {
                 date_selection_toolbar.visibility = dateSelectorVisibility
             }
-            selected_date.text = dateSelectorUiModel?.date ?: ""
+            selectedDateTextView.text = dateSelectorUiModel?.date ?: ""
             val enablePreviousButton = dateSelectorUiModel?.enableSelectPrevious == true
-            if (select_previous_date.isEnabled != enablePreviousButton) {
-                select_previous_date.isEnabled = enablePreviousButton
+            if (previousDateButton.isEnabled != enablePreviousButton) {
+                previousDateButton.isEnabled = enablePreviousButton
             }
             val enableNextButton = dateSelectorUiModel?.enableSelectNext == true
-            if (select_next_date.isEnabled != enableNextButton) {
-                select_next_date.isEnabled = enableNextButton
+            if (nextDateButton.isEnabled != enableNextButton) {
+                nextDateButton.isEnabled = enableNextButton
             }
         })
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewModel.kt
index d3a82cab9718..f639f2ab3149 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewModel.kt
@@ -14,7 +14,6 @@ import org.wordpress.android.analytics.AnalyticsTracker.Stat.STATS_PERIOD_WEEKS_
 import org.wordpress.android.analytics.AnalyticsTracker.Stat.STATS_PERIOD_YEARS_ACCESSED
 import org.wordpress.android.modules.UI_THREAD
 import org.wordpress.android.ui.pages.SnackbarMessageHolder
-import org.wordpress.android.ui.stats.refresh.NavigationTarget.ViewInsightsManagement
 import org.wordpress.android.ui.stats.refresh.lists.BaseListUseCase
 import org.wordpress.android.ui.stats.refresh.lists.StatsListViewModel.StatsSection
 import org.wordpress.android.ui.stats.refresh.lists.StatsListViewModel.StatsSection.DAYS
@@ -29,7 +28,6 @@ import org.wordpress.android.ui.stats.refresh.utils.StatsSiteProvider
 import org.wordpress.android.util.NetworkUtilsWrapper
 import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
 import org.wordpress.android.util.mergeNotNull
-import org.wordpress.android.viewmodel.Event
 import org.wordpress.android.viewmodel.ScopedViewModel
 import javax.inject.Inject
 import javax.inject.Named
@@ -47,9 +45,6 @@ class StatsViewModel
     private val _isRefreshing = MutableLiveData<Boolean>()
     val isRefreshing: LiveData<Boolean> = _isRefreshing
 
-    private val _isMenuVisible = MutableLiveData<Boolean>()
-    val isMenuVisible: LiveData<Boolean> = _isMenuVisible
-
     private var isInitialized = false
 
     private val _showSnackbarMessage = mergeNotNull(
@@ -59,9 +54,6 @@ class StatsViewModel
     )
     val showSnackbarMessage: LiveData<SnackbarMessageHolder> = _showSnackbarMessage
 
-    private val _navigationTarget = MutableLiveData<Event<NavigationTarget>>()
-    val navigationTarget: LiveData<Event<NavigationTarget>> = _navigationTarget
-
     val siteChanged = statsSiteProvider.siteChanged
 
     private val _toolbarHasShadow = MutableLiveData<Boolean>()
@@ -117,7 +109,6 @@ class StatsViewModel
         listUseCases[statsSection]?.onListSelected()
 
         _toolbarHasShadow.value = statsSection == INSIGHTS
-        _isMenuVisible.value = statsSection == INSIGHTS
 
         when (statsSection) {
             INSIGHTS -> analyticsTracker.track(STATS_INSIGHTS_ACCESSED)
@@ -130,10 +121,6 @@ class StatsViewModel
         }
     }
 
-    fun onManageInsightsButtonTapped() {
-        _navigationTarget.value = Event(ViewInsightsManagement)
-    }
-
     override fun onCleared() {
         super.onCleared()
         _showSnackbarMessage.value = null
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/BaseListUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/BaseListUseCase.kt
index 39ef20123a31..2b519389caef 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/BaseListUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/BaseListUseCase.kt
@@ -7,14 +7,13 @@ import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.wordpress.android.R
-import org.wordpress.android.fluxc.store.StatsStore.StatsTypes
+import org.wordpress.android.fluxc.store.StatsStore.StatsType
 import org.wordpress.android.ui.pages.SnackbarMessageHolder
 import org.wordpress.android.ui.stats.refresh.NavigationTarget
 import org.wordpress.android.ui.stats.refresh.lists.StatsListViewModel.UiModel
 import org.wordpress.android.ui.stats.refresh.lists.sections.BaseStatsUseCase
 import org.wordpress.android.ui.stats.refresh.lists.sections.BaseStatsUseCase.UseCaseModel
 import org.wordpress.android.ui.stats.refresh.utils.StatsSiteProvider
-import org.wordpress.android.util.DistinctMutableLiveData
 import org.wordpress.android.util.PackageUtils
 import org.wordpress.android.util.combineMap
 import org.wordpress.android.util.distinct
@@ -28,13 +27,17 @@ class BaseListUseCase(
     private val mainDispatcher: CoroutineDispatcher,
     private val statsSiteProvider: StatsSiteProvider,
     private val useCases: List<BaseStatsUseCase<*, *>>,
-    private val getStatsTypes: suspend () -> List<StatsTypes>,
-    private val mapUiModel: (useCaseModels: List<UseCaseModel>, showError: (Int) -> Unit) -> UiModel
+    private val getStatsTypes: suspend () -> List<StatsType>,
+    private val mapUiModel: (
+        useCaseModels: List<UseCaseModel>,
+        MutableLiveData<Event<NavigationTarget>>,
+        showError: (Int) -> Unit
+    ) -> UiModel
 ) {
     private val blockListData = combineMap(
             useCases.associateBy { it.type }.mapValues { entry -> entry.value.liveData }
     )
-    private val statsTypes = DistinctMutableLiveData<List<StatsTypes>>(listOf())
+    private val statsTypes = MutableLiveData<List<StatsType>>()
     val data: MediatorLiveData<UiModel> = mergeNotNull(statsTypes, blockListData) { types, map ->
         types.mapNotNull {
             if (map.containsKey(it)) {
@@ -44,13 +47,14 @@ class BaseListUseCase(
             }
         }
     }.map { useCaseModels ->
-        mapUiModel(useCaseModels) { message ->
+        mapUiModel(useCaseModels, mutableNavigationTarget) { message ->
             mutableSnackbarMessage.postValue(message)
         }
     }.distinct()
 
+    private val mutableNavigationTarget = MutableLiveData<Event<NavigationTarget>>()
     val navigationTarget: LiveData<Event<NavigationTarget>> = mergeNotNull(
-            useCases.map { it.navigationTarget },
+            useCases.map { it.navigationTarget } + mutableNavigationTarget,
             distinct = false
     )
 
@@ -70,7 +74,7 @@ class BaseListUseCase(
         loadData(true, forced)
     }
 
-    suspend fun refreshTypes(): List<StatsTypes> {
+    suspend fun refreshTypes(): List<StatsType> {
         val items = getStatsTypes()
         withContext(mainDispatcher) {
             statsTypes.value = items
@@ -99,7 +103,6 @@ class BaseListUseCase(
 
     fun onCleared() {
         mutableSnackbarMessage.value = null
-        statsTypes.clear()
         blockListData.value = null
         useCases.forEach { it.clear() }
         data.value = null
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/StatsBlock.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/StatsBlock.kt
index 0a71e078f20f..eef7998ba99f 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/StatsBlock.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/StatsBlock.kt
@@ -1,37 +1,43 @@
 package org.wordpress.android.ui.stats.refresh.lists
 
-import org.wordpress.android.fluxc.store.StatsStore.StatsTypes
+import org.wordpress.android.fluxc.store.StatsStore.StatsType
+import org.wordpress.android.ui.stats.refresh.lists.StatsBlock.Type.CONTROL
 import org.wordpress.android.ui.stats.refresh.lists.StatsBlock.Type.EMPTY
 import org.wordpress.android.ui.stats.refresh.lists.StatsBlock.Type.ERROR
 import org.wordpress.android.ui.stats.refresh.lists.StatsBlock.Type.LOADING
 import org.wordpress.android.ui.stats.refresh.lists.StatsBlock.Type.SUCCESS
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem
 
-sealed class StatsBlock(val type: Type, open val statsTypes: StatsTypes, open val data: List<BlockListItem>) {
+sealed class StatsBlock(val type: Type, open val data: List<BlockListItem>) {
     enum class Type {
         SUCCESS,
         ERROR,
         EMPTY,
-        LOADING
+        LOADING,
+        CONTROL
     }
 
     data class Success(
-        override val statsTypes: StatsTypes,
+        val statsType: StatsType,
         override val data: List<BlockListItem>
-    ) : StatsBlock(SUCCESS, statsTypes, data)
+    ) : StatsBlock(SUCCESS, data)
 
     data class Error(
-        override val statsTypes: StatsTypes,
+        val statsType: StatsType,
         override val data: List<BlockListItem> = listOf()
-    ) : StatsBlock(ERROR, statsTypes, data)
+    ) : StatsBlock(ERROR, data)
 
     data class EmptyBlock(
-        override val statsTypes: StatsTypes,
+        val statsType: StatsType,
         override val data: List<BlockListItem>
-    ) : StatsBlock(EMPTY, statsTypes, data)
+    ) : StatsBlock(EMPTY, data)
 
     data class Loading(
-        override val statsTypes: StatsTypes,
+        val statsType: StatsType,
         override val data: List<BlockListItem>
-    ) : StatsBlock(LOADING, statsTypes, data)
+    ) : StatsBlock(LOADING, data)
+
+    data class Control(
+        override val data: List<BlockListItem>
+    ) : StatsBlock(CONTROL, data)
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/StatsBlockAdapter.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/StatsBlockAdapter.kt
index 260064dedce9..8b6d67c4dcf8 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/StatsBlockAdapter.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/StatsBlockAdapter.kt
@@ -3,6 +3,11 @@ package org.wordpress.android.ui.stats.refresh.lists
 import android.support.v7.util.DiffUtil
 import android.support.v7.widget.RecyclerView.Adapter
 import android.view.ViewGroup
+import org.wordpress.android.ui.stats.refresh.lists.StatsBlock.EmptyBlock
+import org.wordpress.android.ui.stats.refresh.lists.StatsBlock.Loading
+import org.wordpress.android.ui.stats.refresh.lists.StatsBlock.Success
+import org.wordpress.android.ui.stats.refresh.lists.StatsBlock.Error
+import org.wordpress.android.ui.stats.refresh.lists.StatsBlock.Type.CONTROL
 import org.wordpress.android.ui.stats.refresh.lists.StatsBlock.Type.EMPTY
 import org.wordpress.android.ui.stats.refresh.lists.StatsBlock.Type.ERROR
 import org.wordpress.android.ui.stats.refresh.lists.StatsBlock.Type.LOADING
@@ -10,11 +15,13 @@ import org.wordpress.android.ui.stats.refresh.lists.StatsBlock.Type.SUCCESS
 import org.wordpress.android.ui.stats.refresh.lists.StatsBlock.Type.values
 import org.wordpress.android.ui.stats.refresh.lists.viewholders.BaseStatsViewHolder
 import org.wordpress.android.ui.stats.refresh.lists.viewholders.BlockListViewHolder
+import org.wordpress.android.ui.stats.refresh.lists.viewholders.ControlViewHolder
 import org.wordpress.android.ui.stats.refresh.lists.viewholders.LoadingViewHolder
 import org.wordpress.android.util.image.ImageManager
 
 class StatsBlockAdapter(val imageManager: ImageManager) : Adapter<BaseStatsViewHolder>() {
     private var items: List<StatsBlock> = listOf()
+
     fun update(newItems: List<StatsBlock>) {
         val diffResult = DiffUtil.calculateDiff(
                 StatsBlockDiffCallback(
@@ -23,7 +30,6 @@ class StatsBlockAdapter(val imageManager: ImageManager) : Adapter<BaseStatsViewH
                 )
         )
         items = newItems
-
         diffResult.dispatchUpdatesTo(this)
     }
 
@@ -31,6 +37,7 @@ class StatsBlockAdapter(val imageManager: ImageManager) : Adapter<BaseStatsViewH
         return when (values()[viewType]) {
             SUCCESS, ERROR, EMPTY -> BlockListViewHolder(parent, imageManager)
             LOADING -> LoadingViewHolder(parent, imageManager)
+            CONTROL -> ControlViewHolder(parent, imageManager)
         }
     }
 
@@ -43,8 +50,16 @@ class StatsBlockAdapter(val imageManager: ImageManager) : Adapter<BaseStatsViewH
     override fun onBindViewHolder(holder: BaseStatsViewHolder, position: Int, payloads: List<Any>) {
         val item = items[position]
         when (holder) {
-            is BlockListViewHolder -> holder.bind(item.statsTypes, item.data)
-            is LoadingViewHolder -> holder.bind(item.statsTypes, item.data)
+            is ControlViewHolder -> holder.bind(item.data)
+            is BlockListViewHolder,
+            is LoadingViewHolder -> {
+                when (item) {
+                    is Success -> holder.bind(item.statsType, item.data)
+                    is Loading -> holder.bind(item.statsType, item.data)
+                    is EmptyBlock -> holder.bind(item.statsType, item.data)
+                    is Error -> holder.bind(item.statsType, item.data)
+                }
+            }
         }
     }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/StatsBlockDiffCallback.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/StatsBlockDiffCallback.kt
index af10b9d3118d..525467e9587f 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/StatsBlockDiffCallback.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/StatsBlockDiffCallback.kt
@@ -1,6 +1,11 @@
 package org.wordpress.android.ui.stats.refresh.lists
 
 import android.support.v7.util.DiffUtil.Callback
+import org.wordpress.android.ui.stats.refresh.lists.StatsBlock.Control
+import org.wordpress.android.ui.stats.refresh.lists.StatsBlock.EmptyBlock
+import org.wordpress.android.ui.stats.refresh.lists.StatsBlock.Loading
+import org.wordpress.android.ui.stats.refresh.lists.StatsBlock.Success
+import org.wordpress.android.ui.stats.refresh.lists.StatsBlock.Error
 
 class StatsBlockDiffCallback(
     private val oldList: List<StatsBlock>,
@@ -10,7 +15,13 @@ class StatsBlockDiffCallback(
     override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
         val newItem = newList[newItemPosition]
         val oldItem = oldList[oldItemPosition]
-        return oldItem.statsTypes == newItem.statsTypes
+        return oldItem.type == newItem.type && when (oldItem) {
+            is Success -> oldItem.statsType == (newItem as Success).statsType
+            is EmptyBlock -> oldItem.statsType == (newItem as EmptyBlock).statsType
+            is Error -> oldItem.statsType == (newItem as Error).statsType
+            is Loading -> oldItem.statsType == (newItem as Loading).statsType
+            is Control -> true
+        }
     }
 
     override fun getOldListSize(): Int = oldList.size
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/StatsListFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/StatsListFragment.kt
index 1a11bb97f696..9da034a71465 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/StatsListFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/StatsListFragment.kt
@@ -15,6 +15,7 @@ import android.view.View
 import android.view.ViewGroup
 import dagger.android.support.DaggerFragment
 import kotlinx.android.synthetic.main.stats_date_selector.*
+import kotlinx.android.synthetic.main.stats_empty_view.*
 import kotlinx.android.synthetic.main.stats_error_view.*
 import kotlinx.android.synthetic.main.stats_list_fragment.*
 import org.wordpress.android.R
@@ -87,6 +88,10 @@ class StatsListFragment : DaggerFragment() {
                 )
         )
 
+        statsEmptyView.button.setOnClickListener {
+            viewModel.onEmptyInsightsButtonClicked()
+        }
+
         recyclerView.addOnScrollListener(object : RecyclerView.OnScrollListener() {
             override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
                 if (!recyclerView.canScrollVertically(1) && dy != 0) {
@@ -95,13 +100,17 @@ class StatsListFragment : DaggerFragment() {
             }
         })
 
-        select_next_date.setOnClickListener {
+        nextDateButton.setOnClickListener {
             viewModel.onNextDateSelected()
         }
 
-        select_previous_date.setOnClickListener {
+        previousDateButton.setOnClickListener {
             viewModel.onPreviousDateSelected()
         }
+
+        statsErrorView.button.setOnClickListener {
+            viewModel.onRetryClick()
+        }
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -143,10 +152,13 @@ class StatsListFragment : DaggerFragment() {
                     }
                     is UiModel.Error -> {
                         recyclerView.visibility = View.GONE
-                        actionable_error_view.visibility = View.VISIBLE
-                        actionable_error_view.button.setOnClickListener {
-                            viewModel.onRetryClick()
-                        }
+                        statsErrorView.visibility = View.VISIBLE
+                        statsEmptyView.visibility = View.GONE
+                    }
+                    is UiModel.Empty -> {
+                        recyclerView.visibility = View.GONE
+                        statsEmptyView.visibility = View.VISIBLE
+                        statsErrorView.visibility = View.GONE
                     }
                 }
             }
@@ -157,14 +169,14 @@ class StatsListFragment : DaggerFragment() {
             if (date_selection_toolbar.visibility != dateSelectorVisibility) {
                 date_selection_toolbar.visibility = dateSelectorVisibility
             }
-            selected_date.text = dateSelectorUiModel?.date ?: ""
+            selectedDateTextView.text = dateSelectorUiModel?.date ?: ""
             val enablePreviousButton = dateSelectorUiModel?.enableSelectPrevious == true
-            if (select_previous_date.isEnabled != enablePreviousButton) {
-                select_previous_date.isEnabled = enablePreviousButton
+            if (previousDateButton.isEnabled != enablePreviousButton) {
+                previousDateButton.isEnabled = enablePreviousButton
             }
             val enableNextButton = dateSelectorUiModel?.enableSelectNext == true
-            if (select_next_date.isEnabled != enableNextButton) {
-                select_next_date.isEnabled = enableNextButton
+            if (nextDateButton.isEnabled != enableNextButton) {
+                nextDateButton.isEnabled = enableNextButton
             }
         })
 
@@ -193,7 +205,9 @@ class StatsListFragment : DaggerFragment() {
 
     private fun updateInsights(statsState: List<StatsBlock>) {
         recyclerView.visibility = View.VISIBLE
-        actionable_error_view.visibility = View.GONE
+        statsErrorView.visibility = View.GONE
+        statsEmptyView.visibility = View.GONE
+
         val adapter: StatsBlockAdapter
         if (recyclerView.adapter == null) {
             adapter = StatsBlockAdapter(imageManager)
@@ -201,6 +215,7 @@ class StatsListFragment : DaggerFragment() {
         } else {
             adapter = recyclerView.adapter as StatsBlockAdapter
         }
+
         val layoutManager = recyclerView?.layoutManager
         val recyclerViewState = layoutManager?.onSaveInstanceState()
         adapter.update(statsState)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/StatsListViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/StatsListViewModel.kt
index ae6483f46e4d..8c6f5badc2e0 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/StatsListViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/StatsListViewModel.kt
@@ -1,6 +1,7 @@
 package org.wordpress.android.ui.stats.refresh.lists
 
 import android.arch.lifecycle.LiveData
+import android.arch.lifecycle.MutableLiveData
 import android.support.annotation.StringRes
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
@@ -14,6 +15,7 @@ import org.wordpress.android.ui.stats.refresh.DAY_STATS_USE_CASE
 import org.wordpress.android.ui.stats.refresh.INSIGHTS_USE_CASE
 import org.wordpress.android.ui.stats.refresh.MONTH_STATS_USE_CASE
 import org.wordpress.android.ui.stats.refresh.NavigationTarget
+import org.wordpress.android.ui.stats.refresh.NavigationTarget.ViewInsightsManagement
 import org.wordpress.android.ui.stats.refresh.StatsViewModel.DateSelectorUiModel
 import org.wordpress.android.ui.stats.refresh.WEEK_STATS_USE_CASE
 import org.wordpress.android.ui.stats.refresh.YEAR_STATS_USE_CASE
@@ -26,6 +28,7 @@ import org.wordpress.android.ui.stats.refresh.utils.ItemPopupMenuHandler
 import org.wordpress.android.ui.stats.refresh.utils.StatsDateSelector
 import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
 import org.wordpress.android.util.mapNullable
+import org.wordpress.android.util.mergeNotNull
 import org.wordpress.android.util.throttle
 import org.wordpress.android.viewmodel.Event
 import org.wordpress.android.viewmodel.ScopedViewModel
@@ -39,7 +42,7 @@ abstract class StatsListViewModel(
     private val statsUseCase: BaseListUseCase,
     private val analyticsTracker: AnalyticsTrackerWrapper,
     private val dateSelector: StatsDateSelector,
-    private val popupMenuHandler: ItemPopupMenuHandler? = null
+    popupMenuHandler: ItemPopupMenuHandler? = null
 ) : ScopedViewModel(defaultDispatcher) {
     private var trackJob: Job? = null
     private var isInitialized = false
@@ -55,7 +58,10 @@ abstract class StatsListViewModel(
 
     val selectedDate = dateSelector.selectedDate
 
-    val navigationTarget: LiveData<Event<NavigationTarget>> = statsUseCase.navigationTarget
+    private val mutableNavigationTarget = MutableLiveData<Event<NavigationTarget>>()
+    val navigationTarget: LiveData<Event<NavigationTarget>> = mergeNotNull(
+            statsUseCase.navigationTarget, mutableNavigationTarget
+    )
 
     val listSelected = statsUseCase.listSelected
 
@@ -109,6 +115,10 @@ abstract class StatsListViewModel(
         dateSelector.updateDateSelector()
     }
 
+    fun onEmptyInsightsButtonClicked() {
+        mutableNavigationTarget.value = Event(ViewInsightsManagement)
+    }
+
     fun start() {
         if (!isInitialized) {
             isInitialized = true
@@ -123,6 +133,7 @@ abstract class StatsListViewModel(
     sealed class UiModel {
         data class Success(val data: List<StatsBlock>) : UiModel()
         class Error(val message: Int = R.string.stats_loading_error) : UiModel()
+        object Empty : UiModel()
     }
 
     fun onTypeMoved() {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/UiModelMapper.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/UiModelMapper.kt
index 36d2d86a69f8..ae02f7a13836 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/UiModelMapper.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/UiModelMapper.kt
@@ -1,69 +1,97 @@
 package org.wordpress.android.ui.stats.refresh.lists
 
+import android.arch.lifecycle.MutableLiveData
 import org.wordpress.android.R.string
-import org.wordpress.android.fluxc.store.StatsStore.PostDetailTypes
-import org.wordpress.android.fluxc.store.StatsStore.StatsTypes
-import org.wordpress.android.fluxc.store.StatsStore.TimeStatsTypes
-import org.wordpress.android.ui.stats.refresh.lists.StatsBlock.Error
+import org.wordpress.android.fluxc.store.StatsStore.PostDetailType
+import org.wordpress.android.fluxc.store.StatsStore.StatsType
+import org.wordpress.android.fluxc.store.StatsStore.TimeStatsType
+import org.wordpress.android.ui.stats.refresh.NavigationTarget
+import org.wordpress.android.ui.stats.refresh.NavigationTarget.ViewInsightsManagement
 import org.wordpress.android.ui.stats.refresh.lists.StatsListViewModel.UiModel
 import org.wordpress.android.ui.stats.refresh.lists.sections.BaseStatsUseCase.UseCaseModel
 import org.wordpress.android.ui.stats.refresh.lists.sections.BaseStatsUseCase.UseCaseModel.UseCaseState.EMPTY
 import org.wordpress.android.ui.stats.refresh.lists.sections.BaseStatsUseCase.UseCaseModel.UseCaseState.ERROR
 import org.wordpress.android.ui.stats.refresh.lists.sections.BaseStatsUseCase.UseCaseModel.UseCaseState.LOADING
 import org.wordpress.android.ui.stats.refresh.lists.sections.BaseStatsUseCase.UseCaseModel.UseCaseState.SUCCESS
+import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.LinkButton
+import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.NavigationAction
 import org.wordpress.android.util.NetworkUtilsWrapper
+import org.wordpress.android.viewmodel.Event
 import javax.inject.Inject
 
 class UiModelMapper
 @Inject constructor(private val networkUtilsWrapper: NetworkUtilsWrapper) {
-    fun mapInsights(useCaseModels: List<UseCaseModel>, showError: (Int) -> Unit): UiModel {
-        val allFailing = useCaseModels.isNotEmpty() && useCaseModels.fold(true) { acc, useCaseModel ->
-            acc && useCaseModel.state == ERROR
-        }
-        val allFailingWithoutData = useCaseModels.isNotEmpty() && useCaseModels.fold(true) { acc, useCaseModel ->
-            acc && useCaseModel.state == ERROR && useCaseModel.data == null
-        }
-        return if (!allFailing && !allFailingWithoutData) {
-            UiModel.Success(useCaseModels.map { useCaseModel ->
-                when (useCaseModel.state) {
-                    SUCCESS -> StatsBlock.Success(useCaseModel.type, useCaseModel.data ?: listOf())
-                    ERROR -> StatsBlock.Error(
-                            useCaseModel.type,
-                            useCaseModel.stateData ?: useCaseModel.data ?: listOf()
-                    )
-                    LOADING -> StatsBlock.Loading(
-                            useCaseModel.type,
-                            useCaseModel.stateData ?: useCaseModel.data ?: listOf()
-                    )
-                    EMPTY -> StatsBlock.EmptyBlock(
+    fun mapInsights(
+        useCaseModels: List<UseCaseModel>,
+        navigationTarget: MutableLiveData<Event<NavigationTarget>>,
+        showError: (Int) -> Unit
+    ): UiModel {
+        if (useCaseModels.isNotEmpty()) {
+            val allFailing = useCaseModels.fold(true) { acc, useCaseModel ->
+                acc && useCaseModel.state == ERROR
+            }
+            val allFailingWithoutData = useCaseModels.isNotEmpty() && useCaseModels.fold(true) { acc, useCaseModel ->
+                acc && useCaseModel.state == ERROR && useCaseModel.data == null
+            }
+            return if (!allFailing && !allFailingWithoutData) {
+                val data = useCaseModels.map { useCaseModel ->
+                    when (useCaseModel.state) {
+                        SUCCESS -> StatsBlock.Success(useCaseModel.type, useCaseModel.data ?: listOf())
+                        ERROR -> StatsBlock.Error(
+                                useCaseModel.type,
+                                useCaseModel.stateData ?: useCaseModel.data ?: listOf()
+                        )
+                        LOADING -> StatsBlock.Loading(
+                                useCaseModel.type,
+                                useCaseModel.stateData ?: useCaseModel.data ?: listOf()
+                        )
+                        EMPTY -> StatsBlock.EmptyBlock(
+                                useCaseModel.type,
+                                useCaseModel.stateData ?: useCaseModel.data ?: listOf()
+                        )
+                    }
+                }.toMutableList()
+
+                data += StatsBlock.Control(listOf(LinkButton(string.edit,
+                        NavigationAction.create {
+                            navigationTarget.value = Event(ViewInsightsManagement)
+                        }
+                )))
+                UiModel.Success(data)
+            } else if (!allFailingWithoutData) {
+                showError(getErrorMessage())
+                UiModel.Success(useCaseModels.map { useCaseModel ->
+                    StatsBlock.Error(
                             useCaseModel.type,
-                            useCaseModel.stateData ?: useCaseModel.data ?: listOf()
+                            useCaseModel.data ?: useCaseModel.stateData ?: listOf()
                     )
-                }
-            })
-        } else if (!allFailingWithoutData) {
-            showError(getErrorMessage())
-            UiModel.Success(useCaseModels.map { useCaseModel ->
-                Error(
-                        useCaseModel.type,
-                        useCaseModel.data ?: useCaseModel.stateData ?: listOf()
-                )
-            })
+                })
+            } else {
+                UiModel.Error(getErrorMessage())
+            }
         } else {
-            UiModel.Error(getErrorMessage())
+            return UiModel.Empty
         }
     }
 
-    fun mapTimeStats(useCaseModels: List<UseCaseModel>, showError: (Int) -> Unit): UiModel {
-        return mapStatsWithOverview(TimeStatsTypes.OVERVIEW, useCaseModels, showError)
+    fun mapTimeStats(
+        useCaseModels: List<UseCaseModel>,
+        navigationTarget: MutableLiveData<Event<NavigationTarget>>,
+        showError: (Int) -> Unit
+    ): UiModel {
+        return mapStatsWithOverview(TimeStatsType.OVERVIEW, useCaseModels, showError)
     }
 
-    fun mapDetailStats(useCaseModels: List<UseCaseModel>, showError: (Int) -> Unit): UiModel {
-        return mapStatsWithOverview(PostDetailTypes.POST_OVERVIEW, useCaseModels, showError)
+    fun mapDetailStats(
+        useCaseModels: List<UseCaseModel>,
+        navigationTarget: MutableLiveData<Event<NavigationTarget>>,
+        showError: (Int) -> Unit
+    ): UiModel {
+            return mapStatsWithOverview(PostDetailType.POST_OVERVIEW, useCaseModels, showError)
     }
 
     private fun mapStatsWithOverview(
-        overViewType: StatsTypes,
+        overViewType: StatsType,
         useCaseModels: List<UseCaseModel>,
         showError: (Int) -> Unit
     ): UiModel {
@@ -73,33 +101,37 @@ class UiModelMapper
                 }
         val overviewHasData = useCaseModels.any { it.type == overViewType && it.data != null }
         return if (!allFailing) {
-            UiModel.Success(useCaseModels.mapNotNull { useCaseModel ->
-                if ((useCaseModel.type == overViewType) && useCaseModel.data != null) {
-                    StatsBlock.Success(useCaseModel.type, useCaseModel.data)
-                } else {
-                    when (useCaseModel.state) {
-                        SUCCESS -> StatsBlock.Success(useCaseModel.type, useCaseModel.data ?: listOf())
-                        ERROR -> useCaseModel.stateData?.let {
-                            StatsBlock.Error(
-                                    useCaseModel.type,
-                                    useCaseModel.stateData
-                            )
-                        }
-                        LOADING -> useCaseModel.stateData?.let {
-                            StatsBlock.Loading(
-                                    useCaseModel.type,
-                                    useCaseModel.stateData
-                            )
-                        }
-                        EMPTY -> useCaseModel.stateData?.let {
-                            StatsBlock.EmptyBlock(
-                                    useCaseModel.type,
-                                    useCaseModel.stateData
-                            )
+            if (useCaseModels.isNotEmpty()) {
+                UiModel.Success(useCaseModels.mapNotNull { useCaseModel ->
+                    if ((useCaseModel.type == overViewType) && useCaseModel.data != null) {
+                        StatsBlock.Success(useCaseModel.type, useCaseModel.data)
+                    } else {
+                        when (useCaseModel.state) {
+                            SUCCESS -> StatsBlock.Success(useCaseModel.type, useCaseModel.data ?: listOf())
+                            ERROR -> useCaseModel.stateData?.let {
+                                StatsBlock.Error(
+                                        useCaseModel.type,
+                                        useCaseModel.stateData
+                                )
+                            }
+                            LOADING -> useCaseModel.stateData?.let {
+                                StatsBlock.Loading(
+                                        useCaseModel.type,
+                                        useCaseModel.stateData
+                                )
+                            }
+                            EMPTY -> useCaseModel.stateData?.let {
+                                StatsBlock.EmptyBlock(
+                                        useCaseModel.type,
+                                        useCaseModel.stateData
+                                )
+                            }
                         }
                     }
-                }
-            })
+                })
+            } else {
+                UiModel.Empty
+            }
         } else if (overviewHasData) {
             showError(getErrorMessage())
             UiModel.Success(useCaseModels.mapNotNull { useCaseModel ->
@@ -107,7 +139,7 @@ class UiModelMapper
                     StatsBlock.Success(useCaseModel.type, useCaseModel.data)
                 } else {
                     useCaseModel.stateData?.let {
-                        Error(
+                        StatsBlock.Error(
                                 useCaseModel.type,
                                 useCaseModel.stateData
                         )
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/PostAverageViewsPerDayUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/PostAverageViewsPerDayUseCase.kt
index fceb81db30bf..b06797ac879a 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/PostAverageViewsPerDayUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/PostAverageViewsPerDayUseCase.kt
@@ -3,7 +3,7 @@ package org.wordpress.android.ui.stats.refresh.lists.detail
 import kotlinx.coroutines.CoroutineDispatcher
 import org.wordpress.android.R.string
 import org.wordpress.android.fluxc.model.stats.PostDetailStatsModel
-import org.wordpress.android.fluxc.store.StatsStore.PostDetailTypes
+import org.wordpress.android.fluxc.store.StatsStore.PostDetailType
 import org.wordpress.android.fluxc.store.stats.PostDetailStore
 import org.wordpress.android.modules.UI_THREAD
 import org.wordpress.android.ui.stats.refresh.NavigationTarget.ViewDayAverageStats
@@ -33,7 +33,7 @@ class PostAverageViewsPerDayUseCase(
     private val postDetailMapper: PostDetailMapper,
     private val useCaseMode: UseCaseMode
 ) : BaseStatsUseCase<PostDetailStatsModel, ExpandedYearUiState>(
-        PostDetailTypes.AVERAGE_VIEWS_PER_DAY,
+        PostDetailType.AVERAGE_VIEWS_PER_DAY,
         mainDispatcher,
         ExpandedYearUiState()
 ) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/PostDayViewsUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/PostDayViewsUseCase.kt
index 1859685b50ec..0fe631fe3920 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/PostDayViewsUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/PostDayViewsUseCase.kt
@@ -4,7 +4,7 @@ import kotlinx.coroutines.CoroutineDispatcher
 import org.wordpress.android.R.string
 import org.wordpress.android.fluxc.model.stats.PostDetailStatsModel
 import org.wordpress.android.fluxc.network.utils.StatsGranularity.DAYS
-import org.wordpress.android.fluxc.store.StatsStore.PostDetailTypes
+import org.wordpress.android.fluxc.store.StatsStore.PostDetailType
 import org.wordpress.android.fluxc.store.stats.PostDetailStore
 import org.wordpress.android.modules.UI_THREAD
 import org.wordpress.android.ui.stats.refresh.lists.StatsListViewModel.StatsSection.DETAIL
@@ -30,7 +30,7 @@ class PostDayViewsUseCase
     private val statsPostProvider: StatsPostProvider,
     private val postDetailStore: PostDetailStore
 ) : BaseStatsUseCase<PostDetailStatsModel, UiState>(
-        PostDetailTypes.POST_OVERVIEW,
+        PostDetailType.POST_OVERVIEW,
         mainDispatcher,
         UiState()
 ) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/PostHeaderUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/PostHeaderUseCase.kt
index 797fc6726f68..c8a0fd72b94f 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/PostHeaderUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/PostHeaderUseCase.kt
@@ -2,7 +2,7 @@ package org.wordpress.android.ui.stats.refresh.lists.detail
 
 import kotlinx.coroutines.CoroutineDispatcher
 import org.wordpress.android.R.string
-import org.wordpress.android.fluxc.store.StatsStore.PostDetailTypes
+import org.wordpress.android.fluxc.store.StatsStore.PostDetailType
 import org.wordpress.android.modules.UI_THREAD
 import org.wordpress.android.ui.stats.refresh.lists.sections.BaseStatsUseCase.StatelessUseCase
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem
@@ -16,7 +16,7 @@ class PostHeaderUseCase
     @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher,
     private val statsPostProvider: StatsPostProvider
 ) : StatelessUseCase<String>(
-        PostDetailTypes.POST_HEADER,
+        PostDetailType.POST_HEADER,
         mainDispatcher
 ) {
     override suspend fun loadCachedData(): String? {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/PostMonthsAndYearsUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/PostMonthsAndYearsUseCase.kt
index be4afc2f9a0d..f0aacf04b05d 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/PostMonthsAndYearsUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/PostMonthsAndYearsUseCase.kt
@@ -3,7 +3,7 @@ package org.wordpress.android.ui.stats.refresh.lists.detail
 import kotlinx.coroutines.CoroutineDispatcher
 import org.wordpress.android.R.string
 import org.wordpress.android.fluxc.model.stats.PostDetailStatsModel
-import org.wordpress.android.fluxc.store.StatsStore.PostDetailTypes
+import org.wordpress.android.fluxc.store.StatsStore.PostDetailType
 import org.wordpress.android.fluxc.store.stats.PostDetailStore
 import org.wordpress.android.modules.UI_THREAD
 import org.wordpress.android.ui.stats.refresh.NavigationTarget.ViewMonthsAndYearsStats
@@ -33,7 +33,7 @@ class PostMonthsAndYearsUseCase(
     private val postDetailMapper: PostDetailMapper,
     private val useCaseMode: UseCaseMode
 ) : BaseStatsUseCase<PostDetailStatsModel, ExpandedYearUiState>(
-        PostDetailTypes.MONTHS_AND_YEARS,
+        PostDetailType.MONTHS_AND_YEARS,
         mainDispatcher,
         ExpandedYearUiState()
 ) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/PostRecentWeeksUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/PostRecentWeeksUseCase.kt
index 19910f03b75b..5f9c197edb02 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/PostRecentWeeksUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/PostRecentWeeksUseCase.kt
@@ -3,7 +3,7 @@ package org.wordpress.android.ui.stats.refresh.lists.detail
 import kotlinx.coroutines.CoroutineDispatcher
 import org.wordpress.android.R.string
 import org.wordpress.android.fluxc.model.stats.PostDetailStatsModel
-import org.wordpress.android.fluxc.store.StatsStore.PostDetailTypes
+import org.wordpress.android.fluxc.store.StatsStore.PostDetailType
 import org.wordpress.android.fluxc.store.stats.PostDetailStore
 import org.wordpress.android.modules.UI_THREAD
 import org.wordpress.android.ui.stats.refresh.NavigationTarget.ViewRecentWeeksStats
@@ -33,7 +33,7 @@ class PostRecentWeeksUseCase(
     private val postDetailMapper: PostDetailMapper,
     private val useCaseMode: UseCaseMode
 ) : BaseStatsUseCase<PostDetailStatsModel, ExpandedWeekUiState>(
-        PostDetailTypes.CLICKS_BY_WEEKS,
+        PostDetailType.CLICKS_BY_WEEKS,
         mainDispatcher,
         ExpandedWeekUiState()
 ) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/StatsDetailFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/StatsDetailFragment.kt
index 0a39df843538..99eda6c04921 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/StatsDetailFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/StatsDetailFragment.kt
@@ -89,14 +89,14 @@ class StatsDetailFragment : DaggerFragment() {
             if (date_selection_toolbar.visibility != dateSelectorVisibility) {
                 date_selection_toolbar.visibility = dateSelectorVisibility
             }
-            selected_date.text = dateSelectorUiModel?.date ?: ""
+            selectedDateTextView.text = dateSelectorUiModel?.date ?: ""
             val enablePreviousButton = dateSelectorUiModel?.enableSelectPrevious == true
-            if (select_previous_date.isEnabled != enablePreviousButton) {
-                select_previous_date.isEnabled = enablePreviousButton
+            if (previousDateButton.isEnabled != enablePreviousButton) {
+                previousDateButton.isEnabled = enablePreviousButton
             }
             val enableNextButton = dateSelectorUiModel?.enableSelectNext == true
-            if (select_next_date.isEnabled != enableNextButton) {
-                select_next_date.isEnabled = enableNextButton
+            if (nextDateButton.isEnabled != enableNextButton) {
+                nextDateButton.isEnabled = enableNextButton
             }
         })
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/BaseStatsUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/BaseStatsUseCase.kt
index cbdb02a92bdf..2089ff34dea6 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/BaseStatsUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/BaseStatsUseCase.kt
@@ -6,7 +6,7 @@ import android.arch.lifecycle.MutableLiveData
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
 import org.wordpress.android.R
-import org.wordpress.android.fluxc.store.StatsStore.StatsTypes
+import org.wordpress.android.fluxc.store.StatsStore.StatsType
 import org.wordpress.android.ui.stats.refresh.NavigationTarget
 import org.wordpress.android.ui.stats.refresh.lists.sections.BaseStatsUseCase.State.Data
 import org.wordpress.android.ui.stats.refresh.lists.sections.BaseStatsUseCase.State.Empty
@@ -27,7 +27,7 @@ import org.wordpress.android.viewmodel.Event
  * Do not override this class directly. Use StatefulUseCase or StatelessUseCase instead.
  */
 abstract class BaseStatsUseCase<DOMAIN_MODEL, UI_STATE>(
-    val type: StatsTypes,
+    val type: StatsType,
     private val mainDispatcher: CoroutineDispatcher,
     private val defaultUiState: UI_STATE
 ) {
@@ -200,7 +200,7 @@ abstract class BaseStatsUseCase<DOMAIN_MODEL, UI_STATE>(
     }
 
     data class UseCaseModel(
-        val type: StatsTypes,
+        val type: StatsType,
         val data: List<BlockListItem>? = null,
         val stateData: List<BlockListItem>? = null,
         val state: UseCaseState = SUCCESS
@@ -216,7 +216,7 @@ abstract class BaseStatsUseCase<DOMAIN_MODEL, UI_STATE>(
      * @param defaultUiState default value the UI state should have when the screen first loads
      */
     abstract class StatefulUseCase<DOMAIN_MODEL, UI_STATE>(
-        type: StatsTypes,
+        type: StatsType,
         mainDispatcher: CoroutineDispatcher,
         private val defaultUiState: UI_STATE
     ) : BaseStatsUseCase<DOMAIN_MODEL, UI_STATE>(type, mainDispatcher, defaultUiState) {
@@ -238,7 +238,7 @@ abstract class BaseStatsUseCase<DOMAIN_MODEL, UI_STATE>(
      * These blocks don't have only one UI state and it doesn't change.
      */
     abstract class StatelessUseCase<DOMAIN_MODEL>(
-        type: StatsTypes,
+        type: StatsType,
         mainDispatcher: CoroutineDispatcher
     ) : BaseStatsUseCase<DOMAIN_MODEL, NotUsedUiState>(type, mainDispatcher, NotUsedUiState) {
         /**
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/BlockListAdapter.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/BlockListAdapter.kt
index 9f5d045d855d..3c1dbb5addcf 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/BlockListAdapter.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/BlockListAdapter.kt
@@ -16,6 +16,7 @@ import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Expan
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Header
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Information
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Link
+import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.LinkButton
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.ListItem
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.ListItemWithIcon
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.LoadingItem
@@ -35,6 +36,7 @@ import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.HEADER
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.INFO
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.LINK
+import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.LINK_BUTTON
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.LIST_ITEM
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.LIST_ITEM_WITH_ICON
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.LOADING_ITEM
@@ -57,6 +59,7 @@ import org.wordpress.android.ui.stats.refresh.lists.sections.viewholders.Expanda
 import org.wordpress.android.ui.stats.refresh.lists.sections.viewholders.FourColumnsViewHolder
 import org.wordpress.android.ui.stats.refresh.lists.sections.viewholders.HeaderViewHolder
 import org.wordpress.android.ui.stats.refresh.lists.sections.viewholders.InformationViewHolder
+import org.wordpress.android.ui.stats.refresh.lists.sections.viewholders.LinkButtonViewHolder
 import org.wordpress.android.ui.stats.refresh.lists.sections.viewholders.LinkViewHolder
 import org.wordpress.android.ui.stats.refresh.lists.sections.viewholders.ListItemViewHolder
 import org.wordpress.android.ui.stats.refresh.lists.sections.viewholders.ListItemWithIconViewHolder
@@ -121,6 +124,7 @@ class BlockListAdapter(val imageManager: ImageManager) : Adapter<BlockListItemVi
             ACTIVITY_ITEM -> ActivityViewHolder(parent)
             REFERRED_ITEM -> ReferredItemViewHolder(parent)
             QUICK_SCAN_ITEM -> QuickScanItemViewHolder(parent)
+            LINK_BUTTON -> LinkButtonViewHolder(parent)
         }
     }
 
@@ -155,6 +159,7 @@ class BlockListAdapter(val imageManager: ImageManager) : Adapter<BlockListItemVi
             is LoadingItemViewHolder -> holder.bind(item as LoadingItem)
             is ReferredItemViewHolder -> holder.bind(item as ReferredItem)
             is QuickScanItemViewHolder -> holder.bind(item as QuickScanItem)
+            is LinkButtonViewHolder -> holder.bind(item as LinkButton)
         }
     }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/BlockListItem.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/BlockListItem.kt
index 44652ebbf461..626760889bb8 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/BlockListItem.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/BlockListItem.kt
@@ -14,6 +14,7 @@ import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.HEADER
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.INFO
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.LINK
+import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.LINK_BUTTON
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.LIST_ITEM
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.LIST_ITEM_WITH_ICON
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.LOADING_ITEM
@@ -52,7 +53,8 @@ sealed class BlockListItem(val type: Type) {
         LOADING_ITEM,
         ACTIVITY_ITEM,
         REFERRED_ITEM,
-        QUICK_SCAN_ITEM
+        QUICK_SCAN_ITEM,
+        LINK_BUTTON
     }
 
     data class Title(
@@ -139,8 +141,12 @@ sealed class BlockListItem(val type: Type) {
         @DrawableRes val icon: Int? = null,
         @StringRes val text: Int,
         val navigateAction: NavigationAction
-    ) :
-            BlockListItem(LINK)
+    ) : BlockListItem(LINK)
+
+    data class LinkButton(
+        @StringRes val text: Int,
+        val navigateAction: NavigationAction
+    ) : BlockListItem(LINK_BUTTON)
 
     data class BarChartItem(
         val entries: List<Bar>,
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/GranularStatefulUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/GranularStatefulUseCase.kt
index 60c8b17ce4df..d79c978b6911 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/GranularStatefulUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/GranularStatefulUseCase.kt
@@ -4,14 +4,14 @@ import kotlinx.coroutines.CoroutineDispatcher
 import org.wordpress.android.R
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.fluxc.network.utils.StatsGranularity
-import org.wordpress.android.fluxc.store.StatsStore.StatsTypes
+import org.wordpress.android.fluxc.store.StatsStore.StatsType
 import org.wordpress.android.ui.stats.refresh.lists.sections.BaseStatsUseCase.StatefulUseCase
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem
 import org.wordpress.android.ui.stats.refresh.utils.StatsSiteProvider
 import java.util.Date
 
 abstract class GranularStatefulUseCase<DOMAIN_MODEL, UI_STATE>(
-    type: StatsTypes,
+    type: StatsType,
     mainDispatcher: CoroutineDispatcher,
     val statsSiteProvider: StatsSiteProvider,
     val selectedDateProvider: SelectedDateProvider,
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/GranularStatelessUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/GranularStatelessUseCase.kt
index d8a4dfd126d2..d63c796520a4 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/GranularStatelessUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/GranularStatelessUseCase.kt
@@ -4,14 +4,14 @@ import kotlinx.coroutines.CoroutineDispatcher
 import org.wordpress.android.R
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.fluxc.network.utils.StatsGranularity
-import org.wordpress.android.fluxc.store.StatsStore.StatsTypes
+import org.wordpress.android.fluxc.store.StatsStore.StatsType
 import org.wordpress.android.ui.stats.refresh.lists.sections.BaseStatsUseCase.StatelessUseCase
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem
 import org.wordpress.android.ui.stats.refresh.utils.StatsSiteProvider
 import java.util.Date
 
 abstract class GranularStatelessUseCase<DOMAIN_MODEL>(
-    type: StatsTypes,
+    type: StatsType,
     mainDispatcher: CoroutineDispatcher,
     val selectedDateProvider: SelectedDateProvider,
     val statsSiteProvider: StatsSiteProvider,
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/AuthorsUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/AuthorsUseCase.kt
index 9421c52d70f7..f9755680c84f 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/AuthorsUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/AuthorsUseCase.kt
@@ -8,7 +8,7 @@ import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.fluxc.model.stats.LimitMode
 import org.wordpress.android.fluxc.model.stats.time.AuthorsModel
 import org.wordpress.android.fluxc.network.utils.StatsGranularity
-import org.wordpress.android.fluxc.store.StatsStore.TimeStatsTypes.AUTHORS
+import org.wordpress.android.fluxc.store.StatsStore.TimeStatsType.AUTHORS
 import org.wordpress.android.fluxc.store.stats.time.AuthorsStore
 import org.wordpress.android.modules.UI_THREAD
 import org.wordpress.android.ui.stats.StatsConstants
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/ClicksUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/ClicksUseCase.kt
index 738cc45b8d41..0189fe4e8df3 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/ClicksUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/ClicksUseCase.kt
@@ -8,7 +8,7 @@ import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.fluxc.model.stats.LimitMode
 import org.wordpress.android.fluxc.model.stats.time.ClicksModel
 import org.wordpress.android.fluxc.network.utils.StatsGranularity
-import org.wordpress.android.fluxc.store.StatsStore.TimeStatsTypes.CLICKS
+import org.wordpress.android.fluxc.store.StatsStore.TimeStatsType.CLICKS
 import org.wordpress.android.fluxc.store.stats.time.ClicksStore
 import org.wordpress.android.modules.UI_THREAD
 import org.wordpress.android.ui.stats.refresh.NavigationTarget.ViewClicks
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/CountryViewsUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/CountryViewsUseCase.kt
index 51b442505465..f299ff9e9fc2 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/CountryViewsUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/CountryViewsUseCase.kt
@@ -8,7 +8,7 @@ import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.fluxc.model.stats.LimitMode
 import org.wordpress.android.fluxc.model.stats.time.CountryViewsModel
 import org.wordpress.android.fluxc.network.utils.StatsGranularity
-import org.wordpress.android.fluxc.store.StatsStore.TimeStatsTypes.COUNTRIES
+import org.wordpress.android.fluxc.store.StatsStore.TimeStatsType.COUNTRIES
 import org.wordpress.android.fluxc.store.stats.time.CountryViewsStore
 import org.wordpress.android.modules.UI_THREAD
 import org.wordpress.android.ui.stats.refresh.NavigationTarget.ViewCountries
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/OverviewUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/OverviewUseCase.kt
index 8fa07b52463c..dab5d8219c79 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/OverviewUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/OverviewUseCase.kt
@@ -6,7 +6,7 @@ import org.wordpress.android.analytics.AnalyticsTracker
 import org.wordpress.android.fluxc.model.stats.LimitMode
 import org.wordpress.android.fluxc.model.stats.time.VisitsAndViewsModel
 import org.wordpress.android.fluxc.network.utils.StatsGranularity
-import org.wordpress.android.fluxc.store.StatsStore.TimeStatsTypes.OVERVIEW
+import org.wordpress.android.fluxc.store.StatsStore.TimeStatsType.OVERVIEW
 import org.wordpress.android.fluxc.store.stats.time.VisitsAndViewsStore
 import org.wordpress.android.modules.UI_THREAD
 import org.wordpress.android.ui.stats.refresh.lists.sections.BaseStatsUseCase.StatefulUseCase
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/PostsAndPagesUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/PostsAndPagesUseCase.kt
index aae4b9af1823..182d7a4df514 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/PostsAndPagesUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/PostsAndPagesUseCase.kt
@@ -11,7 +11,7 @@ import org.wordpress.android.fluxc.model.stats.time.PostAndPageViewsModel.ViewsT
 import org.wordpress.android.fluxc.model.stats.time.PostAndPageViewsModel.ViewsType.PAGE
 import org.wordpress.android.fluxc.model.stats.time.PostAndPageViewsModel.ViewsType.POST
 import org.wordpress.android.fluxc.network.utils.StatsGranularity
-import org.wordpress.android.fluxc.store.StatsStore.TimeStatsTypes.POSTS_AND_PAGES
+import org.wordpress.android.fluxc.store.StatsStore.TimeStatsType.POSTS_AND_PAGES
 import org.wordpress.android.fluxc.store.stats.time.PostAndPageViewsStore
 import org.wordpress.android.modules.UI_THREAD
 import org.wordpress.android.ui.stats.StatsConstants.ITEM_TYPE_HOME_PAGE
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/ReferrersUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/ReferrersUseCase.kt
index 0c761ff1a1a4..870f5224c848 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/ReferrersUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/ReferrersUseCase.kt
@@ -8,7 +8,7 @@ import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.fluxc.model.stats.LimitMode
 import org.wordpress.android.fluxc.model.stats.time.ReferrersModel
 import org.wordpress.android.fluxc.network.utils.StatsGranularity
-import org.wordpress.android.fluxc.store.StatsStore.TimeStatsTypes.REFERRERS
+import org.wordpress.android.fluxc.store.StatsStore.TimeStatsType.REFERRERS
 import org.wordpress.android.fluxc.store.stats.time.ReferrersStore
 import org.wordpress.android.modules.UI_THREAD
 import org.wordpress.android.ui.stats.refresh.NavigationTarget.ViewReferrers
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/SearchTermsUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/SearchTermsUseCase.kt
index 3ca0f40534db..558efbe85bdb 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/SearchTermsUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/SearchTermsUseCase.kt
@@ -8,7 +8,7 @@ import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.fluxc.model.stats.LimitMode
 import org.wordpress.android.fluxc.model.stats.time.SearchTermsModel
 import org.wordpress.android.fluxc.network.utils.StatsGranularity
-import org.wordpress.android.fluxc.store.StatsStore.TimeStatsTypes.SEARCH_TERMS
+import org.wordpress.android.fluxc.store.StatsStore.TimeStatsType.SEARCH_TERMS
 import org.wordpress.android.fluxc.store.stats.time.SearchTermsStore
 import org.wordpress.android.modules.UI_THREAD
 import org.wordpress.android.ui.stats.refresh.NavigationTarget.ViewSearchTerms
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/VideoPlaysUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/VideoPlaysUseCase.kt
index f546e695f8f9..5f1c3a8e4d86 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/VideoPlaysUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/VideoPlaysUseCase.kt
@@ -8,7 +8,7 @@ import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.fluxc.model.stats.LimitMode
 import org.wordpress.android.fluxc.model.stats.time.VideoPlaysModel
 import org.wordpress.android.fluxc.network.utils.StatsGranularity
-import org.wordpress.android.fluxc.store.StatsStore.TimeStatsTypes.VIDEOS
+import org.wordpress.android.fluxc.store.StatsStore.TimeStatsType.VIDEOS
 import org.wordpress.android.fluxc.store.stats.time.VideoPlaysStore
 import org.wordpress.android.modules.UI_THREAD
 import org.wordpress.android.ui.stats.refresh.NavigationTarget.ViewUrl
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/InsightsMenuAdapter.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/InsightsMenuAdapter.kt
new file mode 100644
index 000000000000..b2a4735614d0
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/InsightsMenuAdapter.kt
@@ -0,0 +1,73 @@
+package org.wordpress.android.ui.stats.refresh.lists.sections.insights
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.BaseAdapter
+import android.widget.ImageView
+import android.widget.TextView
+
+import org.wordpress.android.R
+import org.wordpress.android.ui.stats.refresh.lists.sections.insights.InsightsMenuAdapter.InsightsMenuItem.DOWN
+import org.wordpress.android.ui.stats.refresh.lists.sections.insights.InsightsMenuAdapter.InsightsMenuItem.REMOVE
+import org.wordpress.android.ui.stats.refresh.lists.sections.insights.InsightsMenuAdapter.InsightsMenuItem.UP
+
+class InsightsMenuAdapter(context: Context, isUpVisible: Boolean, isDownVisible: Boolean) : BaseAdapter() {
+    private val mInflater: LayoutInflater = LayoutInflater.from(context)
+    private val items = listOfNotNull(if (isUpVisible) UP else null, if (isDownVisible) DOWN else null, REMOVE)
+
+    override fun getCount(): Int {
+        return items.size
+    }
+
+    override fun getItem(position: Int): Any {
+        return items[position]
+    }
+
+    override fun getItemId(position: Int): Long {
+        return items[position].id
+    }
+
+    override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
+        var view = convertView
+        val holder: MenuHolder
+        if (view == null) {
+            view = mInflater.inflate(R.layout.stats_insights_popup_menu_item, parent, false)
+            holder = MenuHolder(view!!)
+            view.tag = holder
+        } else {
+            holder = view.tag as MenuHolder
+        }
+
+        val textRes: Int
+        val iconRes: Int
+        when (items[position]) {
+            UP -> {
+                textRes = R.string.stats_menu_move_up
+                iconRes = R.drawable.ic_arrow_up_grey_dark_24dp
+            }
+            DOWN -> {
+                textRes = R.string.stats_menu_move_down
+                iconRes = R.drawable.ic_arrow_down_grey_dark_24dp
+            }
+            REMOVE -> {
+                textRes = R.string.stats_menu_remove
+                iconRes = R.drawable.ic_trash_grey_dark_24dp
+            }
+        }
+
+        holder.text.setText(textRes)
+        holder.icon.setImageResource(iconRes)
+        return view
+    }
+
+    internal inner class MenuHolder(view: View) {
+        val text: TextView = view.findViewById(R.id.text)
+        val icon: ImageView = view.findViewById(R.id.image)
+    }
+
+    enum class InsightsMenuItem(val id: Long) {
+        UP(0), DOWN(1), REMOVE(2)
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/management/AddedInsightViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/management/AddedInsightViewHolder.kt
new file mode 100644
index 000000000000..fecb7c741dbf
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/management/AddedInsightViewHolder.kt
@@ -0,0 +1,52 @@
+package org.wordpress.android.ui.stats.refresh.lists.sections.insights.management
+
+import android.support.v4.view.MotionEventCompat
+import android.support.v7.widget.RecyclerView.ViewHolder
+import android.view.MotionEvent
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageButton
+import android.widget.TextView
+import org.wordpress.android.R
+import org.wordpress.android.ui.stats.refresh.lists.sections.insights.management.InsightsManagementViewModel.InsightModel
+
+class AddedInsightViewHolder(
+    val parent: ViewGroup,
+    private val onDragStarted: (viewHolder: ViewHolder) -> Unit,
+    private val onButtonClicked: (InsightModel) -> Unit
+) : InsightsManagementViewHolder(parent) {
+    private val title: TextView = itemView.findViewById(R.id.itemTitle)
+    private val managementButton: ImageButton = itemView.findViewById(R.id.insightsManagementItemButton)
+    private val dragAndDropButton: View = itemView.findViewById(R.id.dragAndDropItemButton)
+    private val divider: View = itemView.findViewById(R.id.divider)
+
+    override fun bind(insight: InsightModel, isLast: Boolean) {
+        title.setText(insight.name)
+
+        managementButton.setImageResource(R.drawable.ic_remove_circle)
+        managementButton.setOnClickListener {
+            managementButton.setOnClickListener(null)
+            onButtonClicked(insight)
+        }
+
+        dragAndDropButton.setOnTouchListener { _, event ->
+            if (MotionEventCompat.isFromSource(event, MotionEvent.ACTION_DOWN)) {
+                onDragStarted(this)
+                itemView.elevation = 10f
+            }
+            return@setOnTouchListener true
+        }
+
+        dragAndDropButton.visibility = View.VISIBLE
+
+        updateDividerVisibility(isLast)
+    }
+
+    fun updateDividerVisibility(isLast: Boolean) {
+        divider.visibility = if (isLast) View.GONE else View.VISIBLE
+    }
+
+    fun onDragFinished() {
+        itemView.elevation = 0f
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/management/InsightsManagementAdapter.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/management/InsightsManagementAdapter.kt
new file mode 100644
index 000000000000..f0861ae66c36
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/management/InsightsManagementAdapter.kt
@@ -0,0 +1,89 @@
+package org.wordpress.android.ui.stats.refresh.lists.sections.insights.management
+
+import android.support.v7.util.DiffUtil
+import android.support.v7.util.DiffUtil.Callback
+import android.support.v7.widget.RecyclerView.Adapter
+import android.support.v7.widget.RecyclerView.ViewHolder
+import android.view.ViewGroup
+import org.wordpress.android.ui.stats.refresh.lists.sections.insights.management.InsightsManagementViewModel.InsightModel
+import org.wordpress.android.ui.stats.refresh.lists.sections.insights.management.InsightsManagementViewModel.InsightModel.Status.ADDED
+import org.wordpress.android.ui.stats.refresh.lists.sections.insights.management.InsightsManagementViewModel.InsightModel.Status.REMOVED
+import java.util.Collections
+
+class InsightsManagementAdapter(
+    private val onItemButtonClicked: (InsightModel) -> Unit,
+    private val onDragStarted: (viewHolder: ViewHolder) -> Unit,
+    private val onDragFinished: (List<InsightModel>) -> Unit
+) : Adapter<InsightsManagementViewHolder>(), ItemTouchHelperAdapter {
+    private var items = ArrayList<InsightModel>()
+
+    override fun onCreateViewHolder(parent: ViewGroup, itemType: Int): InsightsManagementViewHolder {
+        val type = InsightModel.Status.values()[itemType]
+        return when (type) {
+            ADDED -> AddedInsightViewHolder(parent, onDragStarted, onItemButtonClicked)
+            REMOVED -> RemovedInsightViewHolder(parent, onItemButtonClicked)
+        }
+    }
+
+    override fun onBindViewHolder(holder: InsightsManagementViewHolder, position: Int) {
+        holder.bind(items[position], position == items.size - 1)
+    }
+
+    override fun getItemViewType(position: Int): Int {
+        return items[position].type.ordinal
+    }
+
+    override fun onItemMoved(originalViewHolder: ViewHolder, newViewHolder: ViewHolder) {
+        val fromPosition = originalViewHolder.adapterPosition
+        val toPosition = newViewHolder.adapterPosition
+        if (fromPosition < toPosition) {
+            for (i in fromPosition until toPosition) {
+                Collections.swap(items, i, i + 1)
+            }
+        } else {
+            for (i in fromPosition downTo toPosition + 1) {
+                Collections.swap(items, i, i - 1)
+            }
+        }
+        notifyItemMoved(fromPosition, toPosition)
+
+        (originalViewHolder as? AddedInsightViewHolder)?.updateDividerVisibility(toPosition == items.size - 1)
+        (newViewHolder as? AddedInsightViewHolder)?.updateDividerVisibility(fromPosition == items.size - 1)
+    }
+
+    override fun onDragFinished(viewHolder: ViewHolder) {
+        onDragFinished.invoke(items)
+
+        (viewHolder as? AddedInsightViewHolder)?.onDragFinished()
+    }
+
+    override fun getItemCount(): Int = items.size
+
+    fun update(newItems: List<InsightModel>) {
+        val diffResult = DiffUtil.calculateDiff(InsightModelDiffCallback(items, newItems))
+        items = ArrayList(newItems)
+        diffResult.dispatchUpdatesTo(this)
+    }
+}
+
+interface ItemTouchHelperAdapter {
+    fun onItemMoved(originalViewHolder: ViewHolder, newViewHolder: ViewHolder)
+    fun onDragFinished(viewHolder: ViewHolder)
+}
+
+class InsightModelDiffCallback(
+    private val oldList: List<InsightModel>,
+    private val newList: List<InsightModel>
+) : Callback() {
+    override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
+        return oldList[oldItemPosition].insightType == newList[newItemPosition].insightType
+    }
+
+    override fun getOldListSize(): Int = oldList.size
+
+    override fun getNewListSize(): Int = newList.size
+
+    override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
+        return oldList[oldItemPosition] == newList[newItemPosition]
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/management/InsightsManagementFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/management/InsightsManagementFragment.kt
index d68a15728b76..bd8c990ba34b 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/management/InsightsManagementFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/management/InsightsManagementFragment.kt
@@ -4,55 +4,141 @@ import android.arch.lifecycle.Observer
 import android.arch.lifecycle.ViewModelProvider
 import android.arch.lifecycle.ViewModelProviders
 import android.os.Bundle
-import android.support.design.widget.Snackbar
 import android.support.v4.app.FragmentActivity
 import android.support.v7.widget.LinearLayoutManager
+import android.support.v7.widget.helper.ItemTouchHelper
 import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import dagger.android.support.DaggerFragment
 import kotlinx.android.synthetic.main.insights_management_fragment.*
-import org.wordpress.android.R
 import javax.inject.Inject
+import android.animation.LayoutTransition
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import org.wordpress.android.R
+import org.wordpress.android.ui.stats.refresh.lists.sections.insights.management.InsightsManagementViewModel.InsightModel
 
 class InsightsManagementFragment : DaggerFragment() {
     @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
     private lateinit var viewModel: InsightsManagementViewModel
+    private lateinit var addedInsightsTouchHelper: ItemTouchHelper
+
+    private var menu: Menu? = null
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        setHasOptionsMenu(true)
         return inflater.inflate(R.layout.insights_management_fragment, container, false)
     }
 
-    private fun initializeViews() {
-        removedInsights.layoutManager = LinearLayoutManager(activity, LinearLayoutManager.VERTICAL, false)
+    override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) {
+        super.onCreateOptionsMenu(menu, inflater)
+
+        inflater?.inflate(R.menu.menu_insights_management, menu)
+        this.menu = menu
+
+        initializeViews()
+        initializeViewModels(requireActivity())
+
+        enableAnimations()
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
+    private fun enableAnimations() {
+        viewModel.launch {
+            delay(500)
+            val transition = LayoutTransition()
+            transition.disableTransitionType(LayoutTransition.DISAPPEARING)
+            transition.disableTransitionType(LayoutTransition.APPEARING)
+            transition.enableTransitionType(LayoutTransition.CHANGING)
+            insightsManagementContainer.layoutTransition = transition
+        }
+    }
 
-        val nonNullActivity = checkNotNull(activity)
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        if (item.itemId == R.id.save_insights) {
+            viewModel.onSaveInsights()
+        }
+        return true
+    }
 
-        initializeViews()
-        initializeViewModels(nonNullActivity)
+    private fun initializeViews() {
+        removedInsights.layoutManager = LinearLayoutManager(requireActivity(), LinearLayoutManager.VERTICAL, false)
+        addedInsights.layoutManager = LinearLayoutManager(requireActivity(), LinearLayoutManager.VERTICAL, false)
     }
 
     private fun initializeViewModels(activity: FragmentActivity) {
         viewModel = ViewModelProviders.of(activity, viewModelFactory).get(InsightsManagementViewModel::class.java)
-        setupObservers(activity)
+        viewModel.start()
+
+        setupObservers()
     }
 
-    private fun setupObservers(activity: FragmentActivity) {
-        viewModel.showSnackbarMessage.observe(this, Observer { holder ->
-            val parent = activity.findViewById<View>(R.id.coordinatorLayout)
-            if (holder != null && parent != null) {
-                if (holder.buttonTitleRes == null) {
-                    Snackbar.make(parent, getString(holder.messageRes), Snackbar.LENGTH_LONG).show()
+    private fun setupObservers() {
+        viewModel.removedInsights.observe(this, Observer {
+            it?.let { items ->
+                updateRemovedInsights(items)
+
+                if (items.isEmpty()) {
+                    addInsightsHeader.visibility = View.GONE
+                } else {
+                    addInsightsHeader.visibility = View.VISIBLE
+                }
+            }
+        })
+
+        viewModel.addedInsights.observe(this, Observer {
+            it?.let { items ->
+                updateAddedInsights(items)
+
+                if (items.isEmpty()) {
+                    addedInsightsInfo.visibility = View.GONE
                 } else {
-                    val snackbar = Snackbar.make(parent, getString(holder.messageRes), Snackbar.LENGTH_LONG)
-                    snackbar.setAction(getString(holder.buttonTitleRes)) { holder.buttonAction() }
-                    snackbar.show()
+                    addedInsightsInfo.visibility = View.VISIBLE
                 }
             }
         })
+
+        viewModel.closeInsightsManagement.observe(this, Observer {
+            requireActivity().finish()
+        })
+
+        viewModel.isMenuVisible.observe(this, Observer { isMenuVisible ->
+            isMenuVisible?.let {
+                menu?.findItem(R.id.save_insights)?.isVisible = isMenuVisible
+            }
+        })
+    }
+
+    private fun updateRemovedInsights(insights: List<InsightModel>) {
+        var adapter = removedInsights.adapter as? InsightsManagementAdapter
+        if (adapter == null) {
+            adapter = InsightsManagementAdapter(
+                    { item -> viewModel.onItemButtonClicked(item) },
+                    { viewHolder -> addedInsightsTouchHelper.startDrag(viewHolder) },
+                    { list -> viewModel.onAddedInsightsReordered(list) }
+            )
+            removedInsights.adapter = adapter
+        }
+        adapter.update(insights)
+    }
+
+    private fun updateAddedInsights(insights: List<InsightModel>) {
+        var adapter = addedInsights.adapter as? InsightsManagementAdapter
+        if (adapter == null) {
+            adapter = InsightsManagementAdapter(
+                    { item -> viewModel.onItemButtonClicked(item) },
+                    { viewHolder -> addedInsightsTouchHelper.startDrag(viewHolder) },
+                    { list -> viewModel.onAddedInsightsReordered(list) }
+            )
+            addedInsights.adapter = adapter
+
+            val callback = ItemTouchHelperCallback(adapter)
+            addedInsightsTouchHelper = ItemTouchHelper(callback)
+            addedInsightsTouchHelper.attachToRecyclerView(addedInsights)
+        }
+        adapter.update(insights)
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/management/InsightsManagementViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/management/InsightsManagementViewHolder.kt
new file mode 100644
index 000000000000..e0223078ef83
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/management/InsightsManagementViewHolder.kt
@@ -0,0 +1,13 @@
+package org.wordpress.android.ui.stats.refresh.lists.sections.insights.management
+
+import android.support.v7.widget.RecyclerView.ViewHolder
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import org.wordpress.android.R
+import org.wordpress.android.ui.stats.refresh.lists.sections.insights.management.InsightsManagementViewModel.InsightModel
+
+abstract class InsightsManagementViewHolder(
+    parent: ViewGroup
+) : ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.insights_management_list_item, parent, false)) {
+    abstract fun bind(insight: InsightModel, isLast: Boolean)
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/management/InsightsManagementViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/management/InsightsManagementViewModel.kt
index 3433f69661e6..1cf42e5af703 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/management/InsightsManagementViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/management/InsightsManagementViewModel.kt
@@ -2,24 +2,120 @@ package org.wordpress.android.ui.stats.refresh.lists.sections.insights.managemen
 
 import android.arch.lifecycle.LiveData
 import android.arch.lifecycle.MutableLiveData
+import androidx.annotation.StringRes
 import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.launch
+import org.wordpress.android.R
+import org.wordpress.android.fluxc.store.StatsStore
+import org.wordpress.android.fluxc.store.StatsStore.InsightType
+import org.wordpress.android.fluxc.store.StatsStore.InsightType.ALL_TIME_STATS
+import org.wordpress.android.fluxc.store.StatsStore.InsightType.ANNUAL_SITE_STATS
+import org.wordpress.android.fluxc.store.StatsStore.InsightType.COMMENTS
+import org.wordpress.android.fluxc.store.StatsStore.InsightType.FOLLOWERS
+import org.wordpress.android.fluxc.store.StatsStore.InsightType.FOLLOWER_TOTALS
+import org.wordpress.android.fluxc.store.StatsStore.InsightType.LATEST_POST_SUMMARY
+import org.wordpress.android.fluxc.store.StatsStore.InsightType.MOST_POPULAR_DAY_AND_HOUR
+import org.wordpress.android.fluxc.store.StatsStore.InsightType.POSTING_ACTIVITY
+import org.wordpress.android.fluxc.store.StatsStore.InsightType.PUBLICIZE
+import org.wordpress.android.fluxc.store.StatsStore.InsightType.TAGS_AND_CATEGORIES
+import org.wordpress.android.fluxc.store.StatsStore.InsightType.TODAY_STATS
 import org.wordpress.android.modules.UI_THREAD
-import org.wordpress.android.ui.pages.SnackbarMessageHolder
-import org.wordpress.android.util.map
+import org.wordpress.android.ui.stats.refresh.INSIGHTS_USE_CASE
+import org.wordpress.android.ui.stats.refresh.lists.BaseListUseCase
+import org.wordpress.android.ui.stats.refresh.lists.sections.insights.management.InsightsManagementViewModel.InsightModel.Status.ADDED
+import org.wordpress.android.ui.stats.refresh.lists.sections.insights.management.InsightsManagementViewModel.InsightModel.Status.REMOVED
+import org.wordpress.android.ui.stats.refresh.utils.StatsSiteProvider
 import org.wordpress.android.viewmodel.ScopedViewModel
+import org.wordpress.android.viewmodel.SingleLiveEvent
 import javax.inject.Inject
 import javax.inject.Named
 
 class InsightsManagementViewModel @Inject constructor(
-    @Named(UI_THREAD) mainDispatcher: CoroutineDispatcher
+    @Named(UI_THREAD) mainDispatcher: CoroutineDispatcher,
+    @Named(INSIGHTS_USE_CASE) val insightsUseCase: BaseListUseCase,
+    private val siteProvider: StatsSiteProvider,
+    private val statsStore: StatsStore
 ) : ScopedViewModel(mainDispatcher) {
-    private val mutableSnackbarMessage = MutableLiveData<Int>()
+    private val _removedInsights = MutableLiveData<List<InsightModel>>()
+    val removedInsights: LiveData<List<InsightModel>> = _removedInsights
 
-    val showSnackbarMessage: LiveData<SnackbarMessageHolder> = mutableSnackbarMessage.map {
-        SnackbarMessageHolder(it)
+    private val _addedInsights = MutableLiveData<List<InsightModel>>()
+    val addedInsights: LiveData<List<InsightModel>> = _addedInsights
+
+    private val _closeInsightsManagement = SingleLiveEvent<Unit>()
+    val closeInsightsManagement: LiveData<Unit> = _closeInsightsManagement
+
+    private val _isMenuVisible = MutableLiveData<Boolean>()
+    val isMenuVisible: LiveData<Boolean> = _isMenuVisible
+
+    private lateinit var insights: List<InsightModel>
+    private var isInitialized = false
+
+    fun start() {
+        if (!isInitialized) {
+            isInitialized = true
+            _isMenuVisible.value = false
+            loadInsights()
+        }
+    }
+
+    private fun loadInsights() {
+        launch {
+            val addedInsights = statsStore.getAddedInsights(siteProvider.siteModel)
+            insights = addedInsights.map { InsightModel(it, ADDED) } +
+                    statsStore.getRemovedInsights(addedInsights).map { InsightModel(it, REMOVED) }
+            displayInsights()
+        }
+    }
+
+    private fun displayInsights() {
+        _addedInsights.value = insights.filter { it.type == ADDED }
+        _removedInsights.value = insights.filter { it.type == REMOVED }
     }
 
-    override fun onCleared() {
-        mutableSnackbarMessage.value = null
+    fun onSaveInsights() {
+        launch {
+            val addedTypes = insights.filter { it.type == ADDED }.map { it.insightType }
+            statsStore.updateTypes(siteProvider.siteModel, addedTypes)
+
+            insightsUseCase.refreshData(true)
+        }
+        _closeInsightsManagement.call()
+    }
+
+    fun onAddedInsightsReordered(addedInsights: List<InsightModel>) {
+        insights = addedInsights + insights.filter { it.type == REMOVED }
+        _isMenuVisible.value = true
+    }
+
+    fun onItemButtonClicked(insight: InsightModel) {
+        if (insight.type == ADDED) {
+            insight.type = REMOVED
+        } else {
+            insight.type = ADDED
+        }
+        displayInsights()
+        _isMenuVisible.value = true
+    }
+
+    data class InsightModel(val insightType: InsightType, var type: Status) {
+        @StringRes val name: Int = when (insightType) {
+            LATEST_POST_SUMMARY -> R.string.stats_insights_latest_post_summary
+            MOST_POPULAR_DAY_AND_HOUR -> R.string.stats_insights_popular
+            ALL_TIME_STATS -> R.string.stats_insights_all_time_stats
+            TAGS_AND_CATEGORIES -> R.string.stats_insights_tags_and_categories
+            COMMENTS -> R.string.stats_comments
+            FOLLOWERS -> R.string.stats_view_followers
+            TODAY_STATS -> R.string.stats_insights_today
+            POSTING_ACTIVITY -> R.string.stats_insights_posting_activity
+            PUBLICIZE -> R.string.stats_view_publicize
+            ANNUAL_SITE_STATS -> R.string.stats_insights_this_year_site_stats
+            FOLLOWER_TOTALS -> R.string.stats_view_follower_totals
+        }
+
+        enum class Status {
+            ADDED,
+            REMOVED
+        }
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/management/ItemTouchHelperCallback.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/management/ItemTouchHelperCallback.kt
new file mode 100644
index 000000000000..51b9d2944926
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/management/ItemTouchHelperCallback.kt
@@ -0,0 +1,34 @@
+package org.wordpress.android.ui.stats.refresh.lists.sections.insights.management
+
+import android.support.v7.widget.RecyclerView
+import android.support.v7.widget.RecyclerView.ViewHolder
+import android.support.v7.widget.helper.ItemTouchHelper
+
+class ItemTouchHelperCallback(private val adapter: ItemTouchHelperAdapter) : ItemTouchHelper.Callback() {
+    override fun isLongPressDragEnabled(): Boolean {
+        return false
+    }
+
+    override fun isItemViewSwipeEnabled(): Boolean {
+        return false
+    }
+
+    override fun getMovementFlags(recyclerView: RecyclerView, viewHolder: ViewHolder): Int {
+        val dragFlags = ItemTouchHelper.UP or ItemTouchHelper.DOWN
+        return makeMovementFlags(dragFlags, 0)
+    }
+
+    override fun onMove(recyclerView: RecyclerView, viewHolder: ViewHolder, target: ViewHolder): Boolean {
+        adapter.onItemMoved(viewHolder, target)
+        return true
+    }
+
+    override fun onSwiped(viewHolder: ViewHolder, direction: Int) {
+    }
+
+    override fun clearView(recyclerView: RecyclerView, viewHolder: ViewHolder) {
+        super.clearView(recyclerView, viewHolder)
+
+        adapter.onDragFinished(viewHolder)
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/management/RemovedInsightViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/management/RemovedInsightViewHolder.kt
new file mode 100644
index 000000000000..d231c6ef0504
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/management/RemovedInsightViewHolder.kt
@@ -0,0 +1,31 @@
+package org.wordpress.android.ui.stats.refresh.lists.sections.insights.management
+
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageButton
+import android.widget.TextView
+import org.wordpress.android.R
+import org.wordpress.android.ui.stats.refresh.lists.sections.insights.management.InsightsManagementViewModel.InsightModel
+
+class RemovedInsightViewHolder(
+    val parent: ViewGroup,
+    private val onButtonClicked: (InsightModel) -> Unit
+) : InsightsManagementViewHolder(parent) {
+    private val title: TextView = itemView.findViewById(R.id.itemTitle)
+    private val managementButton: ImageButton = itemView.findViewById(R.id.insightsManagementItemButton)
+    private val dragAndDropButton: View = itemView.findViewById(R.id.dragAndDropItemButton)
+    private val divider: View = itemView.findViewById(R.id.divider)
+
+    override fun bind(insight: InsightModel, isLast: Boolean) {
+        title.setText(insight.name)
+
+        managementButton.setImageResource(R.drawable.ic_add_circle)
+        managementButton.setOnClickListener {
+            managementButton.setOnClickListener(null)
+            onButtonClicked(insight)
+        }
+
+        dragAndDropButton.visibility = View.GONE
+        divider.visibility = if (isLast) View.GONE else View.VISIBLE
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/AllTimeStatsUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/AllTimeStatsUseCase.kt
index 9b4500791f0f..52a588c2c2e8 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/AllTimeStatsUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/AllTimeStatsUseCase.kt
@@ -5,7 +5,7 @@ import kotlinx.coroutines.CoroutineDispatcher
 import org.wordpress.android.R
 import org.wordpress.android.R.string
 import org.wordpress.android.fluxc.model.stats.InsightsAllTimeModel
-import org.wordpress.android.fluxc.store.StatsStore.InsightsTypes.ALL_TIME_STATS
+import org.wordpress.android.fluxc.store.StatsStore.InsightType.ALL_TIME_STATS
 import org.wordpress.android.fluxc.store.stats.insights.AllTimeInsightsStore
 import org.wordpress.android.modules.UI_THREAD
 import org.wordpress.android.ui.stats.refresh.lists.sections.BaseStatsUseCase.StatelessUseCase
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/AnnualSiteStatsUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/AnnualSiteStatsUseCase.kt
index c699992c20a2..187a5257977b 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/AnnualSiteStatsUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/AnnualSiteStatsUseCase.kt
@@ -1,10 +1,11 @@
 package org.wordpress.android.ui.stats.refresh.lists.sections.insights.usecases
 
+import android.view.View
 import kotlinx.coroutines.CoroutineDispatcher
 import org.wordpress.android.R
 import org.wordpress.android.R.string
 import org.wordpress.android.fluxc.model.stats.YearsInsightsModel
-import org.wordpress.android.fluxc.store.StatsStore.InsightsTypes.ANNUAL_SITE_STATS
+import org.wordpress.android.fluxc.store.StatsStore.InsightType.ANNUAL_SITE_STATS
 import org.wordpress.android.fluxc.store.stats.insights.MostPopularInsightsStore
 import org.wordpress.android.modules.UI_THREAD
 import org.wordpress.android.ui.stats.refresh.lists.sections.BaseStatsUseCase.StatelessUseCase
@@ -12,6 +13,7 @@ import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.QuickScanItem
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.QuickScanItem.Column
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Title
+import org.wordpress.android.ui.stats.refresh.utils.ItemPopupMenuHandler
 import org.wordpress.android.ui.stats.refresh.utils.StatsSiteProvider
 import org.wordpress.android.ui.stats.refresh.utils.toFormattedString
 import javax.inject.Inject
@@ -21,7 +23,8 @@ class AnnualSiteStatsUseCase
 @Inject constructor(
     @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher,
     private val mostPopularStore: MostPopularInsightsStore,
-    private val statsSiteProvider: StatsSiteProvider
+    private val statsSiteProvider: StatsSiteProvider,
+    private val popupMenuHandler: ItemPopupMenuHandler
 ) : StatelessUseCase<YearsInsightsModel>(ANNUAL_SITE_STATS, mainDispatcher) {
     override suspend fun loadCachedData(): YearsInsightsModel? {
         return mostPopularStore.getYearsInsights(statsSiteProvider.siteModel)
@@ -43,7 +46,7 @@ class AnnualSiteStatsUseCase
 
     override fun buildUiModel(domainModel: YearsInsightsModel): List<BlockListItem> {
         val items = mutableListOf<BlockListItem>()
-        items.add(Title(R.string.stats_insights_this_year_site_stats))
+        items.add(buildTitle())
         val lastYear = domainModel.years.last()
         items.add(
                 QuickScanItem(
@@ -95,4 +98,10 @@ class AnnualSiteStatsUseCase
         )
         return items
     }
+
+    private fun buildTitle() = Title(string.stats_insights_this_year_site_stats, menuAction = this::onMenuClick)
+
+    private fun onMenuClick(view: View) {
+        popupMenuHandler.onMenuClick(view, type)
+    }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/CommentsUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/CommentsUseCase.kt
index 29195d0506b1..3e25b249eef4 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/CommentsUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/CommentsUseCase.kt
@@ -7,7 +7,7 @@ import org.wordpress.android.R.string
 import org.wordpress.android.analytics.AnalyticsTracker
 import org.wordpress.android.fluxc.model.stats.CommentsModel
 import org.wordpress.android.fluxc.model.stats.LimitMode
-import org.wordpress.android.fluxc.store.StatsStore.InsightsTypes.COMMENTS
+import org.wordpress.android.fluxc.store.StatsStore.InsightType.COMMENTS
 import org.wordpress.android.fluxc.store.stats.insights.CommentsStore
 import org.wordpress.android.modules.UI_THREAD
 import org.wordpress.android.ui.stats.refresh.NavigationTarget.ViewCommentsStats
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/FollowersUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/FollowersUseCase.kt
index 34d1ecc7897c..dabb647ee553 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/FollowersUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/FollowersUseCase.kt
@@ -13,7 +13,7 @@ import org.wordpress.android.fluxc.model.stats.FollowersModel
 import org.wordpress.android.fluxc.model.stats.FollowersModel.FollowerModel
 import org.wordpress.android.fluxc.model.stats.LimitMode
 import org.wordpress.android.fluxc.model.stats.PagedMode
-import org.wordpress.android.fluxc.store.StatsStore.InsightsTypes.FOLLOWERS
+import org.wordpress.android.fluxc.store.StatsStore.InsightType.FOLLOWERS
 import org.wordpress.android.fluxc.store.stats.insights.FollowersStore
 import org.wordpress.android.modules.BG_THREAD
 import org.wordpress.android.modules.UI_THREAD
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/LatestPostSummaryUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/LatestPostSummaryUseCase.kt
index 7d9ee58af5ed..5db6e2e19473 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/LatestPostSummaryUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/LatestPostSummaryUseCase.kt
@@ -9,7 +9,7 @@ import org.wordpress.android.analytics.AnalyticsTracker.Stat.STATS_LATEST_POST_S
 import org.wordpress.android.analytics.AnalyticsTracker.Stat.STATS_LATEST_POST_SUMMARY_SHARE_POST_TAPPED
 import org.wordpress.android.analytics.AnalyticsTracker.Stat.STATS_LATEST_POST_SUMMARY_VIEW_POST_DETAILS_TAPPED
 import org.wordpress.android.fluxc.model.stats.InsightsLatestPostModel
-import org.wordpress.android.fluxc.store.StatsStore.InsightsTypes.LATEST_POST_SUMMARY
+import org.wordpress.android.fluxc.store.StatsStore.InsightType.LATEST_POST_SUMMARY
 import org.wordpress.android.fluxc.store.stats.insights.LatestPostInsightsStore
 import org.wordpress.android.modules.UI_THREAD
 import org.wordpress.android.ui.stats.refresh.NavigationTarget.AddNewPost
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/MostPopularInsightsUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/MostPopularInsightsUseCase.kt
index 7e2c9039d756..cf4341de95c0 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/MostPopularInsightsUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/MostPopularInsightsUseCase.kt
@@ -5,7 +5,7 @@ import kotlinx.coroutines.CoroutineDispatcher
 import org.wordpress.android.R
 import org.wordpress.android.R.string
 import org.wordpress.android.fluxc.model.stats.InsightsMostPopularModel
-import org.wordpress.android.fluxc.store.StatsStore.InsightsTypes.MOST_POPULAR_DAY_AND_HOUR
+import org.wordpress.android.fluxc.store.StatsStore.InsightType.MOST_POPULAR_DAY_AND_HOUR
 import org.wordpress.android.fluxc.store.stats.insights.MostPopularInsightsStore
 import org.wordpress.android.modules.UI_THREAD
 import org.wordpress.android.ui.stats.refresh.lists.sections.BaseStatsUseCase.StatelessUseCase
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/PostingActivityUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/PostingActivityUseCase.kt
index 32ca6117dce7..725602c45969 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/PostingActivityUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/PostingActivityUseCase.kt
@@ -5,7 +5,7 @@ import kotlinx.coroutines.CoroutineDispatcher
 import org.wordpress.android.R
 import org.wordpress.android.fluxc.model.stats.insights.PostingActivityModel
 import org.wordpress.android.fluxc.model.stats.insights.PostingActivityModel.Day
-import org.wordpress.android.fluxc.store.StatsStore.InsightsTypes.POSTING_ACTIVITY
+import org.wordpress.android.fluxc.store.StatsStore.InsightType.POSTING_ACTIVITY
 import org.wordpress.android.fluxc.store.stats.insights.PostingActivityStore
 import org.wordpress.android.modules.UI_THREAD
 import org.wordpress.android.ui.stats.refresh.lists.sections.BaseStatsUseCase.StatelessUseCase
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/PublicizeUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/PublicizeUseCase.kt
index 0f31d5f8f215..8e0aec9de598 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/PublicizeUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/PublicizeUseCase.kt
@@ -7,7 +7,7 @@ import org.wordpress.android.R.string
 import org.wordpress.android.analytics.AnalyticsTracker
 import org.wordpress.android.fluxc.model.stats.LimitMode
 import org.wordpress.android.fluxc.model.stats.PublicizeModel
-import org.wordpress.android.fluxc.store.StatsStore.InsightsTypes.PUBLICIZE
+import org.wordpress.android.fluxc.store.StatsStore.InsightType.PUBLICIZE
 import org.wordpress.android.fluxc.store.stats.insights.PublicizeStore
 import org.wordpress.android.modules.UI_THREAD
 import org.wordpress.android.ui.stats.refresh.NavigationTarget.ViewPublicizeStats
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/TagsAndCategoriesUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/TagsAndCategoriesUseCase.kt
index 3c37eb1a4c0c..4a74edb4f22a 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/TagsAndCategoriesUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/TagsAndCategoriesUseCase.kt
@@ -9,7 +9,7 @@ import org.wordpress.android.analytics.AnalyticsTracker
 import org.wordpress.android.fluxc.model.stats.LimitMode
 import org.wordpress.android.fluxc.model.stats.TagsModel
 import org.wordpress.android.fluxc.model.stats.TagsModel.TagModel
-import org.wordpress.android.fluxc.store.StatsStore.InsightsTypes.TAGS_AND_CATEGORIES
+import org.wordpress.android.fluxc.store.StatsStore.InsightType.TAGS_AND_CATEGORIES
 import org.wordpress.android.fluxc.store.stats.insights.TagsStore
 import org.wordpress.android.modules.UI_THREAD
 import org.wordpress.android.ui.stats.refresh.NavigationTarget.ViewTag
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/TodayStatsUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/TodayStatsUseCase.kt
index b88df4445499..b1711e7f34fe 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/TodayStatsUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/TodayStatsUseCase.kt
@@ -5,7 +5,7 @@ import kotlinx.coroutines.CoroutineDispatcher
 import org.wordpress.android.R
 import org.wordpress.android.R.string
 import org.wordpress.android.fluxc.model.stats.VisitsModel
-import org.wordpress.android.fluxc.store.StatsStore.InsightsTypes.TODAY_STATS
+import org.wordpress.android.fluxc.store.StatsStore.InsightType.TODAY_STATS
 import org.wordpress.android.fluxc.store.stats.insights.TodayInsightsStore
 import org.wordpress.android.modules.UI_THREAD
 import org.wordpress.android.ui.stats.refresh.lists.sections.BaseStatsUseCase.StatelessUseCase
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/LinkButtonViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/LinkButtonViewHolder.kt
new file mode 100644
index 000000000000..7b99ec6c6ae2
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/LinkButtonViewHolder.kt
@@ -0,0 +1,19 @@
+package org.wordpress.android.ui.stats.refresh.lists.sections.viewholders
+
+import android.view.ViewGroup
+import android.widget.TextView
+import org.wordpress.android.R
+import org.wordpress.android.R.id
+import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.LinkButton
+
+class LinkButtonViewHolder(val parent: ViewGroup) : BlockListItemViewHolder(
+        parent,
+        R.layout.stats_block_link_button_item
+) {
+    private val text = itemView.findViewById<TextView>(id.text)
+
+    fun bind(item: LinkButton) {
+        text.setText(item.text)
+        text.setOnClickListener { item.navigateAction.click() }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/TabsViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/TabsViewHolder.kt
index 7e8cf853ad40..6c48d0b285ca 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/TabsViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/TabsViewHolder.kt
@@ -6,7 +6,6 @@ import android.support.design.widget.TabLayout.Tab
 import android.view.ViewGroup
 import org.wordpress.android.R
 import org.wordpress.android.R.id
-import org.wordpress.android.R.layout
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.TabsItem
 import org.wordpress.android.util.image.ImageManager
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/viewholders/BaseStatsViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/viewholders/BaseStatsViewHolder.kt
index 37ed84b8acfb..04aad05bb4d9 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/viewholders/BaseStatsViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/viewholders/BaseStatsViewHolder.kt
@@ -6,9 +6,9 @@ import android.support.v7.widget.RecyclerView.ViewHolder
 import android.support.v7.widget.StaggeredGridLayoutManager
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import org.wordpress.android.fluxc.store.StatsStore.InsightsTypes.LATEST_POST_SUMMARY
-import org.wordpress.android.fluxc.store.StatsStore.StatsTypes
-import org.wordpress.android.fluxc.store.StatsStore.TimeStatsTypes.OVERVIEW
+import org.wordpress.android.fluxc.store.StatsStore.InsightType.LATEST_POST_SUMMARY
+import org.wordpress.android.fluxc.store.StatsStore.StatsType
+import org.wordpress.android.fluxc.store.StatsStore.TimeStatsType.OVERVIEW
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem
 
 abstract class BaseStatsViewHolder(
@@ -16,8 +16,8 @@ abstract class BaseStatsViewHolder(
     @LayoutRes layout: Int
 ) : ViewHolder(LayoutInflater.from(parent.context).inflate(layout, parent, false)) {
     @CallSuper
-    open fun bind(statsTypes: StatsTypes, items: List<BlockListItem>) {
-        if (statsTypes == OVERVIEW || statsTypes == LATEST_POST_SUMMARY) {
+    open fun bind(statsType: StatsType?, items: List<BlockListItem>) {
+        if (statsType == OVERVIEW || statsType == LATEST_POST_SUMMARY) {
             val layoutParams = itemView.layoutParams as? StaggeredGridLayoutManager.LayoutParams
             layoutParams?.isFullSpan = true
         }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/viewholders/BlockListViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/viewholders/BlockListViewHolder.kt
index 639527968409..f3fbf508cc4a 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/viewholders/BlockListViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/viewholders/BlockListViewHolder.kt
@@ -4,19 +4,18 @@ import android.support.v7.widget.LinearLayoutManager
 import android.support.v7.widget.RecyclerView
 import android.view.ViewGroup
 import org.wordpress.android.R
-import org.wordpress.android.R.layout
-import org.wordpress.android.fluxc.store.StatsStore.StatsTypes
+import org.wordpress.android.fluxc.store.StatsStore.StatsType
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListAdapter
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem
 import org.wordpress.android.util.image.ImageManager
 
-class BlockListViewHolder(parent: ViewGroup, val imageManager: ImageManager) : BaseStatsViewHolder(
+open class BlockListViewHolder(parent: ViewGroup, val imageManager: ImageManager) : BaseStatsViewHolder(
         parent,
         R.layout.stats_list_block
 ) {
     private val list: RecyclerView = itemView.findViewById(R.id.stats_block_list)
-    override fun bind(statsTypes: StatsTypes, items: List<BlockListItem>) {
-        super.bind(statsTypes, items)
+    override fun bind(statsType: StatsType?, items: List<BlockListItem>) {
+        super.bind(statsType, items)
         list.isNestedScrollingEnabled = false
         if (list.adapter == null) {
             list.layoutManager = LinearLayoutManager(list.context, LinearLayoutManager.VERTICAL, false)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/viewholders/ControlViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/viewholders/ControlViewHolder.kt
new file mode 100644
index 000000000000..afd9155f6afd
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/viewholders/ControlViewHolder.kt
@@ -0,0 +1,15 @@
+package org.wordpress.android.ui.stats.refresh.lists.viewholders
+
+import android.view.ViewGroup
+import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem
+import org.wordpress.android.util.image.ImageManager
+
+class ControlViewHolder(val parent: ViewGroup, imageManager: ImageManager) : BlockListViewHolder(
+        parent,
+        imageManager
+) {
+    fun bind(items: List<BlockListItem>) {
+        super.bind(null, items)
+        itemView.background = null
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/viewholders/LoadingViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/viewholders/LoadingViewHolder.kt
index dff184a738b3..49a9f72bb01f 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/viewholders/LoadingViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/viewholders/LoadingViewHolder.kt
@@ -4,7 +4,6 @@ import android.support.v7.widget.LinearLayoutManager
 import android.support.v7.widget.RecyclerView
 import android.view.ViewGroup
 import org.wordpress.android.R
-import org.wordpress.android.R.layout
 import org.wordpress.android.fluxc.store.StatsStore
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListAdapter
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem
@@ -15,8 +14,8 @@ class LoadingViewHolder(parent: ViewGroup, val imageManager: ImageManager) : Bas
         R.layout.stats_loading_view
 ) {
     private val list: RecyclerView = itemView.findViewById(R.id.stats_block_list)
-    override fun bind(statsTypes: StatsStore.StatsTypes, items: List<BlockListItem>) {
-        super.bind(statsTypes, items)
+    override fun bind(statsType: StatsStore.StatsType?, items: List<BlockListItem>) {
+        super.bind(statsType, items)
         list.isNestedScrollingEnabled = false
         if (list.adapter == null) {
             list.layoutManager = LinearLayoutManager(list.context, LinearLayoutManager.VERTICAL, false)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/utils/ItemPopupMenuHandler.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/utils/ItemPopupMenuHandler.kt
index b1be5216b1fe..06d6d21295a1 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/utils/ItemPopupMenuHandler.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/utils/ItemPopupMenuHandler.kt
@@ -2,7 +2,6 @@ package org.wordpress.android.ui.stats.refresh.utils
 
 import android.arch.lifecycle.LiveData
 import android.arch.lifecycle.MutableLiveData
-import android.support.v7.widget.PopupMenu
 import android.view.View
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.GlobalScope
@@ -10,14 +9,20 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.wordpress.android.R
 import org.wordpress.android.fluxc.store.StatsStore
-import org.wordpress.android.fluxc.store.StatsStore.InsightsTypes
-import org.wordpress.android.fluxc.store.StatsStore.StatsTypes
+import org.wordpress.android.fluxc.store.StatsStore.InsightType
+import org.wordpress.android.fluxc.store.StatsStore.StatsType
 import org.wordpress.android.modules.BG_THREAD
 import org.wordpress.android.modules.UI_THREAD
 import org.wordpress.android.viewmodel.Event
 import javax.inject.Inject
 import javax.inject.Named
 import javax.inject.Singleton
+import android.support.v7.widget.ListPopupWindow
+import org.wordpress.android.ui.stats.refresh.lists.sections.insights.InsightsMenuAdapter
+import org.wordpress.android.ui.stats.refresh.lists.sections.insights.InsightsMenuAdapter.InsightsMenuItem
+import org.wordpress.android.ui.stats.refresh.lists.sections.insights.InsightsMenuAdapter.InsightsMenuItem.DOWN
+import org.wordpress.android.ui.stats.refresh.lists.sections.insights.InsightsMenuAdapter.InsightsMenuItem.REMOVE
+import org.wordpress.android.ui.stats.refresh.lists.sections.insights.InsightsMenuAdapter.InsightsMenuItem.UP
 
 @Singleton
 class ItemPopupMenuHandler
@@ -27,49 +32,49 @@ class ItemPopupMenuHandler
     private val statsStore: StatsStore,
     private val statsSiteProvider: StatsSiteProvider
 ) {
-    private val mutableTypeMoved = MutableLiveData<Event<InsightsTypes>>()
-    val typeMoved: LiveData<Event<InsightsTypes>> = mutableTypeMoved
-    fun onMenuClick(view: View, statsType: StatsTypes) {
+    private val mutableTypeMoved = MutableLiveData<Event<InsightType>>()
+    val typeMoved: LiveData<Event<InsightType>> = mutableTypeMoved
+
+    fun onMenuClick(view: View, statsType: StatsType) {
         GlobalScope.launch(bgDispatcher) {
-            val type = statsType as InsightsTypes
-            val insights = statsStore.getInsights(statsSiteProvider.siteModel)
+            val type = statsType as InsightType
+            val insights = statsStore.getAddedInsights(statsSiteProvider.siteModel)
 
             val indexOfBlock = insights.indexOfFirst { it == type }
             val showUpAction = indexOfBlock > 0
             val showDownAction = indexOfBlock < insights.size - 1
+
             withContext(mainDispatcher) {
-                val popup = PopupMenu(view.context, view)
-                val popupMenu = popup.menu
-                popup.inflate(R.menu.menu_stats_item)
-                popupMenu.findItem(R.id.action_move_up).isVisible = showUpAction
-                popupMenu.findItem(R.id.action_move_down).isVisible = showDownAction
-                popup.show()
-                popup.setOnMenuItemClickListener { menuItem ->
-                    when (menuItem.itemId) {
-                        R.id.action_move_up -> {
+                val popup = ListPopupWindow(view.context)
+                val adapter = InsightsMenuAdapter(view.context, showUpAction, showDownAction)
+                popup.setAdapter(adapter)
+                popup.width = view.context.resources.getDimensionPixelSize(R.dimen.stats_insights_menu_item_width)
+                popup.anchorView = view
+                popup.isModal = true
+                popup.setOnItemClickListener { _, _, _, id ->
+                    when (InsightsMenuItem.values()[id.toInt()]) {
+                        UP -> {
                             GlobalScope.launch(bgDispatcher) {
                                 statsStore.moveTypeUp(statsSiteProvider.siteModel, type)
                                 mutableTypeMoved.postValue(Event(type))
                             }
-                            true
                         }
-                        R.id.action_move_down -> {
+                        DOWN -> {
                             GlobalScope.launch(bgDispatcher) {
                                 statsStore.moveTypeDown(statsSiteProvider.siteModel, type)
                                 mutableTypeMoved.postValue(Event(type))
                             }
-                            true
                         }
-                        R.id.action_remove -> {
+                        REMOVE -> {
                             GlobalScope.launch(bgDispatcher) {
                                 statsStore.removeType(statsSiteProvider.siteModel, type)
                                 mutableTypeMoved.postValue(Event(type))
                             }
-                            true
                         }
-                        else -> false
                     }
+                    popup.dismiss()
                 }
+                popup.show()
             }
         }
     }
diff --git a/WordPress/src/main/res/drawable/ic_add_circle.xml b/WordPress/src/main/res/drawable/ic_add_circle.xml
new file mode 100644
index 000000000000..b6826feeb3e3
--- /dev/null
+++ b/WordPress/src/main/res/drawable/ic_add_circle.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/shape_oval_green" android:gravity="center" />
+    <item android:drawable="@drawable/ic_plus_small_24dp" android:gravity="center" />
+</layer-list>
diff --git a/WordPress/src/main/res/drawable/ic_material_drag_handle_24dp.xml b/WordPress/src/main/res/drawable/ic_material_drag_handle_24dp.xml
new file mode 100644
index 000000000000..6d333d8042a9
--- /dev/null
+++ b/WordPress/src/main/res/drawable/ic_material_drag_handle_24dp.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/grey"
+        android:pathData="M20 9H4v2h16V9zM4 15h16v-2H4v2z" />
+</vector>
diff --git a/WordPress/src/main/res/drawable/ic_minus_small_24dp.xml b/WordPress/src/main/res/drawable/ic_minus_small_24dp.xml
new file mode 100644
index 000000000000..0da31deb6983
--- /dev/null
+++ b/WordPress/src/main/res/drawable/ic_minus_small_24dp.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+
+    <path
+        android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M6 11h12v2H6z" />
+</vector>
diff --git a/WordPress/src/main/res/drawable/ic_plus_small_24dp.xml b/WordPress/src/main/res/drawable/ic_plus_small_24dp.xml
new file mode 100644
index 000000000000..9c2634168399
--- /dev/null
+++ b/WordPress/src/main/res/drawable/ic_plus_small_24dp.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+
+    <path
+        android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M18 11h-5V6h-2v5H6v2h5v5h2v-5h5" />
+</vector>
diff --git a/WordPress/src/main/res/drawable/ic_remove_circle.xml b/WordPress/src/main/res/drawable/ic_remove_circle.xml
new file mode 100644
index 000000000000..581a0cb7cac2
--- /dev/null
+++ b/WordPress/src/main/res/drawable/ic_remove_circle.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/shape_oval_red" android:gravity="center" />
+    <item android:drawable="@drawable/ic_minus_small_24dp" android:gravity="center" />
+</layer-list>
diff --git a/WordPress/src/main/res/layout-w528dp/insights_management_fragment.xml b/WordPress/src/main/res/layout-w528dp/insights_management_fragment.xml
new file mode 100644
index 000000000000..fe773fc50a10
--- /dev/null
+++ b/WordPress/src/main/res/layout-w528dp/insights_management_fragment.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView
+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:id="@+id/insightsManagementScrollView"
+android:layout_width="wrap_content"
+android:layout_height="match_parent">
+
+<android.support.constraint.ConstraintLayout
+    android:id="@+id/insightsManagementContainer"
+    style="@style/StatsInsightManagementList"
+    android:paddingBottom="@dimen/margin_large"
+    android:layout_marginStart="@dimen/margin_large"
+    android:layout_marginEnd="@dimen/margin_large">
+
+    <TextView
+        android:id="@+id/insightsManagementSubtitle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/margin_extra_large"
+        android:layout_marginStart="@dimen/margin_extra_large"
+        android:layout_marginTop="@dimen/stats_insights_management_margin"
+        android:paddingBottom="@dimen/stats_insights_management_margin"
+        android:gravity="center_horizontal"
+        android:text="@string/stats_insights_management_title"
+        android:textColor="@color/grey_darken_20"
+        android:textSize="@dimen/text_sz_large"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"/>
+
+    <android.support.v7.widget.CardView
+        android:id="@+id/addedInsightsCard"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:animateLayoutChanges="false"
+        app:cardUseCompatPadding="true"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/insightsManagementSubtitle"
+        app:cardCornerRadius="@dimen/default_cardview_radius"
+        app:cardElevation="@dimen/default_cardview_elevation">
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/addedInsights"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:nestedScrollingEnabled="false"
+            android:scrollbars="none"
+            tools:listitem="@layout/insights_management_list_item"/>
+
+    </android.support.v7.widget.CardView>
+
+    <TextView
+        android:id="@+id/addedInsightsInfo"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textColor="@color/grey_darken_20"
+        android:textSize="@dimen/text_sz_medium"
+        android:layout_marginTop="@dimen/margin_extra_large"
+        android:layout_marginStart="@dimen/margin_extra_large"
+        android:layout_marginEnd="@dimen/margin_extra_large"
+        android:paddingBottom="@dimen/margin_extra_extra_medium_large"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/addedInsightsCard"
+        android:text="@string/stats_insights_management_drag_and_drop_hint"/>
+
+    <TextView
+        android:id="@+id/addInsightsHeader"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textColor="@color/grey_darken_20"
+        android:textSize="@dimen/text_sz_medium"
+        android:textStyle="bold"
+        android:layout_marginStart="@dimen/margin_extra_large"
+        android:layout_marginEnd="@dimen/margin_extra_large"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/addedInsightsInfo"
+        android:text="@string/stats_insights_add_insights_header"/>
+
+    <android.support.v7.widget.CardView
+        android:id="@+id/removedInsightsCard"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:animateLayoutChanges="false"
+        android:layout_marginTop="@dimen/margin_large"
+        app:cardUseCompatPadding="true"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/addInsightsHeader"
+        app:cardCornerRadius="@dimen/default_cardview_radius"
+        app:cardElevation="@dimen/default_cardview_elevation">
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/removedInsights"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:nestedScrollingEnabled="false"
+            tools:listitem="@layout/insights_management_list_item"
+            />
+
+    </android.support.v7.widget.CardView>
+
+</android.support.constraint.ConstraintLayout>
+
+</ScrollView>
diff --git a/WordPress/src/main/res/layout/insights_management_fragment.xml b/WordPress/src/main/res/layout/insights_management_fragment.xml
index d94781380073..e75aa05bf766 100644
--- a/WordPress/src/main/res/layout/insights_management_fragment.xml
+++ b/WordPress/src/main/res/layout/insights_management_fragment.xml
@@ -1,14 +1,86 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<ScrollView
     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:id="@+id/insightsManagementScrollView"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.v7.widget.RecyclerView
-        android:id="@+id/removedInsights"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:clipToPadding="false"
-        android:scrollbars="none"
-        />
-</LinearLayout>
+    <android.support.constraint.ConstraintLayout
+        android:id="@+id/insightsManagementContainer"
+        style="@style/StatsInsightManagementList"
+        android:clipChildren="false">
+
+        <TextView
+            android:id="@+id/insightsManagementSubtitle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/margin_extra_large"
+            android:layout_marginStart="@dimen/margin_extra_large"
+            android:layout_marginTop="@dimen/stats_insights_management_margin"
+            android:paddingBottom="@dimen/stats_insights_management_margin"
+            android:gravity="center_horizontal"
+            android:text="@string/stats_insights_management_title"
+            android:textColor="@color/grey_darken_20"
+            android:textSize="@dimen/text_sz_large"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"/>
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/addedInsights"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:nestedScrollingEnabled="false"
+            android:translationZ="1dp"
+            android:scrollbars="none"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/insightsManagementSubtitle"
+            tools:listitem="@layout/insights_management_list_item"/>
+
+        <TextView
+            android:id="@+id/addedInsightsInfo"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textColor="@color/grey_darken_20"
+            android:textSize="@dimen/text_sz_medium"
+            android:layout_marginTop="@dimen/margin_extra_large"
+            android:layout_marginStart="@dimen/margin_extra_large"
+            android:layout_marginEnd="@dimen/margin_extra_large"
+            android:paddingBottom="@dimen/margin_extra_extra_medium_large"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/addedInsights"
+            android:text="@string/stats_insights_management_drag_and_drop_hint"/>
+
+        <TextView
+            android:id="@+id/addInsightsHeader"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/margin_extra_large"
+            android:layout_marginStart="@dimen/margin_extra_large"
+            android:text="@string/stats_insights_add_insights_header"
+            android:textColor="@color/grey_darken_20"
+            android:textSize="@dimen/text_sz_medium"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/addedInsightsInfo"/>
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/removedInsights"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:nestedScrollingEnabled="false"
+            android:layout_marginTop="@dimen/margin_large"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/addInsightsHeader"
+            tools:listitem="@layout/insights_management_list_item"
+            />
+
+    </android.support.constraint.ConstraintLayout>
+
+</ScrollView>
diff --git a/WordPress/src/main/res/layout/insights_management_list_item.xml b/WordPress/src/main/res/layout/insights_management_list_item.xml
new file mode 100644
index 000000000000..9b7da91766e9
--- /dev/null
+++ b/WordPress/src/main/res/layout/insights_management_list_item.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:background="@color/white">
+
+    <android.support.v7.widget.AppCompatImageButton
+        android:id="@+id/insightsManagementItemButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        android:paddingBottom="12dp"
+        android:paddingEnd="16dp"
+        android:paddingStart="16dp"
+        android:paddingTop="12dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@drawable/ic_add_circle"/>
+
+    <TextView
+        android:id="@+id/itemTitle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="14dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="14dp"
+        android:textColor="@color/grey_dark"
+        android:textSize="@dimen/text_sz_large"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/dragAndDropItemButton"
+        app:layout_constraintStart_toEndOf="@+id/insightsManagementItemButton"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Latest post" />
+
+    <android.support.v7.widget.AppCompatImageButton
+        android:id="@+id/dragAndDropItemButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:paddingTop="12dp"
+        android:paddingBottom="12dp"
+        android:src="@drawable/ic_material_drag_handle_24dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"/>
+
+    <View
+        android:id="@+id/divider"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/neutral_0"
+        android:layout_marginStart="16dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+</android.support.constraint.ConstraintLayout>
diff --git a/WordPress/src/main/res/layout/stats_block_four_columns_item.xml b/WordPress/src/main/res/layout/stats_block_four_columns_item.xml
index 10fa560668f3..804e1cae3fbb 100644
--- a/WordPress/src/main/res/layout/stats_block_four_columns_item.xml
+++ b/WordPress/src/main/res/layout/stats_block_four_columns_item.xml
@@ -4,7 +4,8 @@
     android:id="@+id/column_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal">
+    android:orientation="horizontal"
+    android:baselineAligned="false">
 
     <include
         android:id="@+id/column1"
diff --git a/WordPress/src/main/res/layout/stats_block_link_button_item.xml b/WordPress/src/main/res/layout/stats_block_link_button_item.xml
new file mode 100644
index 000000000000..8278d849f65b
--- /dev/null
+++ b/WordPress/src/main/res/layout/stats_block_link_button_item.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_height="@dimen/stats_insights_button_container_height"
+              android:layout_width="match_parent"
+              android:gravity="center">
+
+    <Button
+        android:id="@+id/text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:background="?attr/selectableItemBackground"
+        android:textColor="@color/wp_blue_medium"
+        android:textSize="@dimen/text_sz_medium"
+        tools:text="Edit"/>
+
+</FrameLayout>
diff --git a/WordPress/src/main/res/layout/stats_block_title_item.xml b/WordPress/src/main/res/layout/stats_block_title_item.xml
index 4ff1df73b702..39f5d1193f28 100644
--- a/WordPress/src/main/res/layout/stats_block_title_item.xml
+++ b/WordPress/src/main/res/layout/stats_block_title_item.xml
@@ -21,7 +21,7 @@
         android:id="@+id/menu"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="@color/transparent"
+        android:background="?attr/selectableItemBackgroundBorderless"
         android:src="@drawable/ic_ellipsis_vertical_grey_darken_48dp"
         android:contentDescription="@string/stats_item_settings"/>
 
diff --git a/WordPress/src/main/res/layout/stats_date_selector.xml b/WordPress/src/main/res/layout/stats_date_selector.xml
index fe8daf5bdbb5..1a62d9bca772 100644
--- a/WordPress/src/main/res/layout/stats_date_selector.xml
+++ b/WordPress/src/main/res/layout/stats_date_selector.xml
@@ -7,7 +7,7 @@
                                              android:background="@android:color/white">
 
     <TextView
-        android:id="@+id/selected_date"
+        android:id="@+id/selectedDateTextView"
         style="@style/StatsBlockTitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -15,14 +15,14 @@
         android:layout_marginStart="16dp"
         android:text="@string/unknown"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/select_previous_date"
+        app:layout_constraintEnd_toStartOf="@+id/previousDateButton"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.518"/>
 
     <ImageButton
-        android:id="@+id/select_previous_date"
+        android:id="@+id/previousDateButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
@@ -33,12 +33,12 @@
         android:src="@drawable/ic_chevron_left_white_24dp"
         android:tint="@color/neutral_700_neutral_200_selector"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/select_next_date"
-        app:layout_constraintStart_toEndOf="@+id/selected_date"
+        app:layout_constraintEnd_toStartOf="@+id/nextDateButton"
+        app:layout_constraintStart_toEndOf="@+id/selectedDateTextView"
         app:layout_constraintTop_toTopOf="parent"/>
 
     <ImageButton
-        android:id="@+id/select_next_date"
+        android:id="@+id/nextDateButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="12dp"
diff --git a/WordPress/src/main/res/layout/stats_empty_view.xml b/WordPress/src/main/res/layout/stats_empty_view.xml
index 18c50a1b9415..cc4dcd713c21 100644
--- a/WordPress/src/main/res/layout/stats_empty_view.xml
+++ b/WordPress/src/main/res/layout/stats_empty_view.xml
@@ -2,12 +2,14 @@
 <org.wordpress.android.ui.ActionableEmptyView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/actionable_empty_view"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/statsEmptyView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/background_default"
     android:visibility="gone"
-    app:aevButton="@string/manage_insights"
+    tools:visibility="visible"
+    app:aevButton="@string/stats_manage_insights"
     app:aevImage="@drawable/img_illustration_insights_94dp"
-    app:aevSubtitle="@string/stats_empty_insights_description"
+    app:aevSubtitle="@string/stats_insights_management_title"
     app:aevTitle="@string/stats_empty_insights_title"/>
diff --git a/WordPress/src/main/res/layout/stats_error_view.xml b/WordPress/src/main/res/layout/stats_error_view.xml
index c789a623c1d0..a87dc3fd881b 100644
--- a/WordPress/src/main/res/layout/stats_error_view.xml
+++ b/WordPress/src/main/res/layout/stats_error_view.xml
@@ -3,7 +3,7 @@
     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:id="@+id/actionable_error_view"
+    android:id="@+id/statsErrorView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:visibility="gone"
diff --git a/WordPress/src/main/res/layout/stats_insights_popup_menu_item.xml b/WordPress/src/main/res/layout/stats_insights_popup_menu_item.xml
new file mode 100644
index 000000000000..1b589cd3d7e5
--- /dev/null
+++ b/WordPress/src/main/res/layout/stats_insights_popup_menu_item.xml
@@ -0,0 +1,25 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/menu_item_height"
+    android:gravity="start|center_vertical"
+    android:orientation="horizontal"
+    android:paddingStart="@dimen/menu_item_margin"
+    android:paddingEnd="@dimen/menu_item_margin">
+
+    <ImageView
+        android:id="@+id/image"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@null"
+        android:layout_marginEnd="@dimen/margin_extra_large"
+        tools:src="@drawable/ic_arrow_up_grey_dark_24dp" />
+
+    <org.wordpress.android.widgets.WPTextView
+        android:id="@+id/text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?textAppearanceSmallPopupMenu"
+        tools:text="@string/stats_menu_remove" />
+
+</LinearLayout>
diff --git a/WordPress/src/main/res/layout/stats_list_fragment.xml b/WordPress/src/main/res/layout/stats_list_fragment.xml
index 5b30ad47a550..2981a45bd21b 100644
--- a/WordPress/src/main/res/layout/stats_list_fragment.xml
+++ b/WordPress/src/main/res/layout/stats_list_fragment.xml
@@ -17,10 +17,7 @@
         android:layout_weight="1"/>
 
     <include
-        layout="@layout/stats_empty_view"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"/>
+        layout="@layout/stats_empty_view" />
 
     <com.facebook.shimmer.ShimmerFrameLayout
         android:id="@+id/loadingContainer"
diff --git a/WordPress/src/main/res/menu/menu_insights_management.xml b/WordPress/src/main/res/menu/menu_insights_management.xml
new file mode 100644
index 000000000000..a58b0dce68e9
--- /dev/null
+++ b/WordPress/src/main/res/menu/menu_insights_management.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/save_insights"
+        android:title="@string/save"
+        app:showAsAction="always"/>
+</menu>
diff --git a/WordPress/src/main/res/menu/menu_stats_insights.xml b/WordPress/src/main/res/menu/menu_stats_insights.xml
deleted file mode 100644
index 9a9e74776d88..000000000000
--- a/WordPress/src/main/res/menu/menu_stats_insights.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item
-        android:id="@+id/manage_insights"
-        app:showAsAction="always"
-        android:title="@string/manage_insights"/>
-</menu>
diff --git a/WordPress/src/main/res/menu/menu_stats_item.xml b/WordPress/src/main/res/menu/menu_stats_item.xml
deleted file mode 100644
index 4c707d8be788..000000000000
--- a/WordPress/src/main/res/menu/menu_stats_item.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/action_move_up"
-        android:icon="@drawable/ic_arrow_up_grey_dark_24dp"
-        android:title="@string/stats_menu_move_up"/>
-    <item
-        android:id="@+id/action_move_down"
-        android:icon="@drawable/ic_arrow_down_grey_dark_24dp"
-        android:title="@string/stats_menu_move_down"/>
-    <item
-        android:id="@+id/action_remove"
-        android:icon="@drawable/ic_trash_grey_dark_24dp"
-        android:title="@string/stats_menu_remove"/>
-</menu>
diff --git a/WordPress/src/main/res/values-ar/strings.xml b/WordPress/src/main/res/values-ar/strings.xml
index 6474ff88569d..2e7fe5a58ba5 100644
--- a/WordPress/src/main/res/values-ar/strings.xml
+++ b/WordPress/src/main/res/values-ar/strings.xml
@@ -216,7 +216,7 @@ Language: ar
     <string name="stats_followers_count_message">إجمالي %1$s من المتابعين: %2$s</string>
     <string name="stats_followers_email">البريد الإلكتروني</string>
     <string name="stats_followers_wordpress_com">وردبرس.كوم</string>
-    <string name="manage_insights">إدارة الرؤى</string>
+    <string name="stats_manage_insights">إدارة الرؤى</string>
     <string name="stats_empty_insights_description">تخصيص الرؤى الخاصة بك والحصول على معلومات حول أداء موقعك</string>
     <string name="stats_empty_insights_title">لم تتم إضافة رى حتى الآن</string>
     <string name="stats_no_data_yet">لا توجد بيانات حتى الآن</string>
diff --git a/WordPress/src/main/res/values-de/strings.xml b/WordPress/src/main/res/values-de/strings.xml
index d2266904f733..d2cf5b80ac13 100644
--- a/WordPress/src/main/res/values-de/strings.xml
+++ b/WordPress/src/main/res/values-de/strings.xml
@@ -216,7 +216,7 @@ Language: de
     <string name="stats_followers_count_message">%1$s-Follower insgesamt: %2$s</string>
     <string name="stats_followers_email">E-Mail</string>
     <string name="stats_followers_wordpress_com">WordPress.com</string>
-    <string name="manage_insights">Einsichten verwalten</string>
+    <string name="stats_manage_insights">Einsichten verwalten</string>
     <string name="stats_empty_insights_description">Passe deine Einsichten an und erhalte Details zur Leistung deiner Website</string>
     <string name="stats_empty_insights_title">Noch keine Einsichten hinzugefügt</string>
     <string name="stats_no_data_yet">Noch keine Daten</string>
diff --git a/WordPress/src/main/res/values-en-rAU/strings.xml b/WordPress/src/main/res/values-en-rAU/strings.xml
index 34307b72f50e..f68858b47cba 100644
--- a/WordPress/src/main/res/values-en-rAU/strings.xml
+++ b/WordPress/src/main/res/values-en-rAU/strings.xml
@@ -216,7 +216,7 @@ Language: en_AU
     <string name="stats_followers_count_message">Total %1$s Followers: %2$s</string>
     <string name="stats_followers_email">Email</string>
     <string name="stats_followers_wordpress_com">WordPress.com</string>
-    <string name="manage_insights">Manage insights</string>
+    <string name="stats_manage_insights">Manage insights</string>
     <string name="stats_empty_insights_description">Customise your insights and get the low-down on your site’s performance</string>
     <string name="stats_empty_insights_title">No insights added yet</string>
     <string name="stats_no_data_yet">No data yet</string>
diff --git a/WordPress/src/main/res/values-en-rCA/strings.xml b/WordPress/src/main/res/values-en-rCA/strings.xml
index f5a5d3baed2c..a26533e8f398 100644
--- a/WordPress/src/main/res/values-en-rCA/strings.xml
+++ b/WordPress/src/main/res/values-en-rCA/strings.xml
@@ -216,7 +216,7 @@ Language: en_CA
     <string name="stats_followers_count_message">Total %1$s Followers: %2$s</string>
     <string name="stats_followers_email">Email</string>
     <string name="stats_followers_wordpress_com">WordPress.com</string>
-    <string name="manage_insights">Manage insights</string>
+    <string name="stats_manage_insights">Manage insights</string>
     <string name="stats_empty_insights_description">Customize your insights and get the low-down on your site’s performance</string>
     <string name="stats_empty_insights_title">No insights added yet</string>
     <string name="stats_no_data_yet">No data yet</string>
diff --git a/WordPress/src/main/res/values-en-rGB/strings.xml b/WordPress/src/main/res/values-en-rGB/strings.xml
index 1808fb05153e..c658bea430be 100644
--- a/WordPress/src/main/res/values-en-rGB/strings.xml
+++ b/WordPress/src/main/res/values-en-rGB/strings.xml
@@ -200,7 +200,7 @@ Language: en_GB
     <string name="stats_followers_count_message">Total %1$s Followers: %2$s</string>
     <string name="stats_followers_email">E-mail</string>
     <string name="stats_followers_wordpress_com">WordPress.com</string>
-    <string name="manage_insights">Manage insights</string>
+    <string name="stats_manage_insights">Manage insights</string>
     <string name="stats_empty_insights_description">Customise your insights and get the low-down on your site’s performance</string>
     <string name="stats_empty_insights_title">No insights added yet</string>
     <string name="stats_no_data_yet">No data yet</string>
diff --git a/WordPress/src/main/res/values-es-rCL/strings.xml b/WordPress/src/main/res/values-es-rCL/strings.xml
index cd6eb792a8ea..78cc4773cc74 100644
--- a/WordPress/src/main/res/values-es-rCL/strings.xml
+++ b/WordPress/src/main/res/values-es-rCL/strings.xml
@@ -60,7 +60,7 @@ Language: es_CL
     <string name="stats_followers_count_message">Total %1$s Seguidores: %2$s</string>
     <string name="stats_followers_email">Email</string>
     <string name="stats_followers_wordpress_com">WordPress.com</string>
-    <string name="manage_insights">Administrar estadísticas</string>
+    <string name="stats_manage_insights">Administrar estadísticas</string>
     <string name="stats_empty_insights_title">Aún no se ha añadido estadisticas</string>
     <string name="stats_no_data_yet">Aún no hay datos</string>
     <string name="menu_debug">Menú Depuración</string>
diff --git a/WordPress/src/main/res/values-es/strings.xml b/WordPress/src/main/res/values-es/strings.xml
index ed9faa353c80..9dff11f7ae6c 100644
--- a/WordPress/src/main/res/values-es/strings.xml
+++ b/WordPress/src/main/res/values-es/strings.xml
@@ -216,7 +216,7 @@ Language: es
     <string name="stats_followers_count_message">Total %1$s seguidores: %2$s</string>
     <string name="stats_followers_email">Correo electrónico</string>
     <string name="stats_followers_wordpress_com">WordPress.com</string>
-    <string name="manage_insights">Gestionar impresiones</string>
+    <string name="stats_manage_insights">Gestionar impresiones</string>
     <string name="stats_empty_insights_description">Personaliza tus informes y profundiza en el rendimiento de tu sitio</string>
     <string name="stats_empty_insights_title">Aún no se han añadido impresiones</string>
     <string name="stats_no_data_yet">Aún no hay datos</string>
diff --git a/WordPress/src/main/res/values-fr/strings.xml b/WordPress/src/main/res/values-fr/strings.xml
index f592f4fbc7d3..bc17517e7efb 100644
--- a/WordPress/src/main/res/values-fr/strings.xml
+++ b/WordPress/src/main/res/values-fr/strings.xml
@@ -216,7 +216,7 @@ Language: fr
     <string name="stats_followers_count_message">Total des abonnés %1$s : %2$s</string>
     <string name="stats_followers_email">E-mail</string>
     <string name="stats_followers_wordpress_com">WordPress.com</string>
-    <string name="manage_insights">Gérer les tendances</string>
+    <string name="stats_manage_insights">Gérer les tendances</string>
     <string name="stats_empty_insights_description">Personnalisez vos tendances et obtenez les dernières informations sur les performances de votre site</string>
     <string name="stats_empty_insights_title">Aucune tendance n’a encore été ajoutée</string>
     <string name="stats_no_data_yet">Aucune donnée pour le moment.</string>
diff --git a/WordPress/src/main/res/values-he/strings.xml b/WordPress/src/main/res/values-he/strings.xml
index 103e0707b17e..7ce0cffd5108 100644
--- a/WordPress/src/main/res/values-he/strings.xml
+++ b/WordPress/src/main/res/values-he/strings.xml
@@ -212,7 +212,7 @@ Language: he_IL
     <string name="stats_followers_count_message">סך הכול %1$s עוקבים: %2$s</string>
     <string name="stats_followers_email">אימייל</string>
     <string name="stats_followers_wordpress_com">WordPress.com</string>
-    <string name="manage_insights">ניהול תובנות</string>
+    <string name="stats_manage_insights">ניהול תובנות</string>
     <string name="stats_empty_insights_title">עדיין לא נוספו תובנות</string>
     <string name="stats_no_data_yet">עדיין אין נתונים</string>
     <string name="menu_debug">תפריט איתור באגים</string>
diff --git a/WordPress/src/main/res/values-id/strings.xml b/WordPress/src/main/res/values-id/strings.xml
index da2ddad4ccf0..429ab47da673 100644
--- a/WordPress/src/main/res/values-id/strings.xml
+++ b/WordPress/src/main/res/values-id/strings.xml
@@ -212,7 +212,7 @@ Language: id
     <string name="stats_followers_count_message">Total %1$s Pengikut: %2$s</string>
     <string name="stats_followers_email">Email</string>
     <string name="stats_followers_wordpress_com">WordPress.com</string>
-    <string name="manage_insights">Kelola informasi</string>
+    <string name="stats_manage_insights">Kelola informasi</string>
     <string name="stats_empty_insights_title">Belum ada informasi yang ditambahkan</string>
     <string name="stats_no_data_yet">Belum ada data</string>
     <string name="menu_debug">Menu Debug</string>
diff --git a/WordPress/src/main/res/values-it/strings.xml b/WordPress/src/main/res/values-it/strings.xml
index c3f77703f2ef..7d4c41ef2300 100644
--- a/WordPress/src/main/res/values-it/strings.xml
+++ b/WordPress/src/main/res/values-it/strings.xml
@@ -196,7 +196,7 @@ Language: it
     <string name="stats_followers_count_message">Totale follower da %1$s: %2$s</string>
     <string name="stats_followers_email">Email</string>
     <string name="stats_followers_wordpress_com">WordPress.com</string>
-    <string name="manage_insights">Gestisci insight</string>
+    <string name="stats_manage_insights">Gestisci insight</string>
     <string name="stats_empty_insights_title">Nessun insight aggiunto</string>
     <string name="stats_no_data_yet">Nessun dato</string>
     <string name="menu_debug">Menu di debug</string>
diff --git a/WordPress/src/main/res/values-ja/strings.xml b/WordPress/src/main/res/values-ja/strings.xml
index 19ba57e33c10..15922d38098f 100644
--- a/WordPress/src/main/res/values-ja/strings.xml
+++ b/WordPress/src/main/res/values-ja/strings.xml
@@ -215,7 +215,7 @@ Language: ja_JP
     <string name="stats_followers_count_message">Total %1$s Followers:%2$s</string>
     <string name="stats_followers_email">メール</string>
     <string name="stats_followers_wordpress_com">WordPress.com</string>
-    <string name="manage_insights">インサイトを管理</string>
+    <string name="stats_manage_insights">インサイトを管理</string>
     <string name="stats_empty_insights_description">インサイトをカスタマイズして、サイトのパフォーマンスを把握しましょう</string>
     <string name="stats_empty_insights_title">インサイトは追加されていません</string>
     <string name="stats_no_data_yet">データはまだありません</string>
diff --git a/WordPress/src/main/res/values-ko/strings.xml b/WordPress/src/main/res/values-ko/strings.xml
index 559cc6b12c6a..b7e043841826 100644
--- a/WordPress/src/main/res/values-ko/strings.xml
+++ b/WordPress/src/main/res/values-ko/strings.xml
@@ -208,7 +208,7 @@ Language: ko_KR
     <string name="stats_followers_count_message">총 %1$s 팔로워 수: %2$s</string>
     <string name="stats_followers_email">이메일</string>
     <string name="stats_followers_wordpress_com">워드프레스닷컴</string>
-    <string name="manage_insights">인사이트 관리</string>
+    <string name="stats_manage_insights">인사이트 관리</string>
     <string name="stats_empty_insights_title">아직 추가된 인사이트가 없음</string>
     <string name="stats_no_data_yet">아직 데이터 없음</string>
     <string name="menu_debug">디버그 메뉴</string>
diff --git a/WordPress/src/main/res/values-nb/strings.xml b/WordPress/src/main/res/values-nb/strings.xml
index 1d0ae3e90a2f..1506d56ecc66 100644
--- a/WordPress/src/main/res/values-nb/strings.xml
+++ b/WordPress/src/main/res/values-nb/strings.xml
@@ -200,7 +200,7 @@ Language: nb_NO
     <string name="stats_followers_count_message">Totalt %1$s følgere: %2$s</string>
     <string name="stats_followers_email">E-post</string>
     <string name="stats_followers_wordpress_com">WordPress.com</string>
-    <string name="manage_insights">Behandle innsikter</string>
+    <string name="stats_manage_insights">Behandle innsikter</string>
     <string name="stats_empty_insights_description">Tilpass dine innsikter og få den viktigste informasjonen om ytelsen til nettstedet ditt</string>
     <string name="stats_empty_insights_title">Ingen innsikter lagt til ennå</string>
     <string name="stats_no_data_yet">Ingen data ennå</string>
diff --git a/WordPress/src/main/res/values-pl/strings.xml b/WordPress/src/main/res/values-pl/strings.xml
index 3c0512f109a5..d50390b0498e 100644
--- a/WordPress/src/main/res/values-pl/strings.xml
+++ b/WordPress/src/main/res/values-pl/strings.xml
@@ -216,7 +216,7 @@ Language: pl
     <string name="stats_followers_count_message">Całkowita liczba obserwujących %1$s: %2$s</string>
     <string name="stats_followers_email">Email</string>
     <string name="stats_followers_wordpress_com">WordPress.com</string>
-    <string name="manage_insights">Zarządzaj trendami</string>
+    <string name="stats_manage_insights">Zarządzaj trendami</string>
     <string name="stats_empty_insights_description">Spersonalizuj kartę Trendy i uzyskaj pełną informację o wynikach swojej witryny</string>
     <string name="stats_empty_insights_title">Brak trendów, jak dotąd</string>
     <string name="stats_no_data_yet">Brak danych, jak dotąd</string>
diff --git a/WordPress/src/main/res/values-pt-rBR/strings.xml b/WordPress/src/main/res/values-pt-rBR/strings.xml
index a1fb1f5adfca..171cade4f6e4 100644
--- a/WordPress/src/main/res/values-pt-rBR/strings.xml
+++ b/WordPress/src/main/res/values-pt-rBR/strings.xml
@@ -216,7 +216,7 @@ Language: pt_BR
     <string name="stats_followers_count_message">Total de seguidores por %1$s: %2$s</string>
     <string name="stats_followers_email">E-mail</string>
     <string name="stats_followers_wordpress_com">WordPress.com</string>
-    <string name="manage_insights">Gerenciar informações</string>
+    <string name="stats_manage_insights">Gerenciar informações</string>
     <string name="stats_empty_insights_description">Personalize as informações de seu site para saber mais sobre seu desempenho</string>
     <string name="stats_empty_insights_title">Nenhuma informação adicionada ainda</string>
     <string name="stats_no_data_yet">Nenhum dado ainda</string>
diff --git a/WordPress/src/main/res/values-ro/strings.xml b/WordPress/src/main/res/values-ro/strings.xml
index 93ae6842aff6..22847b32c932 100644
--- a/WordPress/src/main/res/values-ro/strings.xml
+++ b/WordPress/src/main/res/values-ro/strings.xml
@@ -216,7 +216,7 @@ Language: ro
     <string name="stats_followers_count_message">Total urmăritori %1$s: %2$s</string>
     <string name="stats_followers_email">Prin email</string>
     <string name="stats_followers_wordpress_com">WordPress.com</string>
-    <string name="manage_insights">Administrează perspectivele</string>
+    <string name="stats_manage_insights">Administrează perspectivele</string>
     <string name="stats_empty_insights_description">Personalizează-ți perspectivele și primești informații relevante despre performanța sitului</string>
     <string name="stats_empty_insights_title">Nu ai adăugat perspective până acum</string>
     <string name="stats_no_data_yet">Încă nu există date</string>
diff --git a/WordPress/src/main/res/values-ru/strings.xml b/WordPress/src/main/res/values-ru/strings.xml
index 9f65326bd005..1a62f0dd7cdc 100644
--- a/WordPress/src/main/res/values-ru/strings.xml
+++ b/WordPress/src/main/res/values-ru/strings.xml
@@ -216,7 +216,7 @@ Language: ru
     <string name="stats_followers_count_message">Всего %1$s Подписчики: %2$s</string>
     <string name="stats_followers_email">Email</string>
     <string name="stats_followers_wordpress_com">WordPress.com</string>
-    <string name="manage_insights">Настроить статистику</string>
+    <string name="stats_manage_insights">Настроить статистику</string>
     <string name="stats_empty_insights_description">Настройте вашу статистику и узнайте важное то, чем живет ваш сайт.</string>
     <string name="stats_empty_insights_title">Еще нет статистики</string>
     <string name="stats_no_data_yet">Пока нет данных</string>
diff --git a/WordPress/src/main/res/values-sq/strings.xml b/WordPress/src/main/res/values-sq/strings.xml
index 633a0cb53c6f..2d966b48a33a 100644
--- a/WordPress/src/main/res/values-sq/strings.xml
+++ b/WordPress/src/main/res/values-sq/strings.xml
@@ -216,7 +216,7 @@ Language: sq_AL
     <string name="stats_followers_count_message">%1$s Ndjekës Gjithsej: %2$s</string>
     <string name="stats_followers_email">Email</string>
     <string name="stats_followers_wordpress_com">WordPress.com</string>
-    <string name="manage_insights">Administroni tendenca</string>
+    <string name="stats_manage_insights">Administroni tendenca</string>
     <string name="stats_empty_insights_description">Përshtatni tendencat tuaj dhe merrni faktet mbi funksionimin e sajtit tuaj</string>
     <string name="stats_empty_insights_title">S’janë shtuar ende tendenca</string>
     <string name="stats_no_data_yet">Ende pa të dhëna</string>
diff --git a/WordPress/src/main/res/values-sv/strings.xml b/WordPress/src/main/res/values-sv/strings.xml
index f09d451a5ab2..10f98a18e516 100644
--- a/WordPress/src/main/res/values-sv/strings.xml
+++ b/WordPress/src/main/res/values-sv/strings.xml
@@ -216,7 +216,7 @@ Language: sv_SE
     <string name="stats_followers_count_message">Totalt antal följare för ”%1$s”: %2$s</string>
     <string name="stats_followers_email">E-post</string>
     <string name="stats_followers_wordpress_com">WordPress.com</string>
-    <string name="manage_insights">Hantera insikter</string>
+    <string name="stats_manage_insights">Hantera insikter</string>
     <string name="stats_empty_insights_description">Anpassa dina insikter och se detaljerna om hur din webbplats presterar</string>
     <string name="stats_empty_insights_title">Inga insikter har lagts till än</string>
     <string name="stats_no_data_yet">Inga data insamlade än</string>
diff --git a/WordPress/src/main/res/values-tr/strings.xml b/WordPress/src/main/res/values-tr/strings.xml
index c05bb094e0fa..b96923fdf7a0 100644
--- a/WordPress/src/main/res/values-tr/strings.xml
+++ b/WordPress/src/main/res/values-tr/strings.xml
@@ -216,7 +216,7 @@ Language: tr
     <string name="stats_followers_count_message">Toplam %1$s takipçisi: %2$s</string>
     <string name="stats_followers_email">E-posta</string>
     <string name="stats_followers_wordpress_com">WordPress.com</string>
-    <string name="manage_insights">İçgörüleri yönet</string>
+    <string name="stats_manage_insights">İçgörüleri yönet</string>
     <string name="stats_empty_insights_description">Analizlerinizi özelleştirin ve sitenizin performansındaki düşüş hakkında bilgi edinin</string>
     <string name="stats_empty_insights_title">Henüz içgörü eklenmedi</string>
     <string name="stats_no_data_yet">Henüz veri yok</string>
diff --git a/WordPress/src/main/res/values-w528dp/stats_styles.xml b/WordPress/src/main/res/values-w528dp/stats_styles.xml
index 711082a1ae55..0de4a22b9943 100644
--- a/WordPress/src/main/res/values-w528dp/stats_styles.xml
+++ b/WordPress/src/main/res/values-w528dp/stats_styles.xml
@@ -6,4 +6,10 @@
         <item name="android:layout_weight">1</item>
         <item name="android:layout_gravity">center_horizontal</item>
     </style>
+
+    <style name="StatsInsightManagementList">
+        <item name="android:layout_width">528dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_gravity">center_horizontal</item>
+    </style>
 </resources>
diff --git a/WordPress/src/main/res/values-w720dp/stats_styles.xml b/WordPress/src/main/res/values-w720dp/stats_styles.xml
index efb9b785aef1..78df3fc4485e 100644
--- a/WordPress/src/main/res/values-w720dp/stats_styles.xml
+++ b/WordPress/src/main/res/values-w720dp/stats_styles.xml
@@ -6,4 +6,10 @@
         <item name="android:layout_weight">1</item>
         <item name="android:layout_gravity">center_horizontal</item>
     </style>
+
+    <style name="StatsInsightManagementList">
+        <item name="android:layout_width">720dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_gravity">center_horizontal</item>
+    </style>
 </resources>
diff --git a/WordPress/src/main/res/values-zh-rCN/strings.xml b/WordPress/src/main/res/values-zh-rCN/strings.xml
index 4a1f908159ab..8fc6f9a34ceb 100644
--- a/WordPress/src/main/res/values-zh-rCN/strings.xml
+++ b/WordPress/src/main/res/values-zh-rCN/strings.xml
@@ -164,7 +164,7 @@ Language: zh_CN
     <string name="stats_followers_count_message">共 %1$s 位粉丝：%2$s</string>
     <string name="stats_followers_email">电子邮件</string>
     <string name="stats_followers_wordpress_com">WordPress.com</string>
-    <string name="manage_insights">管理见解</string>
+    <string name="stats_manage_insights">管理见解</string>
     <string name="stats_empty_insights_title">尚未添加任何见解</string>
     <string name="stats_no_data_yet">尚无数据</string>
     <string name="change_password_dialog_message">正在更改密码…</string>
diff --git a/WordPress/src/main/res/values-zh-rHK/strings.xml b/WordPress/src/main/res/values-zh-rHK/strings.xml
index 9072d6d482ed..6756732eeace 100644
--- a/WordPress/src/main/res/values-zh-rHK/strings.xml
+++ b/WordPress/src/main/res/values-zh-rHK/strings.xml
@@ -170,7 +170,7 @@ Language: zh_TW
     <string name="stats_followers_count_message">%1$s 關注者總數：%2$s</string>
     <string name="stats_followers_email">電子郵件</string>
     <string name="stats_followers_wordpress_com">WordPress.com</string>
-    <string name="manage_insights">管理洞察報告</string>
+    <string name="stats_manage_insights">管理洞察報告</string>
     <string name="stats_empty_insights_title">尚未新增任何洞察報告</string>
     <string name="stats_no_data_yet">尚無資料</string>
     <string name="menu_debug">除錯選單</string>
diff --git a/WordPress/src/main/res/values-zh-rTW/strings.xml b/WordPress/src/main/res/values-zh-rTW/strings.xml
index 9072d6d482ed..6756732eeace 100644
--- a/WordPress/src/main/res/values-zh-rTW/strings.xml
+++ b/WordPress/src/main/res/values-zh-rTW/strings.xml
@@ -170,7 +170,7 @@ Language: zh_TW
     <string name="stats_followers_count_message">%1$s 關注者總數：%2$s</string>
     <string name="stats_followers_email">電子郵件</string>
     <string name="stats_followers_wordpress_com">WordPress.com</string>
-    <string name="manage_insights">管理洞察報告</string>
+    <string name="stats_manage_insights">管理洞察報告</string>
     <string name="stats_empty_insights_title">尚未新增任何洞察報告</string>
     <string name="stats_no_data_yet">尚無資料</string>
     <string name="menu_debug">除錯選單</string>
diff --git a/WordPress/src/main/res/values/dimens.xml b/WordPress/src/main/res/values/dimens.xml
index 1594514b9888..77afd3d13639 100644
--- a/WordPress/src/main/res/values/dimens.xml
+++ b/WordPress/src/main/res/values/dimens.xml
@@ -237,7 +237,7 @@
     <dimen name="site_picker_blavatar_margin_left">7dp</dimen>
     <dimen name="site_picker_blavatar_margin_right">15dp</dimen>
 
-    <dimen name="menu_item_height">48sp</dimen>
+    <dimen name="menu_item_height">48dp</dimen>
     <dimen name="menu_item_width">256sp</dimen>
     <dimen name="menu_item_margin_normal">16dp</dimen>
     <dimen name="menu_item_margin_tablet">24dp</dimen>
@@ -403,6 +403,9 @@
     <dimen name="stats_list_card_last_spacing">8dp</dimen>
     <dimen name="stats_list_item_left_margin">56dp</dimen>
     <dimen name="stats_activity_spacing">1dp</dimen>
+    <dimen name="stats_insights_management_margin">24dp</dimen>
+    <dimen name="stats_insights_menu_item_width">231dp</dimen>
+    <dimen name="stats_insights_button_container_height">52dp</dimen>
 
     <dimen name="settings_icon_size">24dp</dimen>
 
diff --git a/WordPress/src/main/res/values/stats_styles.xml b/WordPress/src/main/res/values/stats_styles.xml
index 021dbb27e5a9..76e0c8ba8acb 100644
--- a/WordPress/src/main/res/values/stats_styles.xml
+++ b/WordPress/src/main/res/values/stats_styles.xml
@@ -200,6 +200,11 @@
         <item name="android:layout_weight">1</item>
     </style>
 
+    <style name="StatsInsightManagementList">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+    </style>
+
     <style name="StatsActivityBox">
         <item name="android:layout_width">@dimen/stats_activity_box_size</item>
         <item name="android:layout_height">@dimen/stats_activity_box_size</item>
diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml
index 1316692a6ab1..95c30717637e 100644
--- a/WordPress/src/main/res/values/strings.xml
+++ b/WordPress/src/main/res/values/strings.xml
@@ -788,8 +788,7 @@
     <string name="stats_no_data_yet">No data yet</string>
     <string name="stats_no_data_for_period">No data for this period</string>
     <string name="stats_empty_insights_title">No insights added yet</string>
-    <string name="stats_empty_insights_description">Customize your insights and get the low-down on your site’s performance</string>
-    <string name="manage_insights">Manage Insights</string>
+    <string name="stats_manage_insights">Manage Insights</string>
     <string name="stats_followers_wordpress_com">WordPress.com</string>
     <string name="stats_followers_email">Email</string>
     <string name="stats_followers_count_message">Total %1$s Followers: %2$s</string>
@@ -903,6 +902,7 @@
     <string name="stats_view_search_terms">Search Terms</string>
     <string name="stats_view_publicize">Publicize</string>
     <string name="stats_view_followers">Followers</string>
+    <string name="stats_view_follower_totals">Followers Totals</string>
 
     <!-- stats: label for the entries -->
     <string name="stats_entry_country">Country</string>
@@ -1037,6 +1037,9 @@
     <string name="stats_insights_path">Path</string>
     <string name="stats_most_popular_percent_views">%1$d%% of views</string>
     <string name="stats_insights_posting_activity">Posting Activity</string>
+    <string name="stats_insights_management_title">Only see the most relevant stats. Add and organise your insights below.</string>
+    <string name="stats_insights_add_insights_header">Add Insights</string>
+    <string name="stats_insights_management_drag_and_drop_hint">Items shown above will show in your Insights tab. Drag and drop to customize.</string>
 
     <!-- Stats post detail -->
     <string name="stats_detail_months_and_years">Months and Years</string>
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/UiModelMapperTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/UiModelMapperTest.kt
index 6b1489c6526b..9a404406ccf4 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/UiModelMapperTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/UiModelMapperTest.kt
@@ -1,17 +1,21 @@
 package org.wordpress.android.ui.stats.refresh.lists
 
+import android.arch.lifecycle.MutableLiveData
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Before
 import org.junit.Test
 import org.mockito.Mock
 import org.wordpress.android.BaseUnitTest
-import org.wordpress.android.fluxc.store.StatsStore.InsightsTypes
-import org.wordpress.android.fluxc.store.StatsStore.InsightsTypes.FOLLOWER_TOTALS
+import org.wordpress.android.fluxc.store.StatsStore.InsightType.FOLLOWER_TOTALS
+import org.wordpress.android.ui.stats.refresh.NavigationTarget
+import org.wordpress.android.ui.stats.refresh.lists.StatsBlock.Success
 import org.wordpress.android.ui.stats.refresh.lists.StatsListViewModel.UiModel
 import org.wordpress.android.ui.stats.refresh.lists.sections.BaseStatsUseCase.UseCaseModel
 import org.wordpress.android.ui.stats.refresh.lists.sections.BaseStatsUseCase.UseCaseModel.UseCaseState.SUCCESS
+import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.LinkButton
 import org.wordpress.android.util.NetworkUtilsWrapper
+import org.wordpress.android.viewmodel.Event
 
 class UiModelMapperTest : BaseUnitTest() {
     @Mock lateinit var networkUtilsWrapper: NetworkUtilsWrapper
@@ -25,15 +29,19 @@ class UiModelMapperTest : BaseUnitTest() {
     @Test
     fun `mapInsights returns success ui model when all the inputs are successful`() {
         var error: Int? = null
-        val uiModel = mapper.mapInsights(listOf(UseCaseModel(FOLLOWER_TOTALS, data = listOf(), state = SUCCESS))) {
+        val navigationTarget = MutableLiveData<Event<NavigationTarget>>()
+        val uiModel = mapper.mapInsights(listOf(
+                UseCaseModel(FOLLOWER_TOTALS, data = listOf(), state = SUCCESS)), navigationTarget) {
             error = it
         }
 
         val model = uiModel as UiModel.Success
-        assertThat(model.data).hasSize(1)
-        assertThat(model.data[0].statsTypes).isEqualTo(InsightsTypes.FOLLOWER_TOTALS)
+        assertThat(model.data).hasSize(2)
+        assertThat((model.data[0] as Success).statsType).isEqualTo(FOLLOWER_TOTALS)
         assertThat(model.data[0].type).isEqualTo(StatsBlock.Type.SUCCESS)
         assertThat(model.data[0].data).isEmpty()
+        assertThat(model.data[1].type).isEqualTo(StatsBlock.Type.CONTROL)
+        assertThat(model.data[1].data.first() is LinkButton).isTrue()
         assertThat(error).isNull()
     }
 }
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/detail/PostDayViewsUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/detail/PostDayViewsUseCaseTest.kt
index 60d7f2ac256b..1e68d23dae22 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/detail/PostDayViewsUseCaseTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/detail/PostDayViewsUseCaseTest.kt
@@ -14,7 +14,7 @@ import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.fluxc.model.stats.PostDetailStatsModel
 import org.wordpress.android.fluxc.model.stats.PostDetailStatsModel.Day
 import org.wordpress.android.fluxc.store.StatsStore.OnStatsFetched
-import org.wordpress.android.fluxc.store.StatsStore.PostDetailTypes
+import org.wordpress.android.fluxc.store.StatsStore.PostDetailType
 import org.wordpress.android.fluxc.store.StatsStore.StatsError
 import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.GENERIC_ERROR
 import org.wordpress.android.fluxc.store.stats.PostDetailStore
@@ -75,7 +75,7 @@ class PostDayViewsUseCaseTest : BaseUnitTest() {
 
         val result = loadData(true, forced)
 
-        Assertions.assertThat(result.type).isEqualTo(PostDetailTypes.POST_OVERVIEW)
+        Assertions.assertThat(result.type).isEqualTo(PostDetailType.POST_OVERVIEW)
         Assertions.assertThat(result.state).isEqualTo(SUCCESS)
         result.data!!.apply {
             Assertions.assertThat(this[0]).isEqualTo(title)
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/BaseStatsUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/BaseStatsUseCaseTest.kt
index 595e239bfa25..2fa767cd81d3 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/BaseStatsUseCaseTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/BaseStatsUseCaseTest.kt
@@ -10,7 +10,7 @@ import org.mockito.Mock
 import org.wordpress.android.BaseUnitTest
 import org.wordpress.android.R.string
 import org.wordpress.android.fluxc.model.SiteModel
-import org.wordpress.android.fluxc.store.StatsStore.InsightsTypes.ALL_TIME_STATS
+import org.wordpress.android.fluxc.store.StatsStore.InsightType.ALL_TIME_STATS
 import org.wordpress.android.test
 import org.wordpress.android.ui.stats.refresh.lists.sections.BaseStatsUseCase.UseCaseModel
 import org.wordpress.android.ui.stats.refresh.lists.sections.BaseStatsUseCase.UseCaseModel.UseCaseState
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/ClicksUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/ClicksUseCaseTest.kt
index 761f70759362..252d4dae6197 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/ClicksUseCaseTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/ClicksUseCaseTest.kt
@@ -17,7 +17,7 @@ import org.wordpress.android.fluxc.network.utils.StatsGranularity.DAYS
 import org.wordpress.android.fluxc.store.StatsStore.OnStatsFetched
 import org.wordpress.android.fluxc.store.StatsStore.StatsError
 import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.GENERIC_ERROR
-import org.wordpress.android.fluxc.store.StatsStore.TimeStatsTypes
+import org.wordpress.android.fluxc.store.StatsStore.TimeStatsType
 import org.wordpress.android.fluxc.store.stats.time.ClicksStore
 import org.wordpress.android.test
 import org.wordpress.android.ui.stats.refresh.lists.sections.BaseStatsUseCase.UseCaseMode.BLOCK
@@ -158,7 +158,7 @@ class ClicksUseCaseTest : BaseUnitTest() {
         )
         val result = loadData(true, forced)
 
-        assertThat(result.type).isEqualTo(TimeStatsTypes.CLICKS)
+        assertThat(result.type).isEqualTo(TimeStatsType.CLICKS)
         assertThat(result.state).isEqualTo(UseCaseState.SUCCESS)
         result.data!!.apply {
             assertThat(this).hasSize(4)
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/OverviewUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/OverviewUseCaseTest.kt
index 53e9f25569d8..02e6ea2de8c9 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/OverviewUseCaseTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/OverviewUseCaseTest.kt
@@ -19,7 +19,7 @@ import org.wordpress.android.fluxc.network.utils.StatsGranularity.DAYS
 import org.wordpress.android.fluxc.store.StatsStore.OnStatsFetched
 import org.wordpress.android.fluxc.store.StatsStore.StatsError
 import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.GENERIC_ERROR
-import org.wordpress.android.fluxc.store.StatsStore.TimeStatsTypes
+import org.wordpress.android.fluxc.store.StatsStore.TimeStatsType
 import org.wordpress.android.fluxc.store.stats.time.VisitsAndViewsStore
 import org.wordpress.android.test
 import org.wordpress.android.ui.stats.refresh.lists.sections.BaseStatsUseCase.UseCaseModel
@@ -83,7 +83,7 @@ class OverviewUseCaseTest : BaseUnitTest() {
 
         val result = loadData(true, forced)
 
-        assertThat(result.type).isEqualTo(TimeStatsTypes.OVERVIEW)
+        assertThat(result.type).isEqualTo(TimeStatsType.OVERVIEW)
         assertThat(result.state).isEqualTo(UseCaseState.SUCCESS)
         result.data!!.apply {
             assertThat(this[0]).isEqualTo(title)
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/PostsAndPagesUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/PostsAndPagesUseCaseTest.kt
index 6a8c67f549d6..d541ea030962 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/PostsAndPagesUseCaseTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/PostsAndPagesUseCaseTest.kt
@@ -19,7 +19,7 @@ import org.wordpress.android.fluxc.network.utils.StatsGranularity.DAYS
 import org.wordpress.android.fluxc.store.StatsStore.OnStatsFetched
 import org.wordpress.android.fluxc.store.StatsStore.StatsError
 import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.GENERIC_ERROR
-import org.wordpress.android.fluxc.store.StatsStore.TimeStatsTypes
+import org.wordpress.android.fluxc.store.StatsStore.TimeStatsType
 import org.wordpress.android.fluxc.store.stats.time.PostAndPageViewsStore
 import org.wordpress.android.test
 import org.wordpress.android.ui.stats.refresh.NavigationTarget
@@ -91,7 +91,7 @@ class PostsAndPagesUseCaseTest : BaseUnitTest() {
         val result = loadData(refresh, forced)
 
         assertThat(result.state).isEqualTo(UseCaseState.ERROR)
-        assertThat(result.type).isEqualTo(TimeStatsTypes.POSTS_AND_PAGES)
+        assertThat(result.type).isEqualTo(TimeStatsType.POSTS_AND_PAGES)
     }
 
     @Test
@@ -112,7 +112,7 @@ class PostsAndPagesUseCaseTest : BaseUnitTest() {
         val result = loadData(refresh, forced)
 
         assertThat(result.state).isEqualTo(UseCaseState.EMPTY)
-        assertThat(result.type).isEqualTo(TimeStatsTypes.POSTS_AND_PAGES)
+        assertThat(result.type).isEqualTo(TimeStatsType.POSTS_AND_PAGES)
         val items = result.stateData!!
         assertThat(items.size).isEqualTo(2)
         assertThat(items[0] is Title).isTrue()
@@ -147,7 +147,7 @@ class PostsAndPagesUseCaseTest : BaseUnitTest() {
         val result = loadData(refresh, forced)
 
         assertThat(result.state).isEqualTo(UseCaseState.SUCCESS)
-        assertThat(result.type).isEqualTo(TimeStatsTypes.POSTS_AND_PAGES)
+        assertThat(result.type).isEqualTo(TimeStatsType.POSTS_AND_PAGES)
         val items = result.data!!
         assertThat(items.size).isEqualTo(3)
         assertThat(items[0] is Title).isTrue()
@@ -189,7 +189,7 @@ class PostsAndPagesUseCaseTest : BaseUnitTest() {
         val result = loadData(refresh, forced)
 
         assertThat(result.state).isEqualTo(UseCaseState.SUCCESS)
-        assertThat(result.type).isEqualTo(TimeStatsTypes.POSTS_AND_PAGES)
+        assertThat(result.type).isEqualTo(TimeStatsType.POSTS_AND_PAGES)
         val items = result.data!!
         assertThat(items.size).isEqualTo(3)
         assertThat(items[0] is Title).isTrue()
@@ -231,7 +231,7 @@ class PostsAndPagesUseCaseTest : BaseUnitTest() {
         val result = loadData(refresh, forced)
 
         assertThat(result.state).isEqualTo(UseCaseState.SUCCESS)
-        assertThat(result.type).isEqualTo(TimeStatsTypes.POSTS_AND_PAGES)
+        assertThat(result.type).isEqualTo(TimeStatsType.POSTS_AND_PAGES)
         val items = result.data!!
         assertThat(items.size).isEqualTo(3)
         assertThat(items[0] is Title).isTrue()
@@ -272,7 +272,7 @@ class PostsAndPagesUseCaseTest : BaseUnitTest() {
         val result = loadData(refresh, forced)
 
         assertThat(result.state).isEqualTo(UseCaseState.SUCCESS)
-        assertThat(result.type).isEqualTo(TimeStatsTypes.POSTS_AND_PAGES)
+        assertThat(result.type).isEqualTo(TimeStatsType.POSTS_AND_PAGES)
         val items = result.data!!
         assertThat(items.size).isEqualTo(4)
         assertHeader(items[1])
@@ -312,7 +312,7 @@ class PostsAndPagesUseCaseTest : BaseUnitTest() {
         val result = loadData(refresh, forced)
 
         assertThat(result.state).isEqualTo(UseCaseState.SUCCESS)
-        assertThat(result.type).isEqualTo(TimeStatsTypes.POSTS_AND_PAGES)
+        assertThat(result.type).isEqualTo(TimeStatsType.POSTS_AND_PAGES)
         val items = result.data!!
         assertThat(items.size).isEqualTo(4)
         assertThat(items[2] is ListItemWithIcon).isTrue()
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/ReferrersUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/ReferrersUseCaseTest.kt
index d6985fd88b64..3cc4eb5cd1e9 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/ReferrersUseCaseTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/ReferrersUseCaseTest.kt
@@ -17,7 +17,7 @@ import org.wordpress.android.fluxc.network.utils.StatsGranularity.DAYS
 import org.wordpress.android.fluxc.store.StatsStore.OnStatsFetched
 import org.wordpress.android.fluxc.store.StatsStore.StatsError
 import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.GENERIC_ERROR
-import org.wordpress.android.fluxc.store.StatsStore.TimeStatsTypes
+import org.wordpress.android.fluxc.store.StatsStore.TimeStatsType
 import org.wordpress.android.fluxc.store.stats.time.ReferrersStore
 import org.wordpress.android.test
 import org.wordpress.android.ui.stats.refresh.lists.sections.BaseStatsUseCase.UseCaseMode.BLOCK
@@ -94,7 +94,7 @@ class ReferrersUseCaseTest : BaseUnitTest() {
 
         val result = loadData(true, forced)
 
-        assertThat(result.type).isEqualTo(TimeStatsTypes.REFERRERS)
+        assertThat(result.type).isEqualTo(TimeStatsType.REFERRERS)
         val expandableItem = result.data!!.assertNonExpandedList()
 
         expandableItem.onExpandClicked(true)
@@ -146,7 +146,7 @@ class ReferrersUseCaseTest : BaseUnitTest() {
         )
         val result = loadData(true, forced)
 
-        assertThat(result.type).isEqualTo(TimeStatsTypes.REFERRERS)
+        assertThat(result.type).isEqualTo(TimeStatsType.REFERRERS)
         assertThat(result.state).isEqualTo(UseCaseState.SUCCESS)
         result.data!!.apply {
             assertThat(this).hasSize(4)
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/SearchTermsUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/SearchTermsUseCaseTest.kt
index 275240c87aa7..c764d1433129 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/SearchTermsUseCaseTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/SearchTermsUseCaseTest.kt
@@ -16,7 +16,7 @@ import org.wordpress.android.fluxc.network.utils.StatsGranularity.DAYS
 import org.wordpress.android.fluxc.store.StatsStore.OnStatsFetched
 import org.wordpress.android.fluxc.store.StatsStore.StatsError
 import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.GENERIC_ERROR
-import org.wordpress.android.fluxc.store.StatsStore.TimeStatsTypes
+import org.wordpress.android.fluxc.store.StatsStore.TimeStatsType
 import org.wordpress.android.fluxc.store.stats.time.SearchTermsStore
 import org.wordpress.android.test
 import org.wordpress.android.ui.stats.refresh.lists.sections.BaseStatsUseCase.UseCaseMode.BLOCK
@@ -91,7 +91,7 @@ class SearchTermsUseCaseTest : BaseUnitTest() {
 
         val result = loadData(true, forced)
 
-        assertThat(result.type).isEqualTo(TimeStatsTypes.SEARCH_TERMS)
+        assertThat(result.type).isEqualTo(TimeStatsType.SEARCH_TERMS)
         assertThat(result.state).isEqualTo(UseCaseState.SUCCESS)
         result.data!!.apply {
             assertTitle(this[0])
@@ -114,7 +114,7 @@ class SearchTermsUseCaseTest : BaseUnitTest() {
         )
         val result = loadData(true, forced)
 
-        assertThat(result.type).isEqualTo(TimeStatsTypes.SEARCH_TERMS)
+        assertThat(result.type).isEqualTo(TimeStatsType.SEARCH_TERMS)
         assertThat(result.state).isEqualTo(UseCaseState.SUCCESS)
         result.data!!.apply {
             assertThat(this!!).hasSize(4)
@@ -144,7 +144,7 @@ class SearchTermsUseCaseTest : BaseUnitTest() {
         )
         val result = loadData(true, forced)
 
-        assertThat(result.type).isEqualTo(TimeStatsTypes.SEARCH_TERMS)
+        assertThat(result.type).isEqualTo(TimeStatsType.SEARCH_TERMS)
         assertThat(result.state).isEqualTo(UseCaseState.SUCCESS)
         result.data!!.apply {
             assertThat(this).hasSize(8)
@@ -174,7 +174,7 @@ class SearchTermsUseCaseTest : BaseUnitTest() {
 
         val result = loadData(true, forced)
 
-        assertThat(result.type).isEqualTo(TimeStatsTypes.SEARCH_TERMS)
+        assertThat(result.type).isEqualTo(TimeStatsType.SEARCH_TERMS)
         assertThat(result.state).isEqualTo(UseCaseState.EMPTY)
         result.stateData!!.apply {
             assertThat(this).hasSize(2)
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/VideoPlaysUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/VideoPlaysUseCaseTest.kt
index 8e1763c42e23..badeea508213 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/VideoPlaysUseCaseTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/VideoPlaysUseCaseTest.kt
@@ -16,7 +16,7 @@ import org.wordpress.android.fluxc.network.utils.StatsGranularity.DAYS
 import org.wordpress.android.fluxc.store.StatsStore.OnStatsFetched
 import org.wordpress.android.fluxc.store.StatsStore.StatsError
 import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.GENERIC_ERROR
-import org.wordpress.android.fluxc.store.StatsStore.TimeStatsTypes
+import org.wordpress.android.fluxc.store.StatsStore.TimeStatsType
 import org.wordpress.android.fluxc.store.stats.time.VideoPlaysStore
 import org.wordpress.android.test
 import org.wordpress.android.ui.stats.refresh.lists.sections.BaseStatsUseCase.UseCaseMode.BLOCK
@@ -92,7 +92,7 @@ class VideoPlaysUseCaseTest : BaseUnitTest() {
 
         val result = loadData(true, forced)
 
-        assertThat(result.type).isEqualTo(TimeStatsTypes.VIDEOS)
+        assertThat(result.type).isEqualTo(TimeStatsType.VIDEOS)
         assertThat(result.state).isEqualTo(UseCaseState.SUCCESS)
         result.data!!.apply {
             assertTitle(this[0])
@@ -122,7 +122,7 @@ class VideoPlaysUseCaseTest : BaseUnitTest() {
         )
         val result = loadData(true, forced)
 
-        assertThat(result.type).isEqualTo(TimeStatsTypes.VIDEOS)
+        assertThat(result.type).isEqualTo(TimeStatsType.VIDEOS)
         assertThat(result.state).isEqualTo(UseCaseState.SUCCESS)
         result.data!!.apply {
             assertThat(this).hasSize(4)
@@ -144,7 +144,7 @@ class VideoPlaysUseCaseTest : BaseUnitTest() {
 
         val result = loadData(true, forced)
 
-        assertThat(result.type).isEqualTo(TimeStatsTypes.VIDEOS)
+        assertThat(result.type).isEqualTo(TimeStatsType.VIDEOS)
         assertThat(result.state).isEqualTo(UseCaseState.EMPTY)
         result.stateData!!.apply {
             assertThat(this).hasSize(2)
@@ -167,7 +167,7 @@ class VideoPlaysUseCaseTest : BaseUnitTest() {
 
         val result = loadData(true, forced)
 
-        assertThat(result.type).isEqualTo(TimeStatsTypes.VIDEOS)
+        assertThat(result.type).isEqualTo(TimeStatsType.VIDEOS)
     }
 
     private fun assertTitle(item: BlockListItem) {
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/AllTimeStatsUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/AllTimeStatsUseCaseTest.kt
index 96d7109ca049..e21b31d27771 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/AllTimeStatsUseCaseTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/AllTimeStatsUseCaseTest.kt
@@ -12,7 +12,7 @@ import org.wordpress.android.BaseUnitTest
 import org.wordpress.android.R
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.fluxc.model.stats.InsightsAllTimeModel
-import org.wordpress.android.fluxc.store.StatsStore.InsightsTypes
+import org.wordpress.android.fluxc.store.StatsStore.InsightType
 import org.wordpress.android.fluxc.store.StatsStore.OnStatsFetched
 import org.wordpress.android.fluxc.store.StatsStore.StatsError
 import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.GENERIC_ERROR
@@ -64,7 +64,7 @@ class AllTimeStatsUseCaseTest : BaseUnitTest() {
         val result = loadAllTimeInsights(refresh, forced)
 
         assertThat(result.state).isEqualTo(UseCaseState.ERROR)
-        assertThat(result.type).isEqualTo(InsightsTypes.ALL_TIME_STATS)
+        assertThat(result.type).isEqualTo(InsightType.ALL_TIME_STATS)
     }
 
     @Test
@@ -82,7 +82,7 @@ class AllTimeStatsUseCaseTest : BaseUnitTest() {
         val result = loadAllTimeInsights(refresh, forced)
 
         assertThat(result.state).isEqualTo(UseCaseState.EMPTY)
-        assertThat(result.type).isEqualTo(InsightsTypes.ALL_TIME_STATS)
+        assertThat(result.type).isEqualTo(InsightType.ALL_TIME_STATS)
         val items = result.stateData!!
         assertEquals(items.size, 2)
         assertTrue(items[0] is Title)
@@ -110,7 +110,7 @@ class AllTimeStatsUseCaseTest : BaseUnitTest() {
         val result = loadAllTimeInsights(refresh, forced)
 
         assertThat(result.state).isEqualTo(UseCaseState.SUCCESS)
-        assertThat(result.type).isEqualTo(InsightsTypes.ALL_TIME_STATS)
+        assertThat(result.type).isEqualTo(InsightType.ALL_TIME_STATS)
         val items = result.data!!
         assertEquals(items.size, 3)
         assertTrue(items[0] is Title)
@@ -146,7 +146,7 @@ class AllTimeStatsUseCaseTest : BaseUnitTest() {
         val result = loadAllTimeInsights(refresh, forced)
 
         assertThat(result.state).isEqualTo(UseCaseState.SUCCESS)
-        assertThat(result.type).isEqualTo(InsightsTypes.ALL_TIME_STATS)
+        assertThat(result.type).isEqualTo(InsightType.ALL_TIME_STATS)
         val items = result.data!!
         assertEquals(items.size, 3)
         assertTrue(items[0] is Title)
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/AnnualSiteStatsUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/AnnualSiteStatsUseCaseTest.kt
index f13d49c4e807..c2765a461be4 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/AnnualSiteStatsUseCaseTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/AnnualSiteStatsUseCaseTest.kt
@@ -24,19 +24,22 @@ import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Quick
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Title
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.QUICK_SCAN_ITEM
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.TITLE
+import org.wordpress.android.ui.stats.refresh.utils.ItemPopupMenuHandler
 import org.wordpress.android.ui.stats.refresh.utils.StatsSiteProvider
 
 class AnnualSiteStatsUseCaseTest : BaseUnitTest() {
     @Mock lateinit var insightsStore: MostPopularInsightsStore
     @Mock lateinit var statsSiteProvider: StatsSiteProvider
     @Mock lateinit var site: SiteModel
+    @Mock lateinit var popupMenuHandler: ItemPopupMenuHandler
     private lateinit var useCase: AnnualSiteStatsUseCase
     @Before
     fun setUp() {
         useCase = AnnualSiteStatsUseCase(
                 Dispatchers.Unconfined,
                 insightsStore,
-                statsSiteProvider
+                statsSiteProvider,
+                popupMenuHandler
         )
         whenever(statsSiteProvider.siteModel).thenReturn(site)
     }
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/CommentsUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/CommentsUseCaseTest.kt
index d369f26bada9..6b48c9b828ab 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/CommentsUseCaseTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/CommentsUseCaseTest.kt
@@ -14,7 +14,7 @@ import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.fluxc.model.stats.CommentsModel
 import org.wordpress.android.fluxc.model.stats.CommentsModel.Post
 import org.wordpress.android.fluxc.model.stats.LimitMode
-import org.wordpress.android.fluxc.store.StatsStore.InsightsTypes
+import org.wordpress.android.fluxc.store.StatsStore.InsightType
 import org.wordpress.android.fluxc.store.StatsStore.OnStatsFetched
 import org.wordpress.android.fluxc.store.StatsStore.StatsError
 import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.GENERIC_ERROR
@@ -85,7 +85,7 @@ class CommentsUseCaseTest : BaseUnitTest() {
 
         val result = loadComments(true, forced)
 
-        assertThat(result.type).isEqualTo(InsightsTypes.COMMENTS)
+        assertThat(result.type).isEqualTo(InsightType.COMMENTS)
         val tabsItem = result.data!!.assertEmptyTab(0)
         assertThat(result.state).isEqualTo(UseCaseState.SUCCESS)
 
@@ -114,7 +114,7 @@ class CommentsUseCaseTest : BaseUnitTest() {
 
         val result = loadComments(true, forced)
 
-        assertThat(result.type).isEqualTo(InsightsTypes.COMMENTS)
+        assertThat(result.type).isEqualTo(InsightType.COMMENTS)
         assertThat(result.state).isEqualTo(UseCaseState.SUCCESS)
         result.data!!.apply {
             assertThat(this).hasSize(3)
@@ -151,7 +151,7 @@ class CommentsUseCaseTest : BaseUnitTest() {
 
         val result = loadComments(true, forced)
 
-        assertThat(result.type).isEqualTo(InsightsTypes.COMMENTS)
+        assertThat(result.type).isEqualTo(InsightType.COMMENTS)
         assertThat(result.state).isEqualTo(UseCaseState.SUCCESS)
         result.data!!.apply {
             assertThat(this).hasSize(4)
@@ -178,7 +178,7 @@ class CommentsUseCaseTest : BaseUnitTest() {
 
         val result = loadComments(true, forced)
 
-        assertThat(result.type).isEqualTo(InsightsTypes.COMMENTS)
+        assertThat(result.type).isEqualTo(InsightType.COMMENTS)
 
         val tabsItem = result.data!!.assertTabWithUsers(0)
         assertThat(result.state).isEqualTo(UseCaseState.SUCCESS)
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/PublicizeUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/PublicizeUseCaseTest.kt
index 36cbd8cdd2a1..632a40ac157c 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/PublicizeUseCaseTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/PublicizeUseCaseTest.kt
@@ -13,7 +13,7 @@ import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.fluxc.model.stats.LimitMode
 import org.wordpress.android.fluxc.model.stats.PublicizeModel
 import org.wordpress.android.fluxc.model.stats.PublicizeModel.Service
-import org.wordpress.android.fluxc.store.StatsStore.InsightsTypes
+import org.wordpress.android.fluxc.store.StatsStore.InsightType
 import org.wordpress.android.fluxc.store.StatsStore.OnStatsFetched
 import org.wordpress.android.fluxc.store.StatsStore.StatsError
 import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.GENERIC_ERROR
@@ -75,7 +75,7 @@ class PublicizeUseCaseTest : BaseUnitTest() {
 
         val result = loadPublicizeModel(true, forced)
 
-        assertThat(result.type).isEqualTo(InsightsTypes.PUBLICIZE)
+        assertThat(result.type).isEqualTo(InsightType.PUBLICIZE)
         assertThat(result.state).isEqualTo(UseCaseState.SUCCESS)
         result.data!!.apply {
             assertThat(this).hasSize(3)
@@ -106,7 +106,7 @@ class PublicizeUseCaseTest : BaseUnitTest() {
 
         val result = loadPublicizeModel(true, forced)
 
-        assertThat(result.type).isEqualTo(InsightsTypes.PUBLICIZE)
+        assertThat(result.type).isEqualTo(InsightType.PUBLICIZE)
         assertThat(result.state).isEqualTo(UseCaseState.SUCCESS)
         result.data!!.apply {
             assertThat(this).hasSize(4)
@@ -130,7 +130,7 @@ class PublicizeUseCaseTest : BaseUnitTest() {
 
         val result = loadPublicizeModel(true, forced)
 
-        assertThat(result.type).isEqualTo(InsightsTypes.PUBLICIZE)
+        assertThat(result.type).isEqualTo(InsightType.PUBLICIZE)
         assertThat(result.state).isEqualTo(UseCaseState.EMPTY)
         result.stateData!!.apply {
             assertThat(this).hasSize(2)
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/TodayStatsUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/TodayStatsUseCaseTest.kt
index 1f2c6fcfa072..8b7786e900a4 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/TodayStatsUseCaseTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/TodayStatsUseCaseTest.kt
@@ -10,7 +10,7 @@ import org.wordpress.android.BaseUnitTest
 import org.wordpress.android.R
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.fluxc.model.stats.VisitsModel
-import org.wordpress.android.fluxc.store.StatsStore.InsightsTypes
+import org.wordpress.android.fluxc.store.StatsStore.InsightType
 import org.wordpress.android.fluxc.store.StatsStore.OnStatsFetched
 import org.wordpress.android.fluxc.store.StatsStore.StatsError
 import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.GENERIC_ERROR
@@ -61,7 +61,7 @@ class TodayStatsUseCaseTest : BaseUnitTest() {
 
         val result = loadTodayStats(refresh, forced)
 
-        assertThat(result.type).isEqualTo(InsightsTypes.TODAY_STATS)
+        assertThat(result.type).isEqualTo(InsightType.TODAY_STATS)
         assertThat(result.state).isEqualTo(UseCaseState.SUCCESS)
         result.data!!.apply {
             assertThat(this).hasSize(3)
@@ -83,7 +83,7 @@ class TodayStatsUseCaseTest : BaseUnitTest() {
 
         val result = loadTodayStats(refresh, forced)
 
-        assertThat(result.type).isEqualTo(InsightsTypes.TODAY_STATS)
+        assertThat(result.type).isEqualTo(InsightType.TODAY_STATS)
         assertThat(result.state).isEqualTo(UseCaseState.EMPTY)
         result.stateData!!.apply {
             assertThat(this).hasSize(2)
diff --git a/build.gradle b/build.gradle
index f2f44d63f327..7efe5520b777 100644
--- a/build.gradle
+++ b/build.gradle
@@ -104,5 +104,5 @@ buildScan {
 }
 
 ext {
-    fluxCVersion = 'fcb9d7af4753f0a9c75f72bb7193c1d548340e76'
+    fluxCVersion = '901b2c3c733594c1298de5310db2b855d82eb6f6'
 }
diff --git a/libs/editor/WordPressEditor/src/main/res/drawable/ic_gridicon_add.xml b/libs/editor/WordPressEditor/src/main/res/drawable/ic_gridicon_add.xml
new file mode 100644
index 000000000000..eeab770fdac0
--- /dev/null
+++ b/libs/editor/WordPressEditor/src/main/res/drawable/ic_gridicon_add.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+
+    <path
+        android:fillColor="#4ab866"
+        android:pathData="M12,2C6.477,2,2,6.477,2,12c0,5.523,4.477,10,10,10s10-4.477,10-10C22,6.477,17.523,2,12,2z M17,13h-4v4h-2v-4H7v-2h4V7h2 v4h4V13z" />
+</vector>
diff --git a/libs/login/WordPressLoginFlow/src/main/res/drawable/shape_oval_green.xml b/libs/login/WordPressLoginFlow/src/main/res/drawable/shape_oval_green.xml
new file mode 100644
index 000000000000..de3dbf83a696
--- /dev/null
+++ b/libs/login/WordPressLoginFlow/src/main/res/drawable/shape_oval_green.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval" >
+    <solid android:color="@color/alert_green" />
+</shape>
diff --git a/libs/login/WordPressLoginFlow/src/main/res/drawable/shape_oval_red.xml b/libs/login/WordPressLoginFlow/src/main/res/drawable/shape_oval_red.xml
new file mode 100644
index 000000000000..c04efe4258dc
--- /dev/null
+++ b/libs/login/WordPressLoginFlow/src/main/res/drawable/shape_oval_red.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval" >
+    <solid android:color="@color/alert_red" />
+</shape>