diff --git a/app/build.gradle b/app/build.gradle
index d1c3940a..001008b6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -119,7 +119,6 @@ dependencies {
     compile 'com.github.ksoichiro:android-observablescrollview:1.6.0'
     compile 'asia.ivity.android:drag-sort-listview:1.0'
     compile 'com.github.semoncat.seekarc:library:0.1'
-    compile 'com.sothree.slidinguppanel:library:3.2.0'
     compile 'com.squareup.retrofit:retrofit:2.0.0-beta2'
     compile 'com.squareup.retrofit:converter-gson:2.0.0-beta2'
     compile 'com.squareup.okhttp:okhttp:2.5.0'
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java
index e62da28b..c9c466e9 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java
@@ -14,7 +14,7 @@ import com.kabouzeid.gramophone.R;
 import com.kabouzeid.gramophone.helper.MusicPlayerRemote;
 import com.kabouzeid.gramophone.ui.fragments.player.MiniPlayerFragment;
 import com.kabouzeid.gramophone.ui.fragments.player.PlayerFragment;
-import com.sothree.slidinguppanel.SlidingUpPanelLayout;
+import com.kabouzeid.gramophone.views.SlidingUpPanelLayout;
 
 import butterknife.Bind;
 import butterknife.ButterKnife;
@@ -67,6 +67,8 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
                 }
             }
         });
+
+        slidingUpPanelLayout.setScrollingEnabled(false);
     }
 
     protected abstract View createContentView();
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java
index 1a03a82a..38a607da 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java
@@ -6,6 +6,7 @@ import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.support.annotation.ColorInt;
 import android.support.v4.app.Fragment;
+import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.CardView;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.Toolbar;
@@ -24,11 +25,11 @@ import com.kabouzeid.gramophone.dialogs.SleepTimerDialog;
 import com.kabouzeid.gramophone.dialogs.SongDetailDialog;
 import com.kabouzeid.gramophone.dialogs.SongShareDialog;
 import com.kabouzeid.gramophone.helper.MusicPlayerRemote;
+import com.kabouzeid.gramophone.interfaces.CabHolder;
 import com.kabouzeid.gramophone.interfaces.MusicServiceEventListener;
 import com.kabouzeid.gramophone.interfaces.PaletteColorHolder;
 import com.kabouzeid.gramophone.loader.SongLoader;
 import com.kabouzeid.gramophone.model.Song;
-import com.kabouzeid.gramophone.ui.activities.MainActivity;
 import com.kabouzeid.gramophone.ui.activities.base.AbsMusicServiceActivity;
 import com.kabouzeid.gramophone.ui.activities.tageditor.AbsTagEditorActivity;
 import com.kabouzeid.gramophone.ui.activities.tageditor.SongTagEditorActivity;
@@ -37,8 +38,8 @@ import com.kabouzeid.gramophone.util.MusicUtil;
 import com.kabouzeid.gramophone.util.NavigationUtil;
 import com.kabouzeid.gramophone.util.Util;
 import com.kabouzeid.gramophone.util.ViewUtil;
+import com.kabouzeid.gramophone.views.SlidingUpPanelLayout;
 import com.kabouzeid.gramophone.views.SquareLayout;
-import com.sothree.slidinguppanel.SlidingUpPanelLayout;
 
 import org.solovyev.android.views.llm.LinearLayoutManager;
 
@@ -107,11 +108,11 @@ public class PlayerFragment extends Fragment implements MusicServiceEventListene
         setUpSubFragments();
 
         recyclerView.setAdapter(new SongAdapter(
-                ((MainActivity) getActivity()),
+                ((AppCompatActivity) getActivity()),
                 SongLoader.getAllSongs(getActivity()),
                 R.layout.item_list,
                 false,
-                ((MainActivity) getActivity())));
+                ((CabHolder) getActivity())));
 
         // TODO set child size
         recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
@@ -274,4 +275,6 @@ public class PlayerFragment extends Fragment implements MusicServiceEventListene
     public interface Callbacks {
         void onPaletteColorChanged();
     }
+
+
 }
diff --git a/app/src/main/res/drawable-hdpi/above_shadow.xml b/app/src/main/res/drawable-hdpi/above_shadow.xml
new file mode 100644
index 00000000..c021bfcc
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/above_shadow.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:startColor="#20000000"
+        android:endColor="@android:color/transparent"
+        android:angle="90"></gradient>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-hdpi/below_shadow.xml b/app/src/main/res/drawable-hdpi/below_shadow.xml
new file mode 100644
index 00000000..224f9758
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/below_shadow.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:startColor="#20000000"
+        android:endColor="@android:color/transparent"
+        android:angle="270"></gradient>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml
index 27a8467a..8469d9d7 100644
--- a/app/src/main/res/layout/fragment_player.xml
+++ b/app/src/main/res/layout/fragment_player.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.sothree.slidinguppanel.SlidingUpPanelLayout
+<com.kabouzeid.gramophone.views.SlidingUpPanelLayout
     android:id="@+id/player_sliding_layout"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/tools"
-    xmlns:sothree="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:focusable="true"
-    android:clickable="false"
     android:gravity="bottom"
     sothree:umanoDragView="@+id/player_panel"
     sothree:umanoFadeColor="#00000000"
@@ -15,7 +12,8 @@
     sothree:umanoPanelHeight="0dp"
     sothree:umanoScrollableView="@+id/player_recycler_view"
     sothree:umanoParallaxOffset="32dp"
-    sothree:umanoShadowHeight="0dp">
+    sothree:umanoShadowHeight="0dp"
+    xmlns:sothree="http://schemas.android.com/apk/res-auto">
 
     <RelativeLayout
         android:id="@+id/player_content"
@@ -77,4 +75,4 @@
 
     </FrameLayout>
 
-</com.sothree.slidinguppanel.SlidingUpPanelLayout>
+</com.kabouzeid.gramophone.views.SlidingUpPanelLayout>
diff --git a/app/src/main/res/layout/sliding_music_panel_layout.xml b/app/src/main/res/layout/sliding_music_panel_layout.xml
index 315af03e..42bc7627 100644
--- a/app/src/main/res/layout/sliding_music_panel_layout.xml
+++ b/app/src/main/res/layout/sliding_music_panel_layout.xml
@@ -1,12 +1,10 @@
-<com.sothree.slidinguppanel.SlidingUpPanelLayout
+<com.kabouzeid.gramophone.views.SlidingUpPanelLayout
     android:id="@+id/sliding_layout"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:sothree="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="bottom"
-    sothree:umanoScrollableView="@+id/sliding_panel"
-    sothree:umanoDragView="@+id/sliding_panel"
     sothree:umanoPanelHeight="@dimen/mini_player_height"
     sothree:umanoShadowHeight="@dimen/card_elevation">
 
@@ -35,4 +33,4 @@
 
     </FrameLayout>
 
-</com.sothree.slidinguppanel.SlidingUpPanelLayout>
\ No newline at end of file
+</com.kabouzeid.gramophone.views.SlidingUpPanelLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 4e44979f..a1839cb9 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -13,4 +13,24 @@
     <attr name="icon_color" format="color" />
     <attr name="divider_color" format="color" />
 
+    <declare-styleable name="SlidingUpPanelLayout">
+        <attr name="umanoPanelHeight" format="dimension" />
+        <attr name="umanoShadowHeight" format="dimension" />
+        <attr name="umanoParallaxOffset" format="dimension" />
+        <attr name="umanoFadeColor" format="color" />
+        <attr name="umanoFlingVelocity" format="integer" />
+        <attr name="umanoDragView" format="reference" />
+        <attr name="umanoScrollableView" format="reference" />
+        <attr name="umanoOverlay" format="boolean" />
+        <attr name="umanoClipPanel" format="boolean" />
+        <attr name="umanoAnchorPoint" format="float" />
+        <attr name="umanoInitialState" format="enum">
+            <enum name="expanded" value="0" />
+            <enum name="collapsed" value="1" />
+            <enum name="anchored" value="2" />
+            <enum name="hidden" value="3" />
+        </attr>
+        <attr name="umanoScrollInterpolator" format="reference" />
+    </declare-styleable>
+
 </resources>
\ No newline at end of file