diff --git a/app/src/main/java/com/song2/wave/UI/Main/MainActivity.kt b/app/src/main/java/com/song2/wave/UI/Main/MainActivity.kt
index a5cab75..46a037f 100644
--- a/app/src/main/java/com/song2/wave/UI/Main/MainActivity.kt
+++ b/app/src/main/java/com/song2/wave/UI/Main/MainActivity.kt
@@ -189,7 +189,7 @@ class MainActivity : AppCompatActivity() {
                 nowFrag = LibraryFragment()
             }
             "myPage" ->{
-                nowFrag = PointHistoryFragment()
+                nowFrag = MyPageHitSuccessFragment()
             }
         }
 
diff --git a/app/src/main/java/com/song2/wave/UI/Main/MyPage/Adapter/MyPageHitSuccessAdapter.kt b/app/src/main/java/com/song2/wave/UI/Main/MyPage/Adapter/MyPageHitSuccessAdapter.kt
index 0222ce0..bba90e4 100644
--- a/app/src/main/java/com/song2/wave/UI/Main/MyPage/Adapter/MyPageHitSuccessAdapter.kt
+++ b/app/src/main/java/com/song2/wave/UI/Main/MyPage/Adapter/MyPageHitSuccessAdapter.kt
@@ -44,8 +44,8 @@ class MyPageHitSuccessAdapter(val ctx: Context, val datalist: ArrayList<HitSucce
     }
 
     inner class Holder(ItemView : View): RecyclerView.ViewHolder(ItemView){
-        var failFilter : RelativeLayout = itemView!!.findViewById(R.id.rl_hit_success_pass)
-        var passFilter : RelativeLayout = itemView!!.findViewById(R.id.rl_hit_success_fail)
+        var failFilter : RelativeLayout = itemView!!.findViewById(R.id.rl_hit_success_fail)
+        var passFilter : RelativeLayout = itemView!!.findViewById(R.id.rl_hit_success_pass)
 
         var songCoverImg = itemView.findViewById(R.id.img_hit_success) as ImageView
         var songName = itemView.findViewById(R.id.tv_hit_success_song_item_song_name) as TextView
diff --git a/app/src/main/java/com/song2/wave/UI/Main/Search/Adapter/SongSearchAdapter.kt b/app/src/main/java/com/song2/wave/UI/Main/Search/Adapter/SongSearchAdapter.kt
index a8afa34..55f20d4 100644
--- a/app/src/main/java/com/song2/wave/UI/Main/Search/Adapter/SongSearchAdapter.kt
+++ b/app/src/main/java/com/song2/wave/UI/Main/Search/Adapter/SongSearchAdapter.kt
@@ -16,6 +16,7 @@ class SongSearchAdapter (private var songData : ArrayList<SongData>, var request
         val mainView : View = LayoutInflater.from(parent.context)
                 .inflate(R.layout.item_song_view, parent, false)
         return SongSearchViewHolder(mainView)
+
     }
 
     override fun getItemCount(): Int = songData.size
diff --git a/app/src/main/java/com/song2/wave/UI/Main/Search/SearchHomeFragment.kt b/app/src/main/java/com/song2/wave/UI/Main/Search/SearchHomeFragment.kt
index 4c03ece..e263498 100644
--- a/app/src/main/java/com/song2/wave/UI/Main/Search/SearchHomeFragment.kt
+++ b/app/src/main/java/com/song2/wave/UI/Main/Search/SearchHomeFragment.kt
@@ -5,6 +5,7 @@ import android.os.Bundle
 import android.support.v4.app.Fragment
 import android.support.v7.widget.LinearLayoutManager
 import android.util.Log
+import android.view.KeyEvent
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -13,7 +14,6 @@ import com.bumptech.glide.RequestManager
 import com.song2.wave.Data.GET.GetSearchResponse
 import com.song2.wave.Data.model.*
 import com.song2.wave.Data.model.SignUp.OriginArtistData
-import com.song2.wave.R
 import com.song2.wave.UI.Main.MainActivity
 import com.song2.wave.UI.Main.Search.Adapter.CoverArtistSearchAdapter
 import com.song2.wave.UI.Main.Search.Adapter.OriginArtistSearchAdapter
@@ -27,6 +27,15 @@ import kotlinx.android.synthetic.main.fragment_search_home.view.*
 import org.jetbrains.anko.support.v4.toast
 import retrofit2.Call
 import retrofit2.Response
+import android.view.inputmethod.EditorInfo
+import android.widget.TextView
+import android.text.InputType
+
+
+
+
+
+
 
 class SearchHomeFragment : Fragment(), OnBackPressedListener {
 
@@ -60,25 +69,31 @@ class SearchHomeFragment : Fragment(), OnBackPressedListener {
     var searchBackFlag: Int = 0 // editText 비활성화 : 0
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        var v: View = inflater.inflate(R.layout.fragment_search_home, container, false)
+        var v: View = inflater.inflate(com.song2.wave.R.layout.fragment_search_home, container, false)
 
         originDataArr = ArrayList<OriginArtistData>()
 /*        if(getArguments() != null){
             getSearchResponse(getArguments()!!.getString("searchData"))
         }*/
 
+
+
+
         v.btn_search_home_frag_searchbar.setOnClickListener {
             getSearchResponse(edit_search_home_frag_searchbar.text.toString())
 
+
+
             ll_search_home_frag_focus_off.visibility = View.VISIBLE
             ll_search_home_frag_focus_on.visibility = View.GONE
+            rv_search_background.visibility = View.GONE
+
             edit_search_home_frag_searchbar.clearFocus()
             searchBackFlag = 0
 
         }
 
 
-
         v.ll_search_home_frag_focus_on.visibility = View.GONE
         songDataArr = ArrayList<SongData>()
         coverArtistDataArr = ArrayList<CoverArtistData>()
@@ -87,15 +102,18 @@ class SearchHomeFragment : Fragment(), OnBackPressedListener {
         // Edittext focus off
         v.ll_search_home_frag_focus.setOnClickListener {
             searchEditTextFocusOff()
+            //rv_search_background.visibility = View.VISIBLE
+
         }
 
         insertExampleData()
 
 
-        insertSearchHistoryData(v)
+       insertSearchHistoryData(v)
 
         // Edittext focus ON
         v.edit_search_home_frag_searchbar.setOnFocusChangeListener { view, hasFocus ->
+            rv_search_background.visibility = View.GONE
             if (hasFocus) {
                 searchEditTextFocusOn()
             }
@@ -104,12 +122,13 @@ class SearchHomeFragment : Fragment(), OnBackPressedListener {
 
 
         // "all delte" button is clicked
-        v.tv_search_home_frag_all_delete.setOnClickListener {
+       v.tv_search_home_frag_all_delete.setOnClickListener {
             searchData.clear()
             searchDataHistoryAdapter = SearchDataHistoryAdapter(searchData)
             v.recycler_search_home_frag_search_home_hisory.adapter = searchDataHistoryAdapter
             v.recycler_search_home_frag_search_home_hisory.layoutManager = LinearLayoutManager(context)
             v.recycler_search_home_frag_search_home_hisory.isNestedScrollingEnabled = false
+            v.rv_search_background.visibility = View.VISIBLE
         }
 
         // artist is clicked
diff --git a/app/src/main/res/drawable-hdpi/img_home_weeklychalenge.png b/app/src/main/res/drawable-hdpi/img_home_weeklychalenge.png
new file mode 100644
index 0000000..1143dad
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/img_home_weeklychalenge.png differ
diff --git a/app/src/main/res/drawable-hdpi/img_search_before_def.png b/app/src/main/res/drawable-hdpi/img_search_before_def.png
new file mode 100644
index 0000000..0cc34d9
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/img_search_before_def.png differ
diff --git a/app/src/main/res/drawable-hdpi/img_search_noresult_def.png b/app/src/main/res/drawable-hdpi/img_search_noresult_def.png
new file mode 100644
index 0000000..e5a2aad
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/img_search_noresult_def.png differ
diff --git a/app/src/main/res/drawable-mdpi/img_home_weeklychalenge.png b/app/src/main/res/drawable-mdpi/img_home_weeklychalenge.png
new file mode 100644
index 0000000..0264302
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/img_home_weeklychalenge.png differ
diff --git a/app/src/main/res/drawable-mdpi/img_search_before_def.png b/app/src/main/res/drawable-mdpi/img_search_before_def.png
new file mode 100644
index 0000000..22d1966
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/img_search_before_def.png differ
diff --git a/app/src/main/res/drawable-mdpi/img_search_noresult_def.png b/app/src/main/res/drawable-mdpi/img_search_noresult_def.png
new file mode 100644
index 0000000..a675946
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/img_search_noresult_def.png differ
diff --git a/app/src/main/res/drawable-xhdpi/img_home_weeklychalenge.png b/app/src/main/res/drawable-xhdpi/img_home_weeklychalenge.png
new file mode 100644
index 0000000..8d3c429
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/img_home_weeklychalenge.png differ
diff --git a/app/src/main/res/drawable-xhdpi/img_search_before_def.png b/app/src/main/res/drawable-xhdpi/img_search_before_def.png
new file mode 100644
index 0000000..62d07ae
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/img_search_before_def.png differ
diff --git a/app/src/main/res/drawable-xhdpi/img_search_noresult_def.png b/app/src/main/res/drawable-xhdpi/img_search_noresult_def.png
new file mode 100644
index 0000000..48d2ad0
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/img_search_noresult_def.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/img_home_weeklychalenge.png b/app/src/main/res/drawable-xxhdpi/img_home_weeklychalenge.png
new file mode 100644
index 0000000..f23765e
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/img_home_weeklychalenge.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/img_search_before_def.png b/app/src/main/res/drawable-xxhdpi/img_search_before_def.png
new file mode 100644
index 0000000..f22725e
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/img_search_before_def.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/img_search_noresult_def.png b/app/src/main/res/drawable-xxhdpi/img_search_noresult_def.png
new file mode 100644
index 0000000..008c904
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/img_search_noresult_def.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/img_home_weeklychalenge.png b/app/src/main/res/drawable-xxxhdpi/img_home_weeklychalenge.png
new file mode 100644
index 0000000..ab4f628
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/img_home_weeklychalenge.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/img_search_before_def.png b/app/src/main/res/drawable-xxxhdpi/img_search_before_def.png
new file mode 100644
index 0000000..bea7f9b
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/img_search_before_def.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/img_search_noresult_def.png b/app/src/main/res/drawable-xxxhdpi/img_search_noresult_def.png
new file mode 100644
index 0000000..744b021
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/img_search_noresult_def.png differ
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 9bb7f11..b962455 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -186,7 +186,7 @@
             android:id="@+id/iv_main_act_bottom_play"
             android:layout_width="36dp"
             android:layout_height="36dp"
-            android:layout_marginLeft="16dp"
+            android:layout_marginLeft="30dp"
             android:layout_gravity="center_vertical"
             android:scaleType="fitXY"
             android:src="@drawable/btn_play_sm"/>
@@ -195,7 +195,7 @@
             android:layout_width="186dp"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:layout_marginLeft="35.5dp"
+            android:layout_marginLeft="40dp"
             android:gravity="center_horizontal"
             >
             <TextView
@@ -227,7 +227,7 @@
             android:layout_height="36dp"
             android:background="@drawable/btn_playlist_sm"
             android:layout_gravity="center_vertical"
-            android:layout_marginLeft="34.5dp"
+            android:layout_marginLeft="54.5dp"
             />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/activity_main_player.xml b/app/src/main/res/layout/activity_main_player.xml
index ffc5f8c..842b2d7 100644
--- a/app/src/main/res/layout/activity_main_player.xml
+++ b/app/src/main/res/layout/activity_main_player.xml
@@ -44,6 +44,8 @@
             android:fontFamily="@font/noto_sans_kr_bold_hestia"
             android:layout_marginLeft="16dp"
             android:textColor="#e5e5e5"
+            android:maxLines="1"
+            android:ellipsize="end"
             android:textSize="22sp"
             android:includeFontPadding="false"/>
 
@@ -59,6 +61,8 @@
             android:lineSpacingExtra="8sp"
             android:gravity="center_horizontal"
             android:text="Covered by Blotto"
+        android:maxLines="1"
+        android:ellipsize="end"
     />
     <ImageView
         android:id="@+id/img_main_player_act_cover_img"
@@ -229,7 +233,9 @@
                 android:textColor="#ffffff"
                 android:lineSpacingExtra="6sp"
                 android:gravity="center_horizontal"
-                android:text="록  메탈  POP"/>
+                android:text="록  메탈  POP"
+                android:maxLines="1"
+                android:ellipsize="end"/>
 
         <ImageView
                 android:layout_gravity="right"
diff --git a/app/src/main/res/layout/bottom_play_list.xml b/app/src/main/res/layout/bottom_play_list.xml
index 7c4ea94..0e25e61 100644
--- a/app/src/main/res/layout/bottom_play_list.xml
+++ b/app/src/main/res/layout/bottom_play_list.xml
@@ -11,7 +11,7 @@
         android:layout_height="36dp"
         android:background="@drawable/btn_play_sm"
         android:layout_marginTop="14dp"
-        android:layout_marginLeft="16dp"
+        android:layout_marginLeft="25dp"
         />
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_home_on.xml b/app/src/main/res/layout/fragment_home_on.xml
index 4f4f14d..a86938a 100644
--- a/app/src/main/res/layout/fragment_home_on.xml
+++ b/app/src/main/res/layout/fragment_home_on.xml
@@ -30,7 +30,7 @@
                                 android:layout_marginStart="22dp"
                                 android:orientation="vertical"
                                 android:layout_marginTop="174dp"
-                                android:layout_width="match_parent" android:layout_height="match_parent">
+                                android:layout_width="match_parent" android:layout_height="397dp">
                             <TextView
                                     android:id="@+id/tv_home_frag_ment"
                                     android:includeFontPadding="false"
@@ -135,7 +135,7 @@
                                         android:layout_centerHorizontal="true"
                                         android:src="@drawable/btn_more"
                                         android:layout_width="24dp" android:layout_height="24dp"
-                                        android:layout_centerVertical="true" />
+                                        android:layout_centerVertical="true"/>
                             </RelativeLayout>
 
                             <ImageView
@@ -262,13 +262,14 @@
                         android:fontFamily="@font/noto_sans_kr_bold_hestia"/>
 
                 <ImageView
-                        android:layout_marginHorizontal="13dp"
-                        android:background="@color/colorPrimary"
+                        android:layout_marginHorizontal="12dp"
                         android:layout_marginTop="16dp"
+                        android:scaleType="fitXY"
                         android:id="@+id/iv_home_frag_challenge_img"
                         android:layout_below="@+id/tv_home_frag_challenge"
-                        android:layout_width="match_parent" android:layout_height="134dp"
-                        android:src="@drawable/img_artwork_1"
+                        android:layout_width="match_parent"
+                        android:layout_height="134dp"
+                        android:src="@drawable/img_home_weeklychalenge"
                         android:layout_alignParentStart="true"/>
 
                 <!--TOP10 : 장르-->
@@ -333,7 +334,7 @@
                         android:layout_below="@+id/rv_home_frag_top10_mood"
                         android:layout_marginHorizontal="4dp"
                         android:layout_marginTop="16dp"
-                        android:layout_width="match_parent" android:layout_height="132dp">
+                        android:layout_width="match_parent" android:layout_height="140dp">
 
                 </android.support.v7.widget.RecyclerView>
             </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_my_page.xml b/app/src/main/res/layout/fragment_my_page.xml
index ed27012..ab3ca2c 100644
--- a/app/src/main/res/layout/fragment_my_page.xml
+++ b/app/src/main/res/layout/fragment_my_page.xml
@@ -205,12 +205,14 @@
         </RelativeLayout>
 
         <LinearLayout
-                android:layout_marginStart="15dp"
                 android:orientation="vertical"
-                android:layout_width="match_parent" android:layout_height="match_parent">
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
             <RelativeLayout
                     android:layout_marginTop="63dp"
-                    android:layout_width="match_parent" android:layout_height="56dp">
+                    android:layout_width="match_parent"
+                    android:layout_height="56dp"
+            android:layout_marginStart="15dp">
                 <TextView
                         android:id="@+id/tv_mypage_frag_scoring_result"
                         android:fontFamily="@font/noto_sans_kr_bold_hestia"
@@ -246,7 +248,10 @@
 
             <RelativeLayout
                     android:layout_marginTop="63dp"
-                    android:layout_width="match_parent" android:layout_height="56dp">
+                    android:layout_width="match_parent"
+                    android:layout_height="56dp"
+                    android:layout_marginStart="15dp"
+            >
                 <TextView
                         android:id="@+id/tv_mypage_frag_hit_scoring_result"
                         android:fontFamily="@font/noto_sans_kr_bold_hestia"
@@ -272,7 +277,9 @@
 
             <android.support.v7.widget.RecyclerView
                     android:id="@+id/rv_mypage_frag_score_hit_result"
-                    android:layout_width="match_parent" android:layout_height="170dp">
+                    android:layout_width="match_parent"
+                    android:layout_marginStart="15dp"
+                    android:layout_height="170dp">
 
             </android.support.v7.widget.RecyclerView>
         </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_search_home.xml b/app/src/main/res/layout/fragment_search_home.xml
index 14c821a..896caaa 100644
--- a/app/src/main/res/layout/fragment_search_home.xml
+++ b/app/src/main/res/layout/fragment_search_home.xml
@@ -23,29 +23,40 @@
             android:id="@+id/btn_search_home_frag_searchbar"
             android:layout_width="24dp"
             android:layout_height="24dp"
-            android:background="@drawable/ic_search"
+            android:background="@drawable/tab_btn_search_active"
             android:layout_centerVertical="true"
-            android:layout_marginLeft="8dp"
+            android:layout_marginLeft="30dp"
+            android:layout_toRightOf="@id/edit_search_home_frag_searchbar"
             />
 
         <EditText
-            android:id="@+id/edit_search_home_frag_searchbar"
-            android:layout_width="300dp"
-            android:layout_height="match_parent"
-            android:layout_marginLeft="8dp"
-            android:hint="검색어를 입력해주세요"
-            android:includeFontPadding="false"
-            android:fontFamily="@font/noto_sans_kr_regular_hestia"
-            android:textSize="14sp"
-            android:textColor="#979797"
-            android:textColorHint="#979797"
-            android:layout_centerVertical="true"
-            android:background="@color/transparent"
-            android:layout_toRightOf="@id/btn_search_home_frag_searchbar"
-            />
+                android:id="@+id/edit_search_home_frag_searchbar"
+                android:layout_width="290dp"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="12dp"
+                android:hint="검색어를 입력해주세요"
+                android:includeFontPadding="false"
+                android:fontFamily="@font/noto_sans_kr_regular_hestia"
+                android:textSize="14sp"
+                android:textColor="#979797"
+                android:textColorHint="#979797"
+                android:layout_centerVertical="true"
+                android:imeOptions="actionSearch"
+                android:inputType="text"
+                android:background="@color/transparent"
+
+        />
 
     </RelativeLayout>
+    <RelativeLayout
+            android:id="@+id/rv_search_background"
+            android:layout_centerInParent="true"
+            android:layout_width="360dp"
+            android:layout_height="346dp"
+            android:layout_marginTop="192dp"
+            android:background="@drawable/img_search_before_def">
 
+    </RelativeLayout>
     <LinearLayout
         android:id="@+id/ll_search_home_frag_focus_on"
         android:layout_width="match_parent"
@@ -66,6 +77,7 @@
                 android:layout_height="wrap_content">
 
                 <TextView
+                        android:visibility="gone"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="최근 검색어"
@@ -77,6 +89,7 @@
                         android:layout_marginBottom="25dp"/>
 
                 <TextView
+                        android:visibility="gone"
                     android:id="@+id/tv_search_home_frag_all_delete"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -93,6 +106,7 @@
 
         </LinearLayout>
         <android.support.v7.widget.RecyclerView
+                android:visibility="gone"
             android:id="@+id/recycler_search_home_frag_search_home_hisory"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -100,6 +114,7 @@
             >
 
         </android.support.v7.widget.RecyclerView>
+
         <LinearLayout
             android:id="@+id/ll_search_home_frag_focus"
             android:layout_width="match_parent"
@@ -110,14 +125,15 @@
         </LinearLayout>
     </LinearLayout>
     <ScrollView
+            android:visibility="gone"
         android:id="@+id/ll_search_home_frag_focus_off"
-        android:visibility="gone"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="24dp"
         android:layout_below="@+id/rl_search_home_frag_searchbar"
         >
         <LinearLayout
+
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
@@ -143,14 +159,14 @@
 
             <RelativeLayout
                 android:id="@+id/rel_search_home_frag_artist"
-                android:layout_width="82dp"
-                android:layout_height="110dp"
+                android:layout_width="100dp"
+                android:layout_height="86dp"
                 android:layout_marginLeft="16dp"
                 >
                 <android.support.v7.widget.RecyclerView
                     android:id="@+id/recycler_search_home_frag_origin_artist"
-                    android:layout_width="82dp"
-                    android:layout_height="110dp"
+                    android:layout_width="86dp"
+                    android:layout_height="86dp"
                     android:background="@drawable/img_artistprofile"
                     />
 
diff --git a/app/src/main/res/layout/item_cover_artist_view.xml b/app/src/main/res/layout/item_cover_artist_view.xml
index 5807439..f948c18 100644
--- a/app/src/main/res/layout/item_cover_artist_view.xml
+++ b/app/src/main/res/layout/item_cover_artist_view.xml
@@ -21,6 +21,8 @@
         android:text="Post Ma…"
         android:textSize="16sp"
         android:textColor="#ffffff"
+        android:maxLines="1"
+        android:ellipsize="end"
         android:fontFamily="@font/noto_sans_kr_bold_hestia"
         android:includeFontPadding="false"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/item_home_song.xml b/app/src/main/res/layout/item_home_song.xml
index 64218ef..85ec501 100644
--- a/app/src/main/res/layout/item_home_song.xml
+++ b/app/src/main/res/layout/item_home_song.xml
@@ -25,6 +25,8 @@
             android:textColor="#ffffff"
             android:lineSpacingExtra="9sp"
             android:text="Song name is..."
+            android:maxLines="1"
+            android:ellipsize="end"
     />
     <TextView
             android:id="@+id/tv_item_home_song_artist"
@@ -38,6 +40,8 @@
             android:lineSpacingExtra="6sp"
             android:gravity="center_horizontal"
             android:text="John Doe"
+            android:maxLines="1"
+            android:ellipsize="end"
     />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_my_waiting_song.xml b/app/src/main/res/layout/item_my_waiting_song.xml
index eca8a71..3a3274c 100644
--- a/app/src/main/res/layout/item_my_waiting_song.xml
+++ b/app/src/main/res/layout/item_my_waiting_song.xml
@@ -44,6 +44,8 @@
             android:lineSpacingExtra="6sp"
             android:gravity="center_horizontal"
             android:text="Song name - alice"
+            android:maxLines="1"
+             android:ellipsize="end"
             android:fontFamily="@font/noto_sans_kr_regular_hestia"
     />
 
diff --git a/app/src/main/res/layout/item_song_failed.xml b/app/src/main/res/layout/item_song_failed.xml
index 4ac39e8..3398bfd 100644
--- a/app/src/main/res/layout/item_song_failed.xml
+++ b/app/src/main/res/layout/item_song_failed.xml
@@ -28,6 +28,8 @@
             android:textColor="#ffffff"
             android:lineSpacingExtra="6sp"
             android:gravity="center_horizontal"
+            android:maxLines="1"
+            android:ellipsize="end"
             android:text="Song2-name"/>
     <TextView
             android:includeFontPadding="false"
@@ -41,5 +43,7 @@
             android:lineSpacingExtra="5sp"
             android:gravity="center_horizontal"
             android:text="Cover Artist"
+            android:maxLines="1"
+            android:ellipsize="end"
             android:layout_centerHorizontal="true"/>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_song_passed.xml b/app/src/main/res/layout/item_song_passed.xml
index 77132b4..8900a74 100644
--- a/app/src/main/res/layout/item_song_passed.xml
+++ b/app/src/main/res/layout/item_song_passed.xml
@@ -22,6 +22,8 @@
             android:lineSpacingExtra="9sp"
             android:gravity="center_horizontal"
             android:text="Song name is.."
+            android:maxLines="1"
+            android:ellipsize="end"
             android:fontFamily="@font/noto_sans_kr_bold_hestia"
             android:layout_marginTop="8dp"
 
@@ -36,6 +38,8 @@
             android:lineSpacingExtra="6sp"
             android:gravity="center_horizontal"
             android:text="Cover Artist"
+            android:maxLines="1"
+            android:ellipsize="end"
             android:fontFamily="@font/noto_sans_kr_bold_hestia"
             android:layout_marginTop="2dp"
     />
diff --git a/app/src/main/res/layout/item_song_passing.xml b/app/src/main/res/layout/item_song_passing.xml
index 65e8ebd..33582a4 100644
--- a/app/src/main/res/layout/item_song_passing.xml
+++ b/app/src/main/res/layout/item_song_passing.xml
@@ -28,6 +28,8 @@
             android:layout_height="wrap_content"
             android:textSize="13sp"
             android:includeFontPadding="false"
+            android:maxLines="1"
+            android:ellipsize="end"
             android:textColor="#ffffff"
             android:lineSpacingExtra="6sp"
             android:gravity="center_horizontal"
@@ -45,6 +47,8 @@
             android:lineSpacingExtra="5sp"
             android:gravity="center_horizontal"
             android:text="Cover Artist"
+            android:maxLines="1"
+            android:ellipsize="end"
             android:layout_centerHorizontal="true"/>
 
 
diff --git a/app/src/main/res/layout/item_waiting_song.xml b/app/src/main/res/layout/item_waiting_song.xml
index df77e67..356603f 100644
--- a/app/src/main/res/layout/item_waiting_song.xml
+++ b/app/src/main/res/layout/item_waiting_song.xml
@@ -28,6 +28,8 @@
             android:includeFontPadding="false"
             android:textColor="#ffffff"
             android:lineSpacingExtra="6sp"
+            android:maxLines="1"
+            android:ellipsize="end"
             android:gravity="center_horizontal"
             android:text="Song2-name"/>
 
@@ -43,6 +45,9 @@
             android:lineSpacingExtra="5sp"
             android:gravity="center_horizontal"
             android:text="Song 2 name"
+            android:maxLines="1"
+            android:ellipsize="end"
+
             android:layout_centerHorizontal="true"/>