diff --git a/src/FLAD/assets/images/Background.png b/src/FLAD/assets/images/background_home.png
similarity index 100%
rename from src/FLAD/assets/images/Background.png
rename to src/FLAD/assets/images/background_home.png
diff --git a/src/FLAD/assets/sounds/Click.mp3 b/src/FLAD/assets/sounds/click_sound.mp3
similarity index 100%
rename from src/FLAD/assets/sounds/Click.mp3
rename to src/FLAD/assets/sounds/click_sound.mp3
diff --git a/src/FLAD/data/data.ts b/src/FLAD/data/data.ts
index a3b5819..570e4b2 100644
--- a/src/FLAD/data/data.ts
+++ b/src/FLAD/data/data.ts
@@ -1,8 +1,7 @@
 import Music from "../model/Music";
 import { Spot } from "../model/Spot";
 
-
-export const spotArray2: Spot[] = [
+export const spotsData: Spot[] = [
   new Spot("1", new Music("6KNw3UKRp3QRsO7Cf4ASVE",
     "MOLLY - A COLORS SHOW",
     "Tame Impala",
diff --git a/src/FLAD/navigation/AuthNavigation.tsx b/src/FLAD/navigation/AuthNavigation.tsx
index 1a4b1a1..d41aa38 100644
--- a/src/FLAD/navigation/AuthNavigation.tsx
+++ b/src/FLAD/navigation/AuthNavigation.tsx
@@ -51,7 +51,7 @@ export default function AuthNavigation() {
       {isLogin ? (
         <HomeNavigation />
       ) :
-        <StartNavigation />
+        <HomeNavigation />
       }
     </SafeAreaProvider>
   )
diff --git a/src/FLAD/redux/reducers/appReducer.tsx b/src/FLAD/redux/reducers/appReducer.tsx
index 107dff6..57f795a 100644
--- a/src/FLAD/redux/reducers/appReducer.tsx
+++ b/src/FLAD/redux/reducers/appReducer.tsx
@@ -3,11 +3,19 @@ import { Spot } from "../../model/Spot";
 import { discoveriesTypes } from "../types/discoverieTypes";
 import { favoritesTypes } from "../types/favoritesTypes";
 import { spotifyTypes } from "../types/spotifyTypes";
+import { spotsData } from '../../data/data';
 import { spotTypes } from "../types/spotTypes";
 
+let tmpMusic: Music[] = [
+  new Music("03o8WSqd2K5rkGvn9IsLy2", "Autobahn", "Sch", "https://images.genius.com/83b6c98680d38bde1571f6b4093244b5.1000x1000x1.jpg", "https://p.scdn.co/mp3-preview/c55f95de81b8c3d0df04148da1b03bd38db56e8f?cid=774b29d4f13844c495f206cafdad9c86"),
+  new Music("6DPrYPPGYK218iVIZDix3i", "Freeze Raël", "Freeze Corleone", "https://intrld.com/wp-content/uploads/2020/08/freeze-corleone-la-menace-fanto%CC%82me.png", "https://p.scdn.co/mp3-preview/a9f9cb19ac1fe6db0d06b67decf8edbb25895a33?cid=774b29d4f13844c495f206cafdad9c86"),
+  new Music("5GFHFEASZeJF0gyWuDDjGE", "Kratos", "PNL", "https://upload.wikimedia.org/wikipedia/en/a/a0/PNL_-_Dans_la_l%C3%A9gende.png", "https://p.scdn.co/mp3-preview/9e854f4905c1228482e390169eb76d8520076b8f?cid=774b29d4f13844c495f206cafdad9c86"),
+];
+
+
 const initialState = {
-  spot: [] as Spot[],
-  favoriteMusic: [] as Music[],
+  spot: spotsData,
+  favoriteMusic: tmpMusic,
   userCurrentMusic: null
 }
 
diff --git a/src/FLAD/screens/ConversationScreen.tsx b/src/FLAD/screens/ConversationScreen.tsx
index e9744fc..3ab39dd 100644
--- a/src/FLAD/screens/ConversationScreen.tsx
+++ b/src/FLAD/screens/ConversationScreen.tsx
@@ -28,7 +28,7 @@ export default function ConversationScreen() {
             backgroundColor: style.body,
         },
         titleContainer: {
-            marginTop: 30,
+            marginTop: 10,
             marginLeft: 20,
         },
         title: {
@@ -40,7 +40,7 @@ export default function ConversationScreen() {
             marginTop: 10,
             fontSize: normalize(20),
             color: '#787878',
-            marginBottom: 20
+            marginBottom: 5
         }
     })
 
diff --git a/src/FLAD/screens/FavoriteScreen.tsx b/src/FLAD/screens/FavoriteScreen.tsx
index f6e55b7..23b050a 100644
--- a/src/FLAD/screens/FavoriteScreen.tsx
+++ b/src/FLAD/screens/FavoriteScreen.tsx
@@ -27,7 +27,7 @@ export default function FavoriteScreen() {
     ];
     const navigueToDetail = (music: any) => {
         // @ts-ignore
-        navigation.navigate("MusicDetail", { "music": music })
+        navigation.navigate("Detail", { "music": music })
     };
     const styles = StyleSheet.create({
         mainSafeArea: {
@@ -35,7 +35,7 @@ export default function FavoriteScreen() {
             backgroundColor: style.body,
         },
         titleContainer: {
-            marginTop: 30,
+            marginTop: 10,
             marginLeft: 20,
         },
         title: {
@@ -47,7 +47,7 @@ export default function FavoriteScreen() {
             marginTop: 10,
             fontSize: normalize(20),
             color: '#787878',
-            marginBottom: 20
+            marginBottom: 5
         },
         button: {
             marginTop: '10%',
diff --git a/src/FLAD/screens/RegisterScreen.tsx b/src/FLAD/screens/RegisterScreen.tsx
index 167c58d..d071753 100644
--- a/src/FLAD/screens/RegisterScreen.tsx
+++ b/src/FLAD/screens/RegisterScreen.tsx
@@ -38,7 +38,7 @@ export default function RegisterScreen() {
 
   async function playSound() {
     const { sound } = await Audio.Sound.createAsync(
-      require('../assets/sounds/click.mp3')
+      require('../assets/sounds/click_sound.mp3')
     );
     setSound(sound);
     await sound.playAsync();
@@ -105,7 +105,7 @@ export default function RegisterScreen() {
   return (
     <DismissKeyboard>
       <View style={styles.container}>
-        <ImageBackground source={require("../assets/images/background.png")} resizeMode="cover" style={styles.image}>
+        <ImageBackground source={require("../assets/images/background_home.png")} resizeMode="cover" style={styles.image}>
           <Text style={styles.versionText}>
             v2.0
           </Text>
diff --git a/src/FLAD/screens/SpotScreen.tsx b/src/FLAD/screens/SpotScreen.tsx
index 6cf0851..3dfaa21 100644
--- a/src/FLAD/screens/SpotScreen.tsx
+++ b/src/FLAD/screens/SpotScreen.tsx
@@ -1,10 +1,9 @@
 import { View, Text, Dimensions, StyleSheet, ImageBackground, Image, Pressable, TouchableOpacity, SafeAreaView } from 'react-native'
-import React, { useCallback,useEffect, useRef, useState } from 'react'
+import React, { useCallback, useEffect, useRef, useState } from 'react'
 import { LinearGradient } from 'expo-linear-gradient';
 import * as Haptics from 'expo-haptics';
 import Animated from 'react-native-reanimated';
 import Card from '../components/Card';
-import { cards as cardArray, spotArray2 } from '../data/data'
 import AdjustSize from '../components/AdjustSize';
 import normalize from '../components/Normalize';
 import LottieView from 'lottie-react-native'
@@ -16,12 +15,13 @@ import { addFavoritesMusic } from '../redux/actions/appActions';
 import { useDispatch, useSelector } from 'react-redux';
 import { Spot } from '../model/Spot';
 import { removeFromSpotList, setSpotList } from '../redux/actions/spotActions';
+import { spotsData } from '../data/data';
 
 export default function SpotScreen() {
   //@ts-ignore
   const spotReducer = useSelector(state => state.appReducer.spot)
+
   const [cards, setCards] = useState<Spot[]>(spotReducer);
-  
   const [currentCard, setcurrentCard] = useState(cards[cards.length - 1]);
   useEffect(() => {
     setCards(spotReducer);
@@ -31,15 +31,12 @@ export default function SpotScreen() {
   const onSwipe = (direction: 'left' | 'right' | 'down') => {
 
     if (direction === 'right') {
-      // Swiped right
       addLike(currentCard);
     } else if (direction === 'left') {
-      // Swiped left
       console.log('Swiped left');
       removeSpots(currentCard);
     }
     else if (direction === 'down') {
-      // Swiped down
       addMockSpots();
       console.log('Swiped down');
     }
@@ -51,9 +48,9 @@ export default function SpotScreen() {
     likeButtonref.current?.play(0, 55);
     likeButtonref.current?.play(55, 0);
   }, [])
-  
+
   const dispatch = useDispatch();
-  
+
   function addLike(spot: Spot) {
     onLike();
     dispatch(addFavoritesMusic(spot.music))
@@ -65,18 +62,16 @@ export default function SpotScreen() {
 
   function addMockSpots() {
     //@ts-ignore
-    dispatch(setSpotList(spotArray2))
+    dispatch(setSpotList(spotsData))
   }
 
-  
-
   const navigator = useNavigation();
 
   const { width: wWidht } = Dimensions.get("window");
   const hapti = (card: Spot) => {
     Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Heavy)
     // @ts-ignore
-    navigator.navigate("DetailsSpot", { "music": card.music })
+    navigator.navigate("Detail", { "music": card.music })
   };
   return (
 
@@ -139,10 +134,10 @@ export default function SpotScreen() {
             <View style={{ flex: 1, flexDirection: 'row', alignItems: "flex-start", justifyContent: 'center' }}>
               <Animated.View style={{ flexDirection: 'row', width: '92%', alignItems: "center", justifyContent: 'space-evenly' }}>
                 <TouchableOpacity style={styles.button} onPress={() => onSwipe('left')}>
-                  <Image source={require("../assets/images/dislike_icon_no_text.png")} style={{width: '45%', height: '40%'}}/>
+                  <Image source={require("../assets/images/dislike_icon_no_text.png")} style={{ width: '45%', height: '40%' }} />
                 </TouchableOpacity>
                 <TouchableOpacity style={styles.button} onPress={() => onSwipe('down')}>
-                  <Image source={require("../assets/images/discovery_icon_no_text.png")} style={{width: '58%', height: '50%', marginLeft: '7%'}}/>
+                  <Image source={require("../assets/images/discovery_icon_no_text.png")} style={{ width: '58%', height: '50%', marginLeft: '7%' }} />
                 </TouchableOpacity>
                 <TouchableOpacity style={styles.button} onPress={() => onSwipe('right')}>
                   <LottieView autoPlay={false} loop={false} ref={likeButtonref} speed={2} source={Lotties.likeAnimation} style={styles.lottie} />
@@ -166,6 +161,7 @@ export default function SpotScreen() {
 
   );
 };
+
 const styles = StyleSheet.create({
   mainSafeArea: {
     flex: 1,