diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index fb27cf786..d111b8ceb 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.digitalcampus.mobile.learning"
     android:versionCode="56"
-    android:versionName="5.5.0">
+    android:versionName="@string/version_name">
 
     <uses-sdk
         android:minSdkVersion="14"
@@ -42,7 +42,7 @@
         <activity
             android:name="org.digitalcampus.oppia.activity.OppiaMobileActivity"
             android:label="@string/app_name"
-            android:theme="@style/Oppia.Theme.Dark">
+            android:theme="@style/Oppia.ToolbarTheme.Dark">
         </activity>
         <activity
             android:name="org.digitalcampus.oppia.activity.CourseIndexActivity"
@@ -51,7 +51,8 @@
         </activity>
         <activity
             android:name="org.digitalcampus.oppia.activity.CourseActivity"
-            android:label="@string/title_activity_course" 
+            android:label="@string/title_activity_course"
+            android:theme="@style/Oppia.ToolbarTheme"
             android:windowSoftInputMode="stateAlwaysHidden" />
         <activity
             android:name="org.digitalcampus.oppia.activity.DownloadActivity"
@@ -66,9 +67,11 @@
             android:label="@string/title_prefs"/>
         <activity
             android:name="org.digitalcampus.oppia.activity.AboutActivity"
+            android:theme="@style/Oppia.ToolbarTheme"
             android:label="@string/title_about" />
         <activity
             android:name="org.digitalcampus.oppia.activity.WelcomeActivity"
+            android:theme="@style/Oppia.ToolbarTheme"
             android:label="@string/title_welcome" />
          <activity
             android:name="org.digitalcampus.oppia.activity.MonitorActivity"
@@ -82,6 +85,7 @@
             android:label="@string/title_download_media" />
          <activity
             android:name="org.digitalcampus.oppia.activity.ScorecardActivity"
+            android:theme="@style/Oppia.ToolbarTheme"
             android:label="@string/title_scorecard" />
          <activity
             android:name="org.digitalcampus.oppia.activity.SearchActivity"
diff --git a/res/drawable-hdpi/quiz_cross.png b/res/drawable-hdpi/quiz_cross.png
index bf4766726..ae098773c 100644
Binary files a/res/drawable-hdpi/quiz_cross.png and b/res/drawable-hdpi/quiz_cross.png differ
diff --git a/res/drawable-hdpi/quiz_tick.png b/res/drawable-hdpi/quiz_tick.png
index be1583924..48805411a 100644
Binary files a/res/drawable-hdpi/quiz_tick.png and b/res/drawable-hdpi/quiz_tick.png differ
diff --git a/res/drawable-xhdpi/drawer_header.png b/res/drawable-xhdpi/drawer_header.png
new file mode 100644
index 000000000..20f542151
Binary files /dev/null and b/res/drawable-xhdpi/drawer_header.png differ
diff --git a/res/drawable-xhdpi/ic_scorecard.png b/res/drawable-xhdpi/ic_scorecard.png
new file mode 100644
index 000000000..3db21133b
Binary files /dev/null and b/res/drawable-xhdpi/ic_scorecard.png differ
diff --git a/res/layout/activity_about.xml b/res/layout/activity_about.xml
index 5198b3972..e85b310c5 100644
--- a/res/layout/activity_about.xml
+++ b/res/layout/activity_about.xml
@@ -1,14 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-     >
+<android.support.design.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/coordinator"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <android.support.v4.view.ViewPager
-        xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/activity_about_pager"
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent" >
+        android:layout_height="fill_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" >
     </android.support.v4.view.ViewPager>
 
-</merge>
\ No newline at end of file
+    <android.support.design.widget.AppBarLayout
+        android:id="@+id/appbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+
+        <include android:id="@+id/toolbar" layout="@layout/toolbar" />
+
+        <android.support.design.widget.TabLayout
+            android:id="@+id/tabs_toolbar"
+            android:layout_width="match_parent"
+            android:background="@color/highlight_label"
+            android:layout_height="wrap_content"
+            style="@style/Oppia.ToolbarTheme.AppTabLayout"
+            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"/>
+    </android.support.design.widget.AppBarLayout>
+
+</android.support.design.widget.CoordinatorLayout>
diff --git a/res/layout/activity_course.xml b/res/layout/activity_course.xml
index 4ac8c29bf..4d540f276 100644
--- a/res/layout/activity_course.xml
+++ b/res/layout/activity_course.xml
@@ -1,15 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical">
-
-    <android.support.v4.view.ViewPager 
-        xmlns:android="http://schemas.android.com/apk/res/android"
-	    android:id="@+id/activity_widget_pager"
-	    android:layout_width="fill_parent"
-	    android:layout_height="fill_parent">
-	</android.support.v4.view.ViewPager>
-
-</merge>
\ No newline at end of file
+<android.support.design.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/coordinator"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <android.support.v4.view.ViewPager
+        android:id="@+id/activity_widget_pager"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" >
+    </android.support.v4.view.ViewPager>
+
+    <android.support.design.widget.AppBarLayout
+        android:id="@+id/appbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+
+        <include android:id="@+id/toolbar" layout="@layout/toolbar" />
+
+        <android.support.design.widget.TabLayout
+            android:id="@+id/tabs_toolbar"
+            android:layout_width="match_parent"
+            android:background="@color/highlight_label"
+            android:layout_height="wrap_content"
+            style="@style/Oppia.ToolbarTheme.AppTabLayout"
+            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"/>
+    </android.support.design.widget.AppBarLayout>
+
+</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/res/layout/activity_course_index.xml b/res/layout/activity_course_index.xml
index 3490c814a..b73bfe09e 100644
--- a/res/layout/activity_course_index.xml
+++ b/res/layout/activity_course_index.xml
@@ -34,6 +34,7 @@
         android:dividerHeight="1dp"
         android:listSelector="@drawable/background_change_pressed"
         android:cacheColorHint="#00000000"
+        android:foreground="?android:windowContentOverlay"
         />
 
 </merge>
\ No newline at end of file
diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml
index a30d52f98..7b3be0bff 100644
--- a/res/layout/activity_main.xml
+++ b/res/layout/activity_main.xml
@@ -1,114 +1,142 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
-    
-    <org.digitalcampus.oppia.application.ScheduleReminders
-        android:id="@+id/schedule_reminders"
-        android:background="@drawable/message_background"
-        android:layout_width="fill_parent" 
-        android:layout_height="wrap_content"
-        android:visibility="gone" />
+<android.support.v4.widget.DrawerLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:id="@+id/drawer">
 
     <FrameLayout
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent">
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
         <LinearLayout
-            android:id="@+id/loading_courses"
             android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="2dip"
-                android:gravity="center"
-                android:text="@string/loading_courses"
-                android:textSize="18sp"
-                android:textColor="@color/text_light"/>
-        </LinearLayout>
-
-        <LinearLayout
+            android:layout_height="fill_parent"
             android:orientation="vertical"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:paddingTop="@dimen/tool_bar_top_padding"
+            android:layout_marginTop="?attr/actionBarSize">
 
-            <ListView
-                android:id="@+id/course_list"
+            <org.digitalcampus.oppia.application.ScheduleReminders
+                android:id="@+id/schedule_reminders"
+                android:background="@drawable/message_background"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:listSelector="@drawable/background_change_pressed"
-                android:divider="@color/list_divider"
-                android:dividerHeight="1dp"
-                android:cacheColorHint="#00000000"
-                android:scrollingCache="false" />
-
-            <LinearLayout
-                android:id="@+id/no_courses"
+                android:visibility="gone" />
+
+            <FrameLayout
                 android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:orientation="vertical"
-                android:visibility="gone" >
+                android:layout_height="fill_parent">
 
-                <TextView
-                    android:id="@+id/manage_courses_text"
-                    android:layout_width="wrap_content"
+                <LinearLayout
+                    android:id="@+id/loading_courses"
+                    android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
-                    android:layout_margin="2dip"
                     android:gravity="center"
-                    android:text="@string/no_courses"
-                    android:textSize="18sp"
-                    android:textColor="@color/text_light"/>
+                    android:orientation="vertical">
 
-                <Button
-                    android:id="@+id/manage_courses_btn"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="10dp"
-                    android:gravity="center"
-                    android:text="@string/title_download_activity"/>
-            </LinearLayout>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="2dip"
+                        android:gravity="center"
+                        android:text="@string/loading_courses"
+                        android:textSize="18sp"
+                        android:textColor="@color/text_light"/>
+                </LinearLayout>
 
-        </LinearLayout>
+                <LinearLayout
+                    android:orientation="vertical"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
 
-        <LinearLayout
-            android:id="@+id/home_messages"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:background="@drawable/message_background"
-            android:orientation="horizontal"
-            android:padding="5dp"
-            android:weightSum="1.0"
-            android:visibility="gone" >
-
-             <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="0.6" >
+                    <ListView
+                        android:id="@+id/course_list"
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:listSelector="@drawable/background_change_pressed"
+                        android:divider="@color/list_divider"
+                        android:dividerHeight="1dp"
+                        android:cacheColorHint="#00000000"
+                        android:scrollingCache="false" />
+
+                    <LinearLayout
+                        android:id="@+id/no_courses"
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center"
+                        android:orientation="vertical"
+                        android:visibility="gone" >
+
+                        <TextView
+                            android:id="@+id/manage_courses_text"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_margin="2dip"
+                            android:gravity="center"
+                            android:text="@string/no_courses"
+                            android:textSize="18sp"
+                            android:textColor="@color/text_light"/>
 
-                <TextView
-                    android:id="@+id/home_message"
+                        <Button
+                            android:id="@+id/manage_courses_btn"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_margin="10dp"
+                            android:gravity="center"
+                            android:text="@string/title_download_activity"/>
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/home_messages"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
-                    android:gravity="center_vertical"
-                    android:textSize="14sp"
-                    android:textColor="@color/text_dark"/>
-            </LinearLayout>
-
-            <Button
-                android:id="@+id/message_action_button"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight=".4"
-                android:gravity="center_vertical|center"
-                android:text="@string/scan_media_download_button"
-                android:textColor="@color/text_dark"/>
+                    android:background="@drawable/message_background"
+                    android:orientation="horizontal"
+                    android:padding="5dp"
+                    android:weightSum="1.0"
+                    android:visibility="gone" >
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0.6" >
+
+                        <TextView
+                            android:id="@+id/home_message"
+                            android:layout_width="fill_parent"
+                            android:layout_height="wrap_content"
+                            android:gravity="center_vertical"
+                            android:textSize="14sp"
+                            android:textColor="@color/text_dark"/>
+                    </LinearLayout>
+
+                    <Button
+                        android:id="@+id/message_action_button"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight=".4"
+                        android:gravity="center_vertical|center"
+                        android:text="@string/scan_media_download_button"
+                        android:textColor="@color/text_dark"/>
+                </LinearLayout>
+            </FrameLayout>
+
         </LinearLayout>
+        <include android:id="@+id/toolbar" layout="@layout/toolbar" />
+
     </FrameLayout>
 
-</LinearLayout>
\ No newline at end of file
+    <android.support.design.widget.NavigationView
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_gravity="start"
+        android:fitsSystemWindows="true"
+        android:id="@+id/navigation_view"
+        app:headerLayout="@layout/drawer_header"
+        app:theme="@style/Oppia.Theme"
+        app:menu="@menu/drawer_main" />
+
+    </android.support.v4.widget.DrawerLayout>
\ No newline at end of file
diff --git a/res/layout/activity_scorecard.xml b/res/layout/activity_scorecard.xml
index e9372cbc6..325e685dd 100644
--- a/res/layout/activity_scorecard.xml
+++ b/res/layout/activity_scorecard.xml
@@ -1,14 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
+<android.support.design.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/coordinator"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <android.support.v4.view.ViewPager
-        xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/activity_scorecard_pager"
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent" >
+        android:layout_height="fill_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" >
     </android.support.v4.view.ViewPager>
 
-</merge>
\ No newline at end of file
+    <android.support.design.widget.AppBarLayout
+        android:id="@+id/appbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+
+        <include android:id="@+id/toolbar" layout="@layout/toolbar" />
+
+        <android.support.design.widget.TabLayout
+            android:id="@+id/tabs_toolbar"
+            android:layout_width="match_parent"
+            android:background="@color/highlight_label"
+            android:layout_height="wrap_content"
+            style="@style/Oppia.ToolbarTheme.AppTabLayout"
+            app:tabGravity="fill"
+            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"/>
+    </android.support.design.widget.AppBarLayout>
+
+</android.support.design.widget.CoordinatorLayout>
diff --git a/res/layout/activity_welcome.xml b/res/layout/activity_welcome.xml
index 5168623d1..7d16fc383 100644
--- a/res/layout/activity_welcome.xml
+++ b/res/layout/activity_welcome.xml
@@ -1,14 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
+<android.support.design.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/coordinator"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <android.support.v4.view.ViewPager
-        xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/activity_welcome_pager"
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent" >
+        android:layout_height="fill_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" >
     </android.support.v4.view.ViewPager>
 
-</LinearLayout>
\ No newline at end of file
+    <android.support.design.widget.AppBarLayout
+        android:id="@+id/appbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+
+        <include android:id="@+id/toolbar" layout="@layout/toolbar" />
+
+        <android.support.design.widget.TabLayout
+            android:id="@+id/tabs_toolbar"
+            android:layout_width="match_parent"
+            android:background="@color/highlight_label"
+            android:layout_height="wrap_content"
+            style="@style/Oppia.ToolbarTheme.AppTabLayout"
+            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"/>
+    </android.support.design.widget.AppBarLayout>
+
+</android.support.design.widget.CoordinatorLayout>
diff --git a/res/layout/drawer_header.xml b/res/layout/drawer_header.xml
new file mode 100644
index 000000000..06a02549c
--- /dev/null
+++ b/res/layout/drawer_header.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:background="@color/highlight_mid"
+    android:layout_height="180dp">
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:src="@drawable/drawer_header"
+        android:id="@+id/imageView8"
+        android:padding="0dp"
+        android:scaleType="centerCrop"
+        android:layout_gravity="top"/>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="18dp"
+        >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/drawer_username"
+            android:gravity="left"
+            android:textSize="14sp"
+            android:textColor="#fff"
+            android:layout_above="@+id/drawer_user_fullname"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="14sp"
+            android:textColor="#FFF"
+            android:textStyle="bold"
+            android:gravity="left"
+            android:paddingBottom="4dp"
+            android:id="@+id/drawer_user_fullname"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/version_name"
+            android:id="@+id/drawer_version_name"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"/>
+    </RelativeLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/tablayout_fixed_tab.xml b/res/layout/tablayout_fixed_tab.xml
new file mode 100644
index 000000000..56941139d
--- /dev/null
+++ b/res/layout/tablayout_fixed_tab.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="wrap_content"
+              android:layout_height="match_parent">
+    <TextView
+        android:layout_width="130dp"
+        android:layout_height="match_parent"
+        style="@style/Oppia.ToolbarTheme.AppTabTextAppearance"
+        android:id="@+id/tabTitle"
+        android:layout_gravity="center"
+        android:gravity="center_vertical|center_horizontal"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/toolbar.xml b/res/layout/toolbar.xml
new file mode 100644
index 000000000..d1581dcca
--- /dev/null
+++ b/res/layout/toolbar.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.Toolbar
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?attr/actionBarSize"
+    app:theme="@style/Oppia.Theme.Dark"
+    android:elevation="4dp"
+    style="@style/ActionBar.Solid.Om"
+    android:paddingTop="@dimen/tool_bar_top_padding"
+    app:popupTheme="@style/ThemeOverlay.AppCompat.Light">
+</android.support.v7.widget.Toolbar>
\ No newline at end of file
diff --git a/res/menu/activity_course_index.xml b/res/menu/activity_course_index.xml
index ba5978739..9c1da9e2d 100644
--- a/res/menu/activity_course_index.xml
+++ b/res/menu/activity_course_index.xml
@@ -1,10 +1,11 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:oppiamobile="http://schemas.android.com/apk/res-auto" >
+      xmlns:oppiamobile="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/points"
-        android:showAsAction="always"
-        android:actionLayout="@layout/points"/>
+        oppiamobile:showAsAction="always"
+        oppiamobile:actionLayout="@layout/points"
+        android:title=""/>
     <item
         android:id="@+id/menu_scorecard"
         android:icon="@drawable/ic_menu_start_conversation"
diff --git a/res/menu/activity_main.xml b/res/menu/activity_main.xml
index e01ceeed3..9bb5f1db8 100644
--- a/res/menu/activity_main.xml
+++ b/res/menu/activity_main.xml
@@ -1,10 +1,11 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:oppiamobile="http://schemas.android.com/apk/res-auto" >
+      xmlns:oppiamobile="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/points"
-        android:actionLayout="@layout/points"
-        android:showAsAction="always"/>
-    <item
+        oppiamobile:actionLayout="@layout/points"
+        oppiamobile:showAsAction="always"
+        android:title=""/>
+    <!--<item
         android:id="@+id/menu_download"
         android:icon="@android:drawable/ic_menu_add"
         android:title="@string/menu_download"/>
@@ -34,5 +35,5 @@
     <item
         android:id="@+id/menu_logout"
         android:icon="@drawable/ic_action_logout"
-        android:title="@string/menu_logout"/>
+        android:title="@string/menu_logout"/>-->
 </menu>
\ No newline at end of file
diff --git a/res/menu/drawer_main.xml b/res/menu/drawer_main.xml
new file mode 100644
index 000000000..cee026a2f
--- /dev/null
+++ b/res/menu/drawer_main.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <group android:id="@+id/drawer_menu_main" android:checkableBehavior="none"> <!--android:checkableBehavior="single"-->
+        <item
+            android:id="@+id/menu_download"
+            android:icon="@android:drawable/ic_menu_add"
+            android:title="@string/menu_download"/>
+        <item
+            android:id="@+id/menu_search"
+            android:icon="@drawable/abs__ic_search"
+            android:title="@string/menu_search"/>
+
+        <item
+            android:id="@+id/menu_language"
+            android:icon="@drawable/ic_menu_start_conversation"
+            android:title="@string/menu_language"/>
+        <item
+            android:id="@+id/menu_scorecard"
+            android:icon="@drawable/ic_scorecard"
+            android:title="@string/menu_scorecard"/>
+        <item
+            android:id="@+id/menu_monitor"
+            android:icon="@drawable/default_icon_quiz"
+            android:title="@string/menu_monitor"/>
+
+    </group>
+
+    <group android:id="@+id/drawer_menu_secondary">
+        <item
+            android:id="@+id/menu_settings"
+            android:icon="@android:drawable/ic_menu_preferences"
+            android:title="@string/menu_settings"/>
+        <item
+            android:id="@+id/menu_about"
+            android:icon="@android:drawable/ic_menu_info_details"
+            android:title="@string/menu_about"/>
+        <item
+            android:id="@+id/menu_logout"
+            android:icon="@drawable/ic_action_logout"
+            android:title="@string/menu_logout"/>
+    </group>
+</menu>
\ No newline at end of file
diff --git a/res/values-v14/styles_oppia.xml b/res/values-v14/styles_oppia.xml
index 34dcc1a59..ab4043f99 100644
--- a/res/values-v14/styles_oppia.xml
+++ b/res/values-v14/styles_oppia.xml
@@ -19,7 +19,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <style name="Oppia.Theme" parent="android:Theme.Holo.Light">
+    <style name="Oppia.Theme" parent="Theme.AppCompat.Light.DarkActionBar">
+
         <item name="android:actionBarItemBackground">@drawable/selectable_background_om</item>
         <item name="android:popupMenuStyle">@style/PopupMenu.Om</item>
         <item name="android:dropDownListViewStyle">@style/DropDownListView.Om</item>
@@ -31,26 +32,23 @@
         <item name="android:actionModeSplitBackground">@drawable/cab_background_bottom_om</item>
         <item name="android:actionModeCloseButtonStyle">@style/ActionButton.CloseMode.Om</item>
         <item name="android:windowBackground">@color/background_light</item>
+        <item name="android:windowActionBar">true</item>
+        <item name="windowActionBar">true</item>
+        <item name="actionBarTheme">@style/Oppia.Theme.ActionBarTheme</item>
+        <item name="actionBarTabStyle">@style/ActionBarTabStyle.Om</item>
+        <item name="actionBarTabTextStyle">@style/OM.Light.TabText.Style</item>
+        <item name="actionDropDownStyle">@style/DropDownNav.Om</item>
+        <item name="actionBarStyle">@style/ActionBar.Solid.Om</item>
+
+        <item name="colorPrimary">@color/highlight_light</item>
+        <item name="colorPrimaryDark">@color/highlight_dark</item>
+        <item name="colorAccent">@color/highlight_secondary</item>
     </style>
     
     <style name="Oppia.Theme.Dark" parent="@style/Oppia.Theme">
         <item name="android:windowBackground">@color/background_dark</item>
     </style>
 
-    <style name="ActionBar.Solid.Om" parent="android:Widget.Holo.ActionBar.Solid">
-        <item name="android:background">@drawable/actionbar_background_gradient</item>
-        <item name="android:backgroundStacked">@drawable/ab_stacked_solid_om</item>
-        <item name="android:backgroundSplit">@drawable/ab_stacked_solid_om</item>
-        <item name="android:progressBarStyle">@style/ProgressBar.Om</item>
-        <item name="android:titleTextStyle">@style/Oppia.ActionBar.TitleTextStyle</item>
-    </style>
-    
-    <style name="Oppia.ActionBar.TitleTextStyle" parent="android:Widget.Holo.ActionBar.Solid">
-        <item name="android:textColor">@color/text_dark</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:textSize">20sp</item>
-    </style>
-    
     <style name="OM.Light.TabText.Style" parent="android:Widget.ActionBar.TabText">
             <item name="android:textAppearance">@android:style/TextAppearance.Medium</item>
             <item name="android:textSize">12sp</item>
diff --git a/res/values-v21/dimens.xml b/res/values-v21/dimens.xml
new file mode 100644
index 000000000..5d7e9a93a
--- /dev/null
+++ b/res/values-v21/dimens.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="tool_bar_top_padding">24dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/res/values-v21/styles_oppia.xml b/res/values-v21/styles_oppia.xml
new file mode 100644
index 000000000..956a76ead
--- /dev/null
+++ b/res/values-v21/styles_oppia.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Oppia.ToolbarTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:colorPrimary">@color/highlight_light</item>
+        <item name="android:colorPrimaryDark">@color/highlight_shadow</item>
+        <item name="android:colorAccent">@color/highlight_secondary</item>
+        <item name="colorPrimary">@color/highlight_light</item>
+        <item name="colorPrimaryDark">@color/highlight_shadow</item>
+        <item name="colorAccent">@color/highlight_secondary</item>
+        <item name="windowActionModeOverlay">true</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowTranslucentStatus">true</item>
+    </style>
+
+    <style name="Oppia.ToolbarTheme.Dark" parent="@style/Oppia.ToolbarTheme">
+        <item name="android:windowBackground">@color/background_dark</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/res/values/colors_oppia.xml b/res/values/colors_oppia.xml
index 4630098c4..f6603bb57 100644
--- a/res/values/colors_oppia.xml
+++ b/res/values/colors_oppia.xml
@@ -10,6 +10,7 @@
     <color name="highlight_light">#74B042</color>
     <color name="highlight_mid">#9aca3c</color>
     <color name="highlight_dark">#495525</color>
+    <color name="highlight_shadow">#597725</color>
     <color name="default_icon_foreground">#666666</color>
     <color name="button_background">#eeeeee</color>
     <color name="activity_icon_background">#ffffff</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 3a48f3190..4ba4b2d1a 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -14,5 +14,6 @@
     <dimen name="range_tick_label_font_size">15dp</dimen>
     <dimen name="domain_tick_label_font_size">15dp</dimen>
     <dimen name="legend_text_font_size">20dp</dimen>
+    <dimen name="tool_bar_top_padding">0dp</dimen>
 
 </resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 128c900aa..098ed11dd 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -306,6 +306,7 @@
     <string name="sequencing.dialog_title">Activity locked</string>
     <string name="sequencing.section.message">You must complete the previous activities in this section before this one becomes available to you.</string>
     <string name="sequencing.course.message">You must complete all the previous activities in the course before this one becomes available to you.</string>
+    <string name="version_name">5.5.0</string>
 
 </resources>
 
diff --git a/res/values/styles_oppia.xml b/res/values/styles_oppia.xml
index ec622977e..060781762 100644
--- a/res/values/styles_oppia.xml
+++ b/res/values/styles_oppia.xml
@@ -20,16 +20,52 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <style name="Oppia.Theme" parent="android:Theme.Holo.Light">
+    <style name="Oppia.Theme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <item name="actionBarTheme">@style/Oppia.Theme.ActionBarTheme</item>
         <item name="android:windowBackground">@color/background_light</item>
-        <item name="android:actionBarTabTextStyle">@style/OM.Light.TabText.Style</item>
+        <item name="actionBarTabTextStyle">@style/OM.Light.TabText.Style</item>
+        <item name="actionDropDownStyle">@style/DropDownNav.Om</item>
+        <item name="actionBarStyle">@style/ActionBar.Solid.Om</item>
+        <item name="actionBarTabStyle">@style/ActionBarTabStyle.Om</item>
+        <item name="android:windowActionBar">true</item>
+        <item name="windowActionBar">true</item>
+
+        <item name="colorPrimary">@color/highlight_light</item>
+        <item name="colorPrimaryDark">@color/highlight_shadow</item>
+        <item name="colorAccent">@color/highlight_secondary</item>
+        <item name="alertDialogTheme">@style/Oppia.AlertDialogStyle</item>
     </style>
 
     <style name="Oppia.Theme.Dark" parent="@style/Oppia.Theme">
         <item name="android:windowBackground">@color/background_dark</item>
     </style>
 
-    <style name="Oppia.ActionBar.TitleTextStyle" parent="android:Widget.Holo.ActionBar.Solid">
+    <style name="Oppia.ToolbarTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="colorPrimary">@color/highlight_light</item>
+        <item name="colorPrimaryDark">@color/highlight_shadow</item>
+        <item name="colorAccent">@color/highlight_secondary</item>
+        <item name="windowActionModeOverlay">true</item>
+    </style>
+
+    <style name="Oppia.ToolbarTheme.Dark" parent="@style/Oppia.ToolbarTheme">
+        <item name="android:windowBackground">@color/background_dark</item>
+    </style>
+
+    <style name="ActionBar.Solid.Om" parent="android:Widget.Holo.ActionBar.Solid">
+        <item name="android:background">@drawable/actionbar_background_gradient</item>
+        <item name="android:backgroundStacked">@drawable/ab_stacked_solid_om</item>
+        <item name="android:backgroundSplit">@drawable/ab_stacked_solid_om</item>
+        <item name="android:progressBarStyle">@style/ProgressBar.Om</item>
+        <item name="android:titleTextStyle">@style/Oppia.ActionBar.TitleTextStyle</item>
+        <item name="background">@drawable/actionbar_background_gradient</item>
+        <item name="backgroundStacked">@drawable/ab_stacked_solid_om</item>
+        <item name="backgroundSplit">@drawable/ab_stacked_solid_om</item>
+        <item name="progressBarStyle">@style/ProgressBar.Om</item>
+        <item name="titleTextStyle">@style/Oppia.ActionBar.TitleTextStyle</item>
+        <item name="elevation">4dp</item>
+    </style>
+
+    <style name="Oppia.ActionBar.TitleTextStyle" parent="Base.ThemeOverlay.AppCompat.ActionBar">
         <item name="android:textColor">@color/text_dark</item>
         <item name="android:textStyle">bold</item>
         <item name="android:textSize">20sp</item>
@@ -46,6 +82,7 @@
 
     <style name="ActionBarTabStyle.Om" parent="android:Widget.ActionBar.TabView">
         <item name="android:background">@drawable/tab_indicator_ab_om</item>
+        <item name="background">@drawable/tab_indicator_ab_om</item>
     </style>
 
     
@@ -86,4 +123,43 @@
         <item name="android:maxLines">2</item>
     </style>
 
+    <style name="Oppia.Theme.ActionBarTheme">
+        <item name="colorControlNormal">@color/text_dark</item>
+    </style>
+
+    <style name="Oppia.AlertDialogStyle" parent="Theme.AppCompat.Light.Dialog">
+        <item name="colorAccent">@color/highlight_secondary</item> <!-- Used for the buttons -->
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:windowTitleStyle">@style/Oppia.AlertDialogStyle.TitleTextStyle</item>
+    </style>
+
+    <style name="Oppia.AlertDialogStyle.TitleTextStyle" parent="Theme.AppCompat.Light.Dialog">
+        <item name="android:textColor">@color/highlight_dark</item>
+        <item name="android:textAppearance">@style/TextAppearance.AppCompat.Title</item>
+    </style>
+
+    <style name="Oppia.ToolbarTheme.Toolbar" parent="Widget.AppCompat.Toolbar">
+        <item name="android:background">@drawable/actionbar_background_gradient</item>
+        <item name="background">@drawable/actionbar_background_gradient</item>
+    </style>
+
+    <style name="Oppia.ToolbarTheme.AppTabLayout" parent="Widget.Design.TabLayout">
+        <item name="tabMaxWidth">100dp</item>
+        <item name="tabMinWidth">60dp</item>
+        <item name="tabIndicatorColor">@color/highlight_mid</item>
+        <item name="tabIndicatorHeight">5dp</item>
+        <item name="tabPaddingStart">6dp</item>
+        <item name="tabPaddingEnd">6dp</item>
+        <item name="tabTextAppearance">@style/Oppia.ToolbarTheme.AppTabTextAppearance</item>
+    </style>
+
+    <style name="Oppia.ToolbarTheme.AppTabTextAppearance" parent="TextAppearance.Design.Tab">
+        <item name="android:textAppearance">@android:style/TextAppearance.Medium</item>
+        <item name="android:textSize">12sp</item>
+        <item name="android:textStyle">normal</item>
+        <item name="android:textColor">@color/text_light</item>
+        <item name="android:ellipsize">end</item>
+        <item name="android:maxLines">2</item>
+    </style>
+
 </resources>
\ No newline at end of file
diff --git a/src/org/digitalcampus/oppia/activity/AboutActivity.java b/src/org/digitalcampus/oppia/activity/AboutActivity.java
index 7af36b73f..9979897db 100644
--- a/src/org/digitalcampus/oppia/activity/AboutActivity.java
+++ b/src/org/digitalcampus/oppia/activity/AboutActivity.java
@@ -17,15 +17,16 @@
 
 package org.digitalcampus.oppia.activity;
 
-import android.app.ActionBar;
-import android.app.ActionBar.Tab;
-import android.app.FragmentTransaction;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.support.design.widget.TabLayout;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentActivity;
+import android.support.v4.app.FragmentTransaction;
 import android.support.v4.view.ViewPager;
+import android.support.v7.app.ActionBar;
+import android.support.v7.widget.Toolbar;
 import android.view.MenuItem;
 
 import org.digitalcampus.mobile.learning.R;
@@ -40,7 +41,7 @@
 import java.util.List;
 import java.util.Locale;
 
-public class AboutActivity extends AppActivity implements ActionBar.TabListener {
+public class AboutActivity extends AppActivity {
 
 	public static final String TAG = AboutActivity.class.getSimpleName();
 	
@@ -52,6 +53,7 @@ public class AboutActivity extends AppActivity implements ActionBar.TabListener
 
 	private ActionBar actionBar;
 	private ViewPager viewPager;
+    private TabLayout tabs;
 	private ActivityPagerAdapter apAdapter;
 	private int currentTab = 0;
 	private SharedPreferences prefs;
@@ -61,13 +63,17 @@ public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 
 		setContentView(R.layout.activity_about);
-		actionBar = getActionBar();
+		actionBar = getSupportActionBar();
 		prefs = PreferenceManager.getDefaultSharedPreferences(this);
 		viewPager = (ViewPager) findViewById(R.id.activity_about_pager);
-		
-		actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
-		actionBar.setDisplayHomeAsUpEnabled(true);
-		actionBar.setHomeButtonEnabled(true);
+
+        tabs = (TabLayout) findViewById(R.id.tabs_toolbar);
+
+        setSupportActionBar((Toolbar) findViewById(R.id.toolbar));
+        actionBar = getSupportActionBar();
+        actionBar.setDisplayHomeAsUpEnabled(true);
+        actionBar.setHomeButtonEnabled(true);
+        actionBar.setDisplayShowTitleEnabled(true);
 		
 		Bundle bundle = this.getIntent().getExtras();
 		if (bundle != null) {
@@ -80,86 +86,35 @@ public void onStart() {
 		super.onStart();
 
 		String lang = prefs.getString(PrefsActivity.PREF_LANGUAGE, Locale.getDefault().getLanguage());
-		
-		actionBar.removeAllTabs();
 		List<Fragment> fragments = new ArrayList<Fragment>();
+        List<String> titles = new ArrayList<>();
 		
 		Fragment fAbout = AboutFragment.newInstance();
 		fragments.add(fAbout);
+        titles.add(this.getString(R.string.tab_title_about));
 		
 		String urlHelp = Storage.getLocalizedFilePath(this, lang, "help.html");
 		Fragment fHelp = OppiaWebViewFragment.newInstance(TAB_HELP, urlHelp);
 		fragments.add(fHelp);
+        titles.add(this.getString(R.string.tab_title_help));
 		
 		String url = Storage.getLocalizedFilePath(this,lang, "privacy.html");
 		Fragment fPrivacy = OppiaWebViewFragment.newInstance(TAB_PRIVACY, url);
 		fragments.add(fPrivacy);
+        titles.add(this.getString(R.string.tab_title_privacy));
 		
 		Fragment fStats = StatsFragment.newInstance();
 		fragments.add(fStats);
+        titles.add(this.getString(R.string.tab_title_activity));
 		
-		
-		apAdapter = new ActivityPagerAdapter(getSupportFragmentManager(), fragments);
+		apAdapter = new ActivityPagerAdapter(this, getSupportFragmentManager(), fragments, titles);
 		viewPager.setAdapter(apAdapter);
+        tabs.setupWithViewPager(viewPager);
+        tabs.setTabMode(TabLayout.MODE_FIXED);
+        tabs.setTabGravity(TabLayout.GRAVITY_FILL);
 
-		boolean setSelected = false;
-		if (currentTab == AboutActivity.TAB_ABOUT){
-			setSelected = true;
-		} else {
-			setSelected = false;
-		}
-		actionBar.addTab(actionBar.newTab().setText(this.getString(R.string.tab_title_about)).setTabListener(this), TAB_ABOUT, setSelected);
-		if (currentTab == AboutActivity.TAB_HELP){
-			setSelected = true;
-		}else {
-			setSelected = false;
-		}
-		actionBar.addTab(actionBar.newTab().setText(this.getString(R.string.tab_title_help)).setTabListener(this), TAB_HELP, setSelected);
-		if (currentTab == AboutActivity.TAB_PRIVACY){
-			setSelected = true;
-		}else {
-			setSelected = false;
-		}
-		actionBar.addTab(actionBar.newTab().setText(this.getString(R.string.tab_title_privacy)).setTabListener(this), TAB_PRIVACY, setSelected);
-
-		if (currentTab == AboutActivity.TAB_STATS){
-			setSelected = true;
-		}else {
-			setSelected = false;
-		}
-		actionBar.addTab(actionBar.newTab().setText(this.getString(R.string.tab_title_activity)).setTabListener(this), TAB_STATS, setSelected);
 		viewPager.setCurrentItem(currentTab);
-		viewPager.setOnPageChangeListener(new ViewPager.OnPageChangeListener() {
-
-			public void onPageScrollStateChanged(int arg0) {
-				// do nothing
-			}
-
-			public void onPageScrolled(int arg0, float arg1, int arg2) {
-				// do nothing
-			}
-
-			public void onPageSelected(int arg0) {
-				actionBar.setSelectedNavigationItem(arg0);
-			}
-
-		});
-	}
-
-	public void onTabSelected(Tab tab, FragmentTransaction ft) {
-		viewPager.setCurrentItem(tab.getPosition());
-		this.currentTab = tab.getPosition();
-		
-	}
-
-	public void onTabUnselected(Tab tab, FragmentTransaction ft) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	public void onTabReselected(Tab tab, FragmentTransaction ft) {
-		// TODO Auto-generated method stub
-		
+        viewPager.setOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabs));
 	}
 	
 	@Override
diff --git a/src/org/digitalcampus/oppia/activity/AppActivity.java b/src/org/digitalcampus/oppia/activity/AppActivity.java
index e0db78b02..ceaa26372 100644
--- a/src/org/digitalcampus/oppia/activity/AppActivity.java
+++ b/src/org/digitalcampus/oppia/activity/AppActivity.java
@@ -19,19 +19,25 @@
 
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.support.v4.app.FragmentActivity;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.MenuItem;
 
 import java.util.ArrayList;
+import java.util.Locale;
 
 import org.digitalcampus.mobile.learning.R;
 import org.digitalcampus.oppia.application.MobileLearning;
 import org.digitalcampus.oppia.application.ScheduleReminders;
 import org.digitalcampus.oppia.application.SessionManager;
+import org.digitalcampus.oppia.model.Course;
+import org.digitalcampus.oppia.model.CourseMetaPage;
 
-public class AppActivity extends FragmentActivity {
+public class AppActivity extends AppCompatActivity {
 	
 	public static final String TAG = AppActivity.class.getSimpleName();
 
@@ -56,6 +62,30 @@ public boolean onOptionsItemSelected(MenuItem item) {
 		return true;
 	}
 
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            actionBar.setDisplayShowHomeEnabled(true);
+            actionBar.setDisplayHomeAsUpEnabled(true);
+            //actionBar.setHomeButtonEnabled(true);
+            actionBar.setDisplayShowTitleEnabled(true);
+
+            //If we are in a course-related activity, we show its title
+            SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+            Bundle bundle = this.getIntent().getExtras();
+            if (bundle != null) {
+                Course course = (Course) bundle.getSerializable(Course.TAG);
+                if (course == null ) return;
+                String title = course.getTitle(prefs.getString(PrefsActivity.PREF_LANGUAGE, Locale.getDefault().getLanguage()));
+                setTitle(title);
+                actionBar.setTitle(title);
+            }
+        }
+    }
+
     @Override
     public void onResume(){
         super.onResume();
diff --git a/src/org/digitalcampus/oppia/activity/CourseActivity.java b/src/org/digitalcampus/oppia/activity/CourseActivity.java
index c8904ab62..704073dd7 100644
--- a/src/org/digitalcampus/oppia/activity/CourseActivity.java
+++ b/src/org/digitalcampus/oppia/activity/CourseActivity.java
@@ -42,9 +42,6 @@
 import org.digitalcampus.oppia.widgets.UrlWidget;
 import org.digitalcampus.oppia.widgets.WidgetFactory;
 
-import android.app.ActionBar;
-import android.app.ActionBar.Tab;
-import android.app.FragmentTransaction;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.drawable.BitmapDrawable;
@@ -55,72 +52,80 @@
 import android.speech.tts.TextToSpeech;
 import android.speech.tts.TextToSpeech.OnInitListener;
 import android.speech.tts.UtteranceProgressListener;
+import android.support.design.widget.TabLayout;
 import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentTransaction;
 import android.support.v4.view.ViewPager;
+import android.support.v7.app.ActionBar;
+import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.Toast;
 
-public class CourseActivity extends AppActivity implements ActionBar.TabListener, OnInitListener {
+public class CourseActivity extends AppActivity implements OnInitListener, TabLayout.OnTabSelectedListener {
 
-	public static final String TAG = CourseActivity.class.getSimpleName();
-	public static final String BASELINE_TAG = "BASELINE";
-	private Section section;
-	private Course course;
+    public static final String TAG = CourseActivity.class.getSimpleName();
+    public static final String BASELINE_TAG = "BASELINE";
+    private Section section;
+    private Course course;
 
-	private int currentActivityNo = 0;
+    private int currentActivityNo = 0;
     private int previousActivityNo = 0;
 
     private SharedPreferences prefs;
-    private DbHelper db;
-	private ArrayList<Activity> activities;
-	private boolean isBaseline = false;
-	private ActionBar actionBar;
+    private ArrayList<Activity> activities;
+    private boolean isBaseline = false;
+    private ActionBar actionBar;
     private long userID;
 
-	private static int TTS_CHECK = 0;
-	private static TextToSpeech myTTS;
-	private boolean ttsRunning = false;
-
-	private ViewPager viewPager;
-	private ActivityPagerAdapter apAdapter;
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-
-		setContentView(R.layout.activity_course);
-		actionBar = getActionBar();
-		prefs = PreferenceManager.getDefaultSharedPreferences(this);
-		viewPager = (ViewPager) findViewById(R.id.activity_widget_pager);
-
-		Bundle bundle = this.getIntent().getExtras();
-		if (bundle != null) {
-			section = (Section) bundle.getSerializable(Section.TAG);
-			course = (Course) bundle.getSerializable(Course.TAG);
-			activities = section.getActivities();
-			currentActivityNo = bundle.getInt(SectionListAdapter.TAG_PLACEHOLDER);
+    private static int TTS_CHECK = 0;
+    private static TextToSpeech myTTS;
+    private boolean ttsRunning = false;
+
+    TabLayout tabs;
+    private ViewPager viewPager;
+    private ActivityPagerAdapter apAdapter;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.activity_course);
+        setSupportActionBar( (Toolbar)findViewById(R.id.toolbar) );
+        actionBar = getSupportActionBar();
+        prefs = PreferenceManager.getDefaultSharedPreferences(this);
+        viewPager = (ViewPager) findViewById(R.id.activity_widget_pager);
+
+        Bundle bundle = this.getIntent().getExtras();
+        if (bundle != null) {
+            section = (Section) bundle.getSerializable(Section.TAG);
+            course = (Course) bundle.getSerializable(Course.TAG);
+            activities = section.getActivities();
+            currentActivityNo = bundle.getInt(SectionListAdapter.TAG_PLACEHOLDER);
             previousActivityNo = currentActivityNo;
-			if (bundle.getSerializable(CourseActivity.BASELINE_TAG) != null) {
-				this.isBaseline = bundle.getBoolean(CourseActivity.BASELINE_TAG);
-			}
-			// set image
-			BitmapDrawable bm = ImageUtils.LoadBMPsdcard(course.getImageFileFromRoot(), this.getResources(), MobileLearning.APP_LOGO);
-			actionBar.setIcon(bm);
-			actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
-			actionBar.setDisplayHomeAsUpEnabled(true);
-			actionBar.setHomeButtonEnabled(true);
-			
-		}
+            if (bundle.getSerializable(CourseActivity.BASELINE_TAG) != null) {
+                this.isBaseline = bundle.getBoolean(CourseActivity.BASELINE_TAG);
+            }
+            // set image
+            BitmapDrawable bm = ImageUtils.LoadBMPsdcard(course.getImageFileFromRoot(), this.getResources(), MobileLearning.APP_LOGO);
+            //actionBar.setIcon(bm);
+            actionBar.setHomeAsUpIndicator(bm);
+            actionBar.setDisplayShowHomeEnabled(true);
+            actionBar.setDisplayHomeAsUpEnabled(true);
+            actionBar.setDisplayShowTitleEnabled(true);
+            //actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
+        }
+        tabs = (TabLayout) findViewById(R.id.tabs_toolbar);
+
         loadActivities();
-	}
-	
-	@Override
-	public void onStart() {
-		super.onStart();
+    }
 
-		viewPager.setOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+    @Override
+    public void onStart() {
+        super.onStart();
+        viewPager.setOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabs));
+        viewPager.setOnPageChangeListener(new ViewPager.OnPageChangeListener() {
 
             public void onPageScrollStateChanged(int arg0) {
                 // do nothing
@@ -131,37 +136,36 @@ public void onPageScrolled(int arg0, float arg1, int arg2) {
             }
 
             public void onPageSelected(int numPage) {
-                Log.d(TAG, "Page selected " + numPage  + " current act " + currentActivityNo);
-                actionBar.setSelectedNavigationItem(numPage);
+                Log.d(TAG, "Page selected " + numPage + " current act " + currentActivityNo);
+                //actionBar.setSelectedNavigationItem(numPage);
             }
-
         });
-	}
-
-	@Override
-	public void onSaveInstanceState(Bundle outState) {
-		super.onSaveInstanceState(outState);
-		outState.putInt("currentActivityNo", currentActivityNo);
-	}
-
-	@Override
-	public void onRestoreInstanceState(Bundle savedInstanceState) {
-		super.onRestoreInstanceState(savedInstanceState);
-		currentActivityNo = savedInstanceState.getInt("currentActivityNo");
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putInt("currentActivityNo", currentActivityNo);
+    }
+
+    @Override
+    public void onRestoreInstanceState(Bundle savedInstanceState) {
+        super.onRestoreInstanceState(savedInstanceState);
+        currentActivityNo = savedInstanceState.getInt("currentActivityNo");
         previousActivityNo = currentActivityNo;
-	}
-	
-	@Override
-	public void onPause() {
-		super.onPause();
-		if (myTTS != null) {
-			myTTS.shutdown();
-			myTTS = null;
-		}
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        if (myTTS != null) {
+            myTTS.shutdown();
+            myTTS = null;
+        }
         WidgetFactory currentWidget = (WidgetFactory) apAdapter.getItem(currentActivityNo);
         currentWidget.pauseTimeTracking();
         currentWidget.saveTracker();
-	}
+    }
 
     public void onResume(){
         super.onResume();
@@ -172,75 +176,75 @@ public void onResume(){
         userID = db.getUserId(SessionManager.getUsername(this));
         DatabaseManager.getInstance().closeDatabase();
     }
-	
-	@Override
-	protected void onDestroy() {
-		if (myTTS != null) {
-			myTTS.shutdown();
-			myTTS = null;
-		}
-		super.onDestroy();
-	}
-	
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-		getMenuInflater().inflate(R.menu.activity_course, menu);
-		return true;
-	}
-
-	@Override
-	public boolean onPrepareOptionsMenu(Menu menu) {
-		MenuItem item = menu.findItem(R.id.menu_tts);
-		if (ttsRunning) {
-			item.setTitle(R.string.menu_stop_read_aloud);
-		} else {
-			item.setTitle(R.string.menu_read_aloud);
-		}
-		return super.onPrepareOptionsMenu(menu);
-	}
-	
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
-		// Handle item selection
-		Bundle tb = new Bundle();
-		Intent i;
-		int itemId = item.getItemId();
-		if (itemId == R.id.menu_language) {
-			createLanguageDialog();
-			return true;
-		} else if (itemId == R.id.menu_help) {
-			i = new Intent(this, AboutActivity.class);
-			tb.putSerializable(AboutActivity.TAB_ACTIVE, AboutActivity.TAB_HELP);
-			i.putExtras(tb);
-			startActivity(i);
-			return true;
-		} else if (itemId == android.R.id.home) {
-			this.finish();
-			return true;
-		} else if (itemId == R.id.menu_scorecard) {
-			i = new Intent(this, ScorecardActivity.class);
-			tb.putSerializable(Course.TAG, course);
-			i.putExtras(tb);
-			startActivity(i);
-			return true;
-		} else if (itemId == R.id.menu_tts) {
-			if (myTTS == null && !ttsRunning) {
-				// check for TTS data
-				Intent checkTTSIntent = new Intent();
-				checkTTSIntent.setAction(TextToSpeech.Engine.ACTION_CHECK_TTS_DATA);
-				startActivityForResult(checkTTSIntent, TTS_CHECK);
-			} else if (myTTS != null && ttsRunning) {
-				this.stopReading();
-			} else {
-				// TTS not installed so show message
-				Toast.makeText(this, this.getString(R.string.error_tts_start), Toast.LENGTH_LONG).show();
-			}
-			supportInvalidateOptionsMenu();
-			return true;
-		} else {
-			return super.onOptionsItemSelected(item);
-		}
-	}
+
+    @Override
+    protected void onDestroy() {
+        if (myTTS != null) {
+            myTTS.shutdown();
+            myTTS = null;
+        }
+        super.onDestroy();
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.activity_course, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onPrepareOptionsMenu(Menu menu) {
+        MenuItem item = menu.findItem(R.id.menu_tts);
+        if (ttsRunning) {
+            item.setTitle(R.string.menu_stop_read_aloud);
+        } else {
+            item.setTitle(R.string.menu_read_aloud);
+        }
+        return super.onPrepareOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        // Handle item selection
+        Bundle tb = new Bundle();
+        Intent i;
+        int itemId = item.getItemId();
+        if (itemId == R.id.menu_language) {
+            createLanguageDialog();
+            return true;
+        } else if (itemId == R.id.menu_help) {
+            i = new Intent(this, AboutActivity.class);
+            tb.putSerializable(AboutActivity.TAB_ACTIVE, AboutActivity.TAB_HELP);
+            i.putExtras(tb);
+            startActivity(i);
+            return true;
+        } else if (itemId == android.R.id.home) {
+            this.finish();
+            return true;
+        } else if (itemId == R.id.menu_scorecard) {
+            i = new Intent(this, ScorecardActivity.class);
+            tb.putSerializable(Course.TAG, course);
+            i.putExtras(tb);
+            startActivity(i);
+            return true;
+        } else if (itemId == R.id.menu_tts) {
+            if (myTTS == null && !ttsRunning) {
+                // check for TTS data
+                Intent checkTTSIntent = new Intent();
+                checkTTSIntent.setAction(TextToSpeech.Engine.ACTION_CHECK_TTS_DATA);
+                startActivityForResult(checkTTSIntent, TTS_CHECK);
+            } else if (myTTS != null && ttsRunning) {
+                this.stopReading();
+            } else {
+                // TTS not installed so show message
+                Toast.makeText(this, this.getString(R.string.error_tts_start), Toast.LENGTH_LONG).show();
+            }
+            supportInvalidateOptionsMenu();
+            return true;
+        } else {
+            return super.onOptionsItemSelected(item);
+        }
+    }
 
     private void loadActivities(){
         String currentLang = prefs.getString(PrefsActivity.PREF_LANGUAGE, Locale.getDefault().getLanguage());
@@ -250,8 +254,9 @@ private void loadActivities(){
         } else if (isBaseline) {
             setTitle(getString(R.string.title_baseline));
         }
-        actionBar.removeAllTabs();
-        List<Fragment> fragments = new ArrayList<Fragment>();
+        //actionBar.removeAllTabs();
+        List<Fragment> fragments = new ArrayList<>();
+        List<String> titles = new ArrayList<>();
 
         for (int i = 0; i < activities.size(); i++) {
             Activity activity = activities.get(i);
@@ -279,36 +284,44 @@ private void loadActivities(){
             }  else if (activities.get(i).getActType().equalsIgnoreCase("url")) {
                 UrlWidget f = UrlWidget.newInstance(activities.get(i), course, isBaseline);
                 fragments.add(f);
-            } 
+            }
+            titles.add(activity.getTitle(currentLang));
         }
 
-        apAdapter = new ActivityPagerAdapter(getSupportFragmentManager(), fragments);
+        apAdapter = new ActivityPagerAdapter(this, getSupportFragmentManager(), fragments, titles);
         viewPager.setAdapter(apAdapter);
+        tabs.setupWithViewPager(viewPager);
+        tabs.setTabMode(TabLayout.MODE_SCROLLABLE);
+        tabs.setOnTabSelectedListener(this);
+
+        for (int i = 0; i < tabs.getTabCount(); i++) {
+            TabLayout.Tab tab = tabs.getTabAt(i);
+            if (tab!=null) tab.setCustomView(apAdapter.getTabView(i));
+        }
 
         //Tab creation
         for (int i=0; i<activities.size(); i++){
             Activity activity = activities.get(i);
             String title = activity.getTitle(currentLang);
-            actionBar.addTab(
-                    actionBar.newTab().setText(title).setTabListener(this),
-                    (currentActivityNo == i) //Set the current active activity as active tab
-            );
+            //actionBar.addTab(
+            //        actionBar.newTab().setText(title).setTabListener(this),
+            //        (currentActivityNo == i) //Set the current active activity as active tab
+            //);
         }
         viewPager.setCurrentItem(currentActivityNo);
     }
 
-	private void createLanguageDialog() {
+    private void createLanguageDialog() {
         UIUtils.createLanguageDialog(this, course.getLangs(), prefs, new Callable<Boolean>() {
-			public Boolean call() throws Exception {
-				CourseActivity.this.loadActivities();
-				return true;
-			}
-		});
-	}
-
-	public void onTabReselected(Tab tab, FragmentTransaction ft) {}
+            public Boolean call() throws Exception {
+                CourseActivity.this.loadActivities();
+                return true;
+            }
+        });
+    }
 
-	public void onTabSelected(Tab tab, FragmentTransaction ft) {
+    @Override
+    public void onTabSelected(TabLayout.Tab tab) {
         int tabSelected = tab.getPosition();
         Log.d(TAG, "Tab selected " + tabSelected + " current act " + currentActivityNo);
 
@@ -333,9 +346,14 @@ public void run() {
         }
     }
 
-    public void onTabUnselected(Tab tab, FragmentTransaction ft) {
+    @Override
+    public void onTabUnselected(TabLayout.Tab tab) {
         ((WidgetFactory) apAdapter.getItem(currentActivityNo)).saveTracker();
-	}
+    }
+
+    @Override
+    public void onTabReselected(TabLayout.Tab tab) { }
+
 
     private boolean canNavigateTo(int newTab){
         //If the course does not have a sequencing mode, we can navigate freely
@@ -350,15 +368,15 @@ private boolean canNavigateTo(int newTab){
         return actCompleted;
     }
 
-	public void onInit(int status) {
-		// check for successful instantiation
-		if (status == TextToSpeech.SUCCESS) {
-			ttsRunning = true;
-			((WidgetFactory) apAdapter.getItem(currentActivityNo)).setReadAloud(true);
-			supportInvalidateOptionsMenu();
-			HashMap<String,String> params = new HashMap<String,String>();
-			params.put(TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID,TAG);
-			myTTS.speak(((WidgetFactory) apAdapter.getItem(currentActivityNo)).getContentToRead(), TextToSpeech.QUEUE_FLUSH, params);
+    public void onInit(int status) {
+        // check for successful instantiation
+        if (status == TextToSpeech.SUCCESS) {
+            ttsRunning = true;
+            ((WidgetFactory) apAdapter.getItem(currentActivityNo)).setReadAloud(true);
+            supportInvalidateOptionsMenu();
+            HashMap<String,String> params = new HashMap<String,String>();
+            params.put(TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID,TAG);
+            myTTS.speak(((WidgetFactory) apAdapter.getItem(currentActivityNo)).getContentToRead(), TextToSpeech.QUEUE_FLUSH, params);
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1) {
                 myTTS.setOnUtteranceProgressListener(new UtteranceProgressListener() {
                     @Override
@@ -371,28 +389,27 @@ public void onDone(String utteranceId){
                 });
             }
         } else {
-			// TTS not installed so show message
-			Toast.makeText(this, this.getString(R.string.error_tts_start), Toast.LENGTH_LONG).show();
-		}
-	}
-
-	@Override
-	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-		if (requestCode == TTS_CHECK) {
-			if (resultCode == TextToSpeech.Engine.CHECK_VOICE_DATA_PASS) {
-				// the user has the necessary data - create the TTS
-				myTTS = new TextToSpeech(this, this);
-			}
-		}
-		super.onActivityResult(requestCode, resultCode, data);
-	}
-
-	private void stopReading() {
-		if (myTTS != null) {
-			myTTS.stop();
-			myTTS = null;
-		}
-		this.ttsRunning = false;
-	}
+            // TTS not installed so show message
+            Toast.makeText(this, this.getString(R.string.error_tts_start), Toast.LENGTH_LONG).show();
+        }
+    }
 
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == TTS_CHECK) {
+            if (resultCode == TextToSpeech.Engine.CHECK_VOICE_DATA_PASS) {
+                // the user has the necessary data - create the TTS
+                myTTS = new TextToSpeech(this, this);
+            }
+        }
+        super.onActivityResult(requestCode, resultCode, data);
+    }
+
+    private void stopReading() {
+        if (myTTS != null) {
+            myTTS.stop();
+            myTTS = null;
+        }
+        this.ttsRunning = false;
+    }
 }
diff --git a/src/org/digitalcampus/oppia/activity/CourseIndexActivity.java b/src/org/digitalcampus/oppia/activity/CourseIndexActivity.java
index e515a237b..302a51d59 100644
--- a/src/org/digitalcampus/oppia/activity/CourseIndexActivity.java
+++ b/src/org/digitalcampus/oppia/activity/CourseIndexActivity.java
@@ -36,7 +36,6 @@
 import org.digitalcampus.oppia.utils.xmlreaders.CourseXMLReader;
 
 import android.animation.ValueAnimator;
-import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -45,6 +44,7 @@
 import android.graphics.drawable.BitmapDrawable;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.support.v7.app.AlertDialog;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -72,8 +72,6 @@ public class CourseIndexActivity extends AppActivity implements OnSharedPreferen
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_course_index);
-		getActionBar().setDisplayHomeAsUpEnabled(true);
-		getActionBar().setHomeButtonEnabled(true);
 		
 		prefs = PreferenceManager.getDefaultSharedPreferences(this);
 		prefs.registerOnSharedPreferenceChangeListener(this);
@@ -118,17 +116,16 @@ public void onCreate(Bundle savedInstanceState) {
     @Override
 	public void onStart() {
 		super.onStart();
-
-		setTitle(course.getTitle(prefs.getString(PrefsActivity.PREF_LANGUAGE, Locale.getDefault().getLanguage())));
 		// set image
 		if (course.getImageFile() != null) {
 			BitmapDrawable bm = ImageUtils.LoadBMPsdcard(course.getImageFileFromRoot(), this.getResources(),
 					R.drawable.dc_logo);
-			getActionBar().setIcon(bm);
-		}
-	}
+			//getSupportActionBar().setIcon(bm);
+            getSupportActionBar().setHomeAsUpIndicator(bm);
+        }
+    }
 
-	@Override
+    @Override
 	public void onResume() {
 		super.onResume();
         if (aDialog != null) {
@@ -284,7 +281,7 @@ private boolean isBaselineCompleted() {
     }
 
     private void showBaselineMessage(final String digest){
-        aDialog = new AlertDialog.Builder(this).create();
+        aDialog = new AlertDialog.Builder(this, R.style.Oppia_AlertDialogStyle).create();
         aDialog.setCancelable(false);
         aDialog.setTitle(R.string.alert_pretest);
         aDialog.setMessage(this.getString(R.string.alert_pretest_summary));
diff --git a/src/org/digitalcampus/oppia/activity/CourseMetaPageActivity.java b/src/org/digitalcampus/oppia/activity/CourseMetaPageActivity.java
index 2df4ead9c..7b3d0e636 100644
--- a/src/org/digitalcampus/oppia/activity/CourseMetaPageActivity.java
+++ b/src/org/digitalcampus/oppia/activity/CourseMetaPageActivity.java
@@ -17,10 +17,10 @@
 
 package org.digitalcampus.oppia.activity;
 
-import android.app.ActionBar;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.support.v7.app.ActionBar;
 import android.webkit.WebView;
 import android.widget.TextView;
 
@@ -42,24 +42,17 @@ public class CourseMetaPageActivity extends AppActivity {
     private CourseMetaPage cmp;
 	
 	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.activity_course_metapage);
-        ActionBar actionBar = getActionBar();
-        if (actionBar != null){
-            actionBar.setDisplayHomeAsUpEnabled(true);
-            actionBar.setHomeButtonEnabled(true);
-        }
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_course_metapage);
 
-		prefs = PreferenceManager.getDefaultSharedPreferences(this);
-		
-		Bundle bundle = this.getIntent().getExtras();
-		if (bundle != null) {
-			course = (Course) bundle.getSerializable(Course.TAG);
-			setTitle(course.getTitle(prefs.getString(PrefsActivity.PREF_LANGUAGE, Locale.getDefault().getLanguage())));
+        prefs = PreferenceManager.getDefaultSharedPreferences(this);
+        Bundle bundle = this.getIntent().getExtras();
+        if (bundle != null) {
+            course = (Course) bundle.getSerializable(Course.TAG);
             int pageID = bundle.getInt(CourseMetaPage.TAG);
-			cmp = course.getMetaPage(pageID);
-		}
+            cmp = course.getMetaPage(pageID);
+        }
 		
 		TextView titleTV = (TextView) findViewById(R.id.course_title);
 		String title = cmp.getLang(prefs.getString(PrefsActivity.PREF_LANGUAGE, Locale.getDefault().getLanguage())).getContent();
diff --git a/src/org/digitalcampus/oppia/activity/DownloadActivity.java b/src/org/digitalcampus/oppia/activity/DownloadActivity.java
index 0dbd54dbf..7cfb74e80 100644
--- a/src/org/digitalcampus/oppia/activity/DownloadActivity.java
+++ b/src/org/digitalcampus/oppia/activity/DownloadActivity.java
@@ -43,13 +43,13 @@
 
 import com.splunk.mint.Mint;
 
-import android.app.ActionBar;
 import android.app.ProgressDialog;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.support.v7.app.ActionBar;
 import android.util.Log;
 import android.widget.ListView;
 import android.widget.Toast;
@@ -72,11 +72,6 @@ public class DownloadActivity extends AppActivity implements APIRequestListener,
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_download);
-        ActionBar actionBar = getActionBar();
-        if (actionBar != null){
-            actionBar.setDisplayHomeAsUpEnabled(true);
-            actionBar.setHomeButtonEnabled(true);
-        }
         prefs = PreferenceManager.getDefaultSharedPreferences(this);
         
 		Bundle bundle = this.getIntent().getExtras(); 
@@ -158,7 +153,7 @@ protected void onSaveInstanceState(Bundle savedInstanceState) {
 	
 	private void getCourseList() {
 		// show progress dialog
-		progressDialog = new ProgressDialog(this);
+		progressDialog = new ProgressDialog(this, R.style.Oppia_AlertDialogStyle);
 		progressDialog.setTitle(R.string.loading);
 		progressDialog.setMessage(getString(R.string.loading));
 		progressDialog.setCancelable(false);
diff --git a/src/org/digitalcampus/oppia/activity/DownloadMediaActivity.java b/src/org/digitalcampus/oppia/activity/DownloadMediaActivity.java
index 2cff61592..15cc2e872 100644
--- a/src/org/digitalcampus/oppia/activity/DownloadMediaActivity.java
+++ b/src/org/digitalcampus/oppia/activity/DownloadMediaActivity.java
@@ -65,8 +65,6 @@ public class DownloadMediaActivity extends AppActivity implements DownloadMediaL
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_download_media);
-		getActionBar().setDisplayHomeAsUpEnabled(true);
-        getActionBar().setHomeButtonEnabled(true);
         prefs = PreferenceManager.getDefaultSharedPreferences(this);
 
 		Bundle bundle = this.getIntent().getExtras();
diff --git a/src/org/digitalcampus/oppia/activity/MonitorActivity.java b/src/org/digitalcampus/oppia/activity/MonitorActivity.java
index c77a61928..f4589526f 100644
--- a/src/org/digitalcampus/oppia/activity/MonitorActivity.java
+++ b/src/org/digitalcampus/oppia/activity/MonitorActivity.java
@@ -49,12 +49,6 @@ public class MonitorActivity extends AppActivity {
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_monitor);
-        ActionBar actionBar = getActionBar();
-        if (actionBar != null){
-            actionBar.setDisplayHomeAsUpEnabled(true);
-            actionBar.setHomeButtonEnabled(true);
-        }
-        
 		prefs = PreferenceManager.getDefaultSharedPreferences(this);
 		webView = new WebView(this);
 		
diff --git a/src/org/digitalcampus/oppia/activity/OppiaMobileActivity.java b/src/org/digitalcampus/oppia/activity/OppiaMobileActivity.java
index 879d722a0..c3340c567 100644
--- a/src/org/digitalcampus/oppia/activity/OppiaMobileActivity.java
+++ b/src/org/digitalcampus/oppia/activity/OppiaMobileActivity.java
@@ -18,7 +18,7 @@
 package org.digitalcampus.oppia.activity;
 
 import android.animation.ValueAnimator;
-import android.app.AlertDialog;
+
 import android.app.ProgressDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -27,6 +27,11 @@
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.support.design.widget.NavigationView;
+import android.support.v4.widget.DrawerLayout;
+import android.support.v7.app.ActionBarDrawerToggle;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.Toolbar;
 import android.util.Log;
 
 import android.view.Menu;
@@ -91,6 +96,7 @@ public class OppiaMobileActivity
     private TextView messageText;
     private Button messageButton;
     private View messageContainer;
+    private NavigationView navigationView;
 
     LinearLayout llNone;
 
@@ -124,9 +130,9 @@ public void onCreate(Bundle savedInstanceState) {
         courseList = (ListView) findViewById(R.id.course_list);
         courseList.setAdapter(courseListAdapter);
 
+        //the alternative of registerForContextMenu(courseList);
         CourseContextMenuCustom courseMenu = new CourseContextMenuCustom(this);
         courseMenu.registerForContextMenu(courseList, this);
-        //the alternative of registerForContextMenu(courseList);
 
         courseList.setOnItemClickListener(new OnItemClickListener() {
 
@@ -142,6 +148,41 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
 
         llNone = (LinearLayout) this.findViewById(R.id.no_courses);
         initialCourseListPadding = courseList.getPaddingTop();
+
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+
+        // Initializing Drawer Layout and ActionBarToggle
+        final DrawerLayout drawerLayout = (DrawerLayout) findViewById(R.id.drawer);
+        navigationView = (NavigationView) findViewById(R.id.navigation_view);
+        ((TextView) navigationView.getHeaderView(0).findViewById(R.id.drawer_user_fullname)).setText(SessionManager.getUserDisplayName(this));
+        ((TextView) navigationView.getHeaderView(0).findViewById(R.id.drawer_username)).setText(SessionManager.getUsername(this));
+        navigationView.setNavigationItemSelectedListener(new NavigationView.OnNavigationItemSelectedListener() {
+            @Override
+            public boolean onNavigationItemSelected(MenuItem menuItem) {
+                boolean result = onOptionsItemSelected(menuItem);
+                menuItem.setChecked(false);
+                drawerLayout.closeDrawers();
+                return result;
+            }
+        });
+
+        ActionBarDrawerToggle actionBarDrawerToggle = new ActionBarDrawerToggle(this,drawerLayout,toolbar,R.string.open, R.string.close){
+            @Override
+            public void onDrawerClosed(View drawerView) {
+                // Code here will be triggered once the drawer closes as we dont want anything to happen so we leave this blank
+                super.onDrawerClosed(drawerView);
+            }
+            @Override
+            public void onDrawerOpened(View drawerView) {
+                // Code here will be triggered once the drawer open as we dont want anything to happen so we leave this blank
+                super.onDrawerOpened(drawerView);
+            }
+        };
+
+        //Setting the actionbarToggle to drawer layout
+        drawerLayout.setDrawerListener(actionBarDrawerToggle);
+        actionBarDrawerToggle.syncState();
 	}
 
 	@Override
@@ -212,17 +253,18 @@ private void updateReminders(){
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
 		getMenuInflater().inflate(R.menu.activity_main, menu);
-		return true;
+		return super.onCreateOptionsMenu(menu);
 	}
 
 	@Override
 	public boolean onPrepareOptionsMenu(Menu menu) {
 		UIUtils.showUserData(menu, this, null);
-		
-		MenuItem itemLogout = menu.findItem(R.id.menu_logout);
-        MenuItem itemSettings = menu.findItem(R.id.menu_settings);
-        MenuItem itemMonitor = menu.findItem(R.id.menu_monitor);
-        MenuItem itemCourseDownload = menu.findItem(R.id.menu_download);
+
+        Menu drawerMenu = navigationView.getMenu();
+		MenuItem itemLogout = drawerMenu.findItem(R.id.menu_logout);
+        MenuItem itemSettings = drawerMenu.findItem(R.id.menu_settings);
+        MenuItem itemMonitor = drawerMenu.findItem(R.id.menu_monitor);
+        MenuItem itemCourseDownload = drawerMenu.findItem(R.id.menu_download);
 
 		itemLogout.setVisible(prefs.getBoolean(PrefsActivity.PREF_LOGOUT_ENABLED, MobileLearning.MENU_ALLOW_LOGOUT));
 		itemSettings.setVisible(MobileLearning.MENU_ALLOW_SETTINGS);
@@ -303,7 +345,7 @@ public Boolean call() throws Exception {
 	}
 
 	private void logout() {
-		AlertDialog.Builder builder = new AlertDialog.Builder(this);
+		AlertDialog.Builder builder = new AlertDialog.Builder(this, R.style.Oppia_AlertDialogStyle);
 		builder.setCancelable(false);
 		builder.setTitle(R.string.logout);
 		builder.setMessage(R.string.logout_confirm);
@@ -337,7 +379,7 @@ public void onPermissionGranted() {
     }
 
 	private void confirmCourseDelete() {
-		AlertDialog.Builder builder = new AlertDialog.Builder(this);
+		AlertDialog.Builder builder = new AlertDialog.Builder(this, R.style.Oppia_AlertDialogStyle);
 		builder.setCancelable(false);
 		builder.setTitle(R.string.course_context_delete);
 		builder.setMessage(R.string.course_context_delete_confirm);
@@ -350,7 +392,7 @@ public void onClick(DialogInterface dialog, int which) {
                 task.setOnDeleteCourseListener(OppiaMobileActivity.this);
                 task.execute(p);
 
-                progressDialog = new ProgressDialog(OppiaMobileActivity.this);
+                progressDialog = new ProgressDialog(OppiaMobileActivity.this, R.style.Oppia_AlertDialogStyle);
                 progressDialog.setMessage(getString(R.string.course_deleting));
                 progressDialog.setCancelable(false);
                 progressDialog.setCanceledOnTouchOutside(false);
@@ -366,7 +408,7 @@ public void onClick(DialogInterface dialog, int which) {
 	}
 
 	private void confirmCourseReset() {
-		AlertDialog.Builder builder = new AlertDialog.Builder(this);
+		AlertDialog.Builder builder = new AlertDialog.Builder(this, R.style.Oppia_AlertDialogStyle);
 		builder.setCancelable(false);
 		builder.setTitle(R.string.course_context_reset);
 		builder.setMessage(R.string.course_context_reset_confirm);
@@ -394,7 +436,7 @@ private void confirmCourseUpdateActivity(){
         task.setUpdateActivityListener(OppiaMobileActivity.this);
         task.execute(p);
 
-        progressDialog = new ProgressDialog(OppiaMobileActivity.this);
+        progressDialog = new ProgressDialog(OppiaMobileActivity.this, R.style.Oppia_AlertDialogStyle);
         progressDialog.setMessage(getString(R.string.course_updating));
         progressDialog.setCancelable(false);
         progressDialog.setCanceledOnTouchOutside(false);
diff --git a/src/org/digitalcampus/oppia/activity/PrefsActivity.java b/src/org/digitalcampus/oppia/activity/PrefsActivity.java
index 33c99cecb..aee9911b5 100644
--- a/src/org/digitalcampus/oppia/activity/PrefsActivity.java
+++ b/src/org/digitalcampus/oppia/activity/PrefsActivity.java
@@ -17,7 +17,6 @@
 
 package org.digitalcampus.oppia.activity;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -36,8 +35,6 @@
 import org.digitalcampus.oppia.utils.storage.StorageAccessStrategyFactory;
 
 import android.app.Activity;
-import android.app.ActionBar;
-import android.app.AlertDialog;
 import android.app.FragmentManager;
 import android.app.FragmentTransaction;
 import android.app.ProgressDialog;
@@ -51,6 +48,7 @@
 import android.preference.CheckBoxPreference;
 import android.preference.EditTextPreference;
 import android.preference.PreferenceManager;
+import android.support.v7.app.AlertDialog;
 import android.util.Log;
 import android.view.MenuItem;
 import android.view.View;
@@ -121,11 +119,6 @@ public class PrefsActivity extends AppActivity implements SharedPreferences.OnSh
 	@Override
 	protected void onCreate(Bundle savedInstanceState) { 
         super.onCreate(savedInstanceState);
-        ActionBar actionBar = getActionBar();
-        if (actionBar != null){
-            actionBar.setDisplayHomeAsUpEnabled(true);
-            actionBar.setHomeButtonEnabled(true);
-        }
 
         prefs = PreferenceManager.getDefaultSharedPreferences(this);
         FragmentManager mFragmentManager = getFragmentManager();
@@ -218,7 +211,7 @@ else if (key.equalsIgnoreCase(PREF_ADMIN_PROTECTION)){
             if (protectionEnabled){
                 Log.d(TAG, "Admin protection enabled, prompting for new password");
                 final EditText passwordInput = new EditText(this);
-                final AlertDialog passwordDialog = new AlertDialog.Builder(this)
+                final AlertDialog passwordDialog = new AlertDialog.Builder(this, R.style.Oppia_AlertDialogStyle)
                     .setTitle(getString(R.string.admin_password_newpassword_dialog_title))
                     .setMessage(getString(R.string.admin_password_newpassword_dialog_message))
                     .setView(passwordInput)
@@ -289,7 +282,7 @@ private void executeChangeStorageTask(String path, String storageOption){
         ChangeStorageOptionTask changeStorageTask = new ChangeStorageOptionTask(PrefsActivity.this.getApplicationContext());
         changeStorageTask.setMoveStorageListener(this);
 
-        pDialog = new ProgressDialog(this);
+        pDialog = new ProgressDialog(this, R.style.Oppia_AlertDialogStyle);
         pDialog.setTitle(R.string.loading);
         pDialog.setMessage(getString(R.string.moving_storage_location));
         pDialog.setCancelable(false);
diff --git a/src/org/digitalcampus/oppia/activity/ScorecardActivity.java b/src/org/digitalcampus/oppia/activity/ScorecardActivity.java
index 44960c75e..59965fad2 100644
--- a/src/org/digitalcampus/oppia/activity/ScorecardActivity.java
+++ b/src/org/digitalcampus/oppia/activity/ScorecardActivity.java
@@ -29,29 +29,30 @@
 import org.digitalcampus.oppia.model.Course;
 import org.digitalcampus.oppia.utils.ImageUtils;
 
-import android.app.ActionBar;
-import android.app.ActionBar.Tab;
 import android.content.SharedPreferences;
 import android.graphics.drawable.BitmapDrawable;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.support.design.widget.TabLayout;
 import android.support.v4.app.Fragment;
-import android.app.FragmentTransaction;
+import android.support.v4.app.FragmentTransaction;
 import android.support.v4.view.ViewPager;
+import android.support.v7.app.ActionBar;
+import android.support.v7.widget.Toolbar;
 import android.view.MenuItem;
 
 
-public class ScorecardActivity extends AppActivity implements ActionBar.TabListener {
+public class ScorecardActivity extends AppActivity {
 
 	public static final String TAG = ScorecardActivity.class.getSimpleName();
     public static final String TAB_TARGET = "target";
     public static final String TAB_TARGET_POINTS = "tab_points";
     public static final String TAB_TARGET_BADGES = "tab_badges";
 
-	private ActionBar actionBar;
+    private ActionBar actionBar;
+    private TabLayout tabs;
 	private ViewPager viewPager;
 	private ActivityPagerAdapter apAdapter;
-	private int currentTab = 0;
 	private SharedPreferences prefs;
 	private Course course = null;
 
@@ -62,10 +63,13 @@ public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 
 		setContentView(R.layout.activity_scorecard);
-		actionBar = getActionBar();
+
 		viewPager = (ViewPager) findViewById(R.id.activity_scorecard_pager);
 
-		actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
+        tabs = (TabLayout) findViewById(R.id.tabs_toolbar);
+
+        setSupportActionBar( (Toolbar)findViewById(R.id.toolbar) );
+        actionBar = getSupportActionBar();
 		actionBar.setDisplayHomeAsUpEnabled(true);
 		actionBar.setHomeButtonEnabled(true);
 
@@ -82,40 +86,44 @@ public void onCreate(Bundle savedInstanceState) {
 	public void onStart() {
 		super.onStart();
 
-		actionBar.removeAllTabs();
 		List<Fragment> fragments = new ArrayList<Fragment>();
+        List<String> tabTitles = new ArrayList<>();
 
 		Fragment fScorecard;
 		if(this.course != null){
 			fScorecard = CourseScorecardFragment.newInstance(course);
             if (course.getImageFile() != null) {
                 BitmapDrawable bm = ImageUtils.LoadBMPsdcard(course.getImageFileFromRoot(), this.getResources(), R.drawable.dc_logo);
-                actionBar.setIcon(bm);
+                //actionBar.setIcon(bm);
+                actionBar.setHomeAsUpIndicator(bm);
             }
 		} else {
 			fScorecard = GlobalScorecardFragment.newInstance();
 		}
-
 		fragments.add(fScorecard);
-		actionBar.addTab(actionBar.newTab().setText(this.getString(R.string.tab_title_scorecard)).setTabListener(this), true);
+        tabTitles.add(this.getString(R.string.tab_title_scorecard));
 
 		boolean scoringEnabled = prefs.getBoolean(PrefsActivity.PREF_SCORING_ENABLED, true);
 		if (scoringEnabled) {
 			Fragment fPoints = PointsFragment.newInstance();
 			fragments.add(fPoints);
-			actionBar.addTab(actionBar.newTab().setText(this.getString(R.string.tab_title_points)).setTabListener(this), false);
-		}
+            tabTitles.add(this.getString(R.string.tab_title_points));
+        }
 
 		boolean badgingEnabled = prefs.getBoolean(PrefsActivity.PREF_BADGING_ENABLED, true);
 		if (badgingEnabled) {
 			Fragment fBadges= BadgesFragment.newInstance();
 			fragments.add(fBadges);
-			actionBar.addTab(actionBar.newTab().setText(this.getString(R.string.tab_title_badges)).setTabListener(this), false);
-		}
+            tabTitles.add(this.getString(R.string.tab_title_badges));
+        }
 
-		apAdapter = new ActivityPagerAdapter(getSupportFragmentManager(), fragments);
+		apAdapter = new ActivityPagerAdapter(this, getSupportFragmentManager(), fragments, tabTitles);
 		viewPager.setAdapter(apAdapter);
+        tabs.setupWithViewPager(viewPager);
+        tabs.setTabMode(TabLayout.MODE_FIXED);
+        tabs.setTabGravity(TabLayout.GRAVITY_FILL);
 
+        int currentTab = 0;
         if ( targetTabOnLoad != null){
             if (targetTabOnLoad.equals(TAB_TARGET_POINTS) && scoringEnabled) {
                 currentTab = 1;
@@ -125,31 +133,9 @@ public void onStart() {
             }
         }
 		viewPager.setCurrentItem(currentTab);
-        actionBar.setSelectedNavigationItem(currentTab);
-		viewPager.setOnPageChangeListener(new ViewPager.OnPageChangeListener() {
-            public void onPageScrollStateChanged(int arg0) {
-            }
-
-            public void onPageScrolled(int arg0, float arg1, int arg2) {
-            }
-
-            public void onPageSelected(int arg0) {
-                actionBar.setSelectedNavigationItem(arg0);
-            }
-
-        });
+        viewPager.setOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabs));
 	}
 
-	public void onTabSelected(Tab tab, FragmentTransaction ft) {
-		viewPager.setCurrentItem(tab.getPosition());
-		this.currentTab = tab.getPosition();
-
-	}
-
-	public void onTabUnselected(Tab tab, FragmentTransaction ft) { }
-
-	public void onTabReselected(Tab tab, FragmentTransaction ft) { }
-
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
 		// Handle item selection
@@ -160,4 +146,5 @@ public boolean onOptionsItemSelected(MenuItem item) {
 		}
 		return true;
 	}
+
 }
diff --git a/src/org/digitalcampus/oppia/activity/SearchActivity.java b/src/org/digitalcampus/oppia/activity/SearchActivity.java
index 0e5a1c272..39d64b89b 100644
--- a/src/org/digitalcampus/oppia/activity/SearchActivity.java
+++ b/src/org/digitalcampus/oppia/activity/SearchActivity.java
@@ -67,11 +67,6 @@ public class SearchActivity extends AppActivity {
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_search);
-        ActionBar actionBar = getActionBar();
-        if (actionBar != null){
-            actionBar.setDisplayHomeAsUpEnabled(true);
-            actionBar.setHomeButtonEnabled(true);
-        }
 
         prefs = PreferenceManager.getDefaultSharedPreferences(this);
 
diff --git a/src/org/digitalcampus/oppia/activity/StartUpActivity.java b/src/org/digitalcampus/oppia/activity/StartUpActivity.java
index 9747e4ed8..be017bd52 100644
--- a/src/org/digitalcampus/oppia/activity/StartUpActivity.java
+++ b/src/org/digitalcampus/oppia/activity/StartUpActivity.java
@@ -18,12 +18,12 @@
 package org.digitalcampus.oppia.activity;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.support.v7.app.AlertDialog;
 import android.util.Log;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -171,7 +171,7 @@ public void onAccessGranted(boolean isGranted) {
     private void afterUpgrade(Payload p){
         // set up local dirs
         if(!Storage.createFolderStructure(this)){
-            AlertDialog.Builder builder = new AlertDialog.Builder(this);
+            AlertDialog.Builder builder = new AlertDialog.Builder(this, R.style.Oppia_AlertDialogStyle);
             builder.setCancelable(false);
             builder.setTitle(R.string.error);
             builder.setMessage(R.string.error_sdcard);
diff --git a/src/org/digitalcampus/oppia/activity/TagSelectActivity.java b/src/org/digitalcampus/oppia/activity/TagSelectActivity.java
index 6f47d3c16..136b15665 100644
--- a/src/org/digitalcampus/oppia/activity/TagSelectActivity.java
+++ b/src/org/digitalcampus/oppia/activity/TagSelectActivity.java
@@ -34,7 +34,6 @@
 
 import com.splunk.mint.Mint;
 
-import android.app.ActionBar;
 import android.app.ProgressDialog;
 import android.content.Intent;
 import android.os.Bundle;
@@ -56,11 +55,6 @@ public class TagSelectActivity extends AppActivity implements APIRequestListener
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_download);
-        ActionBar actionBar = getActionBar();
-        if (actionBar != null){
-            actionBar.setDisplayHomeAsUpEnabled(true);
-            actionBar.setHomeButtonEnabled(true);
-        }
 
         tags = new ArrayList<>();
         tla = new TagListAdapter(this, tags);
@@ -131,7 +125,7 @@ protected void onSaveInstanceState(Bundle savedInstanceState) {
 	
 	private void getTagList() {
 		// show progress dialog
-		pDialog = new ProgressDialog(this);
+		pDialog = new ProgressDialog(this, R.style.Oppia_AlertDialogStyle);
 		pDialog.setTitle(R.string.loading);
 		pDialog.setMessage(getString(R.string.loading));
 		pDialog.setCancelable(true);
diff --git a/src/org/digitalcampus/oppia/activity/WelcomeActivity.java b/src/org/digitalcampus/oppia/activity/WelcomeActivity.java
index 3726698c0..c29bf0f89 100644
--- a/src/org/digitalcampus/oppia/activity/WelcomeActivity.java
+++ b/src/org/digitalcampus/oppia/activity/WelcomeActivity.java
@@ -28,22 +28,23 @@
 import org.digitalcampus.oppia.fragments.WelcomeFragment;
 import org.digitalcampus.oppia.model.Lang;
 
-import android.app.ActionBar;
-import android.app.ActionBar.Tab;
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.design.widget.TabLayout;
 import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
-import android.app.FragmentTransaction;
+import android.support.v4.app.FragmentTransaction;
 import android.support.v4.view.ViewPager;
+import android.support.v7.app.ActionBar;
+import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 
-public class WelcomeActivity extends AppActivity implements ActionBar.TabListener  {
+public class WelcomeActivity extends AppActivity {
 
 	public static final String TAG = WelcomeActivity.class.getSimpleName();
 	private ActionBar actionBar;
 	private ViewPager viewPager;
+    private TabLayout tabs;
     private int currentTab = 0;
 	
 	@Override
@@ -51,70 +52,48 @@ public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 
 		setContentView(R.layout.activity_about);
-		actionBar = getActionBar();
+
+        tabs = (TabLayout) findViewById(R.id.tabs_toolbar);
+
+        setSupportActionBar((Toolbar) findViewById(R.id.toolbar));
+        actionBar = getSupportActionBar();
+        actionBar.setDisplayHomeAsUpEnabled(true);
+        actionBar.setHomeButtonEnabled(true);
+        actionBar.setDisplayShowTitleEnabled(true);
 		viewPager = (ViewPager) findViewById(R.id.activity_about_pager);
-		
-		actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
+
 	}
 	
 	@Override
 	public void onStart() {
 		super.onStart();
-
-		actionBar.removeAllTabs();
 		List<Fragment> fragments = new ArrayList<Fragment>();
+        List<String> tabTitles = new ArrayList<>();
 		
 		Fragment fWelcome = WelcomeFragment.newInstance();
 		fragments.add(fWelcome);
-		actionBar.addTab(actionBar.newTab().setText(this.getString(R.string.tab_title_welcome)).setTabListener(this), true);
+        tabTitles.add(this.getString(R.string.tab_title_welcome));
 
 		Fragment fLogin = LoginFragment.newInstance();
 		fragments.add(fLogin);
-		actionBar.addTab(actionBar.newTab().setText(this.getString(R.string.tab_title_login)).setTabListener(this), false);
+        tabTitles.add(this.getString(R.string.tab_title_login));
 
 		Fragment fRegister = RegisterFragment.newInstance();
 		fragments.add(fRegister);
-		actionBar.addTab(actionBar.newTab().setText(this.getString(R.string.tab_title_register)).setTabListener(this), false);
+        tabTitles.add(this.getString(R.string.tab_title_register));
 
 		Fragment fReset = ResetFragment.newInstance();
 		fragments.add(fReset);
-		actionBar.addTab(actionBar.newTab().setText(this.getString(R.string.tab_title_reset)).setTabListener(this), false);
+        tabTitles.add(this.getString(R.string.tab_title_reset));
 
-        ActivityPagerAdapter apAdapter = new ActivityPagerAdapter(getSupportFragmentManager(), fragments);
+        ActivityPagerAdapter apAdapter = new ActivityPagerAdapter(this, getSupportFragmentManager(), fragments, tabTitles);
 		viewPager.setAdapter(apAdapter);
+        tabs.setupWithViewPager(viewPager);
+        tabs.setTabMode(TabLayout.MODE_FIXED);
+        tabs.setTabGravity(TabLayout.GRAVITY_FILL);
 
 		viewPager.setCurrentItem(currentTab);
-		viewPager.setOnPageChangeListener(new ViewPager.OnPageChangeListener() {
-
-			public void onPageScrollStateChanged(int arg0) {
-				// do nothing
-			}
-
-			public void onPageScrolled(int arg0, float arg1, int arg2) {
-				// do nothing
-			}
-
-			public void onPageSelected(int arg0) {
-				actionBar.setSelectedNavigationItem(arg0);
-			}
-
-		});
-	}
-
-	public void onTabSelected(Tab tab, FragmentTransaction ft) {
-		viewPager.setCurrentItem(tab.getPosition());
-		this.currentTab = tab.getPosition();
-		
-	}
-
-	public void onTabUnselected(Tab tab, FragmentTransaction ft) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	public void onTabReselected(Tab tab, FragmentTransaction ft) {
-		// TODO Auto-generated method stub
-		
+        viewPager.setOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabs));
 	}
 	
 	@Override
diff --git a/src/org/digitalcampus/oppia/adapter/ActivityPagerAdapter.java b/src/org/digitalcampus/oppia/adapter/ActivityPagerAdapter.java
index dce7c34c0..5bec89b42 100644
--- a/src/org/digitalcampus/oppia/adapter/ActivityPagerAdapter.java
+++ b/src/org/digitalcampus/oppia/adapter/ActivityPagerAdapter.java
@@ -19,19 +19,29 @@
 
 import java.util.List;
 
+import android.content.Context;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentStatePagerAdapter;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.TextView;
+
+import org.digitalcampus.mobile.learning.R;
 
 public class ActivityPagerAdapter extends FragmentStatePagerAdapter {
 
-	public static final String TAG = ActivityPagerAdapter.class.getSimpleName();
+    public static final String TAG = ActivityPagerAdapter.class.getSimpleName();
 
-	private List<Fragment> fragments;
+    private List<Fragment> fragments;
+    private List<String> tabTitles;
+    private Context ctx;
 	
-	public ActivityPagerAdapter(FragmentManager fm, List<Fragment> fragments) {
+	public ActivityPagerAdapter(Context ctx, FragmentManager fm, List<Fragment> fragments, List<String> titles) {
 		super(fm);
+        this.ctx = ctx;
 		this.fragments = fragments;
+        this.tabTitles = titles;
 	}
 
 	@Override
@@ -39,8 +49,20 @@ public Fragment getItem(int index) {
 		return fragments.get(index);
 	}
 
+    @Override
+    public CharSequence getPageTitle(int position) {
+        return tabTitles.get(position);
+    }
+
 	@Override
 	public int getCount() {
 		return fragments.size();
 	}
+
+    public View getTabView(int position) {
+        View v = LayoutInflater.from(ctx).inflate(R.layout.tablayout_fixed_tab, null);
+        TextView tv = (TextView) v.findViewById(R.id.tabTitle);
+        tv.setText(tabTitles.get(position));
+        return v;
+    }
 }
diff --git a/src/org/digitalcampus/oppia/application/SessionManager.java b/src/org/digitalcampus/oppia/application/SessionManager.java
index e43b35584..5c570d3c0 100644
--- a/src/org/digitalcampus/oppia/application/SessionManager.java
+++ b/src/org/digitalcampus/oppia/application/SessionManager.java
@@ -26,6 +26,7 @@
 
 import org.digitalcampus.mobile.learning.R;
 import org.digitalcampus.oppia.activity.PrefsActivity;
+import org.digitalcampus.oppia.exception.UserNotFoundException;
 import org.digitalcampus.oppia.listener.PreloadAccountsListener;
 import org.digitalcampus.oppia.model.User;
 import org.digitalcampus.oppia.task.Payload;
@@ -50,6 +51,24 @@ private static String getUsernameFromPrefs(SharedPreferences prefs){
         return prefs.getString(PrefsActivity.PREF_USER_NAME, "");
     }
 
+    public static String getUserDisplayName(Context ctx){
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ctx);
+        String username = getUsernameFromPrefs(prefs);
+
+        DbHelper db = new DbHelper(ctx);
+        try {
+            User u = db.getUser(username);
+            return u.getDisplayName();
+        } catch (UserNotFoundException e) {
+            e.printStackTrace();
+            return null;
+        }
+        finally {
+            DatabaseManager.getInstance().closeDatabase();
+        }
+
+    }
+
     public static String getUsername(Context ctx){
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ctx);
         return getUsernameFromPrefs(prefs);
diff --git a/src/org/digitalcampus/oppia/fragments/PasswordDialogFragment.java b/src/org/digitalcampus/oppia/fragments/PasswordDialogFragment.java
index a61b25788..0d4673cda 100644
--- a/src/org/digitalcampus/oppia/fragments/PasswordDialogFragment.java
+++ b/src/org/digitalcampus/oppia/fragments/PasswordDialogFragment.java
@@ -17,10 +17,10 @@
 
 package org.digitalcampus.oppia.fragments;
 
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
 import android.os.Bundle;
+import android.support.v7.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Button;
@@ -36,7 +36,7 @@ public class PasswordDialogFragment extends DialogFragment {
 
         @Override
         public Dialog onCreateDialog(Bundle savedInstanceState) {
-            AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+            AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.Oppia_AlertDialogStyle);
             LayoutInflater inflater = getActivity().getLayoutInflater();
 
             builder.setView(inflater.inflate(R.layout.dialog_password, null))
diff --git a/src/org/digitalcampus/oppia/widgets/QuizWidget.java b/src/org/digitalcampus/oppia/widgets/QuizWidget.java
index 16ed625c5..614c722bd 100644
--- a/src/org/digitalcampus/oppia/widgets/QuizWidget.java
+++ b/src/org/digitalcampus/oppia/widgets/QuizWidget.java
@@ -59,7 +59,6 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -68,6 +67,7 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.support.v7.app.AlertDialog;
 import android.text.Html;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -360,7 +360,7 @@ private boolean saveAnswer() {
 	}
 
 	private void showFeedback(String msg) {
-		AlertDialog.Builder builder = new AlertDialog.Builder(super.getActivity());
+		AlertDialog.Builder builder = new AlertDialog.Builder(super.getActivity(), R.style.Oppia_AlertDialogStyle);
 		builder.setTitle(super.getActivity().getString(R.string.feedback));
 		builder.setMessage(msg);
 		try {