diff --git a/README.md b/README.md
index 0f943f41f..0335e6fd9 100644
--- a/README.md
+++ b/README.md
@@ -34,3 +34,8 @@ If you run **OSX** then download the [iOS FacebookSDK](https://developers.facebo
 
 ### Known Issues :warning:
 1. Packager fails to resolve aliases at first run. Do `yarn start:reset` instead of `yarn start` at first launch. Same applies when running the app with `react-native run-ios` or `react-native run-android`. Kill the packager and type `yarn start:reset`
+
+## Download
+
+<a href="https://play.google.com/store/apps/details?id=com.everfox.animetrackerandroid&utm_source=github&utm_campaign=kitsu-mobile"><img src="https://i.imgur.com/HqUNEEU.png" alt="Kitsu on Google Play"></a>
+<a href="https://itunes.apple.com/us/app/kitsu-anime/id590452826?mt=8&utm_source=github&utm_campaign=kitsu-mobile"><img src="https://devimages-cdn.apple.com/app-store/marketing/guidelines/images/badge-download-on-the-app-store.svg" alt="Kitsu on the App Store"></a>
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 57668f6cb..93f03ff4b 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -118,7 +118,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 27
         versionCode 1
-        versionName "6.5.1"
+        versionName "6.6"
         multiDexEnabled true
         ndk {
             abiFilters "armeabi-v7a", "x86"
@@ -190,7 +190,7 @@ dependencies {
     compile "com.facebook.fresco:animated-gif:1.3.0"
     compile 'com.facebook.fresco:animated-webp:1.3.0'
     compile 'com.facebook.fresco:webpsupport:1.3.0'
-    compile('com.crashlytics.sdk.android:crashlytics:2.6.8@aar') {
+    compile('com.crashlytics.sdk.android:crashlytics:2.9.3@aar') {
         transitive = true;
     }
 }
diff --git a/android/app/src/main/res/drawable-hdpi/ic_stat_onesignal_default.png b/android/app/src/main/res/drawable-hdpi/ic_stat_onesignal_default.png
new file mode 100755
index 000000000..e0cd0b81d
Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/ic_stat_onesignal_default.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/ic_stat_onesignal_default.png b/android/app/src/main/res/drawable-mdpi/ic_stat_onesignal_default.png
new file mode 100755
index 000000000..09865a9f3
Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/ic_stat_onesignal_default.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/ic_stat_onesignal_default.png b/android/app/src/main/res/drawable-xhdpi/ic_stat_onesignal_default.png
new file mode 100755
index 000000000..5b32b3040
Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/ic_stat_onesignal_default.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_stat_onesignal_default.png b/android/app/src/main/res/drawable-xxhdpi/ic_stat_onesignal_default.png
new file mode 100755
index 000000000..8fb1bd3b0
Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/ic_stat_onesignal_default.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_onesignal_large_icon_default.png b/android/app/src/main/res/drawable-xxxhdpi/ic_onesignal_large_icon_default.png
new file mode 100755
index 000000000..87c5b09ac
Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/ic_onesignal_large_icon_default.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_stat_onesignal_default.png b/android/app/src/main/res/drawable-xxxhdpi/ic_stat_onesignal_default.png
new file mode 100755
index 000000000..1060e940c
Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/ic_stat_onesignal_default.png differ
diff --git a/ios/kitsu_mobile/Info.plist b/ios/kitsu_mobile/Info.plist
index f26a94666..ca68ffbd7 100644
--- a/ios/kitsu_mobile/Info.plist
+++ b/ios/kitsu_mobile/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.5.1</string>
+	<string>6.6</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
diff --git a/src/assets/img/streaming-services/amazon.png b/src/assets/img/streaming-services/amazon.png
new file mode 100644
index 000000000..bf9381343
Binary files /dev/null and b/src/assets/img/streaming-services/amazon.png differ
diff --git a/src/assets/img/streaming-services/tubitv.png b/src/assets/img/streaming-services/tubitv.png
new file mode 100644
index 000000000..81cc04bde
Binary files /dev/null and b/src/assets/img/streaming-services/tubitv.png differ
diff --git a/src/assets/img/streaming-services/viewster.png b/src/assets/img/streaming-services/viewster.png
new file mode 100644
index 000000000..dc4bab5bd
Binary files /dev/null and b/src/assets/img/streaming-services/viewster.png differ
diff --git a/src/assets/img/streaming-services/youtube.png b/src/assets/img/streaming-services/youtube.png
new file mode 100644
index 000000000..6b30af005
Binary files /dev/null and b/src/assets/img/streaming-services/youtube.png differ
diff --git a/src/components/ContentList/component.js b/src/components/ContentList/component.js
index 9d213a572..b4c69fe7a 100644
--- a/src/components/ContentList/component.js
+++ b/src/components/ContentList/component.js
@@ -5,7 +5,7 @@ import { ContentListHeader } from './ContentListHeader';
 import { ItemRenderer } from './ItemRenderer';
 import { styles } from './styles';
 
-export const ContentList = ({ title, data, onPress, onScroll, dark = false, showViewAll = true, ...props }) => (
+export const ContentList = ({ title, data, onPress, dark = false, showViewAll = true, ...props }) => (
   // console.log('data is', title, data);
   <View style={[styles.contentListContainer, dark ? styles.darkBg : styles.lightBg]}>
     <ContentListHeader dark={dark} title={title} onPress={onPress} showViewAll={showViewAll} />
@@ -14,9 +14,6 @@ export const ContentList = ({ title, data, onPress, onScroll, dark = false, show
       data={data}
       ListHeaderComponent={() => <View style={{ width: 10 }} />}
       renderItem={({ item }) => <ItemRenderer item={item} {...props} />}
-      onTouchStart={() => onScroll(true)}
-      onTouchCancel={() => onScroll(false)}
-      onTouchEnd={() => onScroll(false)}
     />
   </View>
 );
diff --git a/src/components/Forms/LoginForm.js b/src/components/Forms/LoginForm.js
index caeb4e17a..cea255616 100644
--- a/src/components/Forms/LoginForm.js
+++ b/src/components/Forms/LoginForm.js
@@ -3,6 +3,7 @@ import { View, Text, TouchableOpacity } from 'react-native';
 import { PropTypes } from 'prop-types';
 import { Button } from 'kitsu/components/Button/';
 import { Input } from 'kitsu/components/Input';
+import { PasswordInput } from 'kitsu/components/PasswordInput';
 import * as colors from 'kitsu/constants/colors';
 import styles from './styles';
 
@@ -24,12 +25,10 @@ const LoginForm = ({
       keyboardType={'email-address'}
       onChangeText={text => handleChange(text, 'email')}
     />
-    <Input
+    <PasswordInput
       placeholder="Password"
-      secureTextEntry
       value={data.password}
       onChangeText={text => handleChange(text, 'password')}
-      autoCapitalize="none"
     />
     <Button
       loading={loading}
diff --git a/src/components/Forms/RecoveryForm.js b/src/components/Forms/RecoveryForm.js
index cec993d38..e404160fc 100644
--- a/src/components/Forms/RecoveryForm.js
+++ b/src/components/Forms/RecoveryForm.js
@@ -1,12 +1,13 @@
 import React from 'react';
-import { View, Text } from 'react-native';
+import { View, Text, TouchableOpacity } from 'react-native';
 import { PropTypes } from 'prop-types';
 import { Button } from 'kitsu/components/Button/';
 import { Input } from 'kitsu/components/Input';
 import CustomIcon from 'kitsu/components/Icon';
 import * as colors from 'kitsu/constants/colors';
+import styles from './styles';
 
-const RecoveryForm = ({ handleChange, data, onReset, loading }) => (
+const RecoveryForm = ({ handleChange, data, onReset, loading, onCancel }) => (
   <View>
     <Input
       placeholder="E-mail"
@@ -20,6 +21,9 @@ const RecoveryForm = ({ handleChange, data, onReset, loading }) => (
       onPress={onReset}
       style={{ marginTop: 10 }}
     />
+    <TouchableOpacity style={styles.forgotButton} onPress={onCancel}>
+      <Text style={styles.forgotText}>Back to Sign In</Text>
+    </TouchableOpacity>
   </View>
 );
 
@@ -28,6 +32,7 @@ RecoveryForm.propTypes = {
   data: PropTypes.object.isRequired,
   onReset: PropTypes.func.isRequired,
   loading: PropTypes.bool.isRequired,
+  onCancel: PropTypes.func.isRequired,
 };
 
 export default RecoveryForm;
diff --git a/src/components/Forms/SignupForm.js b/src/components/Forms/SignupForm.js
index dbf436975..931eed1e9 100644
--- a/src/components/Forms/SignupForm.js
+++ b/src/components/Forms/SignupForm.js
@@ -3,6 +3,7 @@ import { View, Text, TouchableOpacity } from 'react-native';
 import { PropTypes } from 'prop-types';
 import { Button } from 'kitsu/components/Button/';
 import { Input } from 'kitsu/components/Input';
+import { PasswordInput } from 'kitsu/components/PasswordInput';
 import styles from './styles';
 
 const SignupForm = ({
@@ -30,18 +31,15 @@ const SignupForm = ({
       value={data.username}
       onChangeText={text => handleChange(text, 'username')}
     />
-    <Input
+    <PasswordInput
       placeholder="Password"
-      secureTextEntry
       value={data.password}
       onChangeText={text => handleChange(text, 'password')}
     />
-    <Input
+    <PasswordInput
       placeholder="Confirm Password"
-      secureTextEntry
       value={data.confirmPassword}
       onChangeText={text => handleChange(text, 'confirmPassword')}
-      autoCapitalize="none"
     />
     <Button
       loading={loading}
diff --git a/src/components/ImageStatus/component.js b/src/components/ImageStatus/component.js
new file mode 100644
index 000000000..95e8d811b
--- /dev/null
+++ b/src/components/ImageStatus/component.js
@@ -0,0 +1,20 @@
+import React from 'react';
+import { View, Text } from 'react-native';
+import PropTypes from 'prop-types';
+import FastImage from 'react-native-fast-image';
+import styles from './styles';
+
+export const ImageStatus = ({ title, text, image, style }) => (
+  <View style={[styles.statusWrapper, style]}>
+    <Text style={styles.statusTitle}>{title}</Text>
+    <Text style={styles.statusText}>{text}</Text>
+    <FastImage style={styles.statusImage} source={image} />
+  </View>
+);
+
+ImageStatus.propTypes = {
+  title: PropTypes.string.isRequired,
+  text: PropTypes.string.isRequired,
+  image: PropTypes.object.isRequired,
+  style: PropTypes.object,
+};
diff --git a/src/components/ImageStatus/index.js b/src/components/ImageStatus/index.js
new file mode 100644
index 000000000..bb824842c
--- /dev/null
+++ b/src/components/ImageStatus/index.js
@@ -0,0 +1 @@
+export * from './component';
diff --git a/src/components/ImageStatus/styles.js b/src/components/ImageStatus/styles.js
new file mode 100644
index 000000000..c56e08d58
--- /dev/null
+++ b/src/components/ImageStatus/styles.js
@@ -0,0 +1,37 @@
+import { StyleSheet } from 'react-native';
+import * as colors from 'kitsu/constants/colors';
+
+const styles = StyleSheet.create({
+  statusWrapper: {
+    marginTop: 4,
+    padding: 16,
+    justifyContent: 'center',
+    alignItems: 'center',
+    backgroundColor: colors.darkPurple,
+  },
+  statusTitle: {
+    fontWeight: 'bold',
+    fontSize: 16,
+    color: colors.white,
+    fontFamily: 'OpenSans',
+    textAlign: 'center',
+    margin: 4,
+    width: 240,
+  },
+  statusText: {
+    width: 240,
+    fontSize: 12,
+    color: colors.lightGrey,
+    fontFamily: 'OpenSans',
+    textAlign: 'center',
+    margin: 4,
+  },
+  statusImage: {
+    marginTop: 16,
+    width: 140,
+    height: 160,
+    resizeMode: 'contain',
+  },
+});
+
+export default styles;
diff --git a/src/components/PasswordInput/component.js b/src/components/PasswordInput/component.js
new file mode 100644
index 000000000..a3807f15f
--- /dev/null
+++ b/src/components/PasswordInput/component.js
@@ -0,0 +1,51 @@
+import React, { PureComponent } from 'react';
+import { View, TouchableOpacity } from 'react-native';
+import { PropTypes } from 'prop-types';
+import Icon from 'react-native-vector-icons/FontAwesome';
+import { Input } from 'kitsu/components/Input';
+import { styles } from './styles';
+
+export class PasswordInput extends PureComponent {
+  static propTypes = {
+    value: PropTypes.string,
+    onChangeText: PropTypes.func,
+  };
+
+  static defaultProps = {
+    value: '',
+    onChangeText: null,
+  };
+
+  state = {
+    passwordVisible: false,
+  };
+
+  toggleVisibility = () => {
+    this.setState({
+      passwordVisible: !this.state.passwordVisible,
+    });
+  }
+
+  render() {
+    const { value, onChangeText, ...props } = this.props;
+    const { passwordVisible } = this.state;
+    return (
+      <View style={styles.container}>
+        <Input
+          containerStyle={styles.input}
+          {...props}
+          secureTextEntry={!passwordVisible}
+          value={value}
+          onChangeText={onChangeText}
+          autoCapitalize="none"
+        />
+        <TouchableOpacity style={styles.toggle} onPress={this.toggleVisibility}>
+          <Icon
+            name={passwordVisible ? 'eye' : 'eye-slash'}
+            style={styles.eyeIcon}
+          />
+        </TouchableOpacity>
+      </View>
+    );
+  }
+}
diff --git a/src/components/PasswordInput/index.js b/src/components/PasswordInput/index.js
new file mode 100644
index 000000000..bb824842c
--- /dev/null
+++ b/src/components/PasswordInput/index.js
@@ -0,0 +1 @@
+export * from './component';
diff --git a/src/components/PasswordInput/styles.js b/src/components/PasswordInput/styles.js
new file mode 100644
index 000000000..7f3288bdc
--- /dev/null
+++ b/src/components/PasswordInput/styles.js
@@ -0,0 +1,31 @@
+import { StyleSheet } from 'react-native';
+import * as colors from 'kitsu/constants/colors';
+
+export const styles = StyleSheet.create({
+  container: {
+    flexDirection: 'row',
+    backgroundColor: colors.white,
+    justifyContent: 'space-between',
+    alignItems: 'center',
+    marginHorizontal: 16,
+    height: 47,
+    marginVertical: 4,
+    borderRadius: 8,
+  },
+  input: {
+    flex: 1,
+    marginHorizontal: 0,
+    marginVertical: 0,
+  },
+  eyeIcon: {
+    color: colors.darkGrey,
+    marginHorizontal: 8,
+    fontSize: 18,
+    backgroundColor: 'transparent',
+  },
+  toggle: {
+    height: 47,
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+});
diff --git a/src/components/ProgressiveImage/component.js b/src/components/ProgressiveImage/component.js
index 3708c7831..d9a723acd 100644
--- a/src/components/ProgressiveImage/component.js
+++ b/src/components/ProgressiveImage/component.js
@@ -13,7 +13,7 @@ export class ProgressiveImage extends PureComponent {
     duration: PropTypes.number,
     style: PropTypes.any,
     resizeMode: PropTypes.string,
-    source: PropTypes.object.isRequired,
+    source: PropTypes.any.isRequired,
     defaultSource: PropTypes.number,
     hasOverlay: PropTypes.bool,
   };
@@ -70,7 +70,7 @@ export class ProgressiveImage extends PureComponent {
 
     return (
       <View style={[styles.imageBackground, backgroundStyle, style]}>
-        {source.uri && (
+        {source && (
           <FastImage
             onLoad={this.onLoad}
             onLayout={this.onLayout}
diff --git a/src/components/SearchBox/component.js b/src/components/SearchBox/component.js
index 75dbb0a13..279657958 100644
--- a/src/components/SearchBox/component.js
+++ b/src/components/SearchBox/component.js
@@ -1,8 +1,9 @@
 import * as React from 'react';
 import { PropTypes } from 'prop-types';
-import { TextInput, View, ViewPropTypes } from 'react-native';
-import Icon from 'react-native-vector-icons/FontAwesome';
+import { TextInput, View, ViewPropTypes, TouchableOpacity } from 'react-native';
+import Icon from 'react-native-vector-icons/Ionicons';
 import { commonStyles } from 'kitsu/common/styles';
+import { isEmpty } from 'lodash';
 import { styles } from './styles';
 
 export class SearchBox extends React.PureComponent {
@@ -11,42 +12,54 @@ export class SearchBox extends React.PureComponent {
     defaultValue: PropTypes.string,
     onChangeText: PropTypes.func,
     placeholder: PropTypes.string,
-    searchIconOffset: PropTypes.number,
     value: PropTypes.string,
+    showClearButton: PropTypes.bool,
   };
 
   static defaultProps = {
     defaultValue: '',
     onChangeText: () => {},
     placeholder: 'Search',
-    searchIconOffset: 80,
     style: null,
     value: '',
+    showClearButton: true,
   };
 
   render() {
-    const { searchIconOffset, value, ...restProps } = this.props;
+    const { value, onChangeText, showClearButton, ...restProps } = this.props;
 
     return (
       <View style={[styles.searchContainer, this.props.style]}>
         <Icon
-          name="search"
+          name="ios-search"
           style={[
             styles.searchIcon,
             commonStyles.colorLightGrey,
-            { paddingRight: searchIconOffset },
-            value && styles.searchIconFocus,
           ]}
+          size={18}
         />
         <TextInput
           {...restProps}
           value={value}
           style={[commonStyles.text, styles.input]}
+          onChangeText={onChangeText}
           underlineColorAndroid="transparent"
           autoCapitalize={'none'}
           autoCorrect={false}
           keyboardAppearance={'dark'}
         />
+        {showClearButton && !isEmpty(value) &&
+          <TouchableOpacity style={styles.clearContainer} onPress={() => onChangeText('')}>
+            <Icon
+              name="ios-close-circle"
+              style={[
+                styles.clearIcon,
+                commonStyles.colorLightGrey,
+              ]}
+              size={16}
+            />
+          </TouchableOpacity>
+        }
       </View>
     );
   }
diff --git a/src/components/SearchBox/styles.js b/src/components/SearchBox/styles.js
index 0cdcc9123..719151125 100644
--- a/src/components/SearchBox/styles.js
+++ b/src/components/SearchBox/styles.js
@@ -4,24 +4,32 @@ import * as colors from 'kitsu/constants/colors';
 export const styles = StyleSheet.create({
   searchContainer: {
     flexDirection: 'row',
-    justifyContent: 'center',
+    justifyContent: 'flex-start',
     alignItems: 'center',
     backgroundColor: colors.white,
     borderRadius: 3,
     height: 40,
   },
   searchIcon: {
-    position: 'absolute',
     backgroundColor: 'transparent',
-    paddingHorizontal: 10,
+    paddingLeft: 8,
+    paddingRight: 6,
+  },
+  clearContainer: {
+    justifyContent: 'center',
+    alignItems: 'center',
+    height: '100%',
   },
-  searchIconFocus: {
-    left: 0,
-    paddingRight: 0,
+  clearIcon: {
+    paddingHorizontal: 8,
   },
   input: {
     flex: 1,
+    height: '80%',
     color: colors.black,
-    textAlign: 'center',
+    textAlignVertical: 'center',
+    padding: 0,
+    margin: 0,
+    borderWidth: 0,
   },
 });
diff --git a/src/config/api.js b/src/config/api.js
index 9dd993c44..ae16ce3b6 100644
--- a/src/config/api.js
+++ b/src/config/api.js
@@ -526,11 +526,35 @@ Kitsu.define(
     media: {
       jsonApi: 'hasOne',
     },
+    videos: {
+      jsonApi: 'hasMany',
+      type: 'videos',
+    },
     createdAt: '',
   },
   { collectionPath: 'episodes' },
 );
 
+Kitsu.define(
+  'videos',
+  {
+    url: '',
+    availableRegions: [],
+    subLang: '',
+    dubLang: '',
+    embedData: {},
+    episode: {
+      jsonApi: 'hasOne',
+      type: 'episodes',
+    },
+    streamer: {
+      jsonApi: 'hasOne',
+      type: 'streamers',
+    },
+  },
+  { collectionPath: 'videos' },
+);
+
 Kitsu.define(
   'animeProductions',
   {
@@ -931,7 +955,6 @@ Kitsu.define(
       jsonApi: 'hasOne',
     },
     spoiledUnit: {
-      type: 'episodes',
       jsonApi: 'hasOne',
     },
     targetUser: {
@@ -991,12 +1014,33 @@ Kitsu.define(
   { collectionPath: 'one-signal-players' },
 );
 
+Kitsu.define(
+  'streamingLinks',
+  {
+    url: '',
+    createdAt: '',
+    updatedAt: '',
+    streamer: {
+      jsonApi: 'hasOne',
+      type: 'streamers',
+    },
+    media: {
+      jsonApi: 'hasOne',
+      type: ['anime', 'manga', 'drama'],
+    },
+  },
+  { collectionPath: 'streaming-links' },
+);
+
 Kitsu.define(
   'streamers',
   {
     siteName: '',
     logo: '',
-    streamingLinks: '',
+    streamingLinks: {
+      jsonApi: 'hasMany',
+      type: 'streamingLinks',
+    },
   },
   { collectionPath: 'streamers' },
 );
diff --git a/src/config/middlewares.js b/src/config/middlewares.js
index 5cb27f318..a95d4145c 100644
--- a/src/config/middlewares.js
+++ b/src/config/middlewares.js
@@ -107,7 +107,11 @@ export const kitsuRequestMiddleware = {
 
 function applyTitle(item, currentUser) {
   if (!item || !currentUser) { return; }
-  if ((item.type === 'anime' || item.type === 'manga') && item.canonicalTitle) {
+
+  // The objects we want to apply title preferences to
+  const whitelist = ['anime', 'manga', 'episodes'];
+
+  if (whitelist.includes(item.type) && item.canonicalTitle) {
     item.canonicalTitle = getComputedTitle(currentUser, item);
   }
   if (item.anime) { applyTitle(item.anime, currentUser); }
@@ -120,9 +124,7 @@ export const titleMiddleware = {
   res: (payload) => {
     const currentUser = store.getState().user.currentUser;
     if (isArray(payload)) {
-      payload.forEach(item => {
-        applyTitle(item, currentUser);
-      });
+      payload.forEach(item => applyTitle(item, currentUser));
     } else {
       applyTitle(payload, currentUser);
     }
diff --git a/src/constants/app.js b/src/constants/app.js
index 2c58240b1..5ce7b1b17 100644
--- a/src/constants/app.js
+++ b/src/constants/app.js
@@ -40,3 +40,15 @@ export const originalCoverImageDimensions = {
 };
 
 export const TERMS_URL = 'https://kitsu.io/terms';
+
+export const STREAMING_SERVICES = {
+  hulu: require('kitsu/assets/img/streaming-services/hulu.png'),
+  crunchyroll: require('kitsu/assets/img/streaming-services/crunchyroll.png'),
+  netflix: require('kitsu/assets/img/streaming-services/netflix.png'),
+  amazon: require('kitsu/assets/img/streaming-services/amazon.png'),
+  funimation: require('kitsu/assets/img/streaming-services/funimation.png'),
+  hidive: require('kitsu/assets/img/streaming-services/hidive.png'),
+  viewster: require('kitsu/assets/img/streaming-services/viewster.png'),
+  tubitv: require('kitsu/assets/img/streaming-services/tubitv.png'),
+  youtube: require('kitsu/assets/img/streaming-services/youtube.png'),
+};
diff --git a/src/routes/common.js b/src/routes/common.js
index c7114d52a..2343eb142 100644
--- a/src/routes/common.js
+++ b/src/routes/common.js
@@ -1,8 +1,10 @@
 import PostDetails from 'kitsu/screens/Feed/pages/PostDetails';
 import MediaPages from 'kitsu/screens/Profiles/MediaPages';
+import UnitPage from 'kitsu/screens/Profiles/MediaPages/pages/Episodes/Unit'
 import * as ProfileScreens from 'kitsu/screens/Profiles';
 import ProfilePages from 'kitsu/screens/Profiles/ProfilePages';
 import PostCreation from 'kitsu/screens/PostCreation';
+import CreatePost from 'kitsu/screens/Feed/pages/PostCreation/CreatePost';
 import MediaUploadScreen from 'kitsu/screens/PostCreation/MediaUploadScreen';
 import { LibrarySearch } from 'kitsu/screens/Library/LibrarySearch';
 import { sidebarRoutes } from './sidebar';
@@ -20,6 +22,12 @@ export const commonRoutes = {
   MediaPages: {
     screen: MediaPages,
   },
+  CreatePost: {
+    screen: CreatePost,
+  },
+  UnitDetails: {
+    screen: UnitPage,
+  },
   ProfilePages: {
     screen: ProfilePages,
   },
@@ -29,15 +37,6 @@ export const commonRoutes = {
   UserLibraryList: {
     screen: ProfileScreens.UserLibraryListScreen,
   },
-  Network: {
-    screen: ProfileScreens.NetworkScreen,
-  },
-  FavoriteCharacters: {
-    screen: ProfileScreens.FavoriteCharacters,
-  },
-  FavoriteMedia: {
-    screen: ProfileScreens.FavoriteMedia,
-  },
   LibrarySearch: {
     screen: LibrarySearch,
   },
diff --git a/src/routes/feed.js b/src/routes/feed.js
index fefe17a5b..f08086431 100644
--- a/src/routes/feed.js
+++ b/src/routes/feed.js
@@ -3,7 +3,6 @@ import { Platform } from 'react-native';
 import FastImage from 'react-native-fast-image';
 import { StackNavigator } from 'react-navigation';
 import Feed from 'kitsu/screens/Feed';
-import CreatePost from 'kitsu/screens/Feed/pages/PostCreation/CreatePost';
 import homeIcon from 'kitsu/assets/img/tabbar_icons/home.png';
 import { statusBarHeight, navigationBarHeight } from 'kitsu/constants/app';
 import { commonRoutes } from './common';
@@ -15,9 +14,6 @@ const FeedStack = StackNavigator(
     FeedActivity: {
       screen: Feed,
     },
-    CreatePost: {
-      screen: CreatePost,
-    },
     ...commonRoutes,
   },
   {
diff --git a/src/routes/tabs.js b/src/routes/tabs.js
index dc8622de6..a2357ff3e 100644
--- a/src/routes/tabs.js
+++ b/src/routes/tabs.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { PureComponent } from 'react';
 import { DrawerNavigator, TabNavigator } from 'react-navigation';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
@@ -15,6 +15,16 @@ import QuickUpdateStack from './quickUpdate';
 import FeedStack from './feed';
 import LibraryStack from './library';
 
+const TOP_LEVEL_ROUTES = [
+  'FeedActivity',
+  'SearchAll',
+  'QuickUpdate',
+  'Notifications',
+  'LibraryScreen',
+  'DrawerToggle',
+  'DrawerOpen',
+];
+
 const Tabs = TabNavigator(
   {
     Feed: {
@@ -74,7 +84,7 @@ const Drawer = DrawerNavigator({
   drawerBackgroundColor: listBackPurple,
 });
 
-class TabsNav extends React.PureComponent {
+class TabsNav extends PureComponent {
   static propTypes = {
     badge: PropTypes.number.isRequired,
     navigation: PropTypes.object.isRequired,
@@ -83,6 +93,10 @@ class TabsNav extends React.PureComponent {
     fetchNotifications: PropTypes.func.isRequired,
   };
 
+  state = {
+    drawerLockMode: 'unlocked',
+  };
+
   componentWillMount() {
     this.fetchCurrentUser();
     this.props.fetchAlgoliaKeys();
@@ -95,12 +109,39 @@ class TabsNav extends React.PureComponent {
     } catch (e) {
       console.warn(e);
     }
+  };
+
+  onNavigationStateChange = (prevState, currentState) => {
+    const current = this._getRouteName(currentState);
+    const previous = this._getRouteName(prevState);
+    // route changed?
+    if (previous !== current) {
+      // top-level route?
+      if (TOP_LEVEL_ROUTES.includes(current)) {
+        this.setState({ drawerLockMode: 'unlocked' });
+      } else {
+        this.setState({ drawerLockMode: 'locked-closed' });
+      }
+    }
+  };
+
+  _getRouteName(state) {
+    if (!state) return null;
+    const route = state.routes[state.index];
+    if (route.routes) {
+      return this._getRouteName(route);
+    }
+    return route.routeName;
   }
 
   render() {
+    const { navigation: rootNavigation, badge } = this.props;
+    const { drawerLockMode } = this.state;
+    const props = { rootNavigation, badge, drawerLockMode };
     return (
       <Drawer
-        screenProps={{ rootNavigation: this.props.navigation, badge: this.props.badge }}
+        screenProps={props}
+        onNavigationStateChange={this.onNavigationStateChange}
       />
     );
   }
diff --git a/src/routes/tabsNotification.js b/src/routes/tabsNotification.js
index 9107b6abd..57aea984a 100644
--- a/src/routes/tabsNotification.js
+++ b/src/routes/tabsNotification.js
@@ -7,7 +7,7 @@
  *  #1127, #335, #1715,
  */
 
-import React from 'react';
+import React, { PureComponent } from 'react';
 import { DrawerNavigator, TabNavigator } from 'react-navigation';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
@@ -24,6 +24,16 @@ import QuickUpdateStack from './quickUpdate';
 import FeedStack from './feed';
 import LibraryStack from './library';
 
+const TOP_LEVEL_ROUTES = [
+  'FeedActivity',
+  'SearchAll',
+  'QuickUpdate',
+  'Notifications',
+  'LibraryScreen',
+  'DrawerToggle',
+  'DrawerOpen',
+];
+
 const Tabs = TabNavigator(
   {
     Feed: {
@@ -43,7 +53,6 @@ const Tabs = TabNavigator(
     },
   },
   {
-    initialRouteName: 'Notifications',
     lazy: true,
     removeClippedSubviews: true,
     tabBarPosition: 'bottom',
@@ -84,7 +93,7 @@ const Drawer = DrawerNavigator({
   drawerBackgroundColor: listBackPurple,
 });
 
-class TabsNav extends React.PureComponent {
+class TabsNav extends PureComponent {
   static propTypes = {
     badge: PropTypes.number.isRequired,
     navigation: PropTypes.object.isRequired,
@@ -93,6 +102,10 @@ class TabsNav extends React.PureComponent {
     fetchNotifications: PropTypes.func.isRequired,
   };
 
+  state = {
+    drawerLockMode: 'unlocked',
+  };
+
   componentWillMount() {
     this.fetchCurrentUser();
     this.props.fetchAlgoliaKeys();
@@ -105,12 +118,39 @@ class TabsNav extends React.PureComponent {
     } catch (e) {
       console.warn(e);
     }
+  };
+
+  onNavigationStateChange = (prevState, currentState) => {
+    const current = this._getRouteName(currentState);
+    const previous = this._getRouteName(prevState);
+    // route changed?
+    if (previous !== current) {
+      // top-level route?
+      if (TOP_LEVEL_ROUTES.includes(current)) {
+        this.setState({ drawerLockMode: 'unlocked' });
+      } else {
+        this.setState({ drawerLockMode: 'locked-closed' });
+      }
+    }
+  };
+
+  _getRouteName(state) {
+    if (!state) return null;
+    const route = state.routes[state.index];
+    if (route.routes) {
+      return this._getRouteName(route);
+    }
+    return route.routeName;
   }
 
   render() {
+    const { navigation: rootNavigation, badge } = this.props;
+    const { drawerLockMode } = this.state;
+    const props = { rootNavigation, badge, drawerLockMode };
     return (
       <Drawer
-        screenProps={{ rootNavigation: this.props.navigation, badge: this.props.badge }}
+        screenProps={props}
+        onNavigationStateChange={this.onNavigationStateChange}
       />
     );
   }
diff --git a/src/screens/Auth/AuthScreen.js b/src/screens/Auth/AuthScreen.js
index f34f841f8..94a1ceeee 100644
--- a/src/screens/Auth/AuthScreen.js
+++ b/src/screens/Auth/AuthScreen.js
@@ -53,7 +53,7 @@ class AuthScreen extends React.Component {
     if (!signingUp && !signingIn && signupError && signupError[0]) {
       this.setState({
         toastVisible: true,
-        toastTitle: signupError[0].title,
+        toastTitle: signupError[0].detail,
       });
     }
     if (!signingUp && !signingIn && loginError) {
@@ -79,13 +79,13 @@ class AuthScreen extends React.Component {
         toastTitle: "Inputs can't be blank",
         toastVisible: true,
       });
-    } else if (confirmPassword !== password) {
+    } else if (confirmPassword.trim() !== password.trim()) {
       this.setState({
         toastTitle: 'Passwords do not match',
         toastVisible: true,
       });
     } else {
-      this.props.createUser({ email, username, password }, navigation);
+      this.props.createUser({ email, username, password: password.trim() }, navigation);
     }
   };
 
@@ -103,7 +103,8 @@ class AuthScreen extends React.Component {
   };
 
   onSignInFacebook = () => {
-    LoginManager.logInWithReadPermissions(['public_profile']).then(
+    LoginManager.logOut();
+    LoginManager.logInWithReadPermissions(['public_profile', 'email']).then(
       (result) => {
         if (!result.isCancelled) {
           this.onSubmitSignup(true);
diff --git a/src/screens/Auth/RecoveryScreen.js b/src/screens/Auth/RecoveryScreen.js
index 76f0357ba..491b7b9c0 100644
--- a/src/screens/Auth/RecoveryScreen.js
+++ b/src/screens/Auth/RecoveryScreen.js
@@ -51,6 +51,10 @@ class RecoveryScreen extends Component {
     this.setState({ [name]: text });
   }
 
+  goBack = () => {
+    this.props.navigation.goBack();
+  }
+
   render() {
     return (
       <View style={styles.container}>
@@ -76,6 +80,7 @@ class RecoveryScreen extends Component {
               handleChange={this.handleChange}
               onReset={this.onReset}
               loading={this.props.signingIn || this.state.loading}
+              onCancel={this.goBack}
             />
           </View>
         </AuthWrapper>
diff --git a/src/screens/Feed/components/CreatePostRow/component.js b/src/screens/Feed/components/CreatePostRow/component.js
index 1df62b2a4..80f33cf22 100644
--- a/src/screens/Feed/components/CreatePostRow/component.js
+++ b/src/screens/Feed/components/CreatePostRow/component.js
@@ -8,12 +8,12 @@ import { Avatar } from 'kitsu/screens/Feed/components/Avatar';
 import * as Layout from 'kitsu/screens/Feed/components/Layout';
 import { styles } from './styles';
 
-const CreatePostRowComponent = ({ currentUser, targetUser, onPress, title }) => {
+const CreatePostRowComponent = ({ currentUser, targetUser, onPress, title, style }) => {
   const defaultTitle = `Want to share an update, ${currentUser.name}?`;
   const shareTitle = `Share an update with ${targetUser ? targetUser.name : 'Someone'}`;
   const isTargetCurrentUser = targetUser ? targetUser.id === currentUser.id : true;
   return (
-    <View style={styles.wrap}>
+    <View style={[styles.wrap, style]}>
       <TouchableOpacity onPress={onPress}>
         <Layout.RowWrap alignItems="center">
           <Avatar avatar={(currentUser.avatar && currentUser.avatar.medium) || defaultAvatar} />
@@ -42,6 +42,7 @@ CreatePostRowComponent.propTypes = {
   }),
   onPress: PropTypes.func,
   title: PropTypes.string,
+  style: PropTypes.object,
 };
 
 CreatePostRowComponent.defaultProps = {
@@ -49,6 +50,7 @@ CreatePostRowComponent.defaultProps = {
   targetUser: null,
   onPress: null,
   title: null,
+  style: null,
 };
 
 const mapStateToProps = ({ user }) => {
diff --git a/src/screens/Feed/components/GiphyModal/component.js b/src/screens/Feed/components/GiphyModal/component.js
index 500182a45..956cdc990 100644
--- a/src/screens/Feed/components/GiphyModal/component.js
+++ b/src/screens/Feed/components/GiphyModal/component.js
@@ -193,7 +193,6 @@ export class GiphyModal extends PureComponent {
           <View style={styles.searchBoxContainer}>
             <SearchBox
               placeholder="Search for a GIF"
-              searchIconOffset={116}
               style={styles.searchBox}
               value={query}
               onChangeText={this.handleSearchStateChange}
diff --git a/src/screens/Feed/components/MediaModal/component.js b/src/screens/Feed/components/MediaModal/component.js
index 16d7240ab..11c9a3e3b 100644
--- a/src/screens/Feed/components/MediaModal/component.js
+++ b/src/screens/Feed/components/MediaModal/component.js
@@ -169,7 +169,6 @@ class MediaModal extends PureComponent {
           <View style={styles.searchBoxContainer}>
             <SearchBox
               placeholder={'Search for Media'}
-              searchIconOffset={130}
               style={styles.searchBox}
               value={query}
               onChangeText={this.handleSearchStateChange}
diff --git a/src/screens/Feed/components/Post/component.js b/src/screens/Feed/components/Post/component.js
index c9cb68d81..e81dd2aa4 100644
--- a/src/screens/Feed/components/Post/component.js
+++ b/src/screens/Feed/components/Post/component.js
@@ -1,5 +1,5 @@
 import React, { PureComponent } from 'react';
-import { FlatList, View, TouchableOpacity, TouchableWithoutFeedback } from 'react-native';
+import { FlatList, View, TouchableOpacity, TouchableWithoutFeedback, Alert } from 'react-native';
 import PropTypes from 'prop-types';
 import { Kitsu } from 'kitsu/config/api';
 import { defaultAvatar } from 'kitsu/constants/app';
@@ -26,6 +26,7 @@ export class Post extends PureComponent {
   }
 
   state = {
+    post: this.props.post,
     comment: '',
     comments: [],
     latestComments: [],
@@ -36,6 +37,7 @@ export class Post extends PureComponent {
     postLikesCount: parseInt(this.props.post.postLikesCount, 10) || 0,
     overlayRemoved: false,
     isPostingComment: false,
+    isDeleted: false,
   };
 
   mounted = false
@@ -53,7 +55,7 @@ export class Post extends PureComponent {
 
   onPostPress = () => {
     this.props.onPostPress({
-      post: this.props.post,
+      post: this.state.post,
       comments: this.state.comments,
       commentsCount: this.state.commentsCount,
       topLevelCommentsCount: this.state.topLevelCommentsCount,
@@ -93,7 +95,7 @@ export class Post extends PureComponent {
       const comment = await Kitsu.create('comments', {
         content: this.state.comment.trim(),
         post: {
-          id: this.props.post.id,
+          id: this.state.post.id,
           type: 'posts',
         },
         user: {
@@ -124,7 +126,7 @@ export class Post extends PureComponent {
       // they can do so without a refetch.
       const comments = await Kitsu.findAll('comments', {
         filter: {
-          postId: this.props.post.id,
+          postId: this.state.post.id,
           parentId: '_none',
         },
         fields: {
@@ -151,7 +153,7 @@ export class Post extends PureComponent {
     try {
       const likes = await Kitsu.findAll('postLikes', {
         filter: {
-          postId: this.props.post.id,
+          postId: this.state.post.id,
           userId: this.props.currentUser.id,
         },
         include: 'user',
@@ -168,8 +170,8 @@ export class Post extends PureComponent {
 
   toggleLike = async () => {
     try {
-      const { currentUser, post } = this.props;
-      let { like, isLiked, postLikesCount } = this.state;
+      const { currentUser } = this.props;
+      let { like, isLiked, post, postLikesCount } = this.state;
 
       this.setState({
         isLiked: !isLiked,
@@ -203,6 +205,41 @@ export class Post extends PureComponent {
     }
   };
 
+  deletePost = async () => {
+    try {
+      const { post } = this.state;
+      this.setState({ isDeleted: true });
+      await Kitsu.destroy('posts', post.id);
+    } catch (err) {
+      console.log('Error deleting post:', err);
+      this.setState({ isDeleted: false });
+      Alert.alert('Sorry', 'There was an issue deleting the post.', [
+        { text: 'OK', onPress: null },
+      ]);
+    }
+  };
+
+  toggleEditor = () => {
+    if (this.props.currentUser) {
+      this.props.navigation.navigate('CreatePost', {
+        isEditing: true,
+        post: this.state.post,
+        onNewPostCreated: (post) => {
+          const { user, targetUser, spoiledUnit, media, targetGroup } = this.state.post;
+          // Keep the relationships in order since the update call will strip them
+          // and we don't need the additional include payload
+          const postWithRelationships = post;
+          postWithRelationships.user = user;
+          postWithRelationships.targetUser = targetUser;
+          postWithRelationships.spoiledUnit = spoiledUnit;
+          postWithRelationships.media = media;
+          postWithRelationships.targetGroup = targetGroup;
+          this.setState({ post: postWithRelationships });
+        },
+      });
+    }
+  };
+
   focusOnCommentInput = () => {
     if (this.commentInput) this.commentInput.focus();
   }
@@ -214,7 +251,17 @@ export class Post extends PureComponent {
   }
 
   render() {
-    const { navigation, post, currentUser } = this.props;
+    const { navigation, currentUser } = this.props;
+    const {
+      post,
+      comment,
+      latestComments,
+      overlayRemoved,
+      postLikesCount,
+      commentsCount,
+      isPostingComment,
+      isDeleted,
+    } = this.state;
     const {
       createdAt,
       content,
@@ -226,14 +273,7 @@ export class Post extends PureComponent {
       spoiledUnit,
       user,
     } = post;
-    const {
-      comment,
-      latestComments,
-      overlayRemoved,
-      postLikesCount,
-      commentsCount,
-      isPostingComment,
-    } = this.state;
+    if (isDeleted) { return null; }
 
     const isSpoilerOrNSFW = (spoiler || nsfw);
 
@@ -276,6 +316,8 @@ export class Post extends PureComponent {
             onAvatarPress={() => {
               if (user) navigation.navigate('ProfilePages', { userId: user.id });
             }}
+            onEditPress={this.toggleEditor}
+            onDelete={this.deletePost}
             name={user.name}
             time={createdAt}
           />
diff --git a/src/screens/Feed/components/Post/components/PostHeader/component.js b/src/screens/Feed/components/Post/components/PostHeader/component.js
index 6e81c10f8..8dbf6e2f4 100644
--- a/src/screens/Feed/components/Post/components/PostHeader/component.js
+++ b/src/screens/Feed/components/Post/components/PostHeader/component.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { View, TouchableOpacity, Clipboard, ToastAndroid, Platform } from 'react-native';
+import { View, TouchableOpacity, Clipboard, ToastAndroid, Platform, Alert } from 'react-native';
 import PropTypes from 'prop-types';
 import Icon from 'react-native-vector-icons/Ionicons';
 import moment from 'moment';
@@ -12,6 +12,10 @@ import { isEmpty } from 'lodash';
 import { kitsuConfig } from 'kitsu/config/env';
 import { styles } from './styles';
 
+const formatTime = (time) => (
+  moment().diff(time, 'days') < 2 ? moment(time).calendar() : `${moment(time).format('DD MMMM')} at ${moment(time).format('H:MMA')}`
+);
+
 export const PostHeader = ({
   post,
   avatar,
@@ -19,12 +23,21 @@ export const PostHeader = ({
   name,
   time,
   onBackButtonPress,
+  onEditPress,
+  onDelete,
   currentUser,
 }) => {
   const user = (post && post.user);
   const isCurrentUser = (user && currentUser && user.id === currentUser.id);
 
-  const postDateTime = moment().diff(time, 'days') < 2 ? moment(time).calendar() : `${moment(time).format('DD MMM')} at ${moment(time).format('H:MMA')}`;
+  const postDateTime = formatTime(time);
+  const editDateTime = `Edited ${formatTime(post.editedAt)}`;
+
+  const canMutate = () => {
+    const isStaffOrMod = currentUser.title === 'Staff' || currentUser.title === 'Mod';
+    return isCurrentUser || isStaffOrMod;
+  };
+
   const ACTION_OPTIONS = [
     {
       onSelected: async () => {
@@ -43,17 +56,31 @@ export const PostHeader = ({
       },
       text: 'Copy Link to Post',
     },
-    // TODO: Implement post deletion
-    // isCurrentUser ?
-    //   {
-    //     onSelected: null,
-    //     text: 'Delete Post',
-    //   } : {},
+    {
+      condition: canMutate,
+      onSelected: onEditPress,
+      text: 'Edit Post',
+    },
+    {
+      condition: canMutate,
+      onSelected: () => {
+        Alert.alert('Delete Post', 'Are you sure you want to delete this post?', [
+          { text: 'Cancel', onPress: null, },
+          { text: 'I\'m sure', onPress: onDelete, },
+        ], { cancelable: false });
+      },
+      text: 'Delete Post',
+    },
     {
       onSelected: null,
       text: 'Nevermind',
     },
-  ];
+  ].filter((action) => {
+    if (action.condition) {
+      return action.condition();
+    }
+    return true;
+  });
 
   return (
     <View style={styles.postHeader}>
@@ -68,19 +95,22 @@ export const PostHeader = ({
           <Avatar avatar={avatar} />
           <Layout.RowMain>
             <StyledText color="dark" size="xsmall" bold>{name}</StyledText>
-            <StyledText color="grey" size="xxsmall" textStyle={{ marginTop: 3 }}>{postDateTime}</StyledText>
+            <StyledText color="grey" size="xxsmall" textStyle={{ marginTop: 3 }}>
+              {postDateTime}
+              {post.editedAt && " · "}
+              {post.editedAt && editDateTime}
+            </StyledText>
           </Layout.RowMain>
         </TouchableOpacity>
 
-        {/* Todo KB: hook up with real action for each options */}
         <SelectMenu
-          options={ACTION_OPTIONS.filter(s => !isEmpty(s))}
+          options={ACTION_OPTIONS}
           onOptionSelected={(value, option) => {
             if (option.onSelected) option.onSelected();
           }}
           activeOpacity={0.8}
         >
-          <Icon name="ios-more" color={colors.lightGrey} style={{ fontSize: 32, paddingVertical: 10 }} />
+          <Icon name="ios-more" color={colors.lightGrey} style={styles.postHeaderActions} />
         </SelectMenu>
       </Layout.RowWrap>
     </View>
diff --git a/src/screens/Feed/components/Post/components/PostHeader/styles.js b/src/screens/Feed/components/Post/components/PostHeader/styles.js
index ff162f090..cd02b0122 100644
--- a/src/screens/Feed/components/Post/components/PostHeader/styles.js
+++ b/src/screens/Feed/components/Post/components/PostHeader/styles.js
@@ -10,6 +10,11 @@ export const styles = StyleSheet.create({
     marginLeft: -scenePadding,
     padding: scenePadding,
   },
+  postHeaderActions: {
+    fontSize: 32,
+    paddingVertical: 10,
+    paddingLeft: 15,
+  },
   userDetailsLink: {
     flexDirection: 'row',
     alignItems: 'center',
diff --git a/src/screens/Feed/pages/PostCreation/CreatePost.js b/src/screens/Feed/pages/PostCreation/CreatePost.js
index 3ef114c3f..0c8216262 100644
--- a/src/screens/Feed/pages/PostCreation/CreatePost.js
+++ b/src/screens/Feed/pages/PostCreation/CreatePost.js
@@ -58,7 +58,7 @@ class CreatePost extends React.PureComponent {
     const { params = {} } = navigation.state;
 
     return {
-      title: 'Create Post',
+      title: params.isEditing ? 'Edit Post' : 'Create Post',
       headerTitleStyle: {
         color: '#FFFFFF',
         fontSize: 15,
@@ -72,7 +72,7 @@ class CreatePost extends React.PureComponent {
           disabled={params.busy}
           loading={params.busy}
           onPress={params.handlePressPost}
-          title="Post"
+          title={params.isEditing ? "Edit" : "Post"}
         />
       ),
     };
@@ -85,16 +85,29 @@ class CreatePost extends React.PureComponent {
     currentFeed: feedStreams[0],
     error: '',
     gif: null,
-    media: null,
-    nsfw: false,
-    spoiler: false,
+    media: this.props.navigation.state.params.media || null,
+    nsfw: this.props.navigation.state.params.nsfw || false,
+    spoiler: this.props.navigation.state.params.spoiler || false,
+    spoiledUnit: this.props.navigation.state.params.spoiledUnit || null,
   };
 
   componentDidMount() {
-    this.props.navigation.setParams({
+    const { navigation } = this.props;
+    navigation.setParams({
       handlePressPost: this.handlePressPost,
       busy: false,
     });
+
+    // Editing an existing post?
+    const { state: { params } } = navigation;
+    if (!params.isEditing) { return; }
+    const { post } = params;
+    this.setState({
+      content: post.content,
+      spoiler: post.spoiler || false,
+      nsfw: post.nsfw || false,
+      media: post.media,
+    });
   }
 
   handleMedia = (media) => {
@@ -119,7 +132,7 @@ class CreatePost extends React.PureComponent {
     const { navigation } = this.props;
     const { targetUser } = navigation.state.params;
     const currentUserId = this.props.currentUser.id;
-    const { content, currentFeed, gif, media, nsfw, spoiler } = this.state;
+    const { content, currentFeed, gif, media, nsfw, spoiler, spoiledUnit } = this.state;
 
     if (navigation.state.params.busy) return;
 
@@ -142,10 +155,17 @@ class CreatePost extends React.PureComponent {
     const mediaData = media ? {
       media: {
         id: media.id,
-        type: media.kind,
+        type: media.kind || media.type,
       },
     } : {};
 
+    const spoiledData = spoiledUnit ? {
+      spoiledUnit: {
+        id: spoiledUnit.id,
+        type: spoiledUnit.type,
+      }
+    } : {};
+
     const targetData = (targetUser && targetUser.id !== currentUserId) ? {
       targetUser: {
         type: 'users',
@@ -161,18 +181,29 @@ class CreatePost extends React.PureComponent {
     const targetInterestData = isEmpty(targetData) ? { targetInterest } : {};
 
     try {
-      const post = await Kitsu.create('posts', {
-        content: additionalContent,
-        ...targetInterestData,
-        user: {
-          type: 'users',
-          id: currentUserId,
-        },
-        ...targetData,
-        ...mediaData,
-        nsfw,
-        spoiler,
-      });
+      let post = null;
+      if (navigation.state.params.isEditing) {
+        post = await Kitsu.update('posts', {
+          id: navigation.state.params.post.id,
+          content: additionalContent,
+          nsfw,
+          spoiler,
+        });
+      } else {
+        post = await Kitsu.create('posts', {
+          content: additionalContent,
+          ...targetInterestData,
+          user: {
+            type: 'users',
+            id: currentUserId,
+          },
+          ...targetData,
+          ...mediaData,
+          nsfw,
+          spoiler,
+          ...spoiledData,
+        });
+      }
 
       if (navigation.state.params.onNewPostCreated) {
         navigation.state.params.onNewPostCreated(post);
@@ -200,7 +231,7 @@ class CreatePost extends React.PureComponent {
       nsfw,
       spoiler,
     } = this.state;
-    const { busy, targetUser } = navigation.state.params;
+    const { busy, targetUser, isEditing, isMediaDisabled } = navigation.state.params;
 
     const isValidTargetUser = (targetUser && targetUser.id !== currentUser.id && targetUser.name);
     const placeholder = isValidTargetUser ? `Write something to ${targetUser.name}` : 'Write something....';
@@ -262,7 +293,7 @@ class CreatePost extends React.PureComponent {
             <View>
               {media ?
                 <MediaItem
-                  disabled={busy}
+                  disabled={busy || isEditing || isMediaDisabled}
                   media={media}
                   onClear={() => this.setState({ media: null })}
                 />
@@ -271,7 +302,7 @@ class CreatePost extends React.PureComponent {
                   text="Tag Anime or Manga"
                   icon="tag"
                   color={colors.blue}
-                  disabled={busy}
+                  disabled={busy || isEditing}
                   onPress={() => this.handleMediaPickerModal(true)}
                   style={styles.tagMedia}
                 />
diff --git a/src/screens/Intro/RegistrationScreen.js b/src/screens/Intro/RegistrationScreen.js
index 99464520f..f105ba6f6 100644
--- a/src/screens/Intro/RegistrationScreen.js
+++ b/src/screens/Intro/RegistrationScreen.js
@@ -68,7 +68,8 @@ class RegistrationScreen extends React.Component {
   loginFacebook = () => {
     const { navigation } = this.props;
     this.setState({ loggingUser: true });
-    LoginManager.logInWithReadPermissions(['public_profile']).then(
+    LoginManager.logOut();
+    LoginManager.logInWithReadPermissions(['public_profile', 'email']).then(
       (result) => {
         if (!result.isCancelled) {
           this.props.loginUser(null, navigation, 'registration');
diff --git a/src/screens/Library/LibraryScreen/component.js b/src/screens/Library/LibraryScreen/component.js
index 9701d4962..fff8e2555 100644
--- a/src/screens/Library/LibraryScreen/component.js
+++ b/src/screens/Library/LibraryScreen/component.js
@@ -4,7 +4,6 @@ import { StyledText } from 'kitsu/components/StyledText';
 import { PropTypes } from 'prop-types';
 import { UserLibraryList } from 'kitsu/screens/Profiles/UserLibrary/components/UserLibraryList';
 import { capitalize, isEmpty, camelCase } from 'lodash';
-import { TabBar } from 'kitsu/screens/Profiles/components/TabBar';
 import ScrollableTabView from 'react-native-scrollable-tab-view';
 import { styles } from './styles';
 import { LibraryScreenHeader } from '../LibraryScreenHeader';
@@ -17,6 +16,7 @@ const TAB_TEXT_MAPPING = {
   on_hold: { anime: 'On Hold', manga: 'On Hold' },
   dropped: { anime: 'Dropped', manga: 'Dropped' },
 };
+const LIBRARY_PAGINATION_LIMIT = 60;
 
 export class LibraryScreenComponent extends PureComponent {
   static navigationOptions = () => ({
@@ -107,7 +107,7 @@ export class LibraryScreenComponent extends PureComponent {
     if (!currentUser || !currentLibrary) return;
 
     if (!currentLibrary.loading && currentLibrary.fetchMore) {
-      currentLibrary.fetchMore();
+      currentLibrary.fetchMore(LIBRARY_PAGINATION_LIMIT);
     }
   }
 
@@ -190,12 +190,13 @@ export class LibraryScreenComponent extends PureComponent {
     );
   }
 
-  renderTabItem(name, page, active, goToPage) {
+  renderTabItem(name, page, active, goToPage, onLayout) {
     return (
       <TouchableOpacity
         key={name}
         style={[styles.tabItem, active && styles.tabItem__selected]}
         onPress={() => goToPage(page)}
+        onLayout={onLayout}
       >
         <Text style={[styles.statusText, active && styles.tabText__selected]}>
           {name}
diff --git a/src/screens/Library/LibraryScreen/tabbar.js b/src/screens/Library/LibraryScreen/tabbar.js
index bf411ccb5..f7652d913 100644
--- a/src/screens/Library/LibraryScreen/tabbar.js
+++ b/src/screens/Library/LibraryScreen/tabbar.js
@@ -1,38 +1,133 @@
-import React from 'react';
-import { ViewPropTypes } from 'react-native';
+import React, { PureComponent } from 'react';
+import { ViewPropTypes, Platform, Dimensions, View } from 'react-native';
 import { PropTypes } from 'prop-types';
 import { TabBar } from 'kitsu/screens/Profiles/components/TabBar';
 
-export const LibraryTabBar = ({
-  goToPage, // Provided by react-native-scrollable-tab-view
-  renderTab,
-  activeTab, // Provided by react-native-scrollable-tab-view
-  tabs, // Provided by react-native-scrollable-tab-view
-  tabBarStyle,
-  tabBarContainerStyle,
-}) => (
-  <TabBar style={tabBarStyle} containerStyle={tabBarContainerStyle}>
-    {tabs.map((name, page) => {
-      const isTabActive = activeTab === page;
-      return renderTab(name, page, isTabActive, goToPage);
-    })}
-  </TabBar>
-);
-
-
-LibraryTabBar.propTypes = {
-  goToPage: PropTypes.func,
-  renderTab: PropTypes.func.isRequired,
-  activeTab: PropTypes.number,
-  tabs: PropTypes.array,
-  tabBarStyle: ViewPropTypes.style,
-  tabBarContainerStyle: ViewPropTypes.style,
-};
-
-LibraryTabBar.defaultProps = {
-  goToPage: () => null,
-  activeTab: null,
-  tabs: [],
-  tabBarStyle: {},
-  tabBarContainerStyle: {},
-};
+const WINDOW_WIDTH = Dimensions.get('window').width;
+
+export class LibraryTabBar extends PureComponent {
+  static propTypes = {
+    goToPage: PropTypes.func,
+    renderTab: PropTypes.func.isRequired,
+    activeTab: PropTypes.number,
+    tabs: PropTypes.array,
+    tabBarStyle: ViewPropTypes.style,
+    tabBarContainerStyle: ViewPropTypes.style,
+  };
+
+  static defaultProps = {
+    goToPage: () => null,
+    activeTab: null,
+    tabs: [],
+    tabBarStyle: {},
+    tabBarContainerStyle: {},
+  };
+
+  state = {
+    containerWidth: null,
+  };
+
+  _tabMeasurements = [];
+
+  componentDidMount() {
+    // Provided by react-native-scrollable-tab-view
+    this.props.scrollValue.addListener(this.updateView);
+  }
+
+  componentWillReceiveProps(nextProps) {
+    if (JSON.stringify(this.props.tabs) !== JSON.stringify(nextProps.tabs) && this.state.containerWidth) {
+      this.setState({ containerWidth: null, });
+    }
+  }
+
+  updateView = (offset) => {
+    const position = Math.floor(offset.value);
+    const pageOffset = offset.value % 1;
+    const tabCount = this.props.tabs.length;
+    const lastTabPosition = tabCount - 1;
+    if (tabCount === 0 || offset.value < 0 || offset.value > lastTabPosition) {
+      return;
+    }
+    if (this.necessaryMeasurementsCompleted(position, position === lastTabPosition)) {
+      this.updateTabBar(position, pageOffset);
+    }
+  };
+
+  necessaryMeasurementsCompleted = (position, isLastTab) => {
+    return this._tabMeasurements[position] &&
+      (isLastTab || this._tabMeasurements[position + 1]) &&
+      this._tabContainerMeasurements &&
+      this._containerMeasurements;
+  };
+
+  updateTabBar = (position, pageOffset) => {
+    const containerWidth = this._containerMeasurements.width;
+    const tabWidth = this._tabMeasurements[position].width;
+    const nextTabMeasurements = this._tabMeasurements[position + 1];
+    const nextTabWidth = nextTabMeasurements && nextTabMeasurements.width || 0;
+    const tabOffset = this._tabMeasurements[position].left;
+    const absolutePageOffset = pageOffset * tabWidth;
+    let newScrollX = tabOffset + absolutePageOffset;
+
+    newScrollX -= (containerWidth - (1 - pageOffset) * tabWidth - pageOffset * nextTabWidth) / 2;
+    newScrollX = newScrollX >= 0 ? newScrollX : 0;
+
+    if (Platform.OS === 'android') {
+      this._scrollView.scrollTo({ x: newScrollX, y: 0, animated: false, });
+    } else {
+      const rightBoundScroll = this._tabContainerMeasurements.width - (this._containerMeasurements.width);
+      newScrollX = newScrollX > rightBoundScroll ? rightBoundScroll : newScrollX;
+      this._scrollView.scrollTo({ x: newScrollX, y: 0, animated: false, });
+    }
+  };
+
+  measureTab = (page, event) => {
+    const { x, width, height, } = event.nativeEvent.layout;
+    this._tabMeasurements[page] = { left: x, right: x + width, width, height, };
+    this.updateView({ value: this.props.scrollValue._value });
+  };
+
+  onTabContainerLayout = (e) => {
+    this._tabContainerMeasurements = e.nativeEvent.layout;
+    let width = this._tabContainerMeasurements.width;
+    if (width < WINDOW_WIDTH) {
+      width = WINDOW_WIDTH;
+    }
+    this.setState({ containerWidth: width });
+    this.updateView({ value: this.props.scrollValue._value });
+  };
+
+  onContainerLayout = (e) => {
+    this._containerMeasurements = e.nativeEvent.layout;
+    this.updateView({ value: this.props.scrollValue._value });
+  };
+
+  render() {
+    const {
+      goToPage, // Provided by react-native-scrollable-tab-view
+      renderTab,
+      activeTab, // Provided by react-native-scrollable-tab-view
+      tabs, // Provided by react-native-scrollable-tab-view
+      tabBarStyle,
+      tabBarContainerStyle,
+    } = this.props;
+    return (
+      <TabBar
+        style={tabBarStyle}
+        containerStyle={tabBarContainerStyle}
+        onLayout={this.onContainerLayout}
+        onRef={r => { this._scrollView = r; }}
+      >
+        <View
+          style={{ flexDirection: 'row', width: this.state.containerWidth }}
+          onLayout={this.onTabContainerLayout}
+        >
+          {tabs.map((name, page) => {
+            const isTabActive = activeTab === page;
+            return renderTab(name, page, isTabActive, goToPage, (e) => this.measureTab(page, e));
+          })}
+        </View>
+      </TabBar>
+    );
+  }
+}
diff --git a/src/screens/Library/LibrarySearch/component.js b/src/screens/Library/LibrarySearch/component.js
index faba6ddec..2d1ff5be5 100644
--- a/src/screens/Library/LibrarySearch/component.js
+++ b/src/screens/Library/LibrarySearch/component.js
@@ -172,7 +172,6 @@ export class LibrarySearchComponent extends PureComponent {
         style={styles.searchBox}
         onChangeText={this.onSearchTermChanged}
         placeholder="Search Library"
-        searchIconOffset={120}
         value={this.state.searchTerm}
         onSubmitEditing={Keyboard.dismiss}
       />
diff --git a/src/screens/Onboarding/Aozora/CreateAccountScreen.js b/src/screens/Onboarding/Aozora/CreateAccountScreen.js
index 7b01f7ddf..8de9b399b 100644
--- a/src/screens/Onboarding/Aozora/CreateAccountScreen.js
+++ b/src/screens/Onboarding/Aozora/CreateAccountScreen.js
@@ -6,6 +6,7 @@ import { connect } from 'react-redux';
 import { updateGeneralSettings } from 'kitsu/store/user/actions';
 import { setScreenName } from 'kitsu/store/onboarding/actions';
 import { isEmpty, isNull } from 'lodash';
+import { PasswordInput } from 'kitsu/components/PasswordInput';
 import { styles as commonStyles } from '../common/styles';
 import { styles } from './styles';
 
@@ -27,12 +28,12 @@ class CreateAccountScreen extends React.Component {
     if (usernameConfirmed) {
       const { username, email, password, confirmPassword } = this.state;
       const { currentUser, navigation } = this.props;
-      const isValidPass = !isEmpty(password) && password === confirmPassword;
+      const isValidPass = !isEmpty(password) && password.trim() === confirmPassword.trim();
 
       const valuesToUpdate = {
         ...((username !== currentUser.name && { name: username.trim() }) || {}),
         ...((email !== currentUser.email && { email: email.trim() }) || {}),
-        ...((!currentUser.hasPassword && isValidPass && { password }) || {}),
+        ...((!currentUser.hasPassword && isValidPass && { password: password.trim() }) || {}),
       };
       console.log('values to update', valuesToUpdate);
 
@@ -64,16 +65,30 @@ class CreateAccountScreen extends React.Component {
   render() {
     const { email, username, password, confirmPassword, usernameConfirmed } = this.state;
     const { currentUser, error, loading } = this.props;
-    const isValidPass = password.length >= 8 && password === confirmPassword;
+    const isValidPass = password.trim().length >= 8 && password.trim() === confirmPassword.trim();
     const passwordSet = currentUser.hasPassword || isValidPass;
 
     const isEmailValid = !isEmpty(email) && email.includes('@');
     const fieldsValid = isEmailValid && !isEmpty(username);
 
-    const passwordText = passwordSet ? 'Looks good!' : 'You need to set a password!';
+    const passwordText = passwordSet ? 'Looks good!' : 'Password needs to be atleast 8 characters long';
     const usernameText = !usernameConfirmed ? 'Confirm Username' : passwordText;
     const buttonText = !fieldsValid ? 'Please fill out the fields above' : usernameText;
 
+    // We need to extract the error contents
+    // We can't be sure if it's a kitsu error object or just a string
+    // Thus we check both below
+    let errorString = null;
+    if (!isEmpty(error)) {
+      if (error instanceof Array && error[0]) {
+        errorString = error[0].detail || error[0].title || 'Something went wrong';
+      } else if (error instanceof String) {
+        errorString = error;
+      } else {
+        errorString = error.detail || error.title || 'Something went wrong';
+      }
+    }
+
     return (
       <View style={commonStyles.container}>
         <Text style={commonStyles.tutorialText}>
@@ -98,18 +113,15 @@ class CreateAccountScreen extends React.Component {
         />
         {usernameConfirmed && !currentUser.hasPassword ? (
           <View>
-            <Input
+            <PasswordInput
               placeholder="Password"
-              secureTextEntry
               value={password}
               onChangeText={text => this.onChangeText(text, 'password')}
             />
-            <Input
+            <PasswordInput
               placeholder="Confirm Password"
-              secureTextEntry
               value={confirmPassword}
               onChangeText={text => this.onChangeText(text, 'confirmPassword')}
-              autoCapitalize="none"
             />
           </View>
         ) : (
@@ -123,10 +135,10 @@ class CreateAccountScreen extends React.Component {
           titleStyle={commonStyles.buttonTitleStyle}
           loading={loading}
         />
-        { !isEmpty(error) &&
+        {!isEmpty(errorString) &&
           <View style={styles.errorContainer}>
             <Text style={styles.errorText}>
-              An Error Occurred: {error.detail || 'Something went wrong!'}
+              An Error Occurred: {errorString}
             </Text>
           </View>
         }
diff --git a/src/screens/Profiles/MediaPages/index.js b/src/screens/Profiles/MediaPages/index.js
index e03512f3d..1cd19134d 100644
--- a/src/screens/Profiles/MediaPages/index.js
+++ b/src/screens/Profiles/MediaPages/index.js
@@ -331,7 +331,7 @@ class MediaPages extends PureComponent {
       // Fetch the media with categories
       const includes = ['categories'];
       if (type === 'anime') {
-        includes.push('animeProductions.producer');
+        includes.push('animeProductions.producer,streamingLinks.streamer');
       }
       const media = await Kitsu.one(type, id).get({
         include: includes.join(),
@@ -363,7 +363,7 @@ class MediaPages extends PureComponent {
     try {
       // To make this simple, we'll just refetch the media object with these fields.
       const media = await Kitsu.one(type, id).get({
-        include: `mediaRelationships.destination,${type === 'anime' ? 'episodes' : 'chapters'}`,
+        include: `mediaRelationships.destination,${type === 'anime' ? 'episodes.videos' : 'chapters'}`,
       });
 
       const previousCategories = (this.state.media && this.state.media.categories) || null;
@@ -372,9 +372,12 @@ class MediaPages extends PureComponent {
       const previousProductions = (this.state.media && this.state.media.animeProductions) || null;
       const productions = (previousProductions && { animeProductions: previousProductions }) || {};
 
+      const previousStreamingLinks = (this.state.media && this.state.media.streamingLinks) || null;
+      const streamingLinks = (previousStreamingLinks && { streamingLinks: previousStreamingLinks }) || {};
+
       // Combine the 2 object that we have
       this.setState({
-        media: { ...media, ...categories, ...productions },
+        media: { ...media, ...categories, ...productions, ...streamingLinks },
       });
     } catch (error) {
       console.log(error);
diff --git a/src/screens/Profiles/MediaPages/pages/Episodes/Unit/component.js b/src/screens/Profiles/MediaPages/pages/Episodes/Unit/component.js
new file mode 100644
index 000000000..ad755b460
--- /dev/null
+++ b/src/screens/Profiles/MediaPages/pages/Episodes/Unit/component.js
@@ -0,0 +1,275 @@
+import React, { PureComponent } from 'react';
+import { ScrollView, View, Platform, Text, WebView, ActivityIndicator, Dimensions, FlatList, TouchableOpacity } from 'react-native';
+import PropTypes from 'prop-types';
+import { connect } from 'react-redux';
+import { CustomHeader } from 'kitsu/screens/Profiles/components/CustomHeader';
+import WKWebView from 'react-native-wkwebview-reborn';
+import emptyComment from 'kitsu/assets/img/quick_update/comment_empty.png';
+import { KeyboardAwareFlatList } from 'react-native-keyboard-aware-scroll-view';
+import { ErrorPage } from 'kitsu/screens/Profiles/components/ErrorPage';
+import { SceneLoader } from 'kitsu/components/SceneLoader';
+import { StyledText, ViewMoreStyledText } from 'kitsu/components/StyledText';
+import { CreatePostRow } from 'kitsu/screens/Feed/components/CreatePostRow';
+import { SectionHeader } from 'kitsu/screens/Profiles/components/SectionHeader';
+import { Post } from 'kitsu/screens/Feed/components/Post';
+import { ImageStatus } from 'kitsu/components/ImageStatus';
+import { SelectMenu } from 'kitsu/components/SelectMenu';
+import { preprocessFeed } from 'kitsu/utils/preprocessFeed';
+import { scenePadding } from 'kitsu/screens/Profiles/constants';
+import { Kitsu } from 'kitsu/config/api';
+import * as colors from 'kitsu/constants/colors';
+import moment from 'moment';
+import URL from 'url-parse';
+import { styles } from './styles';
+
+const WebComponent = Platform.OS === 'ios' ? WKWebView : WebView;
+const LANGUAGE_LOOKUP = {
+  en: 'English',
+  ja: 'Japanese',
+  es: 'Spanish',
+};
+const ITEM_WIDTH = 50;
+
+class Unit extends PureComponent {
+  static navigationOptions = ({ navigation }) => ({
+    header: () => {
+      const { unit } = navigation.state.params;
+      const type = unit.type === 'episodes' ? 'Episodes' : 'Chapters';
+      return (
+        <CustomHeader
+          leftButtonAction={() => navigation.goBack(null)}
+          leftButtonTitle={`Back to ${type}`}
+          backgroundColor={colors.listBackPurple}
+        />
+      );
+    },
+  });
+
+  state = {
+    isFeedLoading: true,
+    selectedUnit: this.props.navigation.state.params.unit,
+    selectedVideoIndex: 0,
+    discussions: [],
+  };
+
+  componentDidMount() {
+    this.fetchFeed();
+  }
+
+  fetchFeed = async () => {
+    const { selectedUnit } = this.state;
+    this.setState({ isFeedLoading: true });
+    try {
+      const posts = await Kitsu.find('episodeFeed', selectedUnit.id, {
+        include: 'media,actor,unit,subject,target,target.user,target.target_user,target.spoiled_unit,target.media,target.target_group,subject.user,subject.target_user,subject.spoiled_unit,subject.media,subject.target_group,subject.followed,subject.library_entry,subject.anime,subject.manga',
+        filter: { kind: 'posts' },
+        page: { limit: 10, },
+      });
+      const discussions = preprocessFeed(posts);
+      this.setState({ discussions, isFeedLoading: false });
+    } catch (error) {
+      console.log('Failed to fetch feed:', error);
+      this.setState({ discussions: [], isFeedLoading: false });
+    }
+  };
+
+  onVideoChange = (item) => {
+    // Could be a video change within the current unit or a unit change
+    let video = null;
+    if (typeof item === 'number') {
+      this.setState({ selectedVideoIndex: item });
+      video = this.state.selectedUnit.videos[item];
+    } else {
+      this.setState({ selectedUnit: item, selectedVideoIndex: 0 }, this.fetchFeed);
+      video = item.videos[0];
+    }
+    const message = { message: 'initialize', id: video.embedData.eid };
+    this.webview.postMessage(JSON.stringify(message));
+  };
+
+  getLanguageTitle = (video) => {
+    const { dubLang, subLang } = video;
+    if (dubLang !== 'ja') {
+      return `${LANGUAGE_LOOKUP[dubLang]} Dub`;
+    }
+    return `${LANGUAGE_LOOKUP[subLang]} Sub`;
+  };
+
+  navigateToCreatePost = () => {
+    this.props.navigation.navigate('CreatePost', {
+      onNewPostCreated: this.fetchFeed,
+      spoiler: true,
+      spoiledUnit: this.state.selectedUnit,
+      media: this.props.navigation.state.params.media,
+      isMediaDisabled: true,
+    });
+  };
+
+  navigateToPost = (props) => {
+    this.props.navigation.navigate('PostDetails', props);
+  };
+
+  renderLoading = () => (
+    <SceneLoader />
+  );
+
+  renderError = () => (
+    <ErrorPage showHeader={false} />
+  );
+
+  renderPost = ({ item }) => (
+    <Post
+      post={item}
+      onPostPress={this.navigateToPost}
+      currentUser={this.props.currentUser}
+      navigation={this.props.navigation}
+    />
+  );
+
+  renderEmptyFeed = () => (
+    <ImageStatus
+      title="START THE DISCUSSION"
+      text="Be the first to share your thoughts"
+      image={emptyComment}
+      style={{ backgroundColor: colors.listBackPurple }}
+    />
+  );
+
+  getItemLayout = (data, index) => {
+    const item = data[index];
+    const width = item ? ITEM_WIDTH + (item.number.toString().length * 10) + 10 : ITEM_WIDTH + 20;
+    return { length: width, offset: width * index, index };
+  };
+
+  renderUnit = ({ item }) => {
+    const { selectedUnit, selectedVideoIndex } = this.state;
+    const selectedVideo = selectedUnit.videos[selectedVideoIndex];
+    const hasChildVideo = item.videos.filter(video => video === selectedVideo);
+    const width = ITEM_WIDTH + (item.number.toString().length * 10);
+    return (
+      <TouchableOpacity
+        style={[styles.unitButton, hasChildVideo.length === 1 && styles.unitButton__active, { minWidth: width, maxWidth: width }]}
+        onPress={() => { this.onVideoChange(item); }}
+      >
+        <StyledText bold color="dark" size="small">
+          {item.type === 'episodes' ? 'EP ' : 'CH '}
+          {item.number}
+        </StyledText>
+      </TouchableOpacity>
+    );
+  };
+
+  render() {
+    const { isFeedLoading, selectedUnit, selectedVideoIndex, discussions } = this.state;
+    const { media } = this.props.navigation.state.params;
+
+    const hasVideo = selectedUnit.videos && selectedUnit.videos.length >= 1;
+    const selectedVideo = hasVideo && selectedUnit.videos[selectedVideoIndex];
+
+    const unitPrefix = selectedUnit.type === 'episodes' ? 'EP' : 'CH';
+    const lowerUnitPrefix = selectedUnit.type === 'episodes' ? 'episode' : 'chapter';
+    const releaseText = selectedUnit.type === 'episodes' ? 'Aired' : 'Published';
+    let unitDate = selectedUnit.type === 'episodes' ? selectedUnit.airdate : selectedUnit.published;
+    unitDate = unitDate && moment(unitDate).format('MMMM Do, YYYY');
+
+    // Multiple video language options
+    const languageOptions = hasVideo && selectedUnit.videos.map((video, index) => ({ text: this.getLanguageTitle(video), value: index }));
+    if (languageOptions) { languageOptions.push('Nevermind'); }
+
+    // Select only units that have videos
+    const units = hasVideo && media.episodes.filter(item => item.videos.length >= 1).sort((a, b) => a.number - b.number);
+    const unitsIndex = hasVideo && units.findIndex(item => (
+      item.videos.filter(video => video === selectedVideo).length === 1
+    ));
+
+    // Injected javascript
+    const selectedVideoId = selectedVideo && selectedVideo.embedData.eid;
+    const injectedJavaScript = `window.initializeHulu('${selectedVideoId}');`;
+
+    return (
+      <ScrollView style={styles.container}>
+        {/* Video */}
+        {hasVideo && (
+          <View style={styles.videoContainer}>
+            <WebComponent
+              ref={(ref) => { this.webview = ref; }}
+              style={styles.webContainer}
+              source={{ uri: 'https://kitsu.io/hulu-embed-frame.html' }}
+              renderLoading={this.renderLoading}
+              renderError={this.renderError}
+              injectedJavaScript={injectedJavaScript}
+            />
+            {/* Type selector */}
+            <View style={styles.languageContainer}>
+              <SelectMenu
+                options={languageOptions}
+                onOptionSelected={this.onVideoChange}
+              >
+                <View style={styles.languageButton}>
+                  <StyledText color="dark" size="small">{this.getLanguageTitle(selectedVideo)}</StyledText>
+                </View>
+              </SelectMenu>
+            </View>
+            {/* Unit selector */}
+            <View style={styles.unitContainer}>
+              <FlatList
+                horizontal
+                showsHorizontalScrollIndicator={false}
+                keyExtractor={item => item.id}
+                data={units}
+                getItemLayout={this.getItemLayout}
+                initialScrollIndex={unitsIndex}
+                renderItem={this.renderUnit}
+              />
+            </View>
+          </View>
+        )}
+
+        {/* Unit information */}
+        <View style={styles.metaContainer}>
+          <View style={{ marginBottom: 10 }}>
+            <View style={{ flexDirection: 'row' }}>
+              <StyledText color="dark" bold>{unitPrefix} {selectedUnit.number} </StyledText>
+              <StyledText color="dark" textStyle={{ flex: 1 }}>{selectedUnit.canonicalTitle}</StyledText>
+            </View>
+            {unitDate && (
+              <StyledText color="grey" size="xsmall">First {releaseText}: {unitDate}</StyledText>
+            )}
+          </View>
+          <ViewMoreStyledText size="small" color="dark" ellipsizeMode="tail" numberOfLines={4}>{selectedUnit.synopsis}</ViewMoreStyledText>
+        </View>
+
+        {/* Feed */}
+        <View>
+          <View style={{ marginHorizontal: 10, marginVertical: 15 }}>
+            <CreatePostRow
+              title={`What did you think of this ${lowerUnitPrefix}?`}
+              onPress={this.navigateToCreatePost}
+              style={{ borderRadius: 6 }}
+            />
+          </View>
+          <View style={{ paddingVertical: scenePadding }}>
+            <SectionHeader title="Discussion" />
+            {isFeedLoading ? (
+              this.renderLoading()
+            ) : (
+              <KeyboardAwareFlatList
+                data={discussions}
+                keyExtractor={item => item.id}
+                renderItem={this.renderPost}
+                ListEmptyComponent={this.renderEmptyFeed}
+              />
+            )}
+          </View>
+        </View>
+      </ScrollView>
+    );
+  }
+};
+
+const mapStateToProps = ({ user }) => {
+  const { currentUser } = user;
+  return { currentUser };
+};
+
+export default connect(mapStateToProps)(Unit);
diff --git a/src/screens/Profiles/MediaPages/pages/Episodes/Unit/index.js b/src/screens/Profiles/MediaPages/pages/Episodes/Unit/index.js
new file mode 100644
index 000000000..b404d7fd4
--- /dev/null
+++ b/src/screens/Profiles/MediaPages/pages/Episodes/Unit/index.js
@@ -0,0 +1 @@
+export { default } from './component';
diff --git a/src/screens/Profiles/MediaPages/pages/Episodes/Unit/styles.js b/src/screens/Profiles/MediaPages/pages/Episodes/Unit/styles.js
new file mode 100644
index 000000000..f4fc45dc7
--- /dev/null
+++ b/src/screens/Profiles/MediaPages/pages/Episodes/Unit/styles.js
@@ -0,0 +1,50 @@
+import { StyleSheet, Dimensions } from 'react-native';
+import * as colors from 'kitsu/constants/colors';
+
+export const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    backgroundColor: colors.listBackPurple,
+  },
+  videoContainer: {
+    backgroundColor: colors.white,
+  },
+  webContainer: {
+    width: Dimensions.get('window').width,
+    height: 200
+  },
+  languageContainer: {
+    padding: 10,
+    flex: 1,
+    flexDirection: 'row',
+    justifyContent: 'center',
+  },
+  languageButton: {
+    paddingVertical: 5,
+    paddingHorizontal: 10,
+    borderWidth: 1,
+    borderColor: colors.lightGrey,
+    backgroundColor: colors.white,
+  },
+  unitContainer: {
+    flex: 1,
+    paddingVertical: 5,
+  },
+  unitButton: {
+    paddingVertical: 5,
+    paddingHorizontal: 10,
+    marginHorizontal: 5,
+    borderWidth: 1,
+    borderColor: colors.lightGrey,
+    borderRadius: 5,
+    backgroundColor: '#F1F1F1',
+    alignItems: 'center',
+  },
+  unitButton__active: {
+    backgroundColor: colors.white,
+  },
+  metaContainer: {
+    backgroundColor: colors.white,
+    padding: 15,
+  },
+});
diff --git a/src/screens/Profiles/MediaPages/pages/Episodes/component.js b/src/screens/Profiles/MediaPages/pages/Episodes/component.js
index 978aa1ba2..bb2acd5af 100644
--- a/src/screens/Profiles/MediaPages/pages/Episodes/component.js
+++ b/src/screens/Profiles/MediaPages/pages/Episodes/component.js
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import { TabContainer } from 'kitsu/screens/Profiles/components/TabContainer';
 import { RowSeparator } from 'kitsu/screens/Profiles/components/RowSeparator';
 import { StyledText } from 'kitsu/components/StyledText';
-import { isNull, padStart } from 'lodash';
+import { isNull, padStart, isEmpty } from 'lodash';
 import Icon from 'react-native-vector-icons/Ionicons';
 import { lightGrey, listBackPurple } from 'kitsu/constants/colors';
 import { styles } from './styles';
@@ -38,6 +38,13 @@ class Episodes extends PureComponent {
     });
   }
 
+  navigateToUnitPage = (unit) => {
+    this.props.navigation.navigate('UnitDetails', {
+      unit,
+      media: this.props.media,
+    });
+  }
+
   renderItem = ({ item }) => {
     const { libraryEntry, media, onEpisodeProgress, loadingLibrary } = this.props;
 
@@ -52,8 +59,16 @@ class Episodes extends PureComponent {
 
     return (
       <View style={styles.itemWrap}>
-        <StyledText color="black" size="small" bold textStyle={styles.itemNumber}>{paddedString}</StyledText>
-        <StyledText color="black" size="small" textStyle={styles.itemTitle}>{title}</StyledText>
+        <TouchableOpacity
+          style={styles.textContainer}
+          onPress={() => this.navigateToUnitPage(item)}
+        >
+          <StyledText color="black" size="small" bold textStyle={styles.itemNumber}>{paddedString}</StyledText>
+          <StyledText color="black" size="small" textStyle={styles.itemTitle} numberOfLines={1}>{title}</StyledText>
+          { !isEmpty(item.videos) &&
+            <Icon name="ios-desktop-outline" style={styles.watchIcon} size={18} />
+          }
+        </TouchableOpacity>
         <TouchableOpacity
           onPress={() => onEpisodeProgress && onEpisodeProgress(item.number)}
           style={styles.progressIconContainer}
diff --git a/src/screens/Profiles/MediaPages/pages/Episodes/styles.js b/src/screens/Profiles/MediaPages/pages/Episodes/styles.js
index 6ea96146e..fb4681482 100644
--- a/src/screens/Profiles/MediaPages/pages/Episodes/styles.js
+++ b/src/screens/Profiles/MediaPages/pages/Episodes/styles.js
@@ -14,9 +14,14 @@ export const styles = StyleSheet.create({
     flexDirection: 'row',
     alignItems: 'center',
   },
-  itemTitle: {
+  textContainer: {
     flex: 1,
+    flexDirection: 'row',
+    alignItems: 'center',
+  },
+  itemTitle: {
     marginLeft: 8,
+    flexShrink: 1,
   },
   progressIconContainer: {
     paddingLeft: 8,
@@ -52,4 +57,9 @@ export const styles = StyleSheet.create({
     textAlign: 'right',
     textAlignVertical: 'center',
   },
+  watchIcon: {
+    color: colors.darkGrey,
+    paddingHorizontal: 8,
+    paddingVertical: 0,
+  },
 });
diff --git a/src/screens/Profiles/MediaPages/pages/Summary/component.js b/src/screens/Profiles/MediaPages/pages/Summary/component.js
index bce70ff72..0ddbc6bf7 100644
--- a/src/screens/Profiles/MediaPages/pages/Summary/component.js
+++ b/src/screens/Profiles/MediaPages/pages/Summary/component.js
@@ -1,5 +1,5 @@
 import React, { PureComponent } from 'react';
-import { FlatList } from 'react-native';
+import { FlatList, Linking } from 'react-native';
 import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
 import { Kitsu } from 'kitsu/config/api';
@@ -11,8 +11,12 @@ import { ImageCard } from 'kitsu/screens/Profiles/components/ImageCard';
 import { ReactionBox } from 'kitsu/screens/Profiles/components/ReactionBox';
 import { MediaDetails } from 'kitsu/screens/Profiles/components/MediaDetails';
 import { preprocessFeed } from 'kitsu/utils/preprocessFeed';
-import { upperFirst, isNull } from 'lodash';
+import { upperFirst, isNull, isEmpty } from 'lodash';
+import { scenePadding } from 'kitsu/screens/Profiles/constants';
+import { STREAMING_SERVICES } from 'kitsu/constants/app';
 import { SummaryProgress } from './progress';
+import { styles } from './styles';
+
 
 class SummaryComponent extends PureComponent {
   static propTypes = {
@@ -81,6 +85,12 @@ class SummaryComponent extends PureComponent {
   navigateToMedia = (mediaType, mediaId) => (
     this.props.navigation.navigate('MediaPages', { mediaId, mediaType, })
   );
+  navigateToUnitPage = (unit, media) => {
+    this.props.navigation.navigate('UnitDetails', {
+      unit,
+      media,
+    });
+  }
 
   renderItem = ({ item }) => (
     <Post
@@ -92,6 +102,78 @@ class SummaryComponent extends PureComponent {
     />
   );
 
+  renderEpisodes = (media) => {
+    const { loadingAdditional } = this.props;
+
+    // We only want to show episodes and not chapters
+    if (!media || media.type !== 'anime') return null;
+
+    // Filter out episodes that have videos associated with them
+    const episodesWithVideos = (media.episodes || []).filter(e => !isEmpty(e.videos));
+    const episodeSuffix = media.episodeCount ? `of ${media.episodeCount}` : '';
+
+    // We want to show the loading indicator to the user
+    // But once that is done and we don't have any episodes then we just don't render anything
+    if (!loadingAdditional && isEmpty(episodesWithVideos)) return null;
+
+    return (
+      <ScrollableSection
+        title="Episodes"
+        onViewAllPress={() => this.navigateTo('Episodes')}
+        data={this.formatData(episodesWithVideos)}
+        loading={loadingAdditional}
+        renderItem={({ item }) => (
+          <ScrollItem>
+            <ImageCard
+              subtitle={`Ep. ${item.number} ${episodeSuffix}`}
+              title={item.canonicalTitle}
+              variant="landscapeLarge"
+              source={{
+                uri: (item.thumbnail && item.thumbnail.original) ||
+                      (media.posterImage && media.posterImage.medium),
+              }}
+              onPress={() => this.navigateToUnitPage(item, media)}
+            />
+          </ScrollItem>
+        )}
+      />
+    );
+  }
+
+  renderStreamingLinks = (media) => {
+    if (!media || media.type !== 'anime' || isEmpty(media.streamingLinks)) return null;
+
+    // Only show the streaming links that we have images for
+    const filtered = media.streamingLinks.filter((link) => {
+      const name = link.streamer && link.streamer.siteName;
+      return name && Object.keys(STREAMING_SERVICES).includes(name.toLowerCase());
+    }).sort((a, b) => a.streamer.siteName.localeCompare(b.streamer.siteName));
+
+    return (
+      <FlatList
+        data={filtered}
+        keyExtractor={i => i.id}
+        horizontal
+        showsHorizontalScrollIndicator={false}
+        contentContainerStyle={styles.streamingLinksContent}
+        renderItem={({ item }) => (
+          <ScrollItem spacing={scenePadding / 2}>
+            <ImageCard
+              variant="landscapeSmall"
+              source={item.streamer && STREAMING_SERVICES[item.streamer.siteName.toLowerCase()]}
+              onPress={() => {
+                if (!isEmpty(item.url)) {
+                  Linking.openURL(item.url);
+                }
+              }}
+            />
+          </ScrollItem>
+        )}
+        style={styles.streamingLinks}
+      />
+    );
+  }
+
   render() {
     const { media, castings, mediaReactions, loadingAdditional, libraryEntry, onLibraryEditPress } = this.props;
     const { loading, feed } = this.state;
@@ -107,6 +189,12 @@ class SummaryComponent extends PureComponent {
           onEditPress={onLibraryEditPress}
         />
 
+        {/* Streaming Links */}
+        {this.renderStreamingLinks(media)}
+
+        {/* Episodes */}
+        {this.renderEpisodes(media)}
+
         {/* Details */}
         <MediaDetails media={media} />
 
diff --git a/src/screens/Profiles/MediaPages/pages/Summary/styles.js b/src/screens/Profiles/MediaPages/pages/Summary/styles.js
index 3b0d5a37c..96a5cc922 100644
--- a/src/screens/Profiles/MediaPages/pages/Summary/styles.js
+++ b/src/screens/Profiles/MediaPages/pages/Summary/styles.js
@@ -51,4 +51,10 @@ export const styles = StyleSheet.create({
     marginLeft: 10,
     color: colors.lightGrey,
   },
+  streamingLinks: {
+    paddingBottom: scenePadding,
+  },
+  streamingLinksContent: {
+    paddingLeft: scenePadding,
+  },
 });
diff --git a/src/screens/Profiles/UserLibrary/components/LibraryEmptyState/component.js b/src/screens/Profiles/UserLibrary/components/LibraryEmptyState/component.js
index 67933a0a9..e25e7fa5f 100644
--- a/src/screens/Profiles/UserLibrary/components/LibraryEmptyState/component.js
+++ b/src/screens/Profiles/UserLibrary/components/LibraryEmptyState/component.js
@@ -13,14 +13,14 @@ const STATUS_MAP = {
     planned: 'you plan to watch',
     completed: 'you\'ve completed',
     on_hold: 'you have on hold',
-    dropped: 'you have dropped',
+    dropped: 'you\'ve dropped',
   },
   manga: {
     current: 'you\'re currently reading',
     planned: 'you plan to read',
     completed: 'you\'ve completed',
     on_hold: 'you have on hold',
-    dropped: 'you have dropped',
+    dropped: 'you\'ve dropped',
   },
 };
 
diff --git a/src/screens/Profiles/UserLibrary/components/UserLibraryEditScreen/component.js b/src/screens/Profiles/UserLibrary/components/UserLibraryEditScreen/component.js
index cace9e8d2..f873de1ea 100644
--- a/src/screens/Profiles/UserLibrary/components/UserLibraryEditScreen/component.js
+++ b/src/screens/Profiles/UserLibrary/components/UserLibraryEditScreen/component.js
@@ -65,7 +65,7 @@ export class UserLibraryEditScreenComponent extends React.Component {
   }
 
   onTimesRewatchedChanged = (timesRewatched) => {
-    this.setState({ timesRewatched });
+    this.setState({ reconsumeCount: timesRewatched });
   }
 
   onStartedAtChanged = (startedAt) => {
diff --git a/src/screens/Profiles/components/CustomHeader/component.js b/src/screens/Profiles/components/CustomHeader/component.js
index 593d48de7..0bd8ef907 100644
--- a/src/screens/Profiles/components/CustomHeader/component.js
+++ b/src/screens/Profiles/components/CustomHeader/component.js
@@ -11,8 +11,9 @@ export const CustomHeader = ({
   leftButtonAction,
   rightButtonTitle,
   rightButtonAction,
+  backgroundColor,
 }) => (
-  <View style={styles.headerView}>
+  <View style={[styles.headerView, { backgroundColor }]}>
     <View style={[styles.buttonView, styles.buttonView__left]}>
       {leftButtonAction && (
         <TouchableOpacity onPress={leftButtonAction} style={styles.button}>
@@ -26,7 +27,6 @@ export const CustomHeader = ({
         <StyledText color="light" size="default" bold>{title}</StyledText>
       </View>
     )}
-
     <View style={[styles.buttonView, styles.buttonView__right]}>
       {rightButtonAction && (
         <TouchableOpacity onPress={rightButtonAction} style={styles.button}>
@@ -44,6 +44,7 @@ CustomHeader.propTypes = {
   rightButtonAction: PropTypes.func,
   rightButtonTitle: PropTypes.string,
   title: PropTypes.string,
+  backgroundColor: PropTypes.string,
 };
 
 CustomHeader.defaultProps = {
@@ -52,4 +53,5 @@ CustomHeader.defaultProps = {
   rightButtonAction: null,
   rightButtonTitle: null,
   title: null,
+  backgroundColor: 'transparent',
 };
diff --git a/src/screens/Profiles/components/ErrorPage/component.js b/src/screens/Profiles/components/ErrorPage/component.js
index f03898559..3ef5d49c0 100644
--- a/src/screens/Profiles/components/ErrorPage/component.js
+++ b/src/screens/Profiles/components/ErrorPage/component.js
@@ -6,12 +6,14 @@ import { StyledText } from 'kitsu/components/StyledText';
 import { CustomHeader } from 'kitsu/screens/Profiles/components/CustomHeader';
 import { styles } from './styles';
 
-export const ErrorPage = ({ errorText, onBackPress }) => (
+export const ErrorPage = ({ errorText, showHeader, onBackPress }) => (
   <SceneContainer>
-    <CustomHeader
-      leftButtonAction={onBackPress}
-      leftButtonTitle="Back"
-    />
+    {showHeader && (
+      <CustomHeader
+        leftButtonAction={onBackPress}
+        leftButtonTitle="Back"
+      />
+    )}
     <View style={styles.wrapper}>
       <StyledText color="light" textStyle={styles.text}>
         {errorText}
@@ -22,9 +24,11 @@ export const ErrorPage = ({ errorText, onBackPress }) => (
 
 ErrorPage.propTypes = {
   errorText: PropTypes.string,
+  showHeader: PropTypes.bool,
   onBackPress: PropTypes.func.isRequired,
 };
 
 ErrorPage.defaultProps = {
   errorText: 'An Error Occurred',
+  showHeader: true,
 };
diff --git a/src/screens/Profiles/components/TabBar/component.js b/src/screens/Profiles/components/TabBar/component.js
index 2eedc28f4..46b75d12a 100644
--- a/src/screens/Profiles/components/TabBar/component.js
+++ b/src/screens/Profiles/components/TabBar/component.js
@@ -10,8 +10,9 @@ import { StyledText } from 'kitsu/components/StyledText';
 import { styles } from './styles';
 
 export const TabBar = props => (
-  <View style={[styles.container, props.style]}>
+  <View style={[styles.container, props.style]} onLayout={props.onLayout}>
     <ScrollView
+      ref={r => { props.onRef && props.onRef(r) }}
       horizontal
       showsHorizontalScrollIndicator={false}
       contentContainerStyle={[styles.tab, props.containerStyle]}
diff --git a/src/screens/QuickUpdateScreen/QuickUpdate.js b/src/screens/QuickUpdateScreen/QuickUpdate.js
index e5e7a5a3a..cb2c00149 100644
--- a/src/screens/QuickUpdateScreen/QuickUpdate.js
+++ b/src/screens/QuickUpdateScreen/QuickUpdate.js
@@ -26,7 +26,7 @@ import emptyComment from 'kitsu/assets/img/quick_update/comment_empty.png';
 import { isEmpty, capitalize } from 'lodash';
 import { getImgixCoverImage } from 'kitsu/utils/coverImage';
 import { KitsuLibrary, KitsuLibraryEvents, KitsuLibraryEventSource } from 'kitsu/utils/kitsuLibrary';
-
+import { ImageStatus } from 'kitsu/components/ImageStatus';
 import QuickUpdateEditor from './QuickUpdateEditor';
 import QuickUpdateCard from './QuickUpdateCard';
 import HeaderFilterButton from './HeaderFilterButton';
@@ -615,7 +615,7 @@ class QuickUpdate extends Component {
           contentContainerStyle={{ flexGrow: 1 }}
         >
           <View style={styles.emptyStateContainer}>
-            <StatusComponent
+            <ImageStatus
               title={emptyTitle}
               text={`As you add ${descriptionType} to your library, they'll start to displaying here and you'll be able to update them and join community discussions.`}
               image={unstarted}
@@ -739,7 +739,7 @@ class QuickUpdate extends Component {
                   }
                   ListFooterComponent={() => isLoadingNextFeedPage && <ActivityIndicator />}
                   ListEmptyComponent={() => (
-                    <StatusComponent
+                    <ImageStatus
                       title="START THE DISCUSSION"
                       text={`Be the first to share your thoughts about ${episodeOrChapter} ${progress}`}
                       image={emptyComment}
@@ -755,7 +755,7 @@ class QuickUpdate extends Component {
             </View>
           ) : (
             <ScrollView style={styles.unstartedWrapper}>
-              <StatusComponent
+              <ImageStatus
                 title={`START ${media && media.type === 'manga' ? 'READING' : 'WATCHING'} TO JOIN IN`}
                 text={`As you update your progress, you'll see the thoughts from the community on the ${episodeOrChapter}s you've ${watchedOrRead}!`}
                 image={unstarted}
@@ -783,20 +783,6 @@ class QuickUpdate extends Component {
   }
 }
 
-const StatusComponent = ({ title, text, image }) => (
-  <View style={styles.statusWrapper}>
-    <Text style={styles.statusTitle}>{title}</Text>
-    <Text style={styles.statusText}>{text}</Text>
-    <FastImage style={styles.statusImage} source={image} />
-  </View>
-);
-
-StatusComponent.propTypes = {
-  title: PropTypes.string.isRequired,
-  text: PropTypes.string.isRequired,
-  image: PropTypes.object.isRequired,
-};
-
 function getRequestFields(filterMode) {
   const fields = {
     libraryEntries: LIBRARY_ENTRIES_FIELDS.join(),
diff --git a/src/screens/Search/Lists/TopsList/index.js b/src/screens/Search/Lists/TopsList/index.js
index fb5020ab8..b1bfd3be1 100644
--- a/src/screens/Search/Lists/TopsList/index.js
+++ b/src/screens/Search/Lists/TopsList/index.js
@@ -1,10 +1,11 @@
 import React, { PureComponent } from 'react';
 import { ScrollView } from 'react-native';
 import { connect } from 'react-redux';
-import { upperFirst, isEmpty } from 'lodash';
+import { upperFirst, isEmpty, isNull } from 'lodash';
 import { getDefaults, getCategories } from 'kitsu/store/anime/actions';
 import { ContentList } from 'kitsu/components/ContentList';
 import { showSeasonResults, showStreamerResults, showCategoryResults } from 'kitsu/screens/Search/SearchNavigationHelper';
+import { STREAMING_SERVICES } from 'kitsu/constants/app';
 import { styles } from './styles';
 
 class TopsList extends PureComponent {
@@ -173,32 +174,19 @@ class TopsList extends PureComponent {
       action: 'season',
     };
 
-    const streamingServices = [
-      {
-        name: 'netflix',
-        image: require('kitsu/assets/img/streaming-services/netflix.png'),
-      },
-      {
-        name: 'hulu',
-        image: require('kitsu/assets/img/streaming-services/hulu.png'),
-      },
-      {
-        name: 'crunchyroll',
-        image: require('kitsu/assets/img/streaming-services/crunchyroll.png'),
-      },
-      {
-        name: 'funimation',
-        image: require('kitsu/assets/img/streaming-services/funimation.png'),
-      },
-      {
-        name: 'hidive',
-        image: require('kitsu/assets/img/streaming-services/hidive.png'),
-      },
-    ].map(streamer => ({
-      ...streamer,
-      // Add the touch handler for the streamers
-      onPress: () => showStreamerResults(this.props.navigation, streamer.name),
-    }));
+    // Construct the streaming object
+    const streamingServices = Object.keys(STREAMING_SERVICES).map(k => (
+      !isNull(STREAMING_SERVICES[k]) && {
+        name: k,
+        image: STREAMING_SERVICES[k],
+      }
+    ))
+      .filter(s => !isEmpty(s))
+      .map(streamer => ({
+        ...streamer,
+        // Add the touch handler for the streamers
+        onPress: () => showStreamerResults(this.props.navigation, streamer.name),
+      }));
 
     const streamingData = {
       title: `${type} By Streaming`,
@@ -301,7 +289,6 @@ class TopsList extends PureComponent {
             key={listItem.name || listItem.title}
             navigate={navigate}
             onPress={() => this.handleViewAllPress(listItem.title, listItem.type, listItem.action)}
-            onScroll={this.props.onScroll}
           />
         ))}
       </ScrollView>
diff --git a/src/screens/Search/SearchFilter.js b/src/screens/Search/SearchFilter.js
index 74b841746..16d2cbace 100644
--- a/src/screens/Search/SearchFilter.js
+++ b/src/screens/Search/SearchFilter.js
@@ -13,7 +13,7 @@ import * as colors from 'kitsu/constants/colors';
 import { NavigationHeader } from 'kitsu/components/NavigationHeader';
 
 class SearchFilter extends Component {
-  static navigationOptions = () => ({
+  static navigationOptions = ({ navigation }) => ({
     header: (
       <NavigationHeader
         navigation={navigation}
diff --git a/src/screens/Search/SearchScreen/index.js b/src/screens/Search/SearchScreen/index.js
index 6aed021e1..89374db68 100644
--- a/src/screens/Search/SearchScreen/index.js
+++ b/src/screens/Search/SearchScreen/index.js
@@ -20,7 +20,6 @@ class SearchScreen extends PureComponent {
   };
 
   state = {
-    isScrollingScene: false,
     query: {
       anime: undefined,
       manga: undefined,
@@ -65,7 +64,12 @@ class SearchScreen extends PureComponent {
     const filters = currentScene.kind ? `kind:${currentScene.kind}` : '';
     index.search({ query, filters}, (err, content) => {
       if (!err) {
-        this.setState({ searchResults: { [scene]: content.hits } });
+        this.setState({
+          searchResults: {
+            ...this.state.searchResults,
+            [scene]: content.hits,
+          },
+        });
       }
     });
   };
@@ -78,10 +82,6 @@ class SearchScreen extends PureComponent {
     });
   };
 
-  handleSceneScroll = (value) => {
-    this.setState({ isScrollingScene: value });
-  };
-
   renderTabBar = ({ tabs, activeTab, goToPage }) => (
     <View style={styles.tabBar}>
       {tabs.map((name, page) => {
@@ -107,7 +107,6 @@ class SearchScreen extends PureComponent {
         <View key={scene} style={styles.contentContainer} tabLabel={label}>
           <SearchBox
             placeholder={`Search ${label}`}
-            searchIconOffset={108}
             style={styles.searchBox}
             value={this.state.query[scene]}
             onChangeText={t => this.handleQuery(scene, t)}
@@ -128,23 +127,24 @@ class SearchScreen extends PureComponent {
   renderSubScene = (scene) => {
     const { query } = this.state;
     const { navigation, followUser, captureUsersData } = this.props;
-    const hits = this.state.searchResults[scene];
+    const hits = this.state.searchResults[scene] || [];
 
     switch (scene) {
       case 'users': {
-        return <UsersList
-          hits={hits}
-          onFollow={followUser}
-          onData={captureUsersData}
-          navigation={navigation}
-        />
+        return (
+          <UsersList
+            hits={hits}
+            onFollow={followUser}
+            onData={captureUsersData}
+            navigation={navigation}
+          />
+        );
       }
       case 'anime':
       case 'manga': {
         return isEmpty(query[scene]) ? (
           <TopsList
             mounted
-            onScroll={this.handleSceneScroll}
             active={scene}
             navigation={navigation}
           />
diff --git a/src/screens/Sidebar/Blocking.js b/src/screens/Sidebar/Blocking.js
index b4b37a628..f56244921 100644
--- a/src/screens/Sidebar/Blocking.js
+++ b/src/screens/Sidebar/Blocking.js
@@ -95,12 +95,11 @@ const Hits = connectInfiniteHits(({ hits, hasMore, refine, onPress, currentUser
 });
 
 const InstantSearchBox = connectSearchBox(
-  ({ refine, currentRefinement, placeholder, searchIconOffset, style }) => (
+  ({ refine, currentRefinement, placeholder, style }) => (
     <SearchBox
       onChangeText={refine}
       value={currentRefinement}
       placeholder={placeholder}
-      searchIconOffset={searchIconOffset}
       style={style}
     />
   ));
@@ -274,7 +273,7 @@ class Blocking extends React.Component {
             searchState={searchState}
             onSearchStateChange={this.handleSearchStateChange}
           >
-            <InstantSearchBox placeholder={'Search Users to Block'} searchIconOffset={160} />
+            <InstantSearchBox placeholder={'Search Users to Block'} />
             {this.renderResults()}
           </InstantSearch>
         </View>
diff --git a/src/screens/Sidebar/LinkedAccounts.js b/src/screens/Sidebar/LinkedAccounts.js
index 2c11e5959..6c2b3269d 100644
--- a/src/screens/Sidebar/LinkedAccounts.js
+++ b/src/screens/Sidebar/LinkedAccounts.js
@@ -17,7 +17,8 @@ class LinkedAccounts extends React.Component {
     if (isLinked) { // if linked, unlink the account
       this.props.disconnectFBUser();
     } else { // link the account
-      LoginManager.logInWithReadPermissions(['public_profile'])
+      LoginManager.logOut();
+      LoginManager.logInWithReadPermissions(['public_profile', 'email'])
         .then((result) => {
           if (!result.isCancelled) {
             this.props.connectFBUser();
diff --git a/src/store/auth/actions.js b/src/store/auth/actions.js
index 32257cc2f..2a0180683 100644
--- a/src/store/auth/actions.js
+++ b/src/store/auth/actions.js
@@ -1,4 +1,4 @@
-import { AccessToken, GraphRequest, GraphRequestManager } from 'react-native-fbsdk';
+import { AccessToken, GraphRequest, GraphRequestManager, LoginManager } from 'react-native-fbsdk';
 import { NavigationActions } from 'react-navigation';
 import { NetInfo } from 'react-native';
 import { auth } from 'kitsu/config/api';
@@ -181,7 +181,7 @@ const loginUserFb = async (dispatch) => {
       '/me',
       {
         httpMethod: 'GET',
-        version: 'v2.5',
+        version: 'v2.9',
         parameters: {
           fields: {
             string: 'email, name, gender',
@@ -205,5 +205,6 @@ const loginUserFb = async (dispatch) => {
 };
 
 export const logoutUser = () => (dispatch) => {
+  LoginManager.logOut();
   dispatch({ type: types.LOGOUT_USER });
 };
diff --git a/src/store/profile/actions.js b/src/store/profile/actions.js
index a541ac211..78a8b3d83 100644
--- a/src/store/profile/actions.js
+++ b/src/store/profile/actions.js
@@ -215,10 +215,11 @@ export const fetchUserLibraryByType = fetchOptions => async (dispatch, getState)
         console.log(options);
         fetchUserLibraryByType(newOptions)(dispatch, getState);
       },
-      fetchMore: () => {
+      fetchMore: (limit = 10) => {
         if (data.length < libraryEntries.meta.count) {
           const newOptions = {
             ...options,
+            limit,
             refresh: false,
           };
           fetchUserLibraryByType(newOptions)(dispatch, getState);
@@ -242,7 +243,7 @@ export const fetchUserLibraryByType = fetchOptions => async (dispatch, getState)
 
 export const fetchUserLibrary = fetchOptions => async (dispatch, getState) => {
   const options = {
-    limit: 10,
+    ...defaultFetchUserLibraryOptions,
     ...fetchOptions,
   };
 
@@ -254,6 +255,7 @@ export const fetchUserLibrary = fetchOptions => async (dispatch, getState) => {
   const fetchUserTypeOptions = {
     limit: options.limit,
     userId: options.userId,
+    refresh: options.refresh,
   };
 
   try {
diff --git a/src/store/user/actions.js b/src/store/user/actions.js
index 1d5616dcb..5a47bb1da 100644
--- a/src/store/user/actions.js
+++ b/src/store/user/actions.js
@@ -15,7 +15,7 @@ export const fetchCurrentUser = () => async (dispatch, getState) => {
     const user = await Kitsu.findAll('users', {
       fields: {
         users:
-          'id,slug,name,createdAt,email,avatar,coverImage,about,ratingSystem,shareToGlobal,sfwFilter,ratingSystem,facebookId,titleLanguagePreference,status,hasPassword',
+          'id,slug,name,createdAt,email,avatar,coverImage,about,ratingSystem,shareToGlobal,sfwFilter,ratingSystem,facebookId,title,titleLanguagePreference,status,hasPassword',
       },
       filter: { self: true },
     });