diff --git a/src/screens/Production/DownloadSongs.js b/src/screens/Production/DownloadSongs.js
index 5505f3f..f284a2b 100644
--- a/src/screens/Production/DownloadSongs.js
+++ b/src/screens/Production/DownloadSongs.js
@@ -11,8 +11,8 @@ import {
 import useMinuit from "react-native-minuit/src/hooks/useMinuit.js";
 import { responsiveHeight } from "react-native-responsive-dimensions";
 import { background } from "../../assets";
-import MusicLandHeader from "../../components/MusicLandHeader";
 import FullscreenIntroVideo from "../../components/FullscreenIntroVideo";
+import MusicLandHeader from "../../components/MusicLandHeader";
 import firebase, {
   projectsRef,
   serverTimestamp,
@@ -86,10 +86,7 @@ const DownloadSongs = ({ route }) => {
 
   const afterPlaybackUrl = useMemo(() => {
     if (!video) return null;
-    if (Platform.OS === "web") {
-      return video?.afterPlaybackWeb || video?.afterPlayback || null;
-    }
-    return video?.afterPlayback || video?.afterPlaybackMobile || null;
+    return video?.afterPlayback;
   }, [video]);
 
   useEffect(() => {
@@ -229,65 +226,65 @@ const DownloadSongs = ({ route }) => {
             />
             <View style={{ gap: 12, paddingVertical: 12 }}>
               <Text style={styles.title}>
-              Prêt à télécharger
-              {action === "playback" ? " ton  Playback" : " ta chanson"} ?
-            </Text>
-            <View style={{ gap: 10 }}>
-              <Pressable
-                style={styles.itemContainer}
-                onPress={handleDownloadUri}
-                // navigate(Routes.DownloadPrices, {
-                //   action,
-                //   uri,
-                // })
-              >
-                <BlurView
-                  style={styles.blurView}
-                  intensity={Platform.OS !== "ios" ? 10 : 40}
-                  tint="dark"
-                  // experimentalBlurMethod={
-                  //   Platform.OS !== "ios" ? "dimezisBlurView" : "none"
-                  // }
+                Prêt à télécharger
+                {action === "playback" ? " ton  Playback" : " ta chanson"} ?
+              </Text>
+              <View style={{ gap: 10 }}>
+                <Pressable
+                  style={styles.itemContainer}
+                  onPress={handleDownloadUri}
+                  // navigate(Routes.DownloadPrices, {
+                  //   action,
+                  //   uri,
+                  // })
                 >
-                  <Text style={styles.label}>
-                    Télécharger{" "}
-                    {action === "playback" ? "mon Playback" : "ma chanson"}
-                  </Text>
-                  <Text style={styles.description}>Pour moi uniquement</Text>
-                </BlurView>
-              </Pressable>
-              <Pressable
-                style={styles.itemContainer}
-                onPress={() =>
-                  navigate(Routes.StreamSong, {
-                    action,
-                  })
-                }
-              >
-                <BlurView
-                  style={styles.blurView}
-                  intensity={Platform.OS !== "ios" ? 10 : 40}
-                  tint="dark"
-                  // experimentalBlurMethod={
-                  //   Platform.OS !== "ios" ? "dimezisBlurView" : "none"
-                  // }
+                  <BlurView
+                    style={styles.blurView}
+                    intensity={Platform.OS !== "ios" ? 10 : 40}
+                    tint="dark"
+                    // experimentalBlurMethod={
+                    //   Platform.OS !== "ios" ? "dimezisBlurView" : "none"
+                    // }
+                  >
+                    <Text style={styles.label}>
+                      Télécharger{" "}
+                      {action === "playback" ? "mon Playback" : "ma chanson"}
+                    </Text>
+                    <Text style={styles.description}>Pour moi uniquement</Text>
+                  </BlurView>
+                </Pressable>
+                <Pressable
+                  style={styles.itemContainer}
+                  onPress={() =>
+                    navigate(Routes.StreamSong, {
+                      action,
+                    })
+                  }
                 >
-                  <Text style={styles.label}>
-                    Diffuser{" "}
-                    {action === "playback" ? "mon Playback" : "ma chanson"} sur
-                    la plateforme de MusicLand (+ réseaux sociaux) et participer
-                    au concours
-                  </Text>
-                  <Text style={styles.description}>
-                    Top 3: 1er 15% du CA ML - 2ème 10% du CA ML - 3ème 5% du CA
-                    ML (catégorie{" "}
-                    {action === "playback" ? "Playback" : "chanson"})
-                  </Text>
-                </BlurView>
-              </Pressable>
+                  <BlurView
+                    style={styles.blurView}
+                    intensity={Platform.OS !== "ios" ? 10 : 40}
+                    tint="dark"
+                    // experimentalBlurMethod={
+                    //   Platform.OS !== "ios" ? "dimezisBlurView" : "none"
+                    // }
+                  >
+                    <Text style={styles.label}>
+                      Diffuser{" "}
+                      {action === "playback" ? "mon Playback" : "ma chanson"}{" "}
+                      sur la plateforme de MusicLand (+ réseaux sociaux) et
+                      participer au concours
+                    </Text>
+                    <Text style={styles.description}>
+                      Top 3: 1er 15% du CA ML - 2ème 10% du CA ML - 3ème 5% du
+                      CA ML (catégorie{" "}
+                      {action === "playback" ? "Playback" : "chanson"})
+                    </Text>
+                  </BlurView>
+                </Pressable>
+              </View>
             </View>
-          </View>
-        </CreateLyricsHeader>
+          </CreateLyricsHeader>
         </View>
       </Page>
       {action === "playback" && (
diff --git a/src/screens/Writing/Goals.js b/src/screens/Writing/Goals.js
index 895cfdf..4a0f235 100644
--- a/src/screens/Writing/Goals.js
+++ b/src/screens/Writing/Goals.js
@@ -11,8 +11,8 @@ import { BaseButton } from "../../components/Button";
 import ItemContainer from "../../components/ItemContainer/ItemContainer";
 import ListSelection from "../../components/ListSelection/ListSelection";
 import Overlay from "../../components/Overlay";
-import { GOALS, OTHER_OBJECTIVE_OPTION } from "../../data/data";
 import { strings } from "../../constants/strings";
+import { GOALS, OTHER_OBJECTIVE_OPTION } from "../../data/data";
 import { Palette } from "../../styles";
 import { FONT_FAMILY } from "../../styles/Fonts";
 import CreateLyricsHeader from "./components/CreateLyricsHeader";
@@ -106,17 +106,14 @@ const Goals = ({
   return (
     <>
       <ScrollView contentContainerStyle={{ flex: 1, gap: 16, marginTop: 16 }}>
-        <View style={{ gap: 10 }}>
-          <CreateLyricsHeader
-            title={strings.writing.steps.contextTitle}
-            subTitle={strings.writing.steps.contextSubtitle}
-          />
-          <View style={styles.examplesContainer}>
+        <View style={{ gap: 10, height: "100%" }}>
+          <CreateLyricsHeader title={strings.writing.steps.contextTitle} />
+          {/* <View style={styles.examplesContainer}>
             <Text style={styles.examplesText}>
               {strings.writing.steps.contextExamples}
             </Text>
-          </View>
-          <ItemContainer>
+          </View> */}
+          <ItemContainer height={"80%"}>
             <ListSelection
               options={goalsOptions}
               variant="simple"