diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 0000000000..af34eb1d8f
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,58 @@
+#!/usr/bin/env groovy
+
+pipeline {
+    agent {
+     label 'android-worker'
+    }
+
+    environment {
+            PIPELINE_JOBS_NAME = 'edx-app-android-pipeline'
+            ANDROID_HOME = '/opt/android-sdk-linux'
+            APK_PATH = 'OpenEdXMobile/build/outputs/apk/prod/debuggable'
+            CONFIG_REPO_NAME = 'edx-mobile-config'
+    }       
+
+    stages {
+        stage('checkingout configs') { 
+            steps {
+                sh 'mkdir -p edx-mobile-config'
+                dir('edx-mobile-config'){
+                    sshagent(credentials: ['jenkins-worker', 'jenkins-worker-pem'], ignoreMissing: true) {
+                    checkout changelog: false, poll: false, scm: [
+                        $class: 'GitSCM', 
+                        branches: 
+    // Using specific branch to avoid Firebase config limitations
+                                //[[name: '*/master']],
+                                [[name: 'naveed/automation_configs']],
+                        doGenerateSubmoduleConfigurations: false, 
+                        extensions: 
+                                [[$class: 'CloneOption', honorRefspec: true,
+                                    noTags: true, shallow: true]], 
+                        submoduleCfg: [], 
+                        userRemoteConfigs: 
+                                    [[credentialsId: 'jenkins-worker',
+                                    refspec: '+refs/heads/*:refs/remotes/origin/*', 
+                                    url: "git@github.com:edx/${CONFIG_REPO_NAME}.git"]]
+                            ]
+                    }
+                }
+            }
+        }
+        stage('compiling edx-app-android') {
+            steps {
+                writeFile file: './OpenEdXMobile/edx.properties', text: 'edx.dir = \'../edx-mobile-config/prod/\''  
+                sh 'bash ./resources/compile_android.sh'
+            }
+        }
+        stage('valdiate compiled app') {
+            steps {
+                sh 'bash ./resources/validate_builds.sh'
+            }
+        }
+        stage('archive the build') {
+            steps {
+                archiveArtifacts artifacts: "$APK_PATH/*.apk", onlyIfSuccessful: true
+            }
+        }
+    }
+} 
diff --git a/OpenEdXMobile/AndroidManifest.xml b/OpenEdXMobile/AndroidManifest.xml
index 80b17bd9ee..d4a170bbd2 100644
--- a/OpenEdXMobile/AndroidManifest.xml
+++ b/OpenEdXMobile/AndroidManifest.xml
@@ -150,11 +150,6 @@
             android:label="@string/title_download"
             android:theme="@style/AppTheme.NoActionBar.TranslucentStatusBar" />
 
-        <activity
-            android:name=".view.DiscoverCoursesActivity"
-            android:label="@string/label_discover"
-            android:theme="@style/AppTheme.NoActionBar.TranslucentStatusBar" />
-
         <activity
             android:name=".view.ViewSubjectsActivity"
             android:label="@string/browse_by_subject"
@@ -165,6 +160,11 @@
             android:label="@string/label_discover"
             android:theme="@style/AppTheme.NoActionBar.TranslucentStatusBar" />
 
+        <activity
+            android:name="org.edx.mobile.view.ProgramInfoActivity"
+            android:label="@string/label_discover"
+            android:theme="@style/AppTheme.NoActionBar.TranslucentStatusBar" />
+
         <activity
             android:name="org.edx.mobile.view.CourseDetailActivity"
             android:label="@string/label_find_courses"
@@ -177,9 +177,8 @@
             android:theme="@style/AppTheme.NoActionBar.TranslucentStatusBar" />
 
         <activity
-            android:name=".view.NativeFindCoursesActivity"
-            android:label="@string/label_find_courses"
-            android:screenOrientation="portrait"
+            android:name=".view.DiscoveryActivity"
+            android:label="@string/label_discover"
             android:theme="@style/AppTheme.NoActionBar.TranslucentStatusBar" />
 
         <activity
diff --git a/OpenEdXMobile/build.gradle b/OpenEdXMobile/build.gradle
index 8300d82226..ae37c1d76a 100644
--- a/OpenEdXMobile/build.gradle
+++ b/OpenEdXMobile/build.gradle
@@ -17,7 +17,7 @@ buildscript {
         classpath "com.newrelic.agent.android:agent-gradle-plugin:5.4.1"
 
         classpath 'com.facebook.testing.screenshot:plugin:0.8.0'
-        classpath 'com.google.gms:google-services:4.0.1'
+        classpath 'com.google.gms:google-services:4.2.0'
     }
 }
 
@@ -130,13 +130,15 @@ dependencies {
     // For the optional Nullable annotation
     implementation "com.android.support:support-annotations:${SUPPORT_LIBRARY_VERSION}"
 
-    implementation "com.google.android.gms:play-services-plus:15.0.1"
-    implementation "com.google.android.gms:play-services-analytics:16.0.1"
-    implementation "com.google.android.gms:play-services-auth:15.0.1"
-    implementation "com.google.android.gms:play-services-ads:15.0.1"
+    implementation "com.google.android.gms:play-services-plus:16.0.0"
+    implementation "com.google.android.gms:play-services-analytics:16.0.6"
+    implementation "com.google.android.gms:play-services-auth:16.0.1"
     // Google Firebase
-    implementation "com.google.firebase:firebase-core:16.0.1"
-    implementation "com.google.firebase:firebase-messaging:17.1.0"
+    implementation "com.google.firebase:firebase-core:16.0.6"
+    implementation "com.google.firebase:firebase-messaging:17.3.4"
+
+//    Exo Player
+    implementation 'com.google.android.exoplayer:exoplayer:2.9.2'
 
     implementation 'com.facebook.android:facebook-login:4.36.0'
     implementation 'com.google.code.gson:gson:2.7'
@@ -456,6 +458,11 @@ android {
              maxHeapSize '1g'
          }
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 
diff --git a/OpenEdXMobile/res/drawable-nodpi/screen_1.png b/OpenEdXMobile/res/drawable-nodpi/screen_1.png
index 26d28aefd7..e6a28a1a64 100644
Binary files a/OpenEdXMobile/res/drawable-nodpi/screen_1.png and b/OpenEdXMobile/res/drawable-nodpi/screen_1.png differ
diff --git a/OpenEdXMobile/res/drawable-xxhdpi/youngsphere_logo.png b/OpenEdXMobile/res/drawable-xxhdpi/youngsphere_logo.png
new file mode 100644
index 0000000000..023fa343c1
Binary files /dev/null and b/OpenEdXMobile/res/drawable-xxhdpi/youngsphere_logo.png differ
diff --git a/OpenEdXMobile/res/drawable/edx_segmented_control_middle_background.xml b/OpenEdXMobile/res/drawable/edx_segmented_control_middle_background.xml
new file mode 100755
index 0000000000..cd02756ead
--- /dev/null
+++ b/OpenEdXMobile/res/drawable/edx_segmented_control_middle_background.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true" android:state_enabled="false" android:state_focused="true">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/edx_brand_gray_back" />
+            <stroke android:width="@dimen/edx_line" android:color="@color/black" />
+        </shape>
+    </item>
+    <item android:state_checked="true" android:state_enabled="false">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/edx_brand_gray_back" />
+            <stroke android:width="@dimen/edx_hairline" android:color="@color/edx_brand_gray_back" />
+        </shape>
+    </item>
+    <item android:state_checked="true" android:state_focused="true">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/edx_brand_primary_base" />
+            <stroke android:width="@dimen/edx_line" android:color="@color/black" />
+        </shape>
+    </item>
+    <item android:state_checked="true">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/edx_brand_primary_base" />
+            <stroke android:width="@dimen/edx_hairline" android:color="@color/edx_brand_primary_base" />
+        </shape>
+    </item>
+    <item android:state_focused="true">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/white" />
+            <stroke android:width="@dimen/edx_line" android:color="@color/black" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/white" />
+            <stroke android:width="@dimen/edx_hairline" android:color="@color/edx_brand_gray_back" />
+        </shape>
+    </item>
+</selector>
diff --git a/OpenEdXMobile/res/layout/activity_discovery_launch.xml b/OpenEdXMobile/res/layout/activity_discovery_launch.xml
index 1798a7126e..0e00619d20 100755
--- a/OpenEdXMobile/res/layout/activity_discovery_launch.xml
+++ b/OpenEdXMobile/res/layout/activity_discovery_launch.xml
@@ -26,7 +26,7 @@
                 android:layout_height="@dimen/logo_height"
                 android:layout_marginTop="@dimen/logo_top_margin"
                 android:contentDescription="@string/phonetic_app_name"
-                android:src="@drawable/launch_screen_logo" />
+                android:src="@drawable/youngsphere_logo" />
 
             <TextView
                 android:id="@+id/tv_launch_text"
@@ -34,7 +34,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/widget_margin_double"
                 android:text="@string/launch_text"
-                android:textColor="@color/edx_brand_primary_base"
+                android:textColor="@color/edx_success_accent"
                 android:textSize="@dimen/edx_xx_large" />
 
             <android.support.v7.widget.SearchView
diff --git a/OpenEdXMobile/res/layout/activity_launch.xml b/OpenEdXMobile/res/layout/activity_launch.xml
index 759bb596e4..2e3e718cce 100755
--- a/OpenEdXMobile/res/layout/activity_launch.xml
+++ b/OpenEdXMobile/res/layout/activity_launch.xml
@@ -16,7 +16,7 @@
             android:layout_centerHorizontal="true"
             android:layout_marginTop="60dp"
             android:contentDescription="@string/phonetic_app_name"
-            android:src="@drawable/launch_screen_logo" />
+            android:src="@drawable/youngsphere_logo" />
 
         <LinearLayout
             android:id="@+id/bottom_layout"
@@ -32,17 +32,17 @@
 
             <Button
                 android:id="@+id/sign_up_btn"
-                style="@style/bold_white_text"
+                style="@style/bold_orange_text"
                 android:layout_width="match_parent"
                 android:layout_height="50dp"
                 android:layout_gravity="center_vertical"
                 android:layout_marginBottom="5dp"
-                android:background="@drawable/edx_brand_button"
+                android:background="@drawable/bt_google"
                 android:contentDescription="@string/sign_up_and_learn"
                 android:focusable="true"
                 android:padding="5dp"
                 android:text="@string/sign_up_and_learn"
-                android:textColor="@android:color/white"
+                android:textColor="@color/white"
                 android:textSize="16sp" />
 
             <Button
diff --git a/OpenEdXMobile/res/layout/activity_login.xml b/OpenEdXMobile/res/layout/activity_login.xml
index 2e965db577..b860ee10e0 100755
--- a/OpenEdXMobile/res/layout/activity_login.xml
+++ b/OpenEdXMobile/res/layout/activity_login.xml
@@ -49,7 +49,7 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
                         android:contentDescription="@string/phonetic_app_name"
-                        android:src="@drawable/login_screen_logo" />
+                        android:src="@drawable/youngsphere_logo" />
                 </FrameLayout>
 
                 <LinearLayout
diff --git a/OpenEdXMobile/res/layout/auth_panel.xml b/OpenEdXMobile/res/layout/auth_panel.xml
index 0d49dcc390..f9d92cb35d 100644
--- a/OpenEdXMobile/res/layout/auth_panel.xml
+++ b/OpenEdXMobile/res/layout/auth_panel.xml
@@ -16,6 +16,7 @@
             android:layout_width="0dp"
             android:layout_height="@dimen/auth_panel_btn_height"
             android:layout_weight="1"
+            android:background="@drawable/bt_google"
             android:focusable="true"
             android:text="@string/launch_register"
             android:textColor="@color/white"
@@ -31,6 +32,7 @@
             style="@style/edX.Widget.BorderedButton"
             android:layout_width="@dimen/auth_panel_login_btn_width"
             android:layout_height="@dimen/auth_panel_btn_height"
+            android:background="@android:color/holo_green_light"
             android:focusable="true"
             android:text="@string/launch_login"
             android:textColor="@color/edx_brand_primary_accent"
diff --git a/OpenEdXMobile/res/layout/content_error.xml b/OpenEdXMobile/res/layout/content_error.xml
index d25f8f4e73..419ddd440f 100644
--- a/OpenEdXMobile/res/layout/content_error.xml
+++ b/OpenEdXMobile/res/layout/content_error.xml
@@ -26,6 +26,7 @@
             style="@style/edX.Widget.RegularButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:background="@drawable/edx_enroll_button"
             android:visibility="gone"
             tools:text="Reload"
             tools:visibility="visible" />
diff --git a/OpenEdXMobile/res/layout/course_card.xml b/OpenEdXMobile/res/layout/course_card.xml
index eba6cf6d6f..5ef0099958 100644
--- a/OpenEdXMobile/res/layout/course_card.xml
+++ b/OpenEdXMobile/res/layout/course_card.xml
@@ -67,11 +67,11 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:contentDescription="@string/new_course_content"
-                android:paddingLeft="@dimen/widget_margin_half"
                 android:paddingStart="@dimen/widget_margin_half"
+                android:paddingLeft="@dimen/widget_margin_half"
                 android:text="@string/new_course_content"
                 android:textAllCaps="true"
-                android:textColor="@color/edx_brand_primary_accent"
+                android:textColor="@android:color/holo_orange_dark"
                 android:textSize="@dimen/edx_x_small"
                 tools:targetApi="17" />
         </LinearLayout>
diff --git a/OpenEdXMobile/res/layout/delete_successful_dialog.xml b/OpenEdXMobile/res/layout/delete_successful_dialog.xml
index 00a8bd7a82..301c890f38 100755
--- a/OpenEdXMobile/res/layout/delete_successful_dialog.xml
+++ b/OpenEdXMobile/res/layout/delete_successful_dialog.xml
@@ -61,7 +61,7 @@
             android:layout_height="35dip"
             android:layout_gravity="center|center_horizontal"
             android:layout_weight="0.5"
-            android:background="@android:color/white"
+            android:background="@color/edx_success_accent"
             android:text="@string/label_ok"
             android:textAllCaps="true"
             android:textSize="15sp" />
diff --git a/OpenEdXMobile/res/layout/fragment_account.xml b/OpenEdXMobile/res/layout/fragment_account.xml
index 1092708520..a251e0ea7c 100755
--- a/OpenEdXMobile/res/layout/fragment_account.xml
+++ b/OpenEdXMobile/res/layout/fragment_account.xml
@@ -31,11 +31,13 @@
             <TextView
                 android:id="@+id/feedback_btn"
                 style="@style/account_option"
+                android:background="@color/edx_success_accent"
                 android:text="@string/label_submit_feedback" />
 
             <TextView
                 android:id="@+id/logout_btn"
                 style="@style/account_option"
+                android:background="@android:color/holo_orange_dark"
                 android:text="@string/logout" />
 
         </LinearLayout>
diff --git a/OpenEdXMobile/res/layout/fragment_dashboard_error_layout.xml b/OpenEdXMobile/res/layout/fragment_dashboard_error_layout.xml
index 891da451ce..4e4f9697d9 100755
--- a/OpenEdXMobile/res/layout/fragment_dashboard_error_layout.xml
+++ b/OpenEdXMobile/res/layout/fragment_dashboard_error_layout.xml
@@ -21,6 +21,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/widget_margin"
             android:textSize="@dimen/edx_large"
+            android:textStyle="bold"
             tools:text="Error text" />
 
     </LinearLayout>
diff --git a/OpenEdXMobile/res/layout/fragment_edit_user_profile.xml b/OpenEdXMobile/res/layout/fragment_edit_user_profile.xml
index fe77cccc4d..cc8753f145 100644
--- a/OpenEdXMobile/res/layout/fragment_edit_user_profile.xml
+++ b/OpenEdXMobile/res/layout/fragment_edit_user_profile.xml
@@ -70,12 +70,12 @@
                     android:background="?android:attr/selectableItemBackground"
                     android:contentDescription="@string/edit_user_profile_change_photo_description"
                     android:drawablePadding="@dimen/x_small_icon_margin"
+                    android:focusable="true"
                     android:gravity="center_vertical"
                     android:paddingLeft="@dimen/edx_margin"
                     android:paddingRight="@dimen/edx_margin"
                     android:text="@string/edit_user_profile_change_photo"
-                    android:focusable="true"
-                    android:textColor="@color/disableable_button_text"
+                    android:textColor="@color/edx_success_text"
                     android:textSize="@dimen/edx_x_small" />
             </LinearLayout>
 
diff --git a/OpenEdXMobile/res/layout/fragment_find_courses.xml b/OpenEdXMobile/res/layout/fragment_find_courses.xml
index 3cc685760d..cb80a20281 100755
--- a/OpenEdXMobile/res/layout/fragment_find_courses.xml
+++ b/OpenEdXMobile/res/layout/fragment_find_courses.xml
@@ -13,9 +13,11 @@
         android:layout_height="wrap_content"
         android:clipToPadding="false"
         android:divider="@android:color/transparent"
-        android:dividerHeight="@dimen/widget_margin"
+        android:dividerHeight="@dimen/widget_margin_half"
         android:drawSelectorOnTop="false"
         android:listSelector="@android:color/transparent"
+        android:paddingBottom="@dimen/widget_margin_half"
+        android:paddingTop="@dimen/widget_margin_half"
         tools:listitem="@layout/row_course_list" />
 
     <include layout="@layout/loading_indicator" />
diff --git a/OpenEdXMobile/res/layout/fragment_main_discovery.xml b/OpenEdXMobile/res/layout/fragment_main_discovery.xml
new file mode 100644
index 0000000000..238dd97524
--- /dev/null
+++ b/OpenEdXMobile/res/layout/fragment_main_discovery.xml
@@ -0,0 +1,23 @@
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <LinearLayout
+        android:id="@+id/root"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <RadioGroup
+            android:id="@+id/options"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:clipToPadding="true"
+            android:orientation="horizontal"
+            android:padding="@dimen/edx_margin" />
+
+        <FrameLayout
+            android:id="@+id/fl_container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    </LinearLayout>
+</layout>
diff --git a/OpenEdXMobile/res/layout/fragment_my_courses_list.xml b/OpenEdXMobile/res/layout/fragment_my_courses_list.xml
index dc1de65aec..52fd8e0cb5 100644
--- a/OpenEdXMobile/res/layout/fragment_my_courses_list.xml
+++ b/OpenEdXMobile/res/layout/fragment_my_courses_list.xml
@@ -19,7 +19,9 @@
                 android:layout_height="wrap_content"
                 android:clipToPadding="false"
                 android:divider="@android:color/transparent"
-                android:dividerHeight="@dimen/widget_margin"
+                android:dividerHeight="@dimen/widget_margin_half"
+                android:paddingTop="@dimen/widget_margin_half"
+                android:paddingBottom="@dimen/widget_margin_half"
                 android:drawSelectorOnTop="false"
                 android:listSelector="@android:color/transparent"
                 tools:listitem="@layout/row_course_list" />
diff --git a/OpenEdXMobile/res/layout/fragment_user_profile.xml b/OpenEdXMobile/res/layout/fragment_user_profile.xml
index e3821bc85c..965983bcdf 100644
--- a/OpenEdXMobile/res/layout/fragment_user_profile.xml
+++ b/OpenEdXMobile/res/layout/fragment_user_profile.xml
@@ -34,9 +34,9 @@
                     android:id="@+id/name_text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="@dimen/widget_margin"
                     android:layout_marginTop="@dimen/widget_margin"
-                    android:textColor="@color/edx_brand_primary_base"
+                    android:layout_marginBottom="@dimen/widget_margin"
+                    android:textColor="@android:color/holo_orange_dark"
                     android:textSize="@dimen/edx_xx_large"
                     tools:text="username" />
 
@@ -105,7 +105,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/x_small_icon_margin"
-                        android:textColor="@color/edx_brand_primary_accent"
+                        android:textColor="@color/edx_success_accent"
                         android:textSize="@dimen/edx_x_small"
                         android:visibility="gone"
                         tools:text="@string/profile_sharing_limited_by_you"
diff --git a/OpenEdXMobile/res/layout/fragment_videosize_exceeds_dialog.xml b/OpenEdXMobile/res/layout/fragment_videosize_exceeds_dialog.xml
index f696b62334..eae318b9a2 100755
--- a/OpenEdXMobile/res/layout/fragment_videosize_exceeds_dialog.xml
+++ b/OpenEdXMobile/res/layout/fragment_videosize_exceeds_dialog.xml
@@ -63,14 +63,15 @@
             android:layout_width="0dp"
             android:layout_height="35dip"
             android:layout_gravity="center|center_horizontal"
-            android:layout_marginRight="0.5dp"
             android:layout_marginEnd="0.5dp"
+            android:layout_marginRight="0.5dp"
             android:layout_weight="0.5"
             android:background="@android:color/white"
             android:gravity="center"
             android:text="@string/label_cancel"
             android:textAllCaps="true"
             android:textSize="15sp"
+            android:textStyle="bold"
             tools:targetApi="17" />
 
         <Button
@@ -83,7 +84,8 @@
             android:background="@android:color/white"
             android:text="@string/label_download"
             android:textAllCaps="true"
-            android:textSize="15sp" />
+            android:textSize="15sp"
+            android:textStyle="bold" />
     </LinearLayout>
 
 </LinearLayout>
diff --git a/OpenEdXMobile/res/layout/fragment_view_subjects.xml b/OpenEdXMobile/res/layout/fragment_view_subjects.xml
index 4891715f3d..40e8155051 100755
--- a/OpenEdXMobile/res/layout/fragment_view_subjects.xml
+++ b/OpenEdXMobile/res/layout/fragment_view_subjects.xml
@@ -14,6 +14,7 @@
             android:id="@+id/sv_search_subjects"
             style="@style/launch_search_bar"
             android:layout_marginBottom="@dimen/widget_margin"
+            android:background="@color/edx_success_accent"
             android:imeOptions="flagNoFullscreen|flagNoExtractUi"
             app:queryHint="@string/search_subjects"
             app:theme="@style/search_view_theme" />
diff --git a/OpenEdXMobile/res/layout/fragment_webview.xml b/OpenEdXMobile/res/layout/fragment_webview.xml
new file mode 100755
index 0000000000..8204c39dfd
--- /dev/null
+++ b/OpenEdXMobile/res/layout/fragment_webview.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <FrameLayout
+        android:id="@+id/content_error_root"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <org.edx.mobile.view.custom.EdxWebView
+            android:id="@+id/webview"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/grey_act_background" />
+
+        <include
+            android:id="@+id/loading_indicator"
+            layout="@layout/loading_indicator" />
+
+        <include layout="@layout/content_error" />
+    </FrameLayout>
+</layout>
diff --git a/OpenEdXMobile/res/layout/fragment_webview_discovery.xml b/OpenEdXMobile/res/layout/fragment_webview_discovery.xml
new file mode 100755
index 0000000000..8cd852d8ee
--- /dev/null
+++ b/OpenEdXMobile/res/layout/fragment_webview_discovery.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <FrameLayout
+        android:id="@+id/content_error_root"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:id="@+id/ll_content"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+        <FrameLayout
+            android:id="@+id/fl_add_on_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            tools:visibility="visible"/>
+
+            <org.edx.mobile.view.custom.EdxWebView
+                android:id="@+id/webview"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:background="@color/grey_act_background" />
+        </LinearLayout>
+
+        <include
+            android:id="@+id/loading_indicator"
+            layout="@layout/loading_indicator" />
+
+        <include
+            android:id="@+id/content_error"
+            layout="@layout/content_error" />
+
+    </FrameLayout>
+</layout>
diff --git a/OpenEdXMobile/res/layout/panel_filter_by_subject.xml b/OpenEdXMobile/res/layout/panel_filter_by_subject.xml
new file mode 100644
index 0000000000..b4d4dea4d6
--- /dev/null
+++ b/OpenEdXMobile/res/layout/panel_filter_by_subject.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <LinearLayout
+        android:id="@+id/ll_subject_content"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/widget_margin"
+        android:layout_marginRight="@dimen/widget_margin"
+        android:animateLayoutChanges="true"
+        android:orientation="vertical"
+        android:visibility="gone"
+        tools:visibility="visible">
+
+        <TextView
+            android:id="@+id/tv_browse_subjects"
+            style="@style/regular_edx_gray_dark_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/widget_margin"
+            android:text="@string/browse_by_subject"
+            android:textSize="@dimen/edx_x_small" />
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/rv_subjects"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/widget_margin"
+            android:layout_marginTop="@dimen/widget_margin" />
+
+        <include layout="@layout/edx_divider" />
+    </LinearLayout>
+
+</layout>
diff --git a/OpenEdXMobile/res/layout/panel_find_course.xml b/OpenEdXMobile/res/layout/panel_find_course.xml
index 949908c41a..6806e4fe67 100644
--- a/OpenEdXMobile/res/layout/panel_find_course.xml
+++ b/OpenEdXMobile/res/layout/panel_find_course.xml
@@ -3,41 +3,48 @@
 
     <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingLeft="@dimen/widget_margin"
-        android:paddingRight="@dimen/widget_margin">
+        android:layout_height="wrap_content">
 
-        <LinearLayout
-            android:id="@+id/panel_course_layout"
+        <android.support.v7.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@drawable/bg_panel_find_courses"
-            android:descendantFocusability="blocksDescendants"
-            android:gravity="center"
-            android:orientation="vertical"
-            android:paddingLeft="@dimen/edx_margin"
-            android:paddingRight="@dimen/edx_margin">
+            android:layout_marginLeft="@dimen/widget_margin"
+            android:layout_marginRight="@dimen/widget_margin"
+            style="@style/edX.Widget.CardView">
 
-            <TextView
-                android:id="@+id/findcourse_tv"
-                style="@style/semibold_text"
+            <LinearLayout
+                android:id="@+id/panel_course_layout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/edx_margin"
-                android:layout_marginBottom="@dimen/edx_margin"
+                android:background="@drawable/bg_panel_find_courses"
+                android:descendantFocusability="blocksDescendants"
                 android:gravity="center"
-                android:text="@string/find_course_text"
-                android:textColor="@color/edx_brand_gray_base"
-                android:textSize="@dimen/edx_base" />
+                android:orientation="vertical"
+                android:paddingLeft="@dimen/edx_margin"
+                android:paddingRight="@dimen/edx_margin">
 
-            <Button
-                android:id="@+id/course_btn"
-                style="@style/edX.Widget.BrandPillButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/find_course_btn_text"
-                android:layout_marginBottom="@dimen/edx_margin" />
+                <TextView
+                    android:id="@+id/findcourse_tv"
+                    style="@style/semibold_text"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="@dimen/edx_margin"
+                    android:layout_marginTop="@dimen/edx_margin"
+                    android:gravity="center"
+                    android:text="@string/find_course_text"
+                    android:textColor="@color/edx_brand_gray_base"
+                    android:textSize="@dimen/edx_base" />
+
+                <Button
+                    android:id="@+id/course_btn"
+                    style="@style/edX.Widget.BrandPillButton"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="@dimen/edx_margin"
+                    android:background="@android:color/holo_orange_dark"
+                    android:text="@string/find_course_btn_text" />
 
-        </LinearLayout>
+            </LinearLayout>
+        </android.support.v7.widget.CardView>
     </FrameLayout>
 </layout>
diff --git a/OpenEdXMobile/res/layout/panel_player.xml b/OpenEdXMobile/res/layout/panel_player.xml
index df57a99d7e..5862c5f88a 100755
--- a/OpenEdXMobile/res/layout/panel_player.xml
+++ b/OpenEdXMobile/res/layout/panel_player.xml
@@ -12,8 +12,8 @@
         android:background="@color/black"
         android:visibility="visible" >
 
-        <org.edx.mobile.player.Preview
-            android:id="@+id/preview"
+        <com.google.android.exoplayer2.ui.PlayerView
+            android:id="@+id/player_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:rotation="0" />
diff --git a/OpenEdXMobile/res/layout/row_bulk_download.xml b/OpenEdXMobile/res/layout/row_bulk_download.xml
index 4f61142b45..3ae89fa769 100644
--- a/OpenEdXMobile/res/layout/row_bulk_download.xml
+++ b/OpenEdXMobile/res/layout/row_bulk_download.xml
@@ -47,7 +47,7 @@
                 android:id="@+id/tv_title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="@color/edx_brand_primary_base"
+                android:textColor="@android:color/holo_orange_dark"
                 android:textSize="@dimen/edx_small"
                 tools:text="1 of 17 Videos Downloaded" />
 
@@ -56,7 +56,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/bulk_download_description_top_margin"
-                android:textColor="@color/edx_brand_gray_accent"
+                android:textColor="@color/common_google_signin_btn_text_light_pressed"
                 android:textSize="@dimen/edx_small"
                 tools:text="5.5MB of 67.5MB total" />
 
diff --git a/OpenEdXMobile/res/layout/row_chapter_list.xml b/OpenEdXMobile/res/layout/row_chapter_list.xml
index 0503e4391f..04046f8abf 100755
--- a/OpenEdXMobile/res/layout/row_chapter_list.xml
+++ b/OpenEdXMobile/res/layout/row_chapter_list.xml
@@ -18,14 +18,15 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
-        android:layout_marginLeft="10dp"
         android:layout_marginStart="10dp"
+        android:layout_marginLeft="10dp"
         android:ellipsize="end"
         android:maxWidth="@dimen/width_chapter_text"
         android:singleLine="true"
-        tools:text="Chapter Name"
+        android:textColor="@color/black"
         android:textSize="16sp"
-        tools:targetApi="17" />
+        tools:targetApi="17"
+        tools:text="Chapter Name" />
 
     <LinearLayout
         android:id="@+id/bulk_download_layout"
diff --git a/OpenEdXMobile/res/layout/row_course_card.xml b/OpenEdXMobile/res/layout/row_course_card.xml
index 808c3aef8a..8d477e9527 100644
--- a/OpenEdXMobile/res/layout/row_course_card.xml
+++ b/OpenEdXMobile/res/layout/row_course_card.xml
@@ -32,6 +32,7 @@
             <TextView
                 android:id="@+id/course_detail_name"
                 style="@style/course_card_title"
+                android:textColor="@android:color/holo_orange_dark"
                 tools:text="Course Name" />
 
             <TextView
diff --git a/OpenEdXMobile/res/layout/row_course_list.xml b/OpenEdXMobile/res/layout/row_course_list.xml
index 273d46afb3..f09c48cf66 100755
--- a/OpenEdXMobile/res/layout/row_course_list.xml
+++ b/OpenEdXMobile/res/layout/row_course_list.xml
@@ -1,20 +1,30 @@
 <?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:id="@+id/fl_row_course_list_root"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingLeft="@dimen/widget_margin"
     android:paddingRight="@dimen/widget_margin">
 
-    <FrameLayout
-        android:id="@+id/fl_background"
+    <android.support.v7.widget.CardView
+        android:id="@+id/cv_background"
+        style="@style/edX.Widget.CardView"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:background="@color/white"
-        android:foreground="@drawable/fg_course_row">
+        android:foreground="@drawable/selectable_rounded_box_overlay">
 
         <include layout="@layout/course_card" />
 
-    </FrameLayout>
+        <View
+            android:id="@+id/view_foreground_overlay"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@drawable/fg_course_row"
+            android:visibility="gone"
+            tools:ignore="ContentDescription" />
+
+    </android.support.v7.widget.CardView>
 
 </FrameLayout>
diff --git a/OpenEdXMobile/res/layout/row_discussion_comments_comment.xml b/OpenEdXMobile/res/layout/row_discussion_comments_comment.xml
index 393cceccf2..5c8da15a5f 100644
--- a/OpenEdXMobile/res/layout/row_discussion_comments_comment.xml
+++ b/OpenEdXMobile/res/layout/row_discussion_comments_comment.xml
@@ -6,11 +6,9 @@
     android:layout_height="wrap_content"
     android:layout_marginLeft="@dimen/discussion_responses_standard_margin"
     android:layout_marginRight="@dimen/discussion_responses_standard_margin"
-    app:cardCornerRadius="@dimen/edx_box_radius"
+    style="@style/edX.Widget.CardView"
     app:cardElevation="1dp"
-    app:cardMaxElevation="1dp"
-    app:cardPreventCornerOverlap="false"
-    app:cardUseCompatPadding="true">
+    app:cardMaxElevation="1dp">
 
     <LinearLayout
         android:id="@+id/row_discussion_comment_layout"
diff --git a/OpenEdXMobile/res/layout/row_discussion_comments_response.xml b/OpenEdXMobile/res/layout/row_discussion_comments_response.xml
index ded909bd1c..054d393b9e 100644
--- a/OpenEdXMobile/res/layout/row_discussion_comments_response.xml
+++ b/OpenEdXMobile/res/layout/row_discussion_comments_response.xml
@@ -8,9 +8,7 @@
     android:layout_marginRight="@dimen/discussion_responses_standard_margin"
     android:layout_marginLeft="@dimen/discussion_responses_standard_margin"
     android:layout_marginBottom="@dimen/discussion_responses_standard_half_margin"
-    app:cardCornerRadius="@dimen/edx_box_radius"
-    app:cardPreventCornerOverlap="false"
-    app:cardUseCompatPadding="true">
+    style="@style/edX.Widget.CardView">
 
     <LinearLayout
         android:id="@+id/row_discussion_comment_layout"
diff --git a/OpenEdXMobile/res/layout/row_discussion_responses_response.xml b/OpenEdXMobile/res/layout/row_discussion_responses_response.xml
index 102f9b8f3b..9f6acb77d0 100644
--- a/OpenEdXMobile/res/layout/row_discussion_responses_response.xml
+++ b/OpenEdXMobile/res/layout/row_discussion_responses_response.xml
@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.v7.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    style="@style/edX.Widget.CardView"
     android:layout_marginLeft="@dimen/discussion_responses_standard_margin"
     android:layout_marginRight="@dimen/discussion_responses_standard_margin"
-    android:layout_marginTop="@dimen/discussion_responses_standard_margin"
-    app:cardCornerRadius="@dimen/edx_box_radius"
-    app:cardPreventCornerOverlap="false"
-    app:cardUseCompatPadding="true">
+    android:layout_marginTop="@dimen/discussion_responses_standard_margin">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/OpenEdXMobile/res/layout/row_last_accessed.xml b/OpenEdXMobile/res/layout/row_last_accessed.xml
index 8203a9f2ec..17d39e405c 100644
--- a/OpenEdXMobile/res/layout/row_last_accessed.xml
+++ b/OpenEdXMobile/res/layout/row_last_accessed.xml
@@ -29,6 +29,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="@dimen/last_accessed_header_unit_vertical_margin"
                 android:text="@string/last_accessed"
+                android:textColor="@color/edx_success_accent"
                 android:textSize="@dimen/last_accessed_header_text_size"
                 tools:targetApi="17" />
 
@@ -39,6 +40,7 @@
                 android:ellipsize="end"
                 android:maxLines="1"
                 android:textSize="@dimen/last_accessed_unit_text_size"
+                android:textStyle="bold"
                 tools:targetApi="17"
                 tools:text="Course Name" />
         </LinearLayout>
@@ -52,9 +54,9 @@
             android:layout_marginRight="@dimen/last_accessed_button_right_margin"
             android:background="@drawable/selectable_box_overlay"
             android:padding="@dimen/last_accessed_button_padding"
-            android:textAllCaps="true"
             android:text="@string/view_button_text"
-            android:textColor="@color/edx_brand_primary_base"
+            android:textAllCaps="true"
+            android:textColor="@android:color/holo_orange_dark"
             android:textSize="@dimen/last_accessed_button_text_size" />
 
     </LinearLayout>
diff --git a/OpenEdXMobile/res/layout/segment_control_button_base.xml b/OpenEdXMobile/res/layout/segment_control_button_base.xml
new file mode 100644
index 0000000000..975fe42bfa
--- /dev/null
+++ b/OpenEdXMobile/res/layout/segment_control_button_base.xml
@@ -0,0 +1,5 @@
+<RadioButton xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/edX.Widget.SegmentedControlSegment.Start"
+    android:layout_width="0dp"
+    android:layout_height="wrap_content"
+    android:layout_weight="1" />
\ No newline at end of file
diff --git a/OpenEdXMobile/res/layout/toolbar_with_profile_button.xml b/OpenEdXMobile/res/layout/toolbar_with_profile_button.xml
index 2f699799b4..03593c8633 100644
--- a/OpenEdXMobile/res/layout/toolbar_with_profile_button.xml
+++ b/OpenEdXMobile/res/layout/toolbar_with_profile_button.xml
@@ -32,6 +32,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/courses_title_text_left_margin"
             android:layout_marginEnd="@dimen/courses_profile_icon_left_margin"
+            android:textColor="@color/edx_success_text"
             tools:text="Screen title" />
 
         <LinearLayout
diff --git a/OpenEdXMobile/res/layout/view_subjects_item.xml b/OpenEdXMobile/res/layout/view_subjects_item.xml
index 9d0f6a8e25..ee685dd8d2 100644
--- a/OpenEdXMobile/res/layout/view_subjects_item.xml
+++ b/OpenEdXMobile/res/layout/view_subjects_item.xml
@@ -9,7 +9,7 @@
 
         <Button
             android:id="@+id/bt_view_subjects"
-            style="@style/edX.Widget.BrandPillButton"
+            style="@android:style/Widget.Material.Button.Colored"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:text="@string/view_all_subjects"
diff --git a/OpenEdXMobile/res/raw-es/whats_new.json b/OpenEdXMobile/res/raw-es/whats_new.json
index 5645fd51cc..3b5bc820b6 100644
--- a/OpenEdXMobile/res/raw-es/whats_new.json
+++ b/OpenEdXMobile/res/raw-es/whats_new.json
@@ -1,4 +1,18 @@
 [
+  {
+    "version": "2.18",
+    "messages": [
+      {
+        "platforms": [
+          "ios",
+          "android"
+        ],
+        "image": "screen_1",
+        "title": "Descubre Programas y Maestrías",
+        "message": "Ahora puede descubrir programas y maestrías de edX en cualquier lugar!"
+      }
+    ]
+  },
   {
     "version": "2.16",
     "messages": [
diff --git a/OpenEdXMobile/res/raw/whats_new.json b/OpenEdXMobile/res/raw/whats_new.json
index 2d085ced89..cab9fda87f 100644
--- a/OpenEdXMobile/res/raw/whats_new.json
+++ b/OpenEdXMobile/res/raw/whats_new.json
@@ -1,4 +1,18 @@
 [
+  {
+    "version": "2.18",
+    "messages": [
+      {
+        "platforms": [
+          "ios",
+          "android"
+        ],
+        "image": "screen_1",
+        "title": "Program & Degree Discovery",
+        "message": "You can now search edX programs and degrees using the mobile application!"
+      }
+    ]
+  },
   {
     "version": "2.16",
     "messages": [
diff --git a/OpenEdXMobile/res/values-es/errors.xml b/OpenEdXMobile/res/values-es/errors.xml
index 4c4739a9d2..0e5fa24d14 100644
--- a/OpenEdXMobile/res/values-es/errors.xml
+++ b/OpenEdXMobile/res/values-es/errors.xml
@@ -77,6 +77,8 @@
   <string name="error_max_length">%1$s no puede tener más de %2$d caracteres.</string>
   <!--Error message shown when a course hasn't started yet-->
   <string name="course_not_started">Este curso aún no ha empezado. </string>
+  <!--Error message shown when a user's access has expired for a course-->
+  <string name="course_access_expired">Tu Acceso a este curso ha expirado</string>
   <!--Error message shown when a user can't perform an action on e.g. add a post/response/comment in forums-->
   <string name="action_not_completed">Su acción no pudo ser completada.</string>
   <!--Error dialog message shown when the user try to log in in app with un-supported version-->
@@ -85,5 +87,5 @@
   <string name="app_version_unsupported_register_msg">Su versión de la aplicación ya no es compatible. Actualice a la última versión para registrarse.</string>
   <!--Permission Error Messages-->
   <!--Error message shown when a permission is not granted-->
-  <string name="permission_not_granted">Permiso denegado</string>
+  <string name="permission_not_granted">Permiso no concedido</string>
 </resources>
diff --git a/OpenEdXMobile/res/values-es/strings.xml b/OpenEdXMobile/res/values-es/strings.xml
index 001cd116ee..0b1656f94e 100644
--- a/OpenEdXMobile/res/values-es/strings.xml
+++ b/OpenEdXMobile/res/values-es/strings.xml
@@ -40,6 +40,8 @@
   <string name="settings_wifi_top">Descargar solo por Wi-Fi</string>
   <!--Label explaining what wifi only means in detail-->
   <string name="settings_wifi_bottom">Sólo descargar contenido cuando el Wifi está encendido</string>
+  <!--Label for the Download to sd-card setting-->
+  <!--Label explaining the download location setting in detail-->
   <!--Certificate Page-->
   <!--Description of button that will open the certificate sharing menu-->
   <string name="share_certificate_button">Comparta su certificado</string>
@@ -101,6 +103,7 @@
   <string name="label_find_courses">Encontrar cursos</string>
   <!--Title of webview based Find Courses Screen-->
   <string name="label_discover">Exploración</string>
+  <!--Title of Degrees tab on Discovery screen-->
   <!--Title of Find Courses tab on Main Dashboard screen-->
   <string name="label_discovery">Descubrir</string>
   <!--Button allowing users to send an email for feedback-->
@@ -190,6 +193,10 @@ Si no lo recibe en algunos minutos, asegúrese de revisar su carpeta de spam.</s
   <string name="label_ended">Terminado el {date}</string>
   <!--Label for date when course is ending-->
   <string name="label_ending">Terminando el {date}</string>
+  <!--Label for date when course is expiring in a specific time frame like in 2 days-->
+  <!--Label for date when course is expiring on a specific date like on December 5-->
+  <!--Label for date when course expired a specific time ago like 2 days ago-->
+  <!--Label for date when course expired on a specific date like on November 5-->
   <!--Course Details-->
   <!--Accessible content description of label for course content-->
   <string name="course_content">Contenido del curso</string>
@@ -454,6 +461,8 @@ Si no lo recibe en algunos minutos, asegúrese de revisar su carpeta de spam.</s
   <string name="email_client_not_present">No hay apps de correo instaladas</string>
   <!--Search for a course prompt-->
   <string name="search_for_courses">Buscar cursos</string>
+  <!--Search for a program prompt-->
+  <!--Search for a degree prompt-->
   <!--Landing Activity text-->
   <!--Prompt leading user to sign in screen-->
   <string name="already_have_an_account">¿Ya tiene una cuenta? Inicie sesión</string>
@@ -468,7 +477,6 @@ Si no lo recibe en algunos minutos, asegúrese de revisar su carpeta de spam.</s
   <!--Button leading user to log in screen-->
   <string name="launch_login">Iniciar sesión</string>
   <!--Introduction text on the launch screen-->
-  <string name="launch_text">Cursos gratuitos de las mejores universidades del mundo en tu bolsillo.</string>
   <!--Search view leading user to Find Courses screen from the launch screen upon searching some text-->
   <string name="launch_search_courses">Buscar cursos</string>
   <!--Registration Screen-->
diff --git a/OpenEdXMobile/res/values/errors.xml b/OpenEdXMobile/res/values/errors.xml
index 18f6eb0701..49ade44cb2 100755
--- a/OpenEdXMobile/res/values/errors.xml
+++ b/OpenEdXMobile/res/values/errors.xml
@@ -91,7 +91,7 @@
     <string name="course_not_started">This course hasn’t started yet.</string>
 
     <!-- Error message shown when a user's access has expired for a course -->
-    <string name="course_access_expired" tools:ignore="MissingTranslation">Your access to this course has expired.</string>
+    <string name="course_access_expired">Your access to this course has expired.</string>
 
     <!-- Error message shown when a user can't perform an action on e.g. add a post/response/comment in forums -->
     <string name="action_not_completed">Your action could not be completed.</string>
diff --git a/OpenEdXMobile/res/values/ids.xml b/OpenEdXMobile/res/values/ids.xml
index c539cf756c..86eccded4e 100644
--- a/OpenEdXMobile/res/values/ids.xml
+++ b/OpenEdXMobile/res/values/ids.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <item type="id" name="content_error_root" />
+    <item name="content_error_root" type="id" />
+    <item name="option_courses" type="id" />
+    <item name="option_programs" type="id" />
+    <item name="option_degrees" type="id" />
 </resources>
diff --git a/OpenEdXMobile/res/values/strings.xml b/OpenEdXMobile/res/values/strings.xml
index 2e243ccc38..fc0cc3f6d0 100755
--- a/OpenEdXMobile/res/values/strings.xml
+++ b/OpenEdXMobile/res/values/strings.xml
@@ -125,6 +125,8 @@
     <string name="label_find_courses">Find Courses</string>
     <!-- Title of webview based Find Courses Screen -->
     <string name="label_discover">Discover</string>
+    <!-- Title of Degrees tab on Discovery screen -->
+    <string name="label_degrees" tools:ignore="MissingTranslation">Degrees</string>
     <!-- Title of Find Courses tab on Main Dashboard screen -->
     <string name="label_discovery">Discovery</string>
     <!-- Button allowing users to send an email for feedback -->
@@ -513,6 +515,10 @@
     <string name="email_client_not_present">No e-mail clients installed</string>
     <!-- Search for a course prompt -->
     <string name="search_for_courses">Search for courses</string>
+    <!-- Search for a program prompt -->
+    <string name="search_for_programs" tools:ignore="MissingTranslation">Search for programs</string>
+    <!-- Search for a degree prompt -->
+    <string name="search_for_degrees" tools:ignore="MissingTranslation">Search for degrees</string>
 
     <!-- Landing Activity text -->
     <!-- Prompt leading user to sign in screen -->
@@ -529,7 +535,7 @@
     <!-- Button leading user to log in screen -->
     <string name="launch_login">Log In</string>
     <!-- Introduction text on the launch screen -->
-    <string name="launch_text">Free courses from the world’s best universities in your pocket.</string>
+    <string name="launch_text" tools:ignore="MissingTranslation">Courses from the world’s best universities in your pocket.</string>
     <!-- Search view leading user to Find Courses screen from the launch screen upon searching some text -->
     <string name="launch_search_courses">Search Courses</string>
 
diff --git a/OpenEdXMobile/res/values/styles.xml b/OpenEdXMobile/res/values/styles.xml
index 8865750827..9f601d0162 100755
--- a/OpenEdXMobile/res/values/styles.xml
+++ b/OpenEdXMobile/res/values/styles.xml
@@ -451,6 +451,13 @@
         <item name="overlapAnchor">true</item>
     </style>
 
+    <style name="edX.Widget.CardView" parent="CardView">
+        <item name="cardCornerRadius">@dimen/edx_box_radius</item>
+        <item name="cardUseCompatPadding">true</item>
+        <item name="cardPreventCornerOverlap">false</item>
+        <item name="android:background">@color/white</item>
+    </style>
+
     <style name="edX.Widget.DropDownListView" parent="Widget.AppCompat.ListView.DropDown" />
 
     <!-- Spinner with the popup style -->
diff --git a/OpenEdXMobile/res/values/text_styles.xml b/OpenEdXMobile/res/values/text_styles.xml
index 52d70d0d65..a5acc1498c 100755
--- a/OpenEdXMobile/res/values/text_styles.xml
+++ b/OpenEdXMobile/res/values/text_styles.xml
@@ -102,6 +102,9 @@
     <style name="bold_white_text" parent="@style/bold_text">
         <item name="android:textColor">@android:color/white</item>
     </style>
+    <style name="bold_orange_text" parent="@style/bold_text">
+        <item name="android:textColor">@android:color/holo_orange_light</item>
+    </style>
 
     <style name="semibold_white_text" parent="@style/semibold_text">
         <item name="android:textColor">@android:color/white</item>
diff --git a/OpenEdXMobile/screenshots/API_21_NO_GP_XHDPI_768x1280_armeabi-v7a_/org.edx.mobile.test.screenshot.test.DiscoveryLaunchScreenshotTests_testScreenshot_withCourseDiscoveryDisabled.png b/OpenEdXMobile/screenshots/API_21_NO_GP_XHDPI_768x1280_armeabi-v7a_/org.edx.mobile.test.screenshot.test.DiscoveryLaunchScreenshotTests_testScreenshot_withCourseDiscoveryDisabled.png
index dec331de5a..ba43ad96d5 100644
Binary files a/OpenEdXMobile/screenshots/API_21_NO_GP_XHDPI_768x1280_armeabi-v7a_/org.edx.mobile.test.screenshot.test.DiscoveryLaunchScreenshotTests_testScreenshot_withCourseDiscoveryDisabled.png and b/OpenEdXMobile/screenshots/API_21_NO_GP_XHDPI_768x1280_armeabi-v7a_/org.edx.mobile.test.screenshot.test.DiscoveryLaunchScreenshotTests_testScreenshot_withCourseDiscoveryDisabled.png differ
diff --git a/OpenEdXMobile/screenshots/API_21_NO_GP_XHDPI_768x1280_armeabi-v7a_/org.edx.mobile.test.screenshot.test.DiscoveryLaunchScreenshotTests_testScreenshot_withCourseDiscoveryEnabled.png b/OpenEdXMobile/screenshots/API_21_NO_GP_XHDPI_768x1280_armeabi-v7a_/org.edx.mobile.test.screenshot.test.DiscoveryLaunchScreenshotTests_testScreenshot_withCourseDiscoveryEnabled.png
index 69d9c5a16c..52cada9f32 100644
Binary files a/OpenEdXMobile/screenshots/API_21_NO_GP_XHDPI_768x1280_armeabi-v7a_/org.edx.mobile.test.screenshot.test.DiscoveryLaunchScreenshotTests_testScreenshot_withCourseDiscoveryEnabled.png and b/OpenEdXMobile/screenshots/API_21_NO_GP_XHDPI_768x1280_armeabi-v7a_/org.edx.mobile.test.screenshot.test.DiscoveryLaunchScreenshotTests_testScreenshot_withCourseDiscoveryEnabled.png differ
diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/base/WebViewCourseInfoFragment.java b/OpenEdXMobile/src/main/java/org/edx/mobile/base/WebViewCourseInfoFragment.java
index 350782ef86..73ee4424de 100644
--- a/OpenEdXMobile/src/main/java/org/edx/mobile/base/WebViewCourseInfoFragment.java
+++ b/OpenEdXMobile/src/main/java/org/edx/mobile/base/WebViewCourseInfoFragment.java
@@ -1,5 +1,7 @@
 package org.edx.mobile.base;
 
+import android.app.Activity;
+import android.content.Intent;
 import android.databinding.DataBindingUtil;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
@@ -10,21 +12,33 @@
 import android.webkit.URLUtil;
 
 import org.edx.mobile.R;
-import org.edx.mobile.databinding.FragmentFindCourseInfoBinding;
+import org.edx.mobile.databinding.FragmentWebviewBinding;
 import org.edx.mobile.http.notifications.FullScreenErrorNotification;
 import org.edx.mobile.interfaces.WebViewStatusListener;
-import org.edx.mobile.view.BaseWebViewDiscoverFragment;
-import org.edx.mobile.view.CourseInfoActivity;
+import org.edx.mobile.model.api.EnrolledCoursesResponse;
+import org.edx.mobile.util.links.DefaultActionListener;
+import org.edx.mobile.view.BaseWebViewFragment;
 
-public class WebViewCourseInfoFragment extends BaseWebViewDiscoverFragment
+import static org.edx.mobile.view.Router.EXTRA_PATH_ID;
+
+public class WebViewCourseInfoFragment extends BaseWebViewFragment
         implements WebViewStatusListener {
 
-    private FragmentFindCourseInfoBinding binding;
+    private static final int LOG_IN_REQUEST_CODE = 42;
+    private static final String INSTANCE_COURSE_ID = "enrollCourseId";
+    private static final String INSTANCE_EMAIL_OPT_IN = "enrollEmailOptIn";
+
+    private String lastClickEnrollCourseId;
+    private boolean lastClickEnrollEmailOptIn;
+
+    private DefaultActionListener defaultActionListener;
+
+    private FragmentWebviewBinding binding;
 
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        binding = DataBindingUtil.inflate(inflater, R.layout.fragment_find_course_info, container, false);
+        binding = DataBindingUtil.inflate(inflater, R.layout.fragment_webview, container, false);
         return binding.getRoot();
     }
 
@@ -32,6 +46,40 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         loadUrl(getInitialUrl());
+        setWebViewActionListener();
+        if (null != savedInstanceState) {
+            lastClickEnrollCourseId = savedInstanceState.getString(INSTANCE_COURSE_ID);
+            lastClickEnrollEmailOptIn = savedInstanceState.getBoolean(INSTANCE_EMAIL_OPT_IN);
+        }
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putString(INSTANCE_COURSE_ID, lastClickEnrollCourseId);
+        outState.putBoolean(INSTANCE_EMAIL_OPT_IN, lastClickEnrollEmailOptIn);
+    }
+
+    public void setWebViewActionListener() {
+        defaultActionListener = new DefaultActionListener(getActivity(), progressWheel,
+                new DefaultActionListener.EnrollCallback() {
+                    @Override
+                    public void onResponse(@NonNull EnrolledCoursesResponse course) {
+
+                    }
+
+                    @Override
+                    public void onFailure(@NonNull Throwable error) {
+                    }
+
+                    @Override
+                    public void onUserNotLoggedIn(@NonNull String courseId, boolean emailOptIn) {
+                        lastClickEnrollCourseId = courseId;
+                        lastClickEnrollEmailOptIn = emailOptIn;
+                        startActivityForResult(environment.getRouter().getRegisterIntent(), LOG_IN_REQUEST_CODE);
+                    }
+                });
+        client.setActionListener(defaultActionListener);
     }
 
     @Override
@@ -39,6 +87,14 @@ public FullScreenErrorNotification initFullScreenErrorNotification() {
         return new FullScreenErrorNotification(binding.webview);
     }
 
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == LOG_IN_REQUEST_CODE && resultCode == Activity.RESULT_OK) {
+            defaultActionListener.onClickEnroll(lastClickEnrollCourseId, lastClickEnrollEmailOptIn);
+        }
+    }
+
     /**
      * Loads the given URL into {@link #webView}.
      *
@@ -72,12 +128,12 @@ protected String getInitialUrl() {
         if (URLUtil.isValidUrl(binding.webview.getUrl())) {
             return binding.webview.getUrl();
         } else if (getArguments() != null) {
-            final String pathId = getArguments().getString(CourseInfoActivity.EXTRA_PATH_ID);
-            return environment.getConfig().getCourseDiscoveryConfig()
-                    .getCourseInfoUrlTemplate()
-                    .replace("{" + CourseInfoActivity.EXTRA_PATH_ID + "}", pathId);
+            final String pathId = getArguments().getString(EXTRA_PATH_ID);
+            return environment.getConfig().getDiscoveryConfig().getCourseDiscoveryConfig()
+                    .getInfoUrlTemplate()
+                    .replace("{" + EXTRA_PATH_ID + "}", pathId);
         }
-        return environment.getConfig().getCourseDiscoveryConfig().getCourseSearchUrl();
+        return environment.getConfig().getDiscoveryConfig().getCourseDiscoveryConfig().getBaseUrl();
     }
 
     @Override
diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/base/WebViewProgramInfoFragment.java b/OpenEdXMobile/src/main/java/org/edx/mobile/base/WebViewProgramInfoFragment.java
new file mode 100644
index 0000000000..68306284c5
--- /dev/null
+++ b/OpenEdXMobile/src/main/java/org/edx/mobile/base/WebViewProgramInfoFragment.java
@@ -0,0 +1,107 @@
+package org.edx.mobile.base;
+
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.webkit.URLUtil;
+
+import org.edx.mobile.R;
+import org.edx.mobile.databinding.FragmentWebviewBinding;
+import org.edx.mobile.http.notifications.FullScreenErrorNotification;
+import org.edx.mobile.interfaces.WebViewStatusListener;
+import org.edx.mobile.model.api.EnrolledCoursesResponse;
+import org.edx.mobile.util.links.DefaultActionListener;
+import org.edx.mobile.view.BaseWebViewFragment;
+
+import static org.edx.mobile.view.Router.EXTRA_PATH_ID;
+
+public class WebViewProgramInfoFragment extends BaseWebViewFragment
+        implements WebViewStatusListener {
+    private FragmentWebviewBinding binding;
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        binding = DataBindingUtil.inflate(inflater, R.layout.fragment_webview, container, false);
+        return binding.getRoot();
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        loadUrl(getInitialUrl());
+        setWebViewActionListener();
+    }
+
+    public void setWebViewActionListener() {
+        client.setActionListener(new DefaultActionListener(getActivity(), progressWheel,
+                new DefaultActionListener.EnrollCallback() {
+                    @Override
+                    public void onResponse(@NonNull EnrolledCoursesResponse course) {
+                    }
+
+                    @Override
+                    public void onFailure(@NonNull Throwable error) {
+                    }
+
+                    @Override
+                    public void onUserNotLoggedIn(@NonNull String courseId, boolean emailOptIn) {
+                    }
+                }));
+    }
+
+    @Override
+    public FullScreenErrorNotification initFullScreenErrorNotification() {
+        return new FullScreenErrorNotification(binding.webview);
+    }
+
+    /**
+     * Loads the given URL into {@link #webView}.
+     *
+     * @param url The URL to load.
+     */
+    @Override
+    protected void loadUrl(@NonNull String url) {
+        if (client != null) {
+            client.setLoadingInitialUrl(true);
+        }
+        super.loadUrl(url);
+    }
+
+    /**
+     * By default, all links will not be treated as external.
+     * Depends on host, as long as the links have same host, they are treated as non-external links.
+     *
+     * @return
+     */
+    protected boolean isAllLinksExternal() {
+        return true;
+    }
+
+    @Override
+    public void onRefresh() {
+        loadUrl(getInitialUrl());
+    }
+
+    @NonNull
+    protected String getInitialUrl() {
+        if (URLUtil.isValidUrl(binding.webview.getUrl())) {
+            return binding.webview.getUrl();
+        } else if (getArguments() != null) {
+            final String pathId = getArguments().getString(EXTRA_PATH_ID);
+            return environment.getConfig().getDiscoveryConfig().getProgramDiscoveryConfig()
+                    .getInfoUrlTemplate()
+                    .replace("{" + EXTRA_PATH_ID + "}", pathId);
+        }
+        return environment.getConfig().getDiscoveryConfig().getProgramDiscoveryConfig().getBaseUrl();
+    }
+
+    @Override
+    protected boolean isShowingFullScreenError() {
+        return errorNotification != null && errorNotification.isShowing();
+    }
+}
diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/event/DiscoveryTabSelectedEvent.java b/OpenEdXMobile/src/main/java/org/edx/mobile/event/DiscoveryTabSelectedEvent.java
new file mode 100644
index 0000000000..a324646e71
--- /dev/null
+++ b/OpenEdXMobile/src/main/java/org/edx/mobile/event/DiscoveryTabSelectedEvent.java
@@ -0,0 +1,8 @@
+package org.edx.mobile.event;
+
+/**
+ * The event to fire through {@link de.greenrobot.event.EventBus EventBus} on selection of the
+ * 'Discovery' tab exists in {@link org.edx.mobile.view.MainTabsDashboardFragment MainTabsDashboardFragment}.
+ */
+public class DiscoveryTabSelectedEvent {
+}
diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/model/VideoModel.java b/OpenEdXMobile/src/main/java/org/edx/mobile/model/VideoModel.java
index c045955530..22234b28d4 100644
--- a/OpenEdXMobile/src/main/java/org/edx/mobile/model/VideoModel.java
+++ b/OpenEdXMobile/src/main/java/org/edx/mobile/model/VideoModel.java
@@ -47,7 +47,7 @@ public interface VideoModel {
 
     String getSectionName();
 
-    int getLastPlayedOffset();
+    long getLastPlayedOffset();
 
     String getLmsUrl();
     
diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/model/db/DownloadEntry.java b/OpenEdXMobile/src/main/java/org/edx/mobile/model/db/DownloadEntry.java
index f3f67abdd3..00e3352428 100644
--- a/OpenEdXMobile/src/main/java/org/edx/mobile/model/db/DownloadEntry.java
+++ b/OpenEdXMobile/src/main/java/org/edx/mobile/model/db/DownloadEntry.java
@@ -42,7 +42,7 @@ public static enum DownloadedState { DOWNLOADING, DOWNLOADED, ONLINE }
     public String chapter;
     public String section;
     public long downloadedOn;
-    public int lastPlayedOffset;
+    public long lastPlayedOffset;
     public int isCourseActive = 1; // default is TRUE
     public boolean isVideoForWebOnly; //default is FALSE
     public String lmsUrl;
@@ -185,7 +185,7 @@ public String getSectionName() {
     }
 
     @Override
-    public int getLastPlayedOffset() {
+    public long getLastPlayedOffset() {
         return lastPlayedOffset;
     }
 
diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/module/analytics/Analytics.java b/OpenEdXMobile/src/main/java/org/edx/mobile/module/analytics/Analytics.java
index 4e6254df2b..b6deb9937d 100644
--- a/OpenEdXMobile/src/main/java/org/edx/mobile/module/analytics/Analytics.java
+++ b/OpenEdXMobile/src/main/java/org/edx/mobile/module/analytics/Analytics.java
@@ -540,6 +540,7 @@ interface Values {
 
     interface Screens {
         String COURSE_INFO_SCREEN = "Course Info";
+        String PROGRAM_INFO_SCREEN = "Program Info";
         String LAUNCH_ACTIVITY = "Launch";
         String REGISTER = "Register";
         String LOGIN = "Login";
@@ -553,6 +554,8 @@ interface Screens {
         String CERTIFICATE = "View Certificate";
         String DOWNLOADS = "Downloads";
         String FIND_COURSES = "Find Courses";
+        String FIND_PROGRAMS = "Find Programs";
+        String FIND_DEGREES = "Find Degrees";
         String MY_COURSES = "My Courses";
         String SETTINGS = "Settings";
         String FORUM_VIEW_TOPICS = "Forum: View Topics";
diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/module/db/DatabaseModelFactory.java b/OpenEdXMobile/src/main/java/org/edx/mobile/module/db/DatabaseModelFactory.java
index 688c06f0f6..cf76fc1bff 100644
--- a/OpenEdXMobile/src/main/java/org/edx/mobile/module/db/DatabaseModelFactory.java
+++ b/OpenEdXMobile/src/main/java/org/edx/mobile/module/db/DatabaseModelFactory.java
@@ -48,7 +48,7 @@ public static VideoModel getModel(Cursor c) {
         de.chapter = c.getString(c.getColumnIndex(DbStructure.Column.CHAPTER));
         de.section = c.getString(c.getColumnIndex(DbStructure.Column.SECTION));
         de.downloadedOn = c.getLong(c.getColumnIndex(DbStructure.Column.DOWNLOADED_ON));
-        de.lastPlayedOffset = c.getInt(c.getColumnIndex(DbStructure.Column.LAST_PLAYED_OFFSET));
+        de.lastPlayedOffset = c.getLong(c.getColumnIndex(DbStructure.Column.LAST_PLAYED_OFFSET));
         de.isCourseActive = c.getInt(c.getColumnIndex(DbStructure.Column.IS_COURSE_ACTIVE));
         de.isVideoForWebOnly = c.getInt(c.getColumnIndex(DbStructure.Column.VIDEO_FOR_WEB_ONLY)) == 1;
         de.lmsUrl = c.getString(c.getColumnIndex(DbStructure.Column.UNIT_URL));
diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/module/db/IDatabase.java b/OpenEdXMobile/src/main/java/org/edx/mobile/module/db/IDatabase.java
index 025d185f6d..3d7531167e 100644
--- a/OpenEdXMobile/src/main/java/org/edx/mobile/module/db/IDatabase.java
+++ b/OpenEdXMobile/src/main/java/org/edx/mobile/module/db/IDatabase.java
@@ -232,11 +232,10 @@ Integer updateVideoWatchedState(String videoId, WatchedState state,
 
     /**
      * Update a Video's last watched time
-     *
      * @param videoId - Id of video for which status needs to change
      * @param offset  - Last Played offset
      */
-    Integer updateVideoLastPlayedOffset(String videoId, int offset, DataCallback<Integer> callback);
+    Integer updateVideoLastPlayedOffset(String videoId, long offset, DataCallback<Integer> callback);
 
 
     /**
diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/module/db/impl/IDatabaseImpl.java b/OpenEdXMobile/src/main/java/org/edx/mobile/module/db/impl/IDatabaseImpl.java
index c3d30b51be..7a95a5315b 100644
--- a/OpenEdXMobile/src/main/java/org/edx/mobile/module/db/impl/IDatabaseImpl.java
+++ b/OpenEdXMobile/src/main/java/org/edx/mobile/module/db/impl/IDatabaseImpl.java
@@ -351,7 +351,7 @@ public Integer updateVideoWatchedState(String videoId, WatchedState status,
 
 
     @Override
-    public Integer updateVideoLastPlayedOffset(String videoId, int offset,
+    public Integer updateVideoLastPlayedOffset(String videoId, long offset,
                                                final DataCallback<Integer> callback) {
         ContentValues values = new ContentValues();
         values.put(DbStructure.Column.LAST_PLAYED_OFFSET, offset);
diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/player/IPlayerEventCallback.java b/OpenEdXMobile/src/main/java/org/edx/mobile/player/IPlayerEventCallback.java
index d98f08eca5..66afbd999e 100644
--- a/OpenEdXMobile/src/main/java/org/edx/mobile/player/IPlayerEventCallback.java
+++ b/OpenEdXMobile/src/main/java/org/edx/mobile/player/IPlayerEventCallback.java
@@ -1,7 +1,5 @@
 package org.edx.mobile.player;
 
-import android.view.View;
-
 import java.io.Serializable;
 
 public interface IPlayerEventCallback extends Serializable {
@@ -9,5 +7,5 @@ public interface IPlayerEventCallback extends Serializable {
     void onError();
     void onPlaybackStarted();
     void onPlaybackComplete();
-    void saveCurrentPlaybackPosition(int currentPosition);
+    void saveCurrentPlaybackPosition(long currentPosition);
 }
diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/player/PlayerController.java b/OpenEdXMobile/src/main/java/org/edx/mobile/player/PlayerController.java
index 2113785385..4f41d04cb0 100644
--- a/OpenEdXMobile/src/main/java/org/edx/mobile/player/PlayerController.java
+++ b/OpenEdXMobile/src/main/java/org/edx/mobile/player/PlayerController.java
@@ -82,7 +82,7 @@ public class PlayerController extends FrameLayout {
     public static final long    DEFAULT_TIMEOUT_MS = 3000L;
 
     private long                mTimeoutMS = DEFAULT_TIMEOUT_MS;
-    private IPlayer             mPlayer;
+    private PlayerListener mPlayer;
     private Context             mContext;
     private ViewGroup           mAnchor;
     private View                mRoot;
@@ -140,7 +140,7 @@ public void onFinishInflate() {
             initControllerView(mRoot);
     }
 
-    public void setMediaPlayer(IPlayer player) {
+    public void setMediaPlayer(PlayerListener player) {
         mPlayer = player;
         updatePausePlay();
         updateFullScreen();
@@ -378,12 +378,12 @@ private void setAccessibilityFocusPausePlay(boolean force) {
         }
     }
 
-    private String stringForTime(int timeMs) {
-        int totalSeconds = timeMs / 1000;
+    private String stringForTime(long timeMs) {
+        long totalSeconds = timeMs / 1000;
 
-        int seconds = totalSeconds % 60;
-        int minutes = (totalSeconds / 60) % 60;
-        int hours   = totalSeconds / 3600;
+        long seconds = totalSeconds % 60;
+        long minutes = (totalSeconds / 60) % 60;
+        long hours   = totalSeconds / 3600;
 
         mFormatBuilder.setLength(0);
         if (hours > 0) {
@@ -393,13 +393,13 @@ private String stringForTime(int timeMs) {
         }
     }
 
-    private synchronized int setProgress() {
+    private synchronized long setProgress() {
         if (mPlayer == null || mDragging) {
             return 0;
         }
 
-        int position = mPlayer.getCurrentPosition();
-        int duration = mPlayer.getDuration();
+        long position = mPlayer.getCurrentPosition();
+        long duration = mPlayer.getDuration();
         if (mProgress != null) {
             if (duration > 0) {
                 // use long to avoid overflow
@@ -713,7 +713,7 @@ public void onClick(View v) {
             if (mPlayer == null) {
                 return;
             }
-            int pos = mPlayer.getCurrentPosition();
+            long pos = mPlayer.getCurrentPosition();
             try{
                 mPlayer.callPlayerSeeked(pos, pos-30000, true);
             }catch(Exception e){
@@ -791,7 +791,7 @@ public void handleMessage(Message msg) {
                     return;
                 }
 
-                int pos;
+                long pos;
                 switch (msg.what) {
                 case FADE_OUT:
                     if (view.mIsAutoHide) {
diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/player/PlayerFragment.java b/OpenEdXMobile/src/main/java/org/edx/mobile/player/PlayerFragment.java
index 8ec02726ca..f2a8d8320e 100644
--- a/OpenEdXMobile/src/main/java/org/edx/mobile/player/PlayerFragment.java
+++ b/OpenEdXMobile/src/main/java/org/edx/mobile/player/PlayerFragment.java
@@ -33,6 +33,7 @@
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import com.google.android.exoplayer2.ui.PlayerView;
 import com.google.inject.Inject;
 
 import org.edx.mobile.BuildConfig;
@@ -83,7 +84,6 @@ private enum VideoNotPlayMessageType {
     }
 
     private static final Logger logger = new Logger(PlayerFragment.class.getName());
-    private static final String KEY_PLAYER = "player";
     private static final String KEY_VIDEO = "video";
     private static final String KEY_PREPARED = "isPrepared";
     private static final String KEY_AUTOPLAY_DONE = "isAutoPlayDone";
@@ -98,10 +98,9 @@ private enum VideoNotPlayMessageType {
     @Inject
     IEdxEnvironment environment;
 
-    protected IPlayer player;
+    protected PlayerListener player;
     private boolean isPrepared = false;
     private boolean isAutoPlayDone = false;
-    private boolean stateSaved = false;
     private boolean orientationLocked = false;
     private transient OrientationDetector orientationDetector;
     private transient IPlayerEventCallback callback;
@@ -129,19 +128,19 @@ private enum VideoNotPlayMessageType {
     private EnumSet<VideoNotPlayMessageType> curMessageTypes =  EnumSet.noneOf(VideoNotPlayMessageType.class);
 
     private boolean isManualFullscreen = false;
-    private int currentPosition = 0;
+    private long currentPosition = 0;
     private boolean pauseDueToDialog;
     private boolean closedCaptionsEnabled = false;
 
     private final transient Handler handler = new Handler() {
-        private int lastSavedPosition;
+        private long lastSavedPosition;
         @Override
         public void handleMessage(android.os.Message msg) {
             if (msg.what == MSG_TYPE_TICK) {
                 if (callback != null) {
                     if(player!=null && player.isPlaying()) {
                         // mark last current position
-                        int pos = player.getCurrentPosition();
+                        long pos = player.getCurrentPosition();
                         if (pos > 0 && pos != lastSavedPosition) {
                             lastSavedPosition = pos;
                             callback.saveCurrentPlaybackPosition(pos);
@@ -182,7 +181,6 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
      */
     private void restore(Bundle savedInstanceState) {
         if (savedInstanceState != null) {
-            player = (IPlayer) savedInstanceState.get(KEY_PLAYER);
             videoEntry = (DownloadEntry) savedInstanceState.get(KEY_VIDEO);
             isPrepared = savedInstanceState.getBoolean(KEY_PREPARED);
             isAutoPlayDone = savedInstanceState.getBoolean(KEY_AUTOPLAY_DONE);
@@ -190,9 +188,9 @@ private void restore(Bundle savedInstanceState) {
             if (savedInstanceState.getBoolean(KEY_MESSAGE_DISPLAYED)) {
                 showVideoNotAvailable(VideoNotPlayMessageType.IS_VIDEO_MESSAGE_DISPLAYED);
             }
-        } else {
-            if (player == null) player = new Player();
         }
+        if (player == null)
+            player = new VideoPlayer(getActivity());
     }
 
     private void reAttachPlayEventListener() {
@@ -289,11 +287,10 @@ public void onStart() {
         super.onStart();
         logger.debug("Player fragment start");
 
-        stateSaved = false;
         try{
-            Preview preview = (Preview) getView().findViewById(R.id.preview);
+            final PlayerView playerView = (PlayerView) getView().findViewById(R.id.player_view);
             if(player!=null){
-                player.setPreview(preview);
+                player.setPlayerView(playerView);
 
                 // setup the flat if player is fullscreen
                 player.setFullScreen(isScreenLandscape());
@@ -357,11 +354,7 @@ public void handleOnResume() {
         }
     }
 
-    @TargetApi(Build.VERSION_CODES.KITKAT)
     private void configureAutoHideControls() {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
-            return;
-        }
         player.setAutoHideControls(!getTouchExploreEnabled());
         setTouchExploreChangeListener(new AccessibilityManager.TouchExplorationStateChangeListener() {
             @Override
@@ -395,23 +388,21 @@ public void onStop() {
         if(player!=null){
             handler.removeMessages(MSG_TYPE_TICK);
             freezePlayer();
+            removeSubtitleCallBack();
         }
     }
 
     @Override
     public void onDestroy() {
         super.onDestroy();
-        if (!stateSaved) {
-            if (player!=null) {
-                // reset player when user goes back, and there is no state saving happened
-                player.reset();
-                removeSubtitleCallBack();
-
-                // release the player instance
-                player.release();
-                player = null;
-                logger.debug("player detached, reset and released");
-            }
+        if (player!=null) {
+            // reset player when user goes back, and there is no state saving happened
+            player.reset();
+
+            // release the player instance
+            player.release();
+            player = null;
+            logger.debug("player detached, reset and released");
         }
     }
 
@@ -439,10 +430,8 @@ private void hideProgress() {
     @Override
     public void onSaveInstanceState(Bundle outState) {
         logger.debug("Saving state ...");
-        stateSaved = true;
         if (player != null) {
             freezePlayer();
-            outState.putSerializable(KEY_PLAYER, player);
         }
         outState.putSerializable(KEY_VIDEO, videoEntry);
         outState.putBoolean(KEY_PREPARED, isPrepared);
@@ -452,12 +441,12 @@ public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
     }
 
-    public synchronized void prepare(String path, int seekTo, String title,
+    public synchronized void prepare(String path, long seekTo, String title,
                                      TranscriptModel trModel, DownloadEntry video) {
         playOrPrepare(path, seekTo, title, trModel, video, true);
     }
 
-    public synchronized void play(String path, int seekTo, String title,
+    public synchronized void play(String path, long seekTo, String title,
                                   TranscriptModel trModel, DownloadEntry video) {
         playOrPrepare(path, seekTo, title, trModel, video, false);
     }
@@ -470,7 +459,7 @@ public synchronized void play(String path, int seekTo, String title,
      * @param title
      * @param prepareOnly  <code>true</code> player will be prepared but not start to play
      */
-    public synchronized void playOrPrepare(String path, int seekTo, String title,
+    public synchronized void playOrPrepare(String path, long seekTo, String title,
                                            TranscriptModel trModel, DownloadEntry video, boolean prepareOnly) {
         isPrepared = false;
         // block to portrait while preparing
@@ -1115,7 +1104,7 @@ public void run() {
             //This has been reset so that previous cc will not be displayed
             resetClosedCaptioning();
             if (player != null && (player.isPlaying() || player.isPaused())) {
-                int currentPos = player.getCurrentPosition();
+                long currentPos = player.getCurrentPosition();
                 if (subtitlesObj != null) {
                     Collection<Caption> subtitles = subtitlesObj.captions.values();
                     int currentSubtitleIndex = 0;
@@ -1697,7 +1686,7 @@ public void freezePlayer() {
 
         if (player!=null) {
             if (callback != null && player.isPlaying()) {
-                int pos = player.getCurrentPosition();
+                long pos = player.getCurrentPosition();
                 if (pos > 0) {
                     callback.saveCurrentPlaybackPosition(pos);
                 }
diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/player/PlayerListener.java b/OpenEdXMobile/src/main/java/org/edx/mobile/player/PlayerListener.java
new file mode 100644
index 0000000000..dbcfd17aa0
--- /dev/null
+++ b/OpenEdXMobile/src/main/java/org/edx/mobile/player/PlayerListener.java
@@ -0,0 +1,59 @@
+package org.edx.mobile.player;
+
+import android.graphics.Point;
+import android.view.View;
+
+import com.google.android.exoplayer2.ui.PlayerView;
+
+import java.io.Serializable;
+
+public interface PlayerListener extends Serializable {
+
+    long serialVersionUID = 5689385691113719237L;
+
+    void setUri(String uri, long seekTo) throws Exception;
+    void setUriAndPlay(String uri, long seekTo) throws Exception;
+    void restart() throws Exception;
+    void restart(long seekTo) throws Exception;
+    boolean isInError();
+    boolean isPlayingLocally();
+    void start();
+    boolean isPlaying();
+    boolean isPaused();
+    boolean isFrozen();
+    void stop();
+    void pause();
+    long getCurrentPosition();
+    void setFullScreen(boolean isFullScreen);
+    boolean isFullScreen();
+    void setPlayerView(PlayerView preview);
+    void release();
+    void setPlayerListener(IPlayerListener listener);
+    void setController(PlayerController controller);
+    void freeze();
+    void unfreeze();
+    void setVideoTitle(String title);
+    long getLastFreezePosition();
+    void setAutoHideControls(boolean autoHide);
+    boolean getAutoHideControls();
+    void showController();
+    void hideController();
+    void requestAccessibilityFocusPausePlay();
+    void reset();
+    void setLMSUrl(String url);
+    void setNextPreviousListeners(View.OnClickListener next, View.OnClickListener prev);
+    void callSettings(Point p);
+    void callPlayerSeeked(long previousPos, long nextPos, boolean isRewindClicked);
+    PlayerController getController();
+    boolean isReset();
+
+    // methods from PlayerController.MediaPlayerControl interface
+    long    getDuration();
+    void    seekTo(long pos);
+    int     getBufferPercentage();
+    boolean canPause();
+    boolean canSeekBackward();
+    boolean canSeekForward();
+    void    toggleFullScreen();
+    boolean  isSeekable();
+}
diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/player/VideoPlayer.java b/OpenEdXMobile/src/main/java/org/edx/mobile/player/VideoPlayer.java
new file mode 100644
index 0000000000..00a437116c
--- /dev/null
+++ b/OpenEdXMobile/src/main/java/org/edx/mobile/player/VideoPlayer.java
@@ -0,0 +1,722 @@
+package org.edx.mobile.player;
+
+import android.content.Context;
+import android.graphics.Point;
+import android.net.Uri;
+import android.view.View.OnClickListener;
+
+import com.google.android.exoplayer2.ExoPlaybackException;
+import com.google.android.exoplayer2.ExoPlayerFactory;
+import com.google.android.exoplayer2.Player;
+import com.google.android.exoplayer2.SimpleExoPlayer;
+import com.google.android.exoplayer2.Timeline;
+import com.google.android.exoplayer2.analytics.AnalyticsListener;
+import com.google.android.exoplayer2.source.ExtractorMediaSource;
+import com.google.android.exoplayer2.source.MediaSource;
+import com.google.android.exoplayer2.source.hls.HlsMediaSource;
+import com.google.android.exoplayer2.ui.PlayerView;
+import com.google.android.exoplayer2.upstream.DataSource;
+import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
+import com.google.android.exoplayer2.util.Util;
+
+import org.edx.mobile.R;
+import org.edx.mobile.logger.Logger;
+import org.edx.mobile.util.VideoUtil;
+import org.edx.mobile.view.OnSwipeListener;
+
+import java.util.Locale;
+
+import static org.edx.mobile.util.AppConstants.VIDEO_FORMAT_M3U8;
+
+@SuppressWarnings("serial")
+public class VideoPlayer implements Player.EventListener, AnalyticsListener, PlayerListener {
+
+    private SimpleExoPlayer exoPlayer;
+    private Context context;
+
+    // Player states
+    public enum PlayerState {
+        RESET, URI_SET, PREPARED,
+        PLAYING, PAUSED, ERROR, LAGGING, PLAYBACK_COMPLETE, STOPPED
+    }
+
+    private PlayerState state;
+    private boolean isFullScreen;
+    private boolean isPlayingLocally;
+    private boolean playWhenPrepared;
+    private boolean autoHideControls;
+    private transient IPlayerListener callback;
+    private transient PlayerController controller;
+    private long lastCurrentPosition;
+    private long lastFreezePosition;
+    private long lastDuration;
+    private boolean isFrozen;
+    private PlayerState freezeState;
+    private long seekToWhenPrepared;
+    private String videoTitle;
+    private String lmsURL;
+    private String videoUri;
+    private static final Logger logger = new Logger(VideoPlayer.class.getName());
+
+    public VideoPlayer(Context context) {
+        init(context);
+        initExoPlayer();
+    }
+
+    /**
+     * Resets all the fields of this player.
+     *
+     * @param context
+     */
+    private void init(Context context) {
+        this.context = context;
+        this.state = PlayerState.RESET;
+        this.isFullScreen = false;
+        this.isPlayingLocally = true;
+        this.playWhenPrepared = false;
+        this.lastCurrentPosition = 0;
+        this.lastDuration = 0;
+        this.isFrozen = false;
+        this.autoHideControls = true;
+    }
+
+    private void initExoPlayer() {
+        exoPlayer = ExoPlayerFactory.newSimpleInstance(this.context);
+        exoPlayer.addListener(this);
+        exoPlayer.addAnalyticsListener(this);
+        exoPlayer.setRepeatMode(Player.REPEAT_MODE_OFF);
+    }
+
+    @Override
+    public int getBufferPercentage() {
+        return exoPlayer.getBufferedPercentage();
+    }
+
+    @Override
+    public boolean canPause() {
+        if (state == PlayerState.PLAYING
+                || state == PlayerState.PREPARED
+                || state == PlayerState.PAUSED
+                || state == PlayerState.PLAYBACK_COMPLETE
+                || state == PlayerState.LAGGING) {
+            logger.debug("Can pause = TRUE");
+            return true;
+        }
+        logger.debug("Can pause = FALSE");
+        return false;
+    }
+
+    @Override
+    public boolean canSeekBackward() {
+        if ((state == PlayerState.PLAYING
+                || state == PlayerState.PREPARED
+                || state == PlayerState.STOPPED
+                || state == PlayerState.PAUSED
+                || state == PlayerState.LAGGING)
+                && isSeekable()) {
+            logger.debug("Can seek back = TRUE");
+            return true;
+        }
+        logger.debug("Can seek back = FALSE");
+        return false;
+    }
+
+    @Override
+    public boolean canSeekForward() {
+        if ((state == PlayerState.PLAYING
+                || state == PlayerState.PREPARED
+                || state == PlayerState.STOPPED
+                || state == PlayerState.PAUSED
+                || state == PlayerState.LAGGING)
+                && isSeekable()) {
+            logger.debug("Can seek forward = TRUE");
+            return true;
+        }
+        logger.debug("Can seek forward = FALSE");
+        return false;
+    }
+
+    @Override
+    public boolean isFullScreen() {
+        return isFullScreen;
+    }
+
+    @Override
+    public void toggleFullScreen() {
+        setFullScreen(!isFullScreen);
+
+        if (callback != null) {
+            callback.onFullScreen(isFullScreen);
+        }
+    }
+
+    @Override
+    public boolean isSeekable() {
+        final boolean isSeekable = exoPlayer.getCurrentTimeline()
+                .getWindow(exoPlayer.getCurrentWindowIndex(), new Timeline.Window())
+                .isSeekable;
+        if (!isSeekable) {
+            logger.debug("Track not seekable");
+            if (callback != null)
+                callback.onVideoNotSeekable();
+        }
+        return isSeekable;
+    }
+
+    @Override
+    public void callSettings(Point p) {
+        if (callback != null) {
+            callback.callSettings(p);
+        }
+    }
+
+    @Override
+    public void onPlayerStateChanged(boolean playWhenReady, int playbackState) {
+        switch (playbackState) {
+            case Player.STATE_READY:
+                state = PlayerState.PREPARED;
+                if (callback != null) {
+                    callback.onPrepared();
+                }
+
+                if (playWhenReady) {
+                    state = PlayerState.PLAYING;
+                    if (seekToWhenPrepared > 0) {
+                        seekTo(seekToWhenPrepared);
+                    }
+                }
+                break;
+            case Player.STATE_ENDED:
+                // onPlayerStateChanged with Player.STATE_ENDED called twice after calling
+                // setPlayWhenReady(false) in STATE_ENDED
+                // so if already called then avoid on completion again.
+                if (state == PlayerState.PLAYBACK_COMPLETE)
+                    return;
+                // sometimes, error also causes onCompletion() call
+                // avoid on completion if player got an error
+                if (state != PlayerState.ERROR) {
+                    state = PlayerState.PLAYBACK_COMPLETE;
+                    if (callback != null) {
+                        callback.onPlaybackComplete();
+                    }
+                    seekTo(0);
+                    exoPlayer.setPlayWhenReady(false);
+                    logger.debug("Playback complete");
+                }
+                break;
+        }
+    }
+
+    @Override
+    public void onDroppedVideoFrames(EventTime eventTime, int droppedFrames, long elapsedMs) {
+        state = PlayerState.LAGGING;
+        if (callback != null) {
+            callback.onVideoLagging();
+        }
+        logger.debug("Video track lagging");
+    }
+
+    @Override
+    public void onPlayerError(ExoPlaybackException error) {
+        if (lastCurrentPosition != 0) {
+            seekToWhenPrepared = lastCurrentPosition;
+        }
+        state = PlayerState.ERROR;
+        if (callback != null) {
+            callback.onError();
+        }
+
+        if (error.type == ExoPlaybackException.TYPE_UNEXPECTED) {
+            logger.warn("ERROR: unexpected");
+        } else if (error.type == ExoPlaybackException.TYPE_RENDERER) {
+            logger.warn("ERROR: renderer");
+        } else if (error.type == ExoPlaybackException.TYPE_SOURCE) {
+            logger.warn("ERROR: occurred while loading data from MediaSource");
+        }
+        logger.warn("ERROR: type=" + error.type + ";message=" + error.getMessage());
+    }
+
+    @Override
+    public void setUri(String uri, long seekTo) {
+        load(uri, seekTo, false);
+    }
+
+    @Override
+    public void setUriAndPlay(String uri, long seekTo) {
+        load(uri, seekTo, true);
+    }
+
+    @Override
+    public void restart(long seekTo) {
+        logger.debug("RestartFreezePosition=" + seekTo);
+        lastCurrentPosition = 0;
+        // if seekTo=lastCurrentPosition then seekTo() method will not work
+        load(videoUri, seekTo, playWhenPrepared);
+    }
+
+    @Override
+    public void restart() {
+        restart(seekToWhenPrepared);
+    }
+
+    private void load(String videoUri, long seekTo, boolean playWhenPrepared) {
+        this.videoUri = videoUri;
+        this.seekToWhenPrepared = seekTo;
+        this.playWhenPrepared = playWhenPrepared;
+        this.isFrozen = false;
+        this.lastCurrentPosition = 0; // reset last seek position
+
+        // re-display controller, so that it shows latest data
+        if (this.controller != null) {
+            this.controller.hide();
+        }
+
+        reset();
+        state = PlayerState.RESET;
+
+        if (videoUri != null) {
+            final MediaSource mediaSource = getMediaSource(videoUri);
+            exoPlayer.prepare(mediaSource);
+            state = PlayerState.URI_SET;
+            isPlayingLocally = !videoUri.startsWith("http");
+            // notify that the player is now preparing
+            if (callback != null) {
+                callback.onPreparing();
+            }
+        }
+    }
+
+    /**
+     * Function that provides the media source played by ExoPlayer based on media type.
+     *
+     * @param videoUrl Video URL
+     * @return The {@link MediaSource} to play.
+     */
+    private MediaSource getMediaSource(String videoUrl) {
+        final String userAgent = Util.getUserAgent(this.context, this.context.getString(R.string.app_name));
+        final DataSource.Factory dataSourceFactory = new DefaultDataSourceFactory(this.context, userAgent);
+        final MediaSource mediaSource;
+
+        if (VideoUtil.videoHasFormat(videoUrl, VIDEO_FORMAT_M3U8)) {
+            mediaSource = new HlsMediaSource.Factory(dataSourceFactory)
+                    .createMediaSource(Uri.parse(videoUrl));
+        } else {
+            mediaSource = new ExtractorMediaSource.Factory(dataSourceFactory)
+                    .createMediaSource(Uri.parse(videoUrl));
+        }
+        return mediaSource;
+    }
+
+    @Override
+    public boolean isPlayingLocally() {
+        return isPlayingLocally;
+    }
+
+    @Override
+    public boolean isInError() {
+        return state == PlayerState.ERROR;
+    }
+
+    @Override
+    public boolean isReset() {
+        return state == PlayerState.RESET;
+    }
+
+    @Override
+    public void setFullScreen(boolean isFullScreen) {
+        this.isFullScreen = isFullScreen;
+
+        if (controller != null) {
+            controller.setTopBarVisibility(isFullScreen);
+        }
+    }
+
+    @Override
+    public void setPlayerView(final PlayerView playerView) {
+        if (playerView == null) {
+            return;
+        }
+        playerView.setPlayer(exoPlayer);
+        // hide default controls of Exo Player
+        playerView.setUseController(false);
+        logger.debug("Player state=" + state);
+        if (!isPlaying()) {
+            seekTo(lastCurrentPosition);
+        }
+        playerView.setOnTouchListener(new OnSwipeListener(playerView.getContext()) {
+
+            @Override
+            public void onSwipeLeft() {
+                super.onSwipeLeft();
+                if (controller != null) {
+                    controller.playNext();
+                }
+            }
+
+            @Override
+            public void onSwipeRight() {
+                super.onSwipeRight();
+                if (controller != null) {
+                    controller.playPrevious();
+                }
+            }
+
+            @Override
+            public void onClick() {
+                super.onClick();
+
+                if (controller != null
+                        && state != PlayerState.RESET
+                        && state != PlayerState.URI_SET) {
+                    logger.debug("Player touched");
+                    if (controller.isShowing() && autoHideControls) {
+                        controller.hide();
+                    } else {
+                        controller.setLmsUrl(lmsURL);
+                        controller.setTitle(videoTitle);
+                        controller.show();
+                    }
+                }
+            }
+        });
+    }
+
+    @Override
+    public void release() {
+        exoPlayer.removeListener(this);
+        exoPlayer.removeAnalyticsListener(this);
+        exoPlayer.release();
+    }
+
+    @Override
+    public void setPlayerListener(IPlayerListener listener) {
+        this.callback = listener;
+    }
+
+    @Override
+    public void setController(PlayerController cont) {
+        if (this.controller != null) {
+            if (cont == null)
+                this.controller.setMediaPlayer(null);
+            // hide old controller while setting new
+            this.controller.hide();
+            this.controller = null;
+        }
+
+        // now handle new controller object
+        this.controller = cont;
+
+        if (this.controller != null) {
+            this.controller.setMediaPlayer(this);
+            logger.debug("Controller set");
+        }
+    }
+
+    /**
+     * Controls will be hidden immediately if changed to false
+     */
+    @Override
+    public void setAutoHideControls(boolean autoHide) {
+        if (!autoHide && autoHideControls) {
+            hideController();
+        }
+        autoHideControls = autoHide;
+    }
+
+    @Override
+    public boolean getAutoHideControls() {
+        return autoHideControls;
+    }
+
+    @Override
+    public void showController() {
+        if (controller != null) {
+            controller.hide();
+            controller.setTitle(videoTitle);
+            controller.setLmsUrl(lmsURL);
+
+            if (autoHideControls) {
+                controller.resetShowTimeoutMS();
+            } else {
+                controller.setShowTimeoutMS(0);
+            }
+
+            controller.show();
+
+            logger.debug("Player controller shown");
+        }
+    }
+
+    @Override
+    public void hideController() {
+        if (controller != null) {
+            controller.hide();
+        }
+    }
+
+    @Override
+    public void requestAccessibilityFocusPausePlay() {
+        if (controller != null && controller.isShowing()) {
+            controller.requestAccessibilityFocusPausePlay();
+        }
+    }
+
+    @Override
+    public void freeze() {
+        if (isFrozen) {
+            // keep this method one-shot
+            return;
+        }
+
+        isFrozen = true;
+        freezeState = state;
+
+        setPlayerView(null);
+        setController(null);
+        if (isPlaying()) {
+            pause();
+        }
+        if (state == PlayerState.URI_SET && playWhenPrepared) {
+            playWhenPrepared = false;
+        }
+        lastCurrentPosition = getCurrentPosition();
+        lastFreezePosition = lastCurrentPosition;
+        if (lastCurrentPosition > 0) {
+            seekToWhenPrepared = lastCurrentPosition;
+        }
+        logger.debug("FreezePosition=" + lastFreezePosition);
+    }
+
+    @Override
+    public void unfreeze() {
+        if (isFrozen) {
+            logger.debug("unFreezePosition=" + lastFreezePosition);
+            lastCurrentPosition = getCurrentPosition();
+            seekTo(lastFreezePosition);
+            if (freezeState == PlayerState.PLAYING
+                    || freezeState == PlayerState.LAGGING) {
+                start();
+            } else if (freezeState == PlayerState.URI_SET) {
+                if (state == PlayerState.PREPARED) {
+                    // start playing as player is already prepared
+                    start();
+                } else {
+                    playWhenPrepared = true;
+                    if (callback != null) {
+                        callback.onPreparing();
+                    }
+                }
+            } else if (freezeState == PlayerState.PAUSED) {
+                pause();
+            }
+        }
+
+        isFrozen = false;
+    }
+
+    @Override
+    public void setVideoTitle(String title) {
+        this.videoTitle = title;
+    }
+
+    public long getLastFreezePosition() {
+        return lastFreezePosition;
+    }
+
+    // -------------------------------------------------------------------
+    /*
+     * Player Methods below.
+     */
+
+    @Override
+    public void reset() {
+        // stop and reset Exo Player
+        exoPlayer.stop(true);
+        state = PlayerState.RESET;
+    }
+
+    @Override
+    public synchronized void start() throws IllegalStateException {
+        if (state == PlayerState.PREPARED
+                || state == PlayerState.PAUSED
+                || state == PlayerState.STOPPED
+                || state == PlayerState.LAGGING
+                || state == PlayerState.PLAYBACK_COMPLETE) {
+            exoPlayer.setPlayWhenReady(true);
+            if (callback != null) {
+                // mark playing
+                callback.onPlaybackStarted();
+            }
+            state = PlayerState.PLAYING;
+            logger.debug("Playback started");
+
+            // reload controller
+            showController();
+
+            requestAccessibilityFocusPausePlay();
+        } else {
+            logger.warn("Cannot start");
+        }
+    }
+
+    @Override
+    public void stop() throws IllegalStateException {
+        if (state == PlayerState.PREPARED
+                || state == PlayerState.PLAYING
+                || state == PlayerState.PAUSED
+                || state == PlayerState.LAGGING
+                || state == PlayerState.PLAYBACK_COMPLETE) {
+            // Stop the Exo Player
+            exoPlayer.stop(false);
+            state = PlayerState.STOPPED;
+
+            logger.debug("Playback stopped");
+        } else {
+            logger.warn("Playback cannot stop");
+        }
+    }
+
+    @Override
+    public void pause() throws IllegalStateException {
+        if (isPlaying()) {
+            seekToWhenPrepared = getCurrentPosition();
+            // Pause media playback
+            exoPlayer.setPlayWhenReady(false);
+            state = PlayerState.PAUSED;
+            if (callback != null) {
+                callback.onPlaybackPaused();
+            }
+
+            logger.debug("Playback paused");
+        } else {
+            logger.warn("Playback scannot pause");
+        }
+    }
+
+    @Override
+    public synchronized void seekTo(long msec) throws IllegalStateException {
+        long delta = lastCurrentPosition - msec;
+        if (delta < 0) {
+            delta = delta * (-1);
+        }
+
+        if (msec > 0
+                && lastCurrentPosition > 0
+                && (delta <= 1000)) {
+            // no need to perform seek if current position is almost same as seekTo
+            // Delta of 1000 is used to skip seek of 1 sec difference from current position
+            logger.debug(String.format(Locale.US, "Skipping seek to %d from %d ; state=%s",
+                    msec, lastCurrentPosition, state.toString()));
+            return;
+        }
+
+        if (msec < 0) {
+            // cannot seek to invalid position
+            msec = 0;
+        }
+        if (state == PlayerState.PREPARED
+                || state == PlayerState.PLAYING
+                || state == PlayerState.PAUSED
+                || state == PlayerState.STOPPED
+                || state == PlayerState.PLAYBACK_COMPLETE
+                || state == PlayerState.LAGGING) {
+            logger.debug(String.format(Locale.US, "seeking to %d from %d ; state=%s",
+                    msec, lastCurrentPosition, state.toString()));
+            exoPlayer.seekTo(msec);
+            lastCurrentPosition = msec;
+            seekToWhenPrepared = msec;
+
+            logger.debug("playback seeked");
+        } else {
+            logger.warn("Cannot seek");
+        }
+    }
+
+    @Override
+    public synchronized long getCurrentPosition() {
+        try {
+            if (state == PlayerState.PREPARED
+                    || state == PlayerState.PLAYING
+                    || state == PlayerState.PAUSED
+                    || state == PlayerState.STOPPED
+                    || state == PlayerState.PLAYBACK_COMPLETE
+                    || state == PlayerState.LAGGING) {
+                lastCurrentPosition = exoPlayer.getCurrentPosition();
+            }
+        } catch (Exception ex) {
+            logger.error(ex);
+        }
+
+        return lastCurrentPosition;
+    }
+
+    @Override
+    public long getDuration() {
+        try {
+            if (state == PlayerState.PREPARED
+                    || state == PlayerState.PLAYING
+                    || state == PlayerState.PAUSED
+                    || state == PlayerState.STOPPED
+                    || state == PlayerState.PLAYBACK_COMPLETE
+                    || state == PlayerState.LAGGING) {
+                lastDuration = exoPlayer.getDuration();
+            }
+        } catch (Exception ex) {
+            logger.error(ex);
+        }
+        return lastDuration;
+    }
+
+    @Override
+    public boolean isPlaying() {
+        if (state == PlayerState.PLAYING
+                || state == PlayerState.LAGGING) {
+            logger.debug("isPlaying = TRUE");
+            return (exoPlayer.getPlaybackState() == Player.STATE_READY ||
+                    exoPlayer.getPlaybackState() == Player.STATE_BUFFERING)
+                    && exoPlayer.getPlayWhenReady();
+        }
+        logger.debug("isPlaying = FALSE; state=" + state);
+        return false;
+    }
+
+    @Override
+    public boolean isPaused() {
+        if (state == PlayerState.PAUSED) {
+            logger.debug("isPaused = TRUE");
+            return true;
+        }
+        logger.debug("isPaused = FALSE; state=" + state);
+        return false;
+    }
+
+    @Override
+    public boolean isFrozen() {
+        return isFrozen;
+    }
+
+    @Override
+    public void setLMSUrl(String url) {
+        this.lmsURL = url;
+    }
+
+    @Override
+    public void setNextPreviousListeners(OnClickListener next,
+                                         OnClickListener prev) {
+        if (controller != null) {
+            controller.setNextPreviousListeners(next, prev);
+        }
+    }
+
+    @Override
+    public PlayerController getController() {
+        return controller;
+    }
+
+    @Override
+    public void callPlayerSeeked(long previousPos, long nextPos, boolean isRewindClicked) {
+        if (callback != null) {
+            callback.callPlayerSeeked(previousPos, nextPos, isRewindClicked);
+        }
+    }
+}
diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/util/Config.java b/OpenEdXMobile/src/main/java/org/edx/mobile/util/Config.java
index 85919ce110..8903df5965 100644
--- a/OpenEdXMobile/src/main/java/org/edx/mobile/util/Config.java
+++ b/OpenEdXMobile/src/main/java/org/edx/mobile/util/Config.java
@@ -19,6 +19,7 @@
 import com.squareup.phrase.Phrase;
 
 import org.edx.mobile.BuildConfig;
+import org.edx.mobile.core.IEdxEnvironment;
 import org.edx.mobile.logger.Logger;
 
 import java.io.InputStream;
@@ -47,7 +48,7 @@ public class Config {
     private static final String ORGANIZATION_CODE = "ORGANIZATION_CODE";
 
     /* Composite configuration keys */
-    private static final String COURSE_ENROLLMENT = "COURSE_ENROLLMENT";
+    private static final String DISCOVERY = "DISCOVERY";
     private static final String PROGRAM = "PROGRAM";
     private static final String ZERO_RATING = "ZERO_RATING";
     private static final String FACEBOOK = "FACEBOOK";
@@ -101,82 +102,189 @@ public List<String> getWhiteListedDomains() {
         }
     }
 
-    public static class EnrollmentConfig {
-        @SerializedName("WEBVIEW")
-        private WebViewConfig mWebViewConfig;
+    public static class DiscoveryConfig {
+        @SerializedName("COURSE")
+        private CourseDiscoveryConfig courseDiscoveryConfig;
 
-        @SerializedName("TYPE")
-        private String mCourseEnrollmentType;
+        @SerializedName("PROGRAM")
+        private ProgramDiscoveryConfig programDiscoveryConfig;
 
-        public enum CourseDiscoveryType {
+        @SerializedName("DEGREE")
+        private DegreeDiscoveryConfig degreeDiscoveryConfig;
+
+        public enum DiscoveryType {
             WEBVIEW,
             NATIVE
         }
 
+        public CourseDiscoveryConfig getCourseDiscoveryConfig() {
+            return courseDiscoveryConfig;
+        }
+
+        public ProgramDiscoveryConfig getProgramDiscoveryConfig() {
+            return programDiscoveryConfig;
+        }
+
+        public DegreeDiscoveryConfig getDegreeDiscoveryConfig() {
+            return degreeDiscoveryConfig;
+        }
+    }
+
+    public static class CourseDiscoveryConfig {
+        @SerializedName("TYPE")
+        private String typeConfig;
+
+        @SerializedName("WEBVIEW")
+        private WebViewConfig webViewConfig;
+
+        @Nullable
+        private DiscoveryConfig.DiscoveryType getDiscoveryType() {
+            if (null == typeConfig) {
+                return null;
+            }
+            return DiscoveryConfig.DiscoveryType.valueOf(typeConfig.toUpperCase(Locale.US));
+        }
+
+        public boolean isDiscoveryEnabled() {
+            return getDiscoveryType() != null;
+        }
+
+        public boolean isWebviewDiscoveryEnabled() {
+            return getDiscoveryType() == DiscoveryConfig.DiscoveryType.WEBVIEW;
+        }
+
+        public WebViewConfig getWebViewConfig() {
+            return webViewConfig;
+        }
+
+        public String getBaseUrl() {
+            return null == webViewConfig ? null : webViewConfig.getBaseUrl();
+        }
+
+        public String getInfoUrlTemplate() {
+            return null == webViewConfig ? null : webViewConfig.getInfoUrlTemplate();
+        }
+
+        public boolean isSearchEnabled() {
+            return null != webViewConfig && webViewConfig.isSearchEnabled();
+        }
+
+        public boolean isSubjectFilterEnabled() {
+            return null != webViewConfig && webViewConfig.isSubjectFilterEnabled();
+        }
+    }
+
+    public static class ProgramDiscoveryConfig {
+        @SerializedName("TYPE")
+        private String typeConfig;
+
+        @SerializedName("WEBVIEW")
+        private WebViewConfig webViewConfig;
+
         @Nullable
-        private CourseDiscoveryType getCourseDiscoveryType() {
-            if (null == mCourseEnrollmentType) {
+        private DiscoveryConfig.DiscoveryType getDiscoveryType() {
+            if (null == typeConfig) {
                 return null;
             }
-            return CourseDiscoveryType.valueOf(mCourseEnrollmentType.toUpperCase(Locale.US));
+            return DiscoveryConfig.DiscoveryType.valueOf(typeConfig.toUpperCase(Locale.US));
         }
 
-        public boolean isCourseDiscoveryEnabled() {
-            return getCourseDiscoveryType() != null;
+        public boolean isDiscoveryEnabled(@NonNull IEdxEnvironment environment) {
+            return getDiscoveryType() != null &&
+                    environment.getConfig().getDiscoveryConfig().getCourseDiscoveryConfig() != null &&
+                    environment.getConfig().getDiscoveryConfig().getCourseDiscoveryConfig().isDiscoveryEnabled() &&
+                    environment.getConfig().getDiscoveryConfig().getCourseDiscoveryConfig().isWebviewDiscoveryEnabled()
+                    ;
         }
 
-        public boolean isWebviewCourseDiscoveryEnabled() {
-            return getCourseDiscoveryType() == CourseDiscoveryType.WEBVIEW;
+        public boolean isWebviewDiscoveryEnabled() {
+            return getDiscoveryType() == DiscoveryConfig.DiscoveryType.WEBVIEW;
         }
 
         public WebViewConfig getWebViewConfig() {
-            return mWebViewConfig;
+            return webViewConfig;
+        }
+
+        public String getBaseUrl() {
+            return null == webViewConfig ? null : webViewConfig.getBaseUrl();
+        }
+
+        public String getInfoUrlTemplate() {
+            return null == webViewConfig ? null : webViewConfig.getInfoUrlTemplate();
+        }
+
+        public boolean isSearchEnabled() {
+            return null != webViewConfig && webViewConfig.isSearchEnabled();
+        }
+    }
+
+    public static class DegreeDiscoveryConfig {
+        @SerializedName("TYPE")
+        private String typeConfig;
+
+        @SerializedName("WEBVIEW")
+        private WebViewConfig webViewConfig;
+
+        @Nullable
+        private DiscoveryConfig.DiscoveryType getDiscoveryType() {
+            if (null == typeConfig) {
+                return null;
+            }
+            return DiscoveryConfig.DiscoveryType.valueOf(typeConfig.toUpperCase(Locale.US));
+        }
+
+        public boolean isDiscoveryEnabled(@NonNull IEdxEnvironment environment) {
+            return getDiscoveryType() != null &&
+                    environment.getConfig().getDiscoveryConfig().getProgramDiscoveryConfig() != null &&
+                    environment.getConfig().getDiscoveryConfig().getProgramDiscoveryConfig().isDiscoveryEnabled(environment) &&
+                    environment.getConfig().getDiscoveryConfig().getProgramDiscoveryConfig().isWebviewDiscoveryEnabled()
+                    ;
         }
 
-        public String getCourseSearchUrl() {
-            return null == mWebViewConfig ? null : mWebViewConfig.getCourseSearchUrl();
+        public WebViewConfig getWebViewConfig() {
+            return webViewConfig;
         }
 
-        public String getCourseInfoUrlTemplate() {
-            return null == mWebViewConfig ? null : mWebViewConfig.getCourseInfoUrlTemplate();
+        public String getBaseUrl() {
+            return null == webViewConfig ? null : webViewConfig.getBaseUrl();
         }
 
-        public boolean isWebCourseSearchEnabled() {
-            return null != mWebViewConfig && mWebViewConfig.isWebCourseSearchEnabled();
+        public String getInfoUrlTemplate() {
+            return null == webViewConfig ? null : webViewConfig.getInfoUrlTemplate();
         }
 
-        public boolean isSubjectDiscoveryEnabled() {
-            return null != mWebViewConfig && mWebViewConfig.isSubjectDiscoveryEnabled();
+        public boolean isSearchEnabled() {
+            return null != webViewConfig && webViewConfig.isSearchEnabled();
         }
     }
 
     public static class WebViewConfig {
-        @SerializedName("COURSE_SEARCH_URL")
-        private String mSearchUrl;
+        @SerializedName("BASE_URL")
+        private String baseUrl;
 
-        @SerializedName("COURSE_INFO_URL_TEMPLATE")
-        private String mCourseInfoUrlTemplate;
+        @SerializedName("DETAIL_TEMPLATE")
+        private String detailTemplate;
 
-        @SerializedName("SEARCH_BAR_ENABLED")
-        private boolean mSearchBarEnabled;
+        @SerializedName("SEARCH_ENABLED")
+        private boolean searchEnabled;
 
-        @SerializedName("SUBJECT_DISCOVERY_ENABLED")
-        private boolean subjectDiscovery;
+        @SerializedName("SUBJECT_FILTER_ENABLED")
+        private boolean subjectFilterEnabled;
 
-        public String getCourseSearchUrl() {
-            return mSearchUrl;
+        public String getBaseUrl() {
+            return baseUrl;
         }
 
-        public String getCourseInfoUrlTemplate() {
-            return mCourseInfoUrlTemplate;
+        public String getInfoUrlTemplate() {
+            return detailTemplate;
         }
 
-        public boolean isWebCourseSearchEnabled() {
-            return mSearchBarEnabled;
+        public boolean isSearchEnabled() {
+            return searchEnabled;
         }
 
-        public boolean isSubjectDiscoveryEnabled() {
-            return subjectDiscovery;
+        public boolean isSubjectFilterEnabled() {
+            return subjectFilterEnabled;
         }
     }
 
@@ -642,16 +750,16 @@ public boolean isDownloadToSDCardEnabled() {
         return getBoolean(DOWNLOAD_TO_SD_CARD_ENABLED, true);
     }
 
-    @NonNull
-    public EnrollmentConfig getCourseDiscoveryConfig() {
-        return getObjectOrNewInstance(COURSE_ENROLLMENT, EnrollmentConfig.class);
-    }
-
     @NonNull
     public ProgramConfig getProgramConfig() {
         return getObjectOrNewInstance(PROGRAM, ProgramConfig.class);
     }
 
+        @Nullable
+    public DiscoveryConfig getDiscoveryConfig() {
+        return getObjectOrNewInstance(DISCOVERY, DiscoveryConfig.class);
+    }
+
     @NonNull
     public ZeroRatingConfig getZeroRatingConfig() {
         return getObjectOrNewInstance(ZERO_RATING, ZeroRatingConfig.class);
diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/util/links/DefaultActionListener.java b/OpenEdXMobile/src/main/java/org/edx/mobile/util/links/DefaultActionListener.java
index 45745ec0cb..92128eebd7 100644
--- a/OpenEdXMobile/src/main/java/org/edx/mobile/util/links/DefaultActionListener.java
+++ b/OpenEdXMobile/src/main/java/org/edx/mobile/util/links/DefaultActionListener.java
@@ -114,6 +114,15 @@ protected void onFailure(@NonNull final Throwable error) {
                 }
                 break;
             }
+            case PROGRAM_INFO: {
+                final String pathId = helper.params.get(WebViewLink.Param.PATH_ID);
+                if (!TextUtils.isEmpty(pathId)) {
+                    logger.debug("PathId" + pathId);
+                    // Program info coming soon
+                    environment.getRouter().showProgramInfo(activity, pathId);
+                }
+                break;
+            }
             case ENROLL: {
                 final String courseId = helper.params.get(WebViewLink.Param.COURSE_ID);
                 final String emailOptIn = helper.params.get(WebViewLink.Param.EMAIL_OPT);
diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/util/links/WebViewLink.java b/OpenEdXMobile/src/main/java/org/edx/mobile/util/links/WebViewLink.java
index 48b7b73cfe..e2e9d619f5 100644
--- a/OpenEdXMobile/src/main/java/org/edx/mobile/util/links/WebViewLink.java
+++ b/OpenEdXMobile/src/main/java/org/edx/mobile/util/links/WebViewLink.java
@@ -18,6 +18,7 @@ public class WebViewLink {
 
     public enum Authority {
         COURSE_INFO("course_info"),
+        PROGRAM_INFO("program_info"),
         ENROLL("enroll"),
         ENROLLED_PROGRAM_INFO("enrolled_program_info"),
         ENROLLED_COURSE_INFO("enrolled_course_info");
diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/view/BaseWebViewFragment.java b/OpenEdXMobile/src/main/java/org/edx/mobile/view/BaseWebViewFragment.java
new file mode 100644
index 0000000000..580c206599
--- /dev/null
+++ b/OpenEdXMobile/src/main/java/org/edx/mobile/view/BaseWebViewFragment.java
@@ -0,0 +1,208 @@
+package org.edx.mobile.view;
+
+import android.annotation.TargetApi;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.view.View;
+import android.webkit.WebResourceRequest;
+import android.webkit.WebResourceResponse;
+import android.webkit.WebView;
+import android.widget.ProgressBar;
+
+import com.google.inject.Inject;
+
+import org.edx.mobile.R;
+import org.edx.mobile.core.IEdxEnvironment;
+import org.edx.mobile.http.HttpStatus;
+import org.edx.mobile.http.HttpStatusException;
+import org.edx.mobile.http.notifications.FullScreenErrorNotification;
+import org.edx.mobile.http.provider.OkHttpClientProvider;
+import org.edx.mobile.interfaces.RefreshListener;
+import org.edx.mobile.interfaces.WebViewStatusListener;
+import org.edx.mobile.logger.Logger;
+import org.edx.mobile.util.WebViewUtil;
+import org.edx.mobile.view.custom.EdxWebView;
+import org.edx.mobile.view.custom.URLInterceptorWebViewClient;
+
+import okhttp3.MediaType;
+import okhttp3.ResponseBody;
+import retrofit2.Response;
+
+/**
+ * An abstract fragment providing basic functionality for URL interception, its follow up action,
+ * error handling and show page progress based on page status.
+ */
+public abstract class BaseWebViewFragment extends OfflineSupportBaseFragment
+        implements WebViewStatusListener, RefreshListener {
+    protected final Logger logger = new Logger(getClass().getName());
+
+    private EdxWebView webView;
+    protected ProgressBar progressWheel;
+
+    protected FullScreenErrorNotification errorNotification;
+
+    @Inject
+    protected IEdxEnvironment environment;
+
+    @Inject
+    private OkHttpClientProvider okHttpClientProvider;
+
+    protected URLInterceptorWebViewClient client;
+
+    public abstract FullScreenErrorNotification initFullScreenErrorNotification();
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        errorNotification = initFullScreenErrorNotification();
+        webView = (EdxWebView) view.findViewById(R.id.webview);
+        progressWheel = (ProgressBar) view.findViewById(R.id.loading_indicator);
+
+        initWebView();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        webView.onResume();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        webView.onPause();
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        webView.destroy();
+    }
+
+    private void initWebView() {
+        client = new URLInterceptorWebViewClient(getActivity(), webView);
+
+        // if all the links are to be treated as external
+        client.setAllLinksAsExternal(isAllLinksExternal());
+
+        client.setPageStatusListener(pageStatusListener);
+    }
+
+    /**
+     * Loads the given URL into {@link #webView}.
+     *
+     * @param url The URL to load.
+     */
+    protected void loadUrl(@NonNull String url) {
+        WebViewUtil.loadUrlBasedOnOsVersion(getContext(), webView, url, this, errorNotification,
+                okHttpClientProvider, R.string.lbl_reload, new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        onRefresh();
+                    }
+                });
+    }
+
+    @Override
+    public void showLoadingProgress() {
+        if (progressWheel != null) {
+            progressWheel.setVisibility(View.VISIBLE);
+        }
+        if (webView != null) {
+            webView.setVisibility(View.GONE);
+        }
+    }
+
+    @Override
+    public void hideLoadingProgress() {
+        if (progressWheel != null) {
+            progressWheel.setVisibility(View.GONE);
+        }
+        if (webView != null) {
+            webView.setVisibility(View.VISIBLE);
+        }
+    }
+
+    @Override
+    public void clearWebView() {
+        WebViewUtil.clearWebviewHtml(webView);
+    }
+
+    /**
+     * By default, all links will not be treated as external.
+     * Depends on host, as long as the links have same host, they are treated as non-external links.
+     *
+     * @return
+     */
+    protected boolean isAllLinksExternal() {
+        return false;
+    }
+
+    /**
+     * See description of: {@link org.edx.mobile.view.custom.URLInterceptorWebViewClient.IPageStatusListener#onPageLoadProgressChanged(WebView, int)
+     * IPageStatusListener#onPageLoadProgressChanged}.
+     */
+    protected void onWebViewLoadProgressChanged(int progress) {
+    }
+
+    /*
+     * In order to avoid reflection issues of public functions in event bus especially those that
+     * aren't available on a certain api level, this listener has been refactored to a class
+     * variable which is better explained in following references:
+     * https://github.com/greenrobot/EventBus/issues/149
+     * http://greenrobot.org/eventbus/documentation/faq/
+     */
+    private URLInterceptorWebViewClient.IPageStatusListener pageStatusListener = new URLInterceptorWebViewClient.IPageStatusListener() {
+        @Override
+        public void onPageStarted() {
+            showLoadingProgress();
+        }
+
+        @Override
+        public void onPageFinished() {
+            hideLoadingProgress();
+        }
+
+        @Override
+        public void onPageLoadError(WebView view, int errorCode, String description,
+                                    String failingUrl) {
+            errorNotification.showError(getContext(),
+                    new HttpStatusException(Response.error(HttpStatus.SERVICE_UNAVAILABLE,
+                            ResponseBody.create(MediaType.parse("text/plain"), description))),
+                    R.string.lbl_reload, new View.OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            onRefresh();
+                        }
+                    });
+            clearWebView();
+        }
+
+        @Override
+        @TargetApi(Build.VERSION_CODES.M)
+        public void onPageLoadError(WebView view, WebResourceRequest request,
+                                    WebResourceResponse errorResponse,
+                                    boolean isMainRequestFailure) {
+            if (isMainRequestFailure) {
+                errorNotification.showError(getContext(),
+                        new HttpStatusException(Response.error(errorResponse.getStatusCode(),
+                                ResponseBody.create(MediaType.parse(errorResponse.getMimeType()),
+                                        errorResponse.getReasonPhrase()))),
+                        R.string.lbl_reload, new View.OnClickListener() {
+                            @Override
+                            public void onClick(View v) {
+                                onRefresh();
+                            }
+                        });
+                clearWebView();
+            }
+        }
+
+        @Override
+        public void onPageLoadProgressChanged(WebView view, int progress) {
+            onWebViewLoadProgressChanged(progress);
+        }
+    };
+}
diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/view/CourseInfoActivity.java b/OpenEdXMobile/src/main/java/org/edx/mobile/view/CourseInfoActivity.java
index 8d83cd9300..79ae95d5c4 100644
--- a/OpenEdXMobile/src/main/java/org/edx/mobile/view/CourseInfoActivity.java
+++ b/OpenEdXMobile/src/main/java/org/edx/mobile/view/CourseInfoActivity.java
@@ -10,8 +10,6 @@
 
 public class CourseInfoActivity extends BaseSingleFragmentActivity {
 
-    public static final String EXTRA_PATH_ID = "path_id";
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/view/CourseUnitVideoFragment.java b/OpenEdXMobile/src/main/java/org/edx/mobile/view/CourseUnitVideoFragment.java
index 7be5f1bea4..c7def5d6e9 100644
--- a/OpenEdXMobile/src/main/java/org/edx/mobile/view/CourseUnitVideoFragment.java
+++ b/OpenEdXMobile/src/main/java/org/edx/mobile/view/CourseUnitVideoFragment.java
@@ -509,7 +509,7 @@ public void onFail(Exception ex) {
         }
     }
 
-    public void saveCurrentPlaybackPosition(int offset) {
+    public void saveCurrentPlaybackPosition(long offset) {
         try {
             DownloadEntry v = videoModel;
             if (v != null) {
diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/view/DiscoveryActivity.java b/OpenEdXMobile/src/main/java/org/edx/mobile/view/DiscoveryActivity.java
new file mode 100644
index 0000000000..e92795a798
--- /dev/null
+++ b/OpenEdXMobile/src/main/java/org/edx/mobile/view/DiscoveryActivity.java
@@ -0,0 +1,91 @@
+package org.edx.mobile.view;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v7.widget.SearchView;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import org.edx.mobile.R;
+import org.edx.mobile.base.BaseSingleFragmentActivity;
+import org.edx.mobile.module.analytics.Analytics;
+
+public class DiscoveryActivity extends BaseSingleFragmentActivity implements ToolbarCallbacks {
+    public static Intent newIntent(@NonNull Context context) {
+        return new Intent(context, DiscoveryActivity.class);
+    }
+
+    @Override
+    public Fragment getFirstFragment() {
+        final Fragment fragment = new MainDiscoveryFragment();
+        fragment.setArguments(getIntent().getExtras());
+        return fragment;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setTitle(R.string.label_discover);
+        environment.getAnalyticsRegistry().trackScreenView(Analytics.Screens.FIND_COURSES);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        AuthPanelUtils.configureAuthPanel(findViewById(R.id.auth_panel), environment);
+    }
+
+    @Override
+    protected int getToolbarLayoutId() {
+        return R.layout.toolbar_with_profile_button;
+    }
+
+
+    @Override
+    public void setTitle(int titleId) {
+        setTitle(getResources().getString(titleId));
+    }
+
+    @Override
+    public void setTitle(CharSequence title) {
+        final View toolbar = findViewById(R.id.toolbar);
+        if (toolbar != null) {
+            final TextView titleView = getTitleView();
+            if (titleView != null) {
+                titleView.setText(title);
+            }
+        }
+        super.setTitle(title);
+    }
+
+    @Override
+    @Nullable
+    public SearchView getSearchView() {
+        final View searchView = findViewById(R.id.toolbar_search_view);
+        if (searchView != null && searchView instanceof SearchView) {
+            return (SearchView) searchView;
+        }
+        return null;
+    }
+
+    @Override
+    @Nullable
+    public TextView getTitleView() {
+        final View titleView = findViewById(R.id.toolbar_title_view);
+        if (titleView != null && titleView instanceof TextView) {
+            return (TextView) titleView;
+        }
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public ImageView getProfileView() {
+        return null;
+    }
+}
diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/view/DiscoveryLaunchActivity.java b/OpenEdXMobile/src/main/java/org/edx/mobile/view/DiscoveryLaunchActivity.java
index 3a22c572de..f5419937a5 100644
--- a/OpenEdXMobile/src/main/java/org/edx/mobile/view/DiscoveryLaunchActivity.java
+++ b/OpenEdXMobile/src/main/java/org/edx/mobile/view/DiscoveryLaunchActivity.java
@@ -20,7 +20,7 @@ public class DiscoveryLaunchActivity extends PresenterActivity<DiscoveryLaunchPr
     @NonNull
     @Override
     protected DiscoveryLaunchPresenter createPresenter(@Nullable Bundle savedInstanceState) {
-        return new DiscoveryLaunchPresenter(environment.getLoginPrefs(), environment.getConfig().getCourseDiscoveryConfig());
+        return new DiscoveryLaunchPresenter(environment.getLoginPrefs(), environment.getConfig().getDiscoveryConfig().getCourseDiscoveryConfig());
     }
 
     @NonNull
diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/view/DiscoveryLaunchPresenter.java b/OpenEdXMobile/src/main/java/org/edx/mobile/view/DiscoveryLaunchPresenter.java
index 85497d460c..d43836776b 100644
--- a/OpenEdXMobile/src/main/java/org/edx/mobile/view/DiscoveryLaunchPresenter.java
+++ b/OpenEdXMobile/src/main/java/org/edx/mobile/view/DiscoveryLaunchPresenter.java
@@ -1,6 +1,7 @@
 package org.edx.mobile.view;
 
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 
 import org.edx.mobile.module.prefs.LoginPrefs;
 import org.edx.mobile.util.Config;
@@ -10,18 +11,18 @@ public class DiscoveryLaunchPresenter extends ViewHoldingPresenter<DiscoveryLaun
     @NonNull
     private final LoginPrefs loginPrefs;
 
-    @NonNull
-    private final Config.EnrollmentConfig enrollmentConfig;
+    @Nullable
+    private final Config.CourseDiscoveryConfig courseDiscoveryConfig;
 
-    public DiscoveryLaunchPresenter(@NonNull LoginPrefs loginPrefs, @NonNull Config.EnrollmentConfig enrollmentConfig) {
+    public DiscoveryLaunchPresenter(@NonNull LoginPrefs loginPrefs, @NonNull Config.CourseDiscoveryConfig courseDiscoveryConfig) {
         this.loginPrefs = loginPrefs;
-        this.enrollmentConfig = enrollmentConfig;
+        this.courseDiscoveryConfig = courseDiscoveryConfig;
     }
 
     @Override
     public void attachView(@NonNull ViewInterface view) {
         super.attachView(view);
-        view.setEnabledButtons(enrollmentConfig.isCourseDiscoveryEnabled());
+        view.setEnabledButtons(courseDiscoveryConfig != null && courseDiscoveryConfig.isDiscoveryEnabled());
     }
 
     public void onResume() {
diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/view/MainDiscoveryFragment.java b/OpenEdXMobile/src/main/java/org/edx/mobile/view/MainDiscoveryFragment.java
new file mode 100644
index 0000000000..40d8ed5bdb
--- /dev/null
+++ b/OpenEdXMobile/src/main/java/org/edx/mobile/view/MainDiscoveryFragment.java
@@ -0,0 +1,261 @@
+package org.edx.mobile.view;
+
+
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.IdRes;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.annotation.StringRes;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentTransaction;
+import android.util.SparseArray;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
+
+import com.google.inject.Inject;
+
+import org.edx.mobile.R;
+import org.edx.mobile.base.BaseFragment;
+import org.edx.mobile.core.IEdxEnvironment;
+import org.edx.mobile.databinding.FragmentMainDiscoveryBinding;
+import org.edx.mobile.event.DiscoveryTabSelectedEvent;
+import org.edx.mobile.module.analytics.Analytics;
+import org.edx.mobile.view.dialog.NativeFindCoursesFragment;
+
+import de.greenrobot.event.EventBus;
+
+public class MainDiscoveryFragment extends BaseFragment {
+    @Inject
+    protected IEdxEnvironment environment;
+
+    @Nullable
+    protected FragmentMainDiscoveryBinding binding;
+
+    private ToolbarCallbacks toolbarCallbacks;
+
+    private SparseArray<Fragment> fragmentsArray = new SparseArray<>();
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        binding = DataBindingUtil.inflate(inflater, R.layout.fragment_main_discovery,
+                container, false);
+        return binding.getRoot();
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        initFragments();
+        binding.options.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(RadioGroup group, int checkedId) {
+                onFragmentSelected(checkedId, true);
+            }
+        });
+        EventBus.getDefault().register(this);
+    }
+
+    @Override
+    public void onActivityCreated(@Nullable Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        toolbarCallbacks = getActivity() instanceof ToolbarCallbacks ?
+                (ToolbarCallbacks) getActivity() : null;
+        onFragmentVisibilityChanged(getUserVisibleHint());
+    }
+
+    private void initFragments() {
+        // Course discovery
+        if (environment.getConfig().getDiscoveryConfig().getCourseDiscoveryConfig() != null &&
+                environment.getConfig().getDiscoveryConfig().getCourseDiscoveryConfig().isDiscoveryEnabled()) {
+            Fragment courseDiscoveryFragment;
+            if (environment.getConfig().getDiscoveryConfig().getCourseDiscoveryConfig().isWebviewDiscoveryEnabled()) {
+                courseDiscoveryFragment = getChildFragmentManager().findFragmentByTag("fragment_courses_webview");
+                if (courseDiscoveryFragment == null) {
+                    courseDiscoveryFragment = new WebViewDiscoverCoursesFragment();
+                    courseDiscoveryFragment.setArguments(getArguments());
+                    commitFragmentTransaction(courseDiscoveryFragment, "fragment_courses_webview");
+                }
+            } else {
+                courseDiscoveryFragment = getChildFragmentManager().findFragmentByTag("fragment_courses_native");
+                if (courseDiscoveryFragment == null) {
+                    courseDiscoveryFragment = new NativeFindCoursesFragment();
+                    commitFragmentTransaction(courseDiscoveryFragment, "fragment_courses_native");
+                }
+            }
+
+            fragmentsArray.put(R.id.option_courses, courseDiscoveryFragment);
+            addTabItem(R.id.option_courses, R.string.label_my_courses);
+        }
+
+        // Program discovery
+        if (environment.getConfig().getDiscoveryConfig().getProgramDiscoveryConfig() != null &&
+                environment.getConfig().getDiscoveryConfig().getProgramDiscoveryConfig().isDiscoveryEnabled(environment)) {
+            Fragment programDiscoveryFragment = getChildFragmentManager().findFragmentByTag("fragment_programs");
+            if (programDiscoveryFragment == null) {
+                programDiscoveryFragment = new WebViewDiscoverProgramsFragment();
+                commitFragmentTransaction(programDiscoveryFragment, "fragment_programs");
+            }
+
+            fragmentsArray.put(R.id.option_programs, programDiscoveryFragment);
+            addTabItem(R.id.option_programs, R.string.label_my_programs);
+        }
+
+        // Degree discovery
+        if (environment.getConfig().getDiscoveryConfig().getDegreeDiscoveryConfig() != null &&
+                environment.getConfig().getDiscoveryConfig().getDegreeDiscoveryConfig().isDiscoveryEnabled(environment)) {
+            Fragment degreeDiscoveryFragment = getChildFragmentManager().findFragmentByTag("fragment_degrees");
+            if (degreeDiscoveryFragment == null) {
+                degreeDiscoveryFragment = new WebViewDiscoverDegreesFragment();
+                commitFragmentTransaction(degreeDiscoveryFragment, "fragment_degrees");
+            }
+
+            fragmentsArray.put(R.id.option_degrees, degreeDiscoveryFragment);
+            addTabItem(R.id.option_degrees, R.string.label_degrees);
+        }
+
+        if (fragmentsArray.size() < 2) {
+            hideTabsBar();
+        }
+        if (fragmentsArray.size() > 0) {
+            setTabsBackground(binding.options);
+            final int firstBtnId = fragmentsArray.keyAt(0);
+            onFragmentSelected(firstBtnId, false);
+            binding.options.check(firstBtnId);
+        }
+    }
+
+    private void onFragmentSelected(@IdRes int fragmentTabId, final boolean isUserSelected) {
+        // First we need to hide all the fragments along with their shared search view,
+        // then show the required fragment and check either that fragment needs to show the
+        // search view or not through its `onHiddenChanged` method.
+        Fragment selectedFragment = null;
+        for (int i = 0; i < fragmentsArray.size(); i++) {
+            if (fragmentTabId == fragmentsArray.keyAt(i)) {
+                selectedFragment = fragmentsArray.valueAt(i);
+            } else {
+                hideFragment(fragmentsArray.valueAt(i));
+            }
+        }
+        if (selectedFragment != null) {
+            showFragment(selectedFragment);
+        }
+        if (isUserSelected) {
+            switch (fragmentTabId) {
+                case R.id.option_courses:
+                    environment.getAnalyticsRegistry().trackScreenView(Analytics.Screens.FIND_COURSES);
+                    break;
+                case R.id.option_programs:
+                    environment.getAnalyticsRegistry().trackScreenView(Analytics.Screens.FIND_PROGRAMS);
+                    break;
+                case R.id.option_degrees:
+                    environment.getAnalyticsRegistry().trackScreenView(Analytics.Screens.FIND_DEGREES);
+                    break;
+            }
+        }
+    }
+
+    private void commitFragmentTransaction(@NonNull Fragment fragment, @Nullable String tag) {
+        final FragmentTransaction fragmentTransaction = getChildFragmentManager().beginTransaction();
+        fragmentTransaction.add(R.id.fl_container, fragment, tag);
+        fragmentTransaction.commit();
+    }
+
+    private void showFragment(@Nullable Fragment fragment) {
+        if (fragment == null || !fragment.isHidden()) {
+            return;
+        }
+        getChildFragmentManager().beginTransaction()
+                .show(fragment)
+                .commit();
+    }
+
+    private void hideFragment(@Nullable Fragment fragment) {
+        if (fragment == null || fragment.isHidden()) {
+            return;
+        }
+        getChildFragmentManager().beginTransaction()
+                .hide(fragment)
+                .commit();
+    }
+
+    private void addTabItem(@IdRes int id, @StringRes int label) {
+        final RadioButton radioButton = (RadioButton) getLayoutInflater().inflate(
+                R.layout.segment_control_button_base, binding.options, false);
+        radioButton.setId(id);
+        radioButton.setText(label);
+        binding.options.addView(radioButton);
+    }
+
+    private void setTabsBackground(@NonNull RadioGroup options) {
+        final int childCount = options.getChildCount();
+        for (int i = 0; i < childCount; i++) {
+            if (i == 0) {
+                options.getChildAt(i).setBackgroundResource(R.drawable.edx_segmented_control_left_background);
+            } else if (i == childCount - 1) {
+                options.getChildAt(i).setBackgroundResource(R.drawable.edx_segmented_control_right_background);
+            } else {
+                options.getChildAt(i).setBackgroundResource(R.drawable.edx_segmented_control_middle_background);
+            }
+        }
+    }
+
+    private void hideTabsBar() {
+        binding.options.setVisibility(View.GONE);
+    }
+
+    @SuppressWarnings("unused")
+    public void onEventMainThread(@NonNull DiscoveryTabSelectedEvent event) {
+        onFragmentSelected(binding.options.getCheckedRadioButtonId(), true);
+    }
+
+    @Override
+    public void setUserVisibleHint(boolean isVisibleToUser) {
+        super.setUserVisibleHint(isVisibleToUser);
+        onFragmentVisibilityChanged(isVisibleToUser);
+    }
+
+    public void onFragmentVisibilityChanged(final boolean isVisibleToUser) {
+        if (toolbarCallbacks != null && toolbarCallbacks.getSearchView() != null) {
+            // Sometimes when fragment visibility is changed by swiping left/right the viewpager,
+            // visibility of SearchView doesn't get changed accordingly, putting the code within
+            // runnable does the job in this case.
+            toolbarCallbacks.getSearchView().post(new Runnable() {
+                @Override
+                public void run() {
+                    final Fragment nativeCoursesFragment = getChildFragmentManager().findFragmentByTag("fragment_courses_native");
+                    if ((nativeCoursesFragment != null && nativeCoursesFragment.isVisible()) || !isVisibleToUser) {
+                        toolbarCallbacks.getSearchView().setVisibility(View.GONE);
+                    } else {
+                        updateShownFragmentsVisibility();
+                    }
+                }
+            });
+        }
+    }
+
+    /**
+     * This function lets the currently shown Fragment know that it has now become visible to
+     * the user by calling its {@link Fragment#setUserVisibleHint(boolean)} function.
+     */
+    private void updateShownFragmentsVisibility() {
+        for (int i = 0; i < fragmentsArray.size(); i++) {
+            final Fragment fragment = fragmentsArray.get(fragmentsArray.keyAt(i));
+            if (fragment != null && fragment.getUserVisibleHint()
+                    && fragment.isVisible()) {
+                fragment.setUserVisibleHint(true);
+                return;
+            }
+        }
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        EventBus.getDefault().unregister(this);
+    }
+}
diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/view/MainTabsDashboardFragment.java b/OpenEdXMobile/src/main/java/org/edx/mobile/view/MainTabsDashboardFragment.java
index dfef2ff345..e259d7b001 100644
--- a/OpenEdXMobile/src/main/java/org/edx/mobile/view/MainTabsDashboardFragment.java
+++ b/OpenEdXMobile/src/main/java/org/edx/mobile/view/MainTabsDashboardFragment.java
@@ -16,6 +16,7 @@
 
 import org.edx.mobile.R;
 import org.edx.mobile.event.AccountDataLoadedEvent;
+import org.edx.mobile.event.DiscoveryTabSelectedEvent;
 import org.edx.mobile.event.MoveToDiscoveryTabEvent;
 import org.edx.mobile.event.ProfilePhotoUpdatedEvent;
 import org.edx.mobile.model.FragmentItemModel;
@@ -26,8 +27,8 @@
 import org.edx.mobile.user.ProfileImage;
 import org.edx.mobile.user.UserAPI;
 import org.edx.mobile.user.UserService;
+import org.edx.mobile.util.Config;
 import org.edx.mobile.util.UserProfileUtils;
-import org.edx.mobile.view.dialog.NativeFindCoursesFragment;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -142,17 +143,19 @@ public void onFragmentSelected() {
                     }));
         }
 
-        if (environment.getConfig().getCourseDiscoveryConfig().isCourseDiscoveryEnabled()) {
-            items.add(new FragmentItemModel(
-                    environment.getConfig().getCourseDiscoveryConfig().isWebviewCourseDiscoveryEnabled()
-                            ? WebViewDiscoverCoursesFragment.class : NativeFindCoursesFragment.class,
+        final Config.ProgramDiscoveryConfig programDiscoveryConfig = environment.getConfig().getDiscoveryConfig().getProgramDiscoveryConfig();
+        final Config.CourseDiscoveryConfig courseDiscoveryConfig = environment.getConfig().getDiscoveryConfig().getCourseDiscoveryConfig();
+        if ((courseDiscoveryConfig != null && courseDiscoveryConfig.isDiscoveryEnabled()) ||
+                (programDiscoveryConfig != null && programDiscoveryConfig.isDiscoveryEnabled(environment))) {
+            items.add(new FragmentItemModel(MainDiscoveryFragment.class,
                     getResources().getString(R.string.label_discovery), FontAwesomeIcons.fa_search,
                     new FragmentItemModel.FragmentStateListener() {
                         @Override
                         public void onFragmentSelected() {
-                            environment.getAnalyticsRegistry().trackScreenView(Analytics.Screens.FIND_COURSES);
+                            EventBus.getDefault().post(new DiscoveryTabSelectedEvent());
                         }
-                    }));
+                    }
+            ));
         }
 
         return items;
@@ -160,7 +163,7 @@ public void onFragmentSelected() {
 
     @SuppressWarnings("unused")
     public void onEventMainThread(@NonNull MoveToDiscoveryTabEvent event) {
-        if (!environment.getConfig().getCourseDiscoveryConfig().isCourseDiscoveryEnabled()) {
+        if (!environment.getConfig().getDiscoveryConfig().getCourseDiscoveryConfig().isDiscoveryEnabled()) {
             return;
         }
         if (binding != null) {
diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/view/MyCoursesListFragment.java b/OpenEdXMobile/src/main/java/org/edx/mobile/view/MyCoursesListFragment.java
index 0dc9f1b85c..8a75d686b7 100644
--- a/OpenEdXMobile/src/main/java/org/edx/mobile/view/MyCoursesListFragment.java
+++ b/OpenEdXMobile/src/main/java/org/edx/mobile/view/MyCoursesListFragment.java
@@ -154,7 +154,7 @@ public void onClick(View v) {
             addFindCoursesFooter();
             adapter.notifyDataSetChanged();
 
-            if (adapter.isEmpty() && !environment.getConfig().getCourseDiscoveryConfig().isCourseDiscoveryEnabled()) {
+            if (adapter.isEmpty() && !environment.getConfig().getDiscoveryConfig().getCourseDiscoveryConfig().isDiscoveryEnabled()) {
                 errorNotification.showError(R.string.no_courses_to_display,
                         FontAwesomeIcons.fa_exclamation_circle, 0, null);
                 binding.myCourseList.setVisibility(View.GONE);
@@ -245,7 +245,8 @@ private void addFindCoursesFooter() {
         if (binding.myCourseList.getFooterViewsCount() > 0) {
             return;
         }
-        if (environment.getConfig().getCourseDiscoveryConfig().isCourseDiscoveryEnabled()) {
+        if (environment.getConfig().getDiscoveryConfig().getCourseDiscoveryConfig() != null &&
+                environment.getConfig().getDiscoveryConfig().getCourseDiscoveryConfig().isDiscoveryEnabled()) {
             // Add 'Find a Course' list item as a footer.
             final PanelFindCourseBinding footer = DataBindingUtil.inflate(LayoutInflater.from(getActivity()),
                     R.layout.panel_find_course, binding.myCourseList, false);
diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/view/ProgramInfoActivity.java b/OpenEdXMobile/src/main/java/org/edx/mobile/view/ProgramInfoActivity.java
new file mode 100644
index 0000000000..8b834757eb
--- /dev/null
+++ b/OpenEdXMobile/src/main/java/org/edx/mobile/view/ProgramInfoActivity.java
@@ -0,0 +1,24 @@
+package org.edx.mobile.view;
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+
+import org.edx.mobile.base.BaseSingleFragmentActivity;
+import org.edx.mobile.base.WebViewProgramInfoFragment;
+import org.edx.mobile.module.analytics.Analytics;
+
+public class ProgramInfoActivity extends BaseSingleFragmentActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        environment.getAnalyticsRegistry().trackScreenView(Analytics.Screens.PROGRAM_INFO_SCREEN);
+    }
+
+    @Override
+    public Fragment getFirstFragment() {
+        final WebViewProgramInfoFragment fragment = new WebViewProgramInfoFragment();
+        fragment.setArguments(getIntent().getExtras());
+        return fragment;
+    }
+}
diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/view/Router.java b/OpenEdXMobile/src/main/java/org/edx/mobile/view/Router.java
index 28fb951945..68c108a405 100644
--- a/OpenEdXMobile/src/main/java/org/edx/mobile/view/Router.java
+++ b/OpenEdXMobile/src/main/java/org/edx/mobile/view/Router.java
@@ -54,6 +54,7 @@ public class Router {
     public static final String EXTRA_IS_VIDEOS_MODE = "videos_mode";
     public static final String EXTRA_IS_ON_COURSE_OUTLINE = "is_on_course_outline";
     public static final String EXTRA_SUBJECT_FILTER = "subject_filter";
+    public static final String EXTRA_PATH_ID = "path_id";
 
     @Inject
     Config config;
@@ -79,10 +80,16 @@ public void showDownloads(Context context) {
 
     public void showCourseInfo(Activity sourceActivity, String pathId) {
         Intent courseInfoIntent = new Intent(sourceActivity, CourseInfoActivity.class);
-        courseInfoIntent.putExtra(CourseInfoActivity.EXTRA_PATH_ID, pathId);
+        courseInfoIntent.putExtra(EXTRA_PATH_ID, pathId);
         sourceActivity.startActivity(courseInfoIntent);
     }
 
+    public void showProgramInfo(Activity sourceActivity, String pathId) {
+        Intent programInfoIntent = new Intent(sourceActivity, ProgramInfoActivity.class);
+        programInfoIntent.putExtra(EXTRA_PATH_ID, pathId);
+        sourceActivity.startActivity(programInfoIntent);
+    }
+
     public void showSettings(Activity sourceActivity) {
         Intent settingsIntent = new Intent(sourceActivity, SettingsActivity.class);
         settingsIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
@@ -323,23 +330,18 @@ public void showCertificate(@NonNull Context context, @NonNull EnrolledCoursesRe
     public void showCourseDetail(@NonNull Context context, @NonNull CourseDetail courseDetail) {
         context.startActivity(CourseDetailActivity.newIntent(context, courseDetail));
     }
-    
+
     public void showFindCourses(@NonNull Context context, @Nullable String searchQuery) {
-        if (!config.getCourseDiscoveryConfig().isCourseDiscoveryEnabled()) {
+        if (!config.getDiscoveryConfig().getCourseDiscoveryConfig().isDiscoveryEnabled()) {
             throw new RuntimeException("Course discovery is not enabled");
         }
-        final Intent findCoursesIntent;
-        if (config.getCourseDiscoveryConfig().isWebviewCourseDiscoveryEnabled()) {
-            findCoursesIntent = new Intent(context, DiscoverCoursesActivity.class);
-            if (searchQuery != null) {
-                findCoursesIntent.putExtra(Router.EXTRA_SEARCH_QUERY, searchQuery);
-            }
-        } else {
-            findCoursesIntent = NativeFindCoursesActivity.newIntent(context);
+        final Intent discoveryIntent = DiscoveryActivity.newIntent(context);
+        if (searchQuery != null) {
+            discoveryIntent.putExtra(Router.EXTRA_SEARCH_QUERY, searchQuery);
         }
         //Add this flag as multiple activities need to be created
-        findCoursesIntent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
-        context.startActivity(findCoursesIntent);
+        discoveryIntent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+        context.startActivity(discoveryIntent);
     }
 
     public void showWhatsNewActivity(@NonNull Activity activity) {
diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/view/WebViewDiscoverCoursesFragment.java b/OpenEdXMobile/src/main/java/org/edx/mobile/view/WebViewDiscoverCoursesFragment.java
index 45cb56180e..74f9651314 100644
--- a/OpenEdXMobile/src/main/java/org/edx/mobile/view/WebViewDiscoverCoursesFragment.java
+++ b/OpenEdXMobile/src/main/java/org/edx/mobile/view/WebViewDiscoverCoursesFragment.java
@@ -5,26 +5,16 @@
 import android.content.res.Configuration;
 import android.databinding.DataBindingUtil;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.SearchView;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.accessibility.AccessibilityEvent;
-import android.webkit.URLUtil;
-import android.widget.TextView;
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 
-import org.edx.mobile.BuildConfig;
 import org.edx.mobile.R;
-import org.edx.mobile.databinding.FragmentWebviewCourseDiscoveryBinding;
-import org.edx.mobile.event.MainDashboardRefreshEvent;
-import org.edx.mobile.event.NetworkConnectivityChangeEvent;
-import org.edx.mobile.http.notifications.FullScreenErrorNotification;
+import org.edx.mobile.databinding.PanelFilterBySubjectBinding;
 import org.edx.mobile.model.SubjectModel;
 import org.edx.mobile.module.analytics.Analytics;
 import org.edx.mobile.util.FileUtil;
@@ -38,73 +28,49 @@
 import java.util.List;
 import java.util.Map;
 
-import de.greenrobot.event.EventBus;
-
-import static org.edx.mobile.util.UrlUtil.QUERY_PARAM_SEARCH;
 import static org.edx.mobile.util.UrlUtil.QUERY_PARAM_SUBJECT;
 import static org.edx.mobile.util.UrlUtil.buildUrlWithQueryParams;
 
-public class WebViewDiscoverCoursesFragment extends BaseWebViewDiscoverFragment {
+public class WebViewDiscoverCoursesFragment extends WebViewDiscoverFragment {
     private static final int VIEW_SUBJECTS_REQUEST_CODE = 999;
-    private static final String INSTANCE_CURRENT_DISCOVER_URL = "current_discover_url";
-
-    private FragmentWebviewCourseDiscoveryBinding binding;
-    private SearchView searchView;
-    private ToolbarCallbacks toolbarCallbacks;
 
     @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        binding = DataBindingUtil.inflate(inflater, R.layout.fragment_webview_course_discovery, container, false);
-        return binding.getRoot();
-    }
+    private PanelFilterBySubjectBinding panelBinding;
 
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        // Check for search query in extras
-        String searchQueryExtra = null;
-        String searchUrl = null;
-
-        if (savedInstanceState != null) {
-            searchUrl = savedInstanceState.getString(INSTANCE_CURRENT_DISCOVER_URL, null);
-        }
-        if (searchUrl == null && getArguments() != null) {
-            searchQueryExtra = getArguments().getString(Router.EXTRA_SEARCH_QUERY);
-        }
-
-        if (searchQueryExtra != null) {
-            initSearch(searchQueryExtra);
-        } else {
-            loadUrl(searchUrl == null ? getInitialUrl() : searchUrl);
-        }
         if (shouldShowSubjectDiscovery()) {
             initSubjects();
         }
-        if (!EventBus.getDefault().isRegistered(this)) {
-            EventBus.getDefault().register(this);
-        }
+    }
+
+    private boolean shouldShowSubjectDiscovery() {
+        return getActivity() instanceof MainDashboardActivity &&
+                environment.getConfig().getDiscoveryConfig().getCourseDiscoveryConfig().isSubjectFilterEnabled() &&
+                getResources().getConfiguration().orientation != Configuration.ORIENTATION_LANDSCAPE;
     }
 
     @Override
-    public void onSaveInstanceState(Bundle outState) {
-        outState.putString(INSTANCE_CURRENT_DISCOVER_URL, binding.webview.getUrl());
-        super.onSaveInstanceState(outState);
+    protected String getSearchUrl() {
+        return environment.getConfig().getDiscoveryConfig().getCourseDiscoveryConfig().getBaseUrl();
     }
 
     @Override
-    public FullScreenErrorNotification initFullScreenErrorNotification() {
-        return new FullScreenErrorNotification(binding.llContent);
+    protected int getQueryHint() {
+        return R.string.search_for_courses;
     }
 
-    private void initSearch(@NonNull String query) {
-        final String baseUrl = getInitialUrl();
-        final Map<String, String> queryParams = new HashMap<>();
-        queryParams.put(QUERY_PARAM_SEARCH, query);
-        loadUrl(buildUrlWithQueryParams(logger, baseUrl, queryParams));
+    @Override
+    protected boolean isSearchEnabled() {
+        return environment.getConfig().getDiscoveryConfig().getCourseDiscoveryConfig().isSearchEnabled();
     }
 
     private void initSubjects() {
+        panelBinding = DataBindingUtil.inflate(getLayoutInflater(), R.layout.panel_filter_by_subject,
+                binding.flAddOnContainer, true);
+        binding.flAddOnContainer.setVisibility(View.VISIBLE);
+
         final String subjectItemsJson;
         try {
             subjectItemsJson = FileUtil.loadTextFileFromResources(getContext(), R.raw.subjects);
@@ -121,7 +87,7 @@ private void initSubjects() {
             final PopularSubjectsAdapter adapter = new PopularSubjectsAdapter(popularSubjects, new PopularSubjectsAdapter.ClickListener() {
                 @Override
                 public void onSubjectClick(View view) {
-                    final int position = binding.rvSubjects.getChildAdapterPosition(view);
+                    final int position = panelBinding.rvSubjects.getChildAdapterPosition(view);
                     final String baseUrl = getInitialUrl();
                     final String subjectFilter = popularSubjects.get(position).filter;
                     final Map<String, String> queryParams = new HashMap<>();
@@ -141,73 +107,13 @@ public void onViewAllSubjectsClick() {
 
             final LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getContext(),
                     LinearLayoutManager.HORIZONTAL, false);
-            binding.rvSubjects.setLayoutManager(linearLayoutManager);
-            binding.rvSubjects.setAdapter(adapter);
+            panelBinding.rvSubjects.setLayoutManager(linearLayoutManager);
+            panelBinding.rvSubjects.setAdapter(adapter);
         } catch (IOException e) {
             e.printStackTrace();
         }
     }
 
-    @Override
-    public void onActivityCreated(@Nullable Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-        toolbarCallbacks = getActivity() instanceof ToolbarCallbacks ?
-                (ToolbarCallbacks) getActivity() : null;
-        initSearchView();
-    }
-
-    private void initSearchView() {
-        searchView = toolbarCallbacks.getSearchView();
-        searchView.setQueryHint(getResources().getString(R.string.search_for_courses));
-        searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
-
-            @Override
-            public boolean onQueryTextSubmit(String query) {
-                initSearch(query);
-                searchView.onActionViewCollapsed();
-                final boolean isLoggedIn = environment.getLoginPrefs().getUsername() != null;
-                environment.getAnalyticsRegistry().trackCoursesSearch(query, isLoggedIn, BuildConfig.VERSION_NAME);
-                return true;
-            }
-
-            @Override
-            public boolean onQueryTextChange(String newText) {
-                return false;
-            }
-        });
-        searchView.setOnQueryTextFocusChangeListener(new View.OnFocusChangeListener() {
-            @Override
-            public void onFocusChange(View view, boolean queryTextFocused) {
-                if (!queryTextFocused) {
-                    updateTitleVisibility(View.VISIBLE);
-                    searchView.onActionViewCollapsed();
-                } else {
-                    updateTitleVisibility(View.GONE);
-                }
-            }
-        });
-        if (getUserVisibleHint()) {
-            searchView.setVisibility(View.VISIBLE);
-        }
-        if (searchView.hasFocus()) {
-            updateTitleVisibility(View.GONE);
-        }
-    }
-
-    private void updateTitleVisibility(int visibility) {
-        final TextView titleView = toolbarCallbacks != null ? toolbarCallbacks.getTitleView() : null;
-        if (titleView != null) {
-            titleView.setVisibility(visibility);
-        }
-    }
-
-    @NonNull
-    protected String getInitialUrl() {
-        return URLUtil.isValidUrl(binding.webview.getUrl()) ?
-                binding.webview.getUrl() :
-                environment.getConfig().getCourseDiscoveryConfig().getCourseSearchUrl();
-    }
-
     @Override
     public void onWebViewLoadProgressChanged(int progress) {
         if (progress == 100) {
@@ -221,34 +127,16 @@ public void onWebViewLoadProgressChanged(int progress) {
         }
     }
 
-    @SuppressWarnings("unused")
-    public void onEvent(MainDashboardRefreshEvent event) {
-        loadUrl(getInitialUrl());
-    }
-
-    @Override
-    public void onRefresh() {
-        EventBus.getDefault().post(new MainDashboardRefreshEvent());
-    }
-
-    @SuppressWarnings("unused")
-    public void onEvent(NetworkConnectivityChangeEvent event) {
-        onNetworkConnectivityChangeEvent(event);
-    }
-
-    @Override
-    public void setUserVisibleHint(boolean isVisibleToUser) {
-        super.setUserVisibleHint(isVisibleToUser);
-        if (searchView != null) {
-            searchView.setVisibility(isVisibleToUser ? View.VISIBLE : View.GONE);
+    private void setSubjectLayoutVisibility(int visibility) {
+        if (panelBinding != null) {
+            if (shouldShowSubjectDiscovery()) {
+                ViewAnimationUtil.fadeViewTo(panelBinding.llSubjectContent, visibility);
+            } else {
+                panelBinding.llSubjectContent.setVisibility(View.GONE);
+            }
         }
     }
 
-    @Override
-    protected boolean isShowingFullScreenError() {
-        return errorNotification != null && errorNotification.isShowing();
-    }
-
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
@@ -265,17 +153,4 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
                 break;
         }
     }
-
-    private boolean shouldShowSubjectDiscovery() {
-        return getActivity() instanceof MainDashboardActivity && environment.getConfig().getCourseDiscoveryConfig().isSubjectDiscoveryEnabled() &&
-                getResources().getConfiguration().orientation != Configuration.ORIENTATION_LANDSCAPE;
-    }
-
-    private void setSubjectLayoutVisibility(int visibility) {
-        if (shouldShowSubjectDiscovery()) {
-            ViewAnimationUtil.fadeViewTo(binding.llSubjectContent, visibility);
-        } else {
-            binding.llSubjectContent.setVisibility(View.GONE);
-        }
-    }
 }
diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/view/WebViewDiscoverDegreesFragment.java b/OpenEdXMobile/src/main/java/org/edx/mobile/view/WebViewDiscoverDegreesFragment.java
new file mode 100644
index 0000000000..e4db3f9a1e
--- /dev/null
+++ b/OpenEdXMobile/src/main/java/org/edx/mobile/view/WebViewDiscoverDegreesFragment.java
@@ -0,0 +1,20 @@
+package org.edx.mobile.view;
+
+import org.edx.mobile.R;
+
+public class WebViewDiscoverDegreesFragment extends WebViewDiscoverFragment {
+    @Override
+    protected String getSearchUrl() {
+        return environment.getConfig().getDiscoveryConfig().getDegreeDiscoveryConfig().getBaseUrl();
+    }
+
+    @Override
+    protected int getQueryHint() {
+        return R.string.search_for_degrees;
+    }
+
+    @Override
+    protected boolean isSearchEnabled() {
+        return environment.getConfig().getDiscoveryConfig().getDegreeDiscoveryConfig().isSearchEnabled();
+    }
+}
diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/view/WebViewDiscoverFragment.java b/OpenEdXMobile/src/main/java/org/edx/mobile/view/WebViewDiscoverFragment.java
new file mode 100644
index 0000000000..0da0507ef8
--- /dev/null
+++ b/OpenEdXMobile/src/main/java/org/edx/mobile/view/WebViewDiscoverFragment.java
@@ -0,0 +1,232 @@
+package org.edx.mobile.view;
+
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.SearchView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.webkit.URLUtil;
+import android.widget.TextView;
+
+import org.edx.mobile.BuildConfig;
+import org.edx.mobile.R;
+import org.edx.mobile.databinding.FragmentWebviewDiscoveryBinding;
+import org.edx.mobile.event.DiscoveryTabSelectedEvent;
+import org.edx.mobile.event.MainDashboardRefreshEvent;
+import org.edx.mobile.event.NetworkConnectivityChangeEvent;
+import org.edx.mobile.http.notifications.FullScreenErrorNotification;
+import org.edx.mobile.model.api.EnrolledCoursesResponse;
+import org.edx.mobile.util.links.DefaultActionListener;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import de.greenrobot.event.EventBus;
+
+import static org.edx.mobile.util.UrlUtil.QUERY_PARAM_SEARCH;
+import static org.edx.mobile.util.UrlUtil.buildUrlWithQueryParams;
+
+/**
+ * An abstract fragment providing basic functionality of searching the webpage via toolbar searchview.
+ */
+public abstract class WebViewDiscoverFragment extends BaseWebViewFragment {
+    private static final String INSTANCE_CURRENT_DISCOVER_URL = "current_discover_url";
+
+    protected FragmentWebviewDiscoveryBinding binding;
+    private SearchView searchView;
+    private ToolbarCallbacks toolbarCallbacks;
+
+    protected abstract String getSearchUrl();
+
+    protected abstract int getQueryHint();
+
+    protected abstract boolean isSearchEnabled();
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        binding = DataBindingUtil.inflate(inflater, R.layout.fragment_webview_discovery, container, false);
+        return binding.getRoot();
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        // Check for search query in extras
+        String searchQueryExtra = null;
+        String searchUrl = null;
+
+        if (savedInstanceState != null) {
+            searchUrl = savedInstanceState.getString(INSTANCE_CURRENT_DISCOVER_URL, null);
+        }
+        if (searchUrl == null && getArguments() != null) {
+            searchQueryExtra = getArguments().getString(Router.EXTRA_SEARCH_QUERY);
+        }
+
+        if (searchQueryExtra != null) {
+            initSearch(searchQueryExtra);
+        } else {
+            loadUrl(searchUrl == null ? getInitialUrl() : searchUrl);
+        }
+        if (!EventBus.getDefault().isRegistered(this)) {
+            EventBus.getDefault().register(this);
+        }
+        setWebViewActionListener();
+    }
+
+    public void setWebViewActionListener() {
+        client.setActionListener(new DefaultActionListener(getActivity(), progressWheel,
+                new DefaultActionListener.EnrollCallback() {
+                    @Override
+                    public void onResponse(@NonNull EnrolledCoursesResponse course) {
+
+                    }
+
+                    @Override
+                    public void onFailure(@NonNull Throwable error) {
+                    }
+
+                    @Override
+                    public void onUserNotLoggedIn(@NonNull String courseId, boolean emailOptIn) {
+                    }
+                }));
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        outState.putString(INSTANCE_CURRENT_DISCOVER_URL, binding.webview.getUrl());
+        super.onSaveInstanceState(outState);
+    }
+
+    @Override
+    public FullScreenErrorNotification initFullScreenErrorNotification() {
+        return new FullScreenErrorNotification(binding.llContent);
+    }
+
+    private void initSearch(@NonNull String query) {
+        final String baseUrl = getInitialUrl();
+        final Map<String, String> queryParams = new HashMap<>();
+        queryParams.put(QUERY_PARAM_SEARCH, query);
+        loadUrl(buildUrlWithQueryParams(logger, baseUrl, queryParams));
+    }
+
+    @Override
+    public void onActivityCreated(@Nullable Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        toolbarCallbacks = getActivity() instanceof ToolbarCallbacks ?
+                (ToolbarCallbacks) getActivity() : null;
+        initSearchView();
+    }
+
+    private SearchView.OnQueryTextListener onQueryTextListener = new SearchView.OnQueryTextListener() {
+        @Override
+        public boolean onQueryTextSubmit(String query) {
+            initSearch(query);
+            searchView.onActionViewCollapsed();
+            final boolean isLoggedIn = environment.getLoginPrefs().getUsername() != null;
+            environment.getAnalyticsRegistry().trackCoursesSearch(query, isLoggedIn, BuildConfig.VERSION_NAME);
+            return true;
+        }
+
+        @Override
+        public boolean onQueryTextChange(String newText) {
+            return false;
+        }
+    };
+
+    private SearchView.OnFocusChangeListener onFocusChangeListener = new View.OnFocusChangeListener() {
+        @Override
+        public void onFocusChange(View view, boolean queryTextFocused) {
+            if (!queryTextFocused) {
+                updateTitleVisibility(View.VISIBLE);
+                searchView.onActionViewCollapsed();
+            } else {
+                updateTitleVisibility(View.GONE);
+            }
+        }
+    };
+
+    private void initSearchView() {
+        searchView = toolbarCallbacks.getSearchView();
+        if (getUserVisibleHint()) {
+            searchView.setQueryHint(getResources().getString(getQueryHint()));
+            searchView.setOnQueryTextListener(onQueryTextListener);
+            searchView.setOnQueryTextFocusChangeListener(onFocusChangeListener);
+        }
+        if (searchView.hasFocus()) {
+            updateTitleVisibility(View.GONE);
+        }
+    }
+
+    private void updateTitleVisibility(int visibility) {
+        final TextView titleView = toolbarCallbacks != null ? toolbarCallbacks.getTitleView() : null;
+        if (titleView != null) {
+            titleView.setVisibility(visibility);
+        }
+    }
+
+    @NonNull
+    protected String getInitialUrl() {
+        return URLUtil.isValidUrl(binding.webview.getUrl()) ?
+                binding.webview.getUrl() : getSearchUrl();
+    }
+
+    @SuppressWarnings("unused")
+    public void onEvent(MainDashboardRefreshEvent event) {
+        loadUrl(getInitialUrl());
+    }
+
+    @Override
+    public void onRefresh() {
+        EventBus.getDefault().post(new MainDashboardRefreshEvent());
+    }
+
+    @SuppressWarnings("unused")
+    public void onEvent(NetworkConnectivityChangeEvent event) {
+        onNetworkConnectivityChangeEvent(event);
+    }
+
+    @SuppressWarnings("unused")
+    public void onEventMainThread(@NonNull DiscoveryTabSelectedEvent event) {
+        // OfflineSupportBaseFragment.setUserVisibleHint(*) should be called automatically whenever
+        // the fragment visibility is changed to user but in the case of WebViewDiscoverCoursesFragment
+        // & WebViewDiscoverProgramsFragment setUserVisibleHint is not getting called on tab selection
+        // that's why we need to call it manually.
+        if (!isHidden()) {
+            setUserVisibleHint(getUserVisibleHint());
+        }
+    }
+
+    @Override
+    public void setUserVisibleHint(boolean isVisibleToUser) {
+        super.setUserVisibleHint(isVisibleToUser);
+        onFragmentVisibilityChange(isVisibleToUser);
+    }
+
+    @Override
+    public void onHiddenChanged(boolean hidden) {
+        super.onHiddenChanged(hidden);
+        onFragmentVisibilityChange(!hidden);
+    }
+
+    private void onFragmentVisibilityChange(boolean isVisible) {
+        if (searchView != null) {
+            if (isVisible && isSearchEnabled()) {
+                searchView.setVisibility(View.VISIBLE);
+                searchView.setQueryHint(getResources().getString(getQueryHint()));
+                searchView.setOnQueryTextListener(onQueryTextListener);
+                searchView.setOnQueryTextFocusChangeListener(onFocusChangeListener);
+            } else {
+                searchView.setVisibility(View.GONE);
+            }
+        }
+    }
+
+    @Override
+    protected boolean isShowingFullScreenError() {
+        return errorNotification != null && errorNotification.isShowing();
+    }
+}
diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/view/WebViewDiscoverProgramsFragment.java b/OpenEdXMobile/src/main/java/org/edx/mobile/view/WebViewDiscoverProgramsFragment.java
new file mode 100644
index 0000000000..efd6bf5394
--- /dev/null
+++ b/OpenEdXMobile/src/main/java/org/edx/mobile/view/WebViewDiscoverProgramsFragment.java
@@ -0,0 +1,20 @@
+package org.edx.mobile.view;
+
+import org.edx.mobile.R;
+
+public class WebViewDiscoverProgramsFragment extends WebViewDiscoverFragment {
+    @Override
+    protected String getSearchUrl() {
+        return environment.getConfig().getDiscoveryConfig().getProgramDiscoveryConfig().getBaseUrl();
+    }
+
+    @Override
+    protected int getQueryHint() {
+        return R.string.search_for_programs;
+    }
+
+    @Override
+    protected boolean isSearchEnabled() {
+        return environment.getConfig().getDiscoveryConfig().getProgramDiscoveryConfig().isSearchEnabled();
+    }
+}
diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/view/adapters/CourseCardViewHolder.java b/OpenEdXMobile/src/main/java/org/edx/mobile/view/adapters/CourseCardViewHolder.java
index 208a384ec8..43a852f38f 100644
--- a/OpenEdXMobile/src/main/java/org/edx/mobile/view/adapters/CourseCardViewHolder.java
+++ b/OpenEdXMobile/src/main/java/org/edx/mobile/view/adapters/CourseCardViewHolder.java
@@ -1,6 +1,7 @@
 package org.edx.mobile.view.adapters;
 
 import android.content.Context;
+import android.os.Build;
 import android.support.annotation.LayoutRes;
 import android.support.annotation.NonNull;
 import android.view.View;
@@ -33,6 +34,11 @@ public CourseCardViewHolder(View convertView) {
                 .findViewById(R.id.course_image);
         this.newCourseContent = convertView
                 .findViewById(R.id.new_course_content_layout);
+        if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+            // On pre-lollipop devices CardView doesn't support the clipping for round corners
+            // Overlay foreground image is used as a hack for it.
+            convertView.findViewById(R.id.view_foreground_overlay).setVisibility(View.VISIBLE);
+        }
     }
 
     public void setCourseTitle(@NonNull String title) {
diff --git a/OpenEdXMobile/src/test/java/org/edx/mobile/login/LoginActivityTest.java b/OpenEdXMobile/src/test/java/org/edx/mobile/login/LoginActivityTest.java
index 540446dca6..f55859e2ac 100644
--- a/OpenEdXMobile/src/test/java/org/edx/mobile/login/LoginActivityTest.java
+++ b/OpenEdXMobile/src/test/java/org/edx/mobile/login/LoginActivityTest.java
@@ -1,5 +1,7 @@
 package org.edx.mobile.login;
 
+import android.view.View;
+
 import org.edx.mobile.R;
 import org.edx.mobile.view.LoginActivity;
 import org.edx.mobile.view.PresenterActivityTest;
@@ -7,7 +9,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.assertj.android.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class LoginActivityTest extends PresenterActivityTest<LoginActivity, LoginPresenter, LoginPresenter.LoginViewInterface> {
 
@@ -19,30 +21,30 @@ public void setup() {
     @Test
     public void testSetSocialLoginButtons_withFacebookEnabled_facebookButtonIsVisible() {
         view.setSocialLoginButtons(false, true);
-        assertThat(activity.findViewById(R.id.panel_login_social)).isVisible();
-        assertThat(activity.findViewById(R.id.google_button)).isNotVisible();
-        assertThat(activity.findViewById(R.id.facebook_button)).isVisible();
+        assertThat(activity.findViewById(R.id.panel_login_social).getVisibility()).isEqualTo(View.VISIBLE);
+        assertThat(activity.findViewById(R.id.google_button).getVisibility()).isNotEqualTo(View.VISIBLE);
+        assertThat(activity.findViewById(R.id.facebook_button).getVisibility()).isEqualTo(View.VISIBLE);
     }
 
     @Test
     public void testSetSocialLoginButtons_withGoogleEnabled_googleButtonIsVisible() {
         view.setSocialLoginButtons(true, false);
-        assertThat(activity.findViewById(R.id.panel_login_social)).isVisible();
-        assertThat(activity.findViewById(R.id.google_button)).isVisible();
-        assertThat(activity.findViewById(R.id.facebook_button)).isNotVisible();
+        assertThat(activity.findViewById(R.id.panel_login_social).getVisibility()).isEqualTo(View.VISIBLE);
+        assertThat(activity.findViewById(R.id.google_button).getVisibility()).isEqualTo(View.VISIBLE);
+        assertThat(activity.findViewById(R.id.facebook_button).getVisibility()).isNotEqualTo(View.VISIBLE);
     }
 
     @Test
     public void testSetSocialLoginButtons_withSocialLoginEnabled_socialLoginButtonsAreVisible() {
         view.setSocialLoginButtons(true, true);
-        assertThat(activity.findViewById(R.id.panel_login_social)).isVisible();
-        assertThat(activity.findViewById(R.id.google_button)).isVisible();
-        assertThat(activity.findViewById(R.id.facebook_button)).isVisible();
+        assertThat(activity.findViewById(R.id.panel_login_social).getVisibility()).isEqualTo(View.VISIBLE);
+        assertThat(activity.findViewById(R.id.google_button).getVisibility()).isEqualTo(View.VISIBLE);
+        assertThat(activity.findViewById(R.id.facebook_button).getVisibility()).isEqualTo(View.VISIBLE);
     }
 
     @Test
     public void testSetSocialLoginButtons_withSocialLoginNotEnabled_socialLoginButtonsNotVisible() {
         view.setSocialLoginButtons(false, false);
-        assertThat(activity.findViewById(R.id.panel_login_social)).isNotVisible();
+        assertThat(activity.findViewById(R.id.panel_login_social).getVisibility()).isNotEqualTo(View.VISIBLE);
     }
 }
diff --git a/OpenEdXMobile/src/test/java/org/edx/mobile/profiles/UserProfileFragmentTest.java b/OpenEdXMobile/src/test/java/org/edx/mobile/profiles/UserProfileFragmentTest.java
index 51b322a623..4fc666c296 100644
--- a/OpenEdXMobile/src/test/java/org/edx/mobile/profiles/UserProfileFragmentTest.java
+++ b/OpenEdXMobile/src/test/java/org/edx/mobile/profiles/UserProfileFragmentTest.java
@@ -16,8 +16,9 @@
 import java.util.Collections;
 import java.util.List;
 
-import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.assertj.android.api.Assertions.assertThat;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
@@ -34,7 +35,7 @@ public class UserProfileFragmentTest extends PresenterFragmentTest<
     public void before() {
         startFragment(TestableUserProfileFragment.newInstance(ProfileValues.USERNAME));
         binding = DataBindingUtil.getBinding(fragment.getView());
-        assertThat(binding).isNotNull();
+        assertNotNull(binding);
     }
 
     @Test
@@ -46,13 +47,13 @@ public void setName_updatesTextView() {
     @Test
     public void setEditProfileMenuButtonVisible_withTrue_showsEditProfileOption() {
         view.setEditProfileMenuButtonVisible(true);
-        assertThat(fragment.getActivity().findViewById(R.id.edit_profile)).isNotNull();
+        assertNotNull(fragment.getActivity().findViewById(R.id.edit_profile));
     }
 
     @Test
     public void setEditProfileMenuButtonVisible_withFalse_hidesEditProfileOption() {
         view.setEditProfileMenuButtonVisible(false);
-        assertThat(fragment.getActivity().findViewById(R.id.edit_profile)).isNull();
+        assertNull(fragment.getActivity().findViewById(R.id.edit_profile));
     }
 
     @Test
diff --git a/OpenEdXMobile/src/test/java/org/edx/mobile/test/ConfigTests.java b/OpenEdXMobile/src/test/java/org/edx/mobile/test/ConfigTests.java
index 239d352386..6784f0ed3e 100644
--- a/OpenEdXMobile/src/test/java/org/edx/mobile/test/ConfigTests.java
+++ b/OpenEdXMobile/src/test/java/org/edx/mobile/test/ConfigTests.java
@@ -15,6 +15,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
@@ -25,7 +26,8 @@
 public class ConfigTests extends BaseTestCase {
     //TODO - should we place constant at a central place?
     /* Config keys */
-    private static final String COURSE_ENROLLMENT = "COURSE_ENROLLMENT";
+    private static final String DISCOVERY = "DISCOVERY";
+    private static final String COURSE_DISCOVERY = "COURSE";
     private static final String SOCIAL_SHARING = "SOCIAL_SHARING";
     private static final String ZERO_RATING = "ZERO_RATING";
     private static final String FACEBOOK = "FACEBOOK";
@@ -38,10 +40,10 @@ public class ConfigTests extends BaseTestCase {
     private static final String ENABLED = "ENABLED";
     private static final String DISABLED_CARRIERS = "DISABLED_CARRIERS";
     private static final String CARRIERS = "CARRIERS";
-    private static final String COURSE_SEARCH_URL = "COURSE_SEARCH_URL";
+    private static final String BASE_URL = "BASE_URL";
     private static final String EXPLORE_SUBJECTS_URL = "EXPLORE_SUBJECTS_URL";
     private static final String TYPE = "TYPE";
-    private static final String COURSE_INFO_URL_TEMPLATE = "COURSE_INFO_URL_TEMPLATE";
+    private static final String DETAIL_TEMPLATE = "DETAIL_TEMPLATE";
     private static final String FACEBOOK_APP_ID = "FACEBOOK_APP_ID";
     private static final String FABRIC_KEY = "FABRIC_KEY";
     private static final String FABRIC_BUILD_SECRET = "FABRIC_BUILD_SECRET";
@@ -111,34 +113,39 @@ public void testZeroRatingConfig() {
     public void testEnrollmentNoConfig() {
         JsonObject configBase = new JsonObject();
         Config config = new Config(configBase);
-        assertFalse(config.getCourseDiscoveryConfig().isCourseDiscoveryEnabled());
-        assertFalse(config.getCourseDiscoveryConfig().isWebviewCourseDiscoveryEnabled());
-        assertNull(config.getCourseDiscoveryConfig().getCourseSearchUrl());
-        assertNull(config.getCourseDiscoveryConfig().getCourseInfoUrlTemplate());
+
+        assertNotNull(config.getDiscoveryConfig());
+        assertNull(config.getDiscoveryConfig().getCourseDiscoveryConfig());
+        assertNull(config.getDiscoveryConfig().getProgramDiscoveryConfig());
     }
 
     @Test
     public void testEnrollmentEmptyConfig() {
         JsonObject configBase = new JsonObject();
-        JsonObject enrollmentConfig = new JsonObject();
-        configBase.add(COURSE_ENROLLMENT, enrollmentConfig);
+        JsonObject discoveryConfig = new JsonObject();
+        configBase.add(DISCOVERY, discoveryConfig);
+        JsonObject courseDiscoveryConfig = new JsonObject();
+        discoveryConfig.add(COURSE_DISCOVERY, courseDiscoveryConfig);
 
         Config config = new Config(configBase);
-        assertFalse(config.getCourseDiscoveryConfig().isCourseDiscoveryEnabled());
-        assertFalse(config.getCourseDiscoveryConfig().isWebviewCourseDiscoveryEnabled());
-        assertNull(config.getCourseDiscoveryConfig().getCourseSearchUrl());
-        assertNull(config.getCourseDiscoveryConfig().getCourseInfoUrlTemplate());
+        assertFalse(config.getDiscoveryConfig().getCourseDiscoveryConfig().isDiscoveryEnabled());
+        assertFalse(config.getDiscoveryConfig().getCourseDiscoveryConfig().isWebviewDiscoveryEnabled());
+        assertNull(config.getDiscoveryConfig().getCourseDiscoveryConfig().getBaseUrl());
+        assertNull(config.getDiscoveryConfig().getCourseDiscoveryConfig().getInfoUrlTemplate());
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void testEnrollmentInvalidType() {
         JsonObject configBase = new JsonObject();
-        JsonObject enrollmentConfig = new JsonObject();
-        enrollmentConfig.add(TYPE, new JsonPrimitive("invalid type"));
-        configBase.add(COURSE_ENROLLMENT, enrollmentConfig);
+
+        JsonObject discoveryConfig = new JsonObject();
+        configBase.add(DISCOVERY, discoveryConfig);
+        JsonObject courseDiscoveryConfig = new JsonObject();
+        discoveryConfig.add(COURSE_DISCOVERY, courseDiscoveryConfig);
+        courseDiscoveryConfig.add(TYPE, new JsonPrimitive("invalid type"));
 
         Config config = new Config(configBase);
-        assertFalse(config.getCourseDiscoveryConfig().isCourseDiscoveryEnabled());
+        assertFalse(config.getDiscoveryConfig().getCourseDiscoveryConfig().isDiscoveryEnabled());
     }
 
     @RunWith(value = Parameterized.class)
@@ -165,39 +172,49 @@ public static Iterable<Object[]> data() {
         @Test
         public void testEnrollmentConfig() {
             JsonObject configBase = new JsonObject();
-            JsonObject enrollmentConfig = new JsonObject();
+
+            JsonObject discoveryConfig = new JsonObject();
+            configBase.add(DISCOVERY, discoveryConfig);
+            JsonObject courseDiscoveryConfig = new JsonObject();
+            discoveryConfig.add(COURSE_DISCOVERY, courseDiscoveryConfig);
+
             JsonObject webviewConfig = new JsonObject();
-            enrollmentConfig.add(TYPE, new JsonPrimitive(course_enrollment_type));
-            webviewConfig.add(COURSE_SEARCH_URL, new JsonPrimitive("fake-url"));
-            webviewConfig.add(COURSE_INFO_URL_TEMPLATE, new JsonPrimitive("fake-url-template"));
-            enrollmentConfig.add("WEBVIEW", webviewConfig);
-            configBase.add(COURSE_ENROLLMENT, enrollmentConfig);
+            courseDiscoveryConfig.add(TYPE, new JsonPrimitive(course_enrollment_type));
+            webviewConfig.add(BASE_URL, new JsonPrimitive("fake-url"));
+            webviewConfig.add(DETAIL_TEMPLATE, new JsonPrimitive("fake-url-template"));
+            courseDiscoveryConfig.add("WEBVIEW", webviewConfig);
 
             Config config = new Config(configBase);
-            assertTrue(config.getCourseDiscoveryConfig().isCourseDiscoveryEnabled());
-            assertEquals(config.getCourseDiscoveryConfig().isWebviewCourseDiscoveryEnabled(), expected);
-            assertEquals(config.getCourseDiscoveryConfig().getCourseSearchUrl(), "fake-url");
-            assertEquals(config.getCourseDiscoveryConfig().getCourseInfoUrlTemplate(), "fake-url-template");
+            assertTrue(config.getDiscoveryConfig().getCourseDiscoveryConfig().isDiscoveryEnabled());
+            assertEquals(config.getDiscoveryConfig().getCourseDiscoveryConfig().isWebviewDiscoveryEnabled(), expected);
+            assertEquals(config.getDiscoveryConfig().getCourseDiscoveryConfig().getBaseUrl(), "fake-url");
+            assertEquals(config.getDiscoveryConfig().getCourseDiscoveryConfig().getInfoUrlTemplate(), "fake-url-template");
         }
     }
 
     @Test
     public void testEnrollmentConfig_withExploreSubjectsEnabled() {
         JsonObject configBase = new JsonObject();
-        JsonObject enrollmentConfig = new JsonObject();
+
+        JsonObject discoveryConfig = new JsonObject();
+        configBase.add(DISCOVERY, discoveryConfig);
+        JsonObject courseDiscoveryConfig = new JsonObject();
+
+        discoveryConfig.add(COURSE_DISCOVERY, courseDiscoveryConfig);
+        courseDiscoveryConfig.add(TYPE, new JsonPrimitive("invalid type"));
+
         JsonObject webviewConfig = new JsonObject();
-        enrollmentConfig.add(TYPE, new JsonPrimitive("WEBVIEW"));
-        webviewConfig.add(COURSE_SEARCH_URL, new JsonPrimitive("fake-url"));
+        courseDiscoveryConfig.add(TYPE, new JsonPrimitive("WEBVIEW"));
+        webviewConfig.add(BASE_URL, new JsonPrimitive("fake-url"));
         webviewConfig.add(EXPLORE_SUBJECTS_URL, new JsonPrimitive("explore-subjects-url"));
-        webviewConfig.add(COURSE_INFO_URL_TEMPLATE, new JsonPrimitive("fake-url-template"));
-        enrollmentConfig.add("WEBVIEW", webviewConfig);
-        configBase.add(COURSE_ENROLLMENT, enrollmentConfig);
+        webviewConfig.add(DETAIL_TEMPLATE, new JsonPrimitive("fake-url-template"));
+        courseDiscoveryConfig.add("WEBVIEW", webviewConfig);
 
         Config config = new Config(configBase);
-        assertTrue(config.getCourseDiscoveryConfig().isCourseDiscoveryEnabled());
-        assertTrue(config.getCourseDiscoveryConfig().isWebviewCourseDiscoveryEnabled());
-        assertEquals(config.getCourseDiscoveryConfig().getCourseSearchUrl(), "fake-url");
-        assertEquals(config.getCourseDiscoveryConfig().getCourseInfoUrlTemplate(), "fake-url-template");
+        assertTrue(config.getDiscoveryConfig().getCourseDiscoveryConfig().isDiscoveryEnabled());
+        assertTrue(config.getDiscoveryConfig().getCourseDiscoveryConfig().isWebviewDiscoveryEnabled());
+        assertEquals(config.getDiscoveryConfig().getCourseDiscoveryConfig().getBaseUrl(), "fake-url");
+        assertEquals(config.getDiscoveryConfig().getCourseDiscoveryConfig().getInfoUrlTemplate(), "fake-url-template");
     }
 
     @Test
diff --git a/build.gradle b/build.gradle
index 64f796c44b..d85b67b612 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,7 +17,7 @@ buildscript {
     }
     dependencies {
         classpath "com.android.tools.build:gradle:${GRADLE_PLUGIN_VERSION}"
-        classpath 'com.google.gms:google-services:4.0.1'
+        classpath 'com.google.gms:google-services:4.2.0'
     }
 }
 
diff --git a/openedx.yaml b/openedx.yaml
index 3bdc6bdd61..e81dcb1c3b 100644
--- a/openedx.yaml
+++ b/openedx.yaml
@@ -4,7 +4,7 @@
 nick: andr
 oeps: {}
 owner: edx/edx-mobile-push
+openedx-release: {ref: release/latest}
 tags:
   - mobile
   - android
-track-pulls: true
diff --git a/resources/compile_android.sh b/resources/compile_android.sh
new file mode 100644
index 0000000000..eeac070c02
--- /dev/null
+++ b/resources/compile_android.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+set -e
+
+# Clear old outputs if any 
+rm -rf OpenEdXMobile/build/
+
+# Compile app 
+echo 'Compiling Android App'
+./gradlew printConfig assembleProdDebuggable 
diff --git a/resources/validate_builds.sh b/resources/validate_builds.sh
new file mode 100644
index 0000000000..dfc6a3b6d4
--- /dev/null
+++ b/resources/validate_builds.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+set -e
+
+# validated if created build is debug build 
+EXPECTED_FLAG='application-debuggable'
+
+for APK in $APK_PATH/"*.apk"; do
+    echo "Checking if $APK is debuggable"
+    DEBUGGABLE=`$ANDROID_HOME/build-tools/27.0.3/aapt dump badging $APK |grep $EXPECTED_FLAG`
+    if [ $? == 0 ]; then
+       echo "The build is debuggable"
+       exit 0
+    else
+       echo "The build is not debuggable"
+       exit 1
+    fi
+done