diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index dac8f21..e804898 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="sleepchild.aupod22"
-    versionCode="012"
-    versionName="0.1.2">
-	
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    versionCode="014"
+    versionName="0.1.4">
+
+	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
         
     <uses-sdk
         android:minSdkVersion="14"
@@ -43,6 +43,9 @@
 				<data android:mimeType="audio/*" />
             </intent-filter>
         </activity>
+        <activity
+            android:name=".TagEditorActivity"
+            android:launchMode="singleTop"></activity>
         
         <service android:name=".AudioService"/>
             
diff --git a/res/drawable/ic_chevron_left_white_24dp.png b/res/drawable/ic_chevron_left_white_24dp.png
new file mode 100644
index 0000000..815b155
Binary files /dev/null and b/res/drawable/ic_chevron_left_white_24dp.png differ
diff --git a/res/drawable/ic_dots_vert_white.png b/res/drawable/ic_dots_vert_white.png
new file mode 100644
index 0000000..2fff38e
Binary files /dev/null and b/res/drawable/ic_dots_vert_white.png differ
diff --git a/res/drawable/ic_keyboard_arrow_left_black_24dp.png b/res/drawable/ic_keyboard_arrow_left_black_24dp.png
new file mode 100644
index 0000000..23ef6d6
Binary files /dev/null and b/res/drawable/ic_keyboard_arrow_left_black_24dp.png differ
diff --git a/res/drawable/ic_save_black_24dp.png b/res/drawable/ic_save_black_24dp.png
new file mode 100644
index 0000000..fb9c14b
Binary files /dev/null and b/res/drawable/ic_save_black_24dp.png differ
diff --git a/res/drawable/ic_save_white_24dp.png b/res/drawable/ic_save_white_24dp.png
new file mode 100644
index 0000000..aa03320
Binary files /dev/null and b/res/drawable/ic_save_white_24dp.png differ
diff --git a/res/drawable/ic_settings.png b/res/drawable/ic_settings.png
index d293b40..12e5d10 100644
Binary files a/res/drawable/ic_settings.png and b/res/drawable/ic_settings.png differ
diff --git a/res/drawable/icon_pencil.png b/res/drawable/icon_pencil.png
new file mode 100644
index 0000000..26fcd77
Binary files /dev/null and b/res/drawable/icon_pencil.png differ
diff --git a/res/layout/activity_auplayer.xml b/res/layout/activity_auplayer.xml
new file mode 100644
index 0000000..74d6d62
--- /dev/null
+++ b/res/layout/activity_auplayer.xml
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/pluto">
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="40dp">
+
+            <LinearLayout
+                android:id="@+id/auplayer_btn_back"
+                android:onClick="onButton"
+                android:orientation="vertical"
+                android:layout_width="40dp"
+                android:layout_height="match_parent"
+                android:gravity="center">
+
+                <ImageView
+                    android:clickable="false"
+                    android:layout_width="26dp"
+                    android:layout_height="26dp"
+                    android:background="@drawable/ic_chevron_left_white_24dp"/>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/auplayer_btn_options"
+                android:onClick="onButton"
+                android:orientation="vertical"
+                android:layout_width="40dp"
+                android:layout_height="match_parent"
+                android:layout_alignParentRight="true"
+                android:gravity="center">
+
+                <ImageView
+                    android:clickable="false"
+                    android:layout_width="22dp"
+                    android:layout_height="22dp"
+                    android:background="@drawable/ic_dots_vert_white"/>
+
+            </LinearLayout>
+
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1.0">
+
+            <LinearLayout
+                android:id="@+id/aupalyer_iv_art2_background"
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@drawable/fallback_cover"/>
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="#FFFFFF"
+                android:alpha="0.7"/>
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:id="@+id/layout3LinearLayout1">
+
+                <LinearLayout
+                    android:orientation="vertical"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1.0"
+                    android:padding="20dp">
+
+                    <ImageView
+                        android:id="@+id/auplayer_iv_art"
+                        android:src="@drawable/fallback_cover"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"/>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:orientation="vertical"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp">
+
+                    <TextView
+                        android:id="@+id/auplayer_tv_title"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="If I Were You"
+                        android:background="#FFFFFF"
+                        android:textColor="#000000"
+                        android:textSize="20sp"
+                        android:layout_marginBottom="4dp"
+                        android:ellipsize="end"
+                        android:singleLine="true"/>
+
+                    <TextView
+                        android:id="@+id/auplayer_tv_artist"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Sirens"
+                        android:textColor="#555555"
+                        android:textSize="16sp"
+                        android:background="#FFFFFF"
+                        android:ellipsize="end"
+                        android:singleLine="true"/>
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+        </RelativeLayout>
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="10dp">
+
+            <SeekBar
+                android:id="@+id/aupalyer_seeker"
+                android:layout_width="match_parent"
+                android:layout_height="18dp"/>
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <TextView
+                    android:id="@+id/auplayer_currentpos"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="00:00"
+                    android:textColor="#FFFFFF"
+                    android:textSize="14sp"/>
+
+                <TextView
+                    android:id="@+id/auplayer_duration"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="00:00"
+                    android:layout_alignParentRight="true"
+                    android:textColor="#FFFFFF"
+                    android:textSize="14sp"/>
+
+            </RelativeLayout>
+
+            <LinearLayout
+                android:orientation="horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center">
+
+                <LinearLayout
+                    android:id="@+id/auplayer_btn_prev"
+                    android:onClick="onButton"
+                    android:orientation="vertical"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="15dp">
+
+                        <ImageView
+                            android:clickable="false"
+                            android:layout_width="34dp"
+                            android:layout_height="34dp"
+                            android:background="@drawable/ic_prev"/>
+
+                </LinearLayout>
+
+
+                <ImageButton
+                    android:id="@+id/auplayer_btn_playpause"
+                    android:onClick="onButton"
+                    android:layout_width="100dp"
+                    style="?android:attr/buttonBarButtonStyle"
+                    android:layout_height="100dp"
+                    android:src="@drawable/ic_play"
+                    android:layout_marginRight="30dp"
+                    android:layout_marginLeft="30dp"/>
+
+                <LinearLayout
+                    android:id="@+id/auplayer_btn_next"
+                    android:onClick="onButton"
+                    android:orientation="vertical"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="15dp">
+
+                    <ImageView
+                        android:clickable="false"
+                        android:layout_width="34dp"
+                        android:layout_height="34dp"
+                        android:background="@drawable/ic_next"/>
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</RelativeLayout>
+
+
diff --git a/res/layout/activity_tageditor.xml b/res/layout/activity_tageditor.xml
new file mode 100644
index 0000000..cbe14ae
--- /dev/null
+++ b/res/layout/activity_tageditor.xml
@@ -0,0 +1,210 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#0A5CB9">
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="45dp">
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="45dp"
+            android:layout_height="match_parent"
+            android:gravity="center">
+
+            <ImageView
+                android:layout_width="26dp"
+                android:layout_height="26dp"
+                android:background="@drawable/ic_chevron_left_white_24dp"/>
+
+        </LinearLayout>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:text="Tag Editor"
+            android:layout_weight="1.0"
+            android:textColor="#FFFFFF"
+            android:gravity="center_vertical"
+            android:textSize="20sp"/>
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="45dp"
+            android:layout_height="match_parent"
+            android:gravity="center">
+
+            <ImageView
+                android:layout_width="26dp"
+                android:layout_height="26dp"
+                android:background="@drawable/ic_save_white_24dp"/>
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="#E0E0E0"/>
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center_horizontal"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp"
+            android:paddingTop="10dp">
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="150dp"
+                android:layout_height="150dp"
+                android:padding="1dp"
+                android:background="#FFFFFF"
+                android:layout_marginBottom="20dp">
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="#FFFFFF">
+
+                    <LinearLayout
+                        android:orientation="vertical"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:background="@drawable/fallback_cover"/>
+
+                </RelativeLayout>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="10dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Title"
+                    android:textColor="#FFFFFF"
+                    android:textSize="14sp"/>
+
+                <EditText
+                    android:layout_width="match_parent"
+                    android:ems="10"
+                    android:layout_height="wrap_content"
+                    android:hint="title"
+                    android:textColor="#FFFFFF"
+                    android:textColorHint="#A4A4A4"/>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="10dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Artist"
+                    android:textColor="#FFFFFF"
+                    android:textSize="14sp"/>
+
+                <EditText
+                    android:layout_width="match_parent"
+                    android:ems="10"
+                    android:layout_height="wrap_content"
+                    android:hint="artist"
+                    android:textColorHint="#AAAAAA"/>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="10dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Album"
+                    android:textColor="#FFFFFF"
+                    android:textSize="14sp"/>
+
+                <EditText
+                    android:layout_width="match_parent"
+                    android:ems="10"
+                    android:layout_height="wrap_content"
+                    android:hint="album"
+                    android:textColorHint="#AAAAAA"/>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="10dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Genre"
+                    android:textColor="#FFFFFF"
+                    android:textSize="14sp"/>
+
+                <EditText
+                    android:layout_width="match_parent"
+                    android:ems="10"
+                    android:layout_height="wrap_content"
+                    android:hint="genre"
+                    android:textColorHint="#989898"/>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="10dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="year"
+                    android:textColor="#FFFFFF"
+                    android:textSize="14sp"/>
+
+                <EditText
+                    android:layout_width="match_parent"
+                    android:ems="10"
+                    android:layout_height="wrap_content"
+                    android:hint="year"
+                    android:textColorHint="#BABABA"/>
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </ScrollView>
+
+</LinearLayout>
+
+
diff --git a/res/layout/activity_tageditor2.xml b/res/layout/activity_tageditor2.xml
new file mode 100644
index 0000000..7933bda
--- /dev/null
+++ b/res/layout/activity_tageditor2.xml
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="45dp">
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="45dp"
+            android:layout_height="match_parent"
+            android:gravity="center">
+
+            <ImageView
+                android:layout_width="26dp"
+                android:layout_height="26dp"
+                android:background="@drawable/ic_keyboard_arrow_left_black_24dp"/>
+
+        </LinearLayout>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:text="Tag Editor"
+            android:layout_weight="1.0"
+            android:textColor="#000000"
+            android:gravity="center_vertical"
+            android:textSize="20sp"/>
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="45dp"
+            android:layout_height="match_parent"
+            android:gravity="center">
+
+            <ImageView
+                android:layout_width="26dp"
+                android:layout_height="26dp"
+                android:background="@drawable/ic_save_black_24dp"/>
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="#626262"/>
+
+    
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center_horizontal"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp"
+            android:paddingTop="10dp">
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="150dp"
+                android:layout_height="150dp"
+                android:padding="1dp"
+                android:background="#000000"
+                android:layout_marginBottom="20dp">
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="#FFFFFF">
+
+                    <LinearLayout
+                        android:orientation="vertical"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:background="@drawable/fallback_cover"/>
+
+                </RelativeLayout>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="10dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Title"
+                    android:textColor="#000000"
+                    android:textSize="14sp"/>
+
+                <EditText
+                    android:layout_width="match_parent"
+                    android:ems="10"
+                    android:layout_height="wrap_content"
+                    android:hint="title"/>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="10dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Artist"
+                    android:textColor="#000000"
+                    android:textSize="14sp"/>
+
+                <EditText
+                    android:layout_width="match_parent"
+                    android:ems="10"
+                    android:layout_height="wrap_content"
+                    android:hint="artist"/>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="10dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Album"
+                    android:textColor="#000000"
+                    android:textSize="14sp"/>
+
+                <EditText
+                    android:layout_width="match_parent"
+                    android:ems="10"
+                    android:layout_height="wrap_content"
+                    android:hint="album"/>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="10dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Genre"
+                    android:textColor="#000000"
+                    android:textSize="14sp"/>
+
+                <EditText
+                    android:layout_width="match_parent"
+                    android:ems="10"
+                    android:layout_height="wrap_content"
+                    android:hint="genre"/>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="10dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="year"
+                    android:textColor="#000000"
+                    android:textSize="14sp"/>
+
+                <EditText
+                    android:layout_width="match_parent"
+                    android:ems="10"
+                    android:layout_height="wrap_content"
+                    android:hint="year"/>
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+   
+
+</LinearLayout>
+
+
diff --git a/res/layout/cathy.xml b/res/layout/cathy.xml
new file mode 100644
index 0000000..45e459f
--- /dev/null
+++ b/res/layout/cathy.xml
@@ -0,0 +1,6 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical">
+    
+</LinearLayout>
diff --git a/res/layout/popup_auplayer_songoptions.xml b/res/layout/popup_auplayer_songoptions.xml
new file mode 100644
index 0000000..470b2df
--- /dev/null
+++ b/res/layout/popup_auplayer_songoptions.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    android:id="@+id/popup_auplayer_songoptions_container"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="20dp">
+
+    <LinearLayout
+        android:id="@+id/popup_auplayer_songoptions_clk"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="#FFFFFF"
+        android:layout_centerInParent="true">
+
+        <LinearLayout
+            android:tag="showinfo"
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:id="@+id/popup_auplayer_songoptions_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text=""
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textSize="17sp"
+                android:singleLine="true"
+                android:ellipsize="end"
+                android:textColor="#000000"/>
+            
+            <TextView
+                android:id="@+id/popup_auplayer_songoptions_artist"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text=""
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textSize="17sp"
+                android:singleLine="true"
+                android:ellipsize="end"
+                android:textColor="#696969"/>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="#DCDCDC"
+            android:layout_marginBottom="5dp"
+            android:layout_marginTop="5dp"/>
+
+        <TextView
+            android:tag="addtoplaylist"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Add to playlist"
+            android:padding="10dp"
+            android:textSize="18sp"
+            android:textColor="#000000"
+            android:ellipsize="end"/>
+
+        <TextView
+            android:tag="editfiletags"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Edit Tags"
+            android:padding="10dp"
+            android:textSize="18sp"
+            android:textColor="#000000"
+            android:ellipsize="end"/>
+
+        <TextView
+            android:tag="deletesong"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Delete song"
+            android:padding="10dp"
+            android:textSize="18sp"
+            android:textColor="#000000"
+            android:ellipsize="end"/>
+
+    </LinearLayout>
+
+</RelativeLayout>
+
+
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3c3f67f..1ba5e70 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,4 +1,4 @@
 <resources>
     <string name="app_name">aupod</string>
-    <string name="app_name_c">AuPod</string>
+    <string name="app_version">0.1.3</string>
 </resources>
diff --git a/src/sleepchild/aupod22/AudioService.java b/src/sleepchild/aupod22/AudioService.java
index ac704d0..f3f9e32 100644
--- a/src/sleepchild/aupod22/AudioService.java
+++ b/src/sleepchild/aupod22/AudioService.java
@@ -11,6 +11,8 @@ public class AudioService extends Service implements SongFactory.FactoryEvents
 {
     public static final int REQUEST_CODE = 914826;
     public static final String CMD_START = "sleepchild.aupod.service_cmd.start";
+    public static final String CMD_EXIT = "sleepchild.aupod.service_cmdE_Exit";
+    
     
     public static final String CMD_PLAY = "sleepchild.aupod.service_cmd_PLAY";
     public static final String CMD_PAUSE = "sleepchild.aupod.service_cmd.PAUSECMD";
@@ -142,6 +144,10 @@ public int getCurrentPosition(){
         return player.getCurrentPosition();
     }
     
+    public int getDuration(){
+        return player.getDuration();
+    }
+    
     public void seekTo(int pos){
         player.seekTo(pos);
     }
@@ -284,8 +290,27 @@ private void unRegisterMediaButtons(){
         audioMgr.unregisterMediaButtonEventReceiver(mediaButtonComp);
     }
     
+    Runnable dblk;
+    int d=0;
     private void handleMediaButton(){
-        playPause();
+        if(dblk==null){
+            dblk = new Runnable(){
+                public void run(){
+                    //single click
+                    d=0;
+                    playPause();
+                }
+            };
+        }
+        d++;
+        if(d==2){
+            // double click
+            handle.removeCallbacks(dblk);
+            playNext();
+            d=0;
+        }else if(d==1){
+            handle.postDelayed(dblk,250);
+        }
     }
     
 }
diff --git a/src/sleepchild/aupod22/PlayerActivity.java b/src/sleepchild/aupod22/PlayerActivity.java
index 734be34..8f8da46 100644
--- a/src/sleepchild/aupod22/PlayerActivity.java
+++ b/src/sleepchild/aupod22/PlayerActivity.java
@@ -1,4 +1,5 @@
 package sleepchild.aupod22;
+
 import android.os.*;
 import android.widget.*;
 import android.graphics.*;
@@ -8,6 +9,7 @@
 import android.graphics.drawable.*;
 import android.view.*;
 import java.util.concurrent.*;
+import sleepchild.aupod22.menu.*;
 
 public class PlayerActivity extends BaseActivity
 {
@@ -17,18 +19,18 @@ public class PlayerActivity extends BaseActivity
     LinearLayout art2Background;
     ImageView currentArt;
     AudioService aupod;
-//    SongItem currentSong;
     ImageView playpauseIcon;
     SeekBar seeker;
     Runnable seekerTick;
     boolean seektouch;
     Handler handle;
+    SongOptions songMenu;
     
     @Override
     public void onCreate(Bundle savedInstanceState)
     {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.auplayer);
+        setContentView(R.layout.activity_auplayer);
         init();
     }
     
@@ -83,6 +85,8 @@ public void run(){
         
         trackTimeCurrent = (TextView) findViewById(R.id.auplayer_currentpos);
         trackTimeDuration = (TextView) findViewById(R.id.auplayer_duration);
+        
+        songMenu = new SongOptions(this);
     }
     
     void updateInfo(){
@@ -97,7 +101,13 @@ void updateInfo(){
             currentArt.setImageResource(R.drawable.fallback_cover);
             art2Background.setBackgroundResource(R.drawable.fallback_cover);
         }
-        seeker.setMax((int)si.duration);
+        
+        if(aupod.isPlaying()){
+            seeker.setMax(aupod.getDuration());
+        }else{
+            seeker.setMax((int)si.duration);
+        }
+        
         seeker.setProgress(aupod.getCurrentPosition());
         trackTimeDuration.setText(formatTime((int)si.duration));
         //*/
@@ -161,6 +171,12 @@ public void onButton(View v){
                     aupod.playPrev();
                 }
                 break;
+            case R.id.auplayer_btn_back:
+                finish();
+                break;
+            case R.id.auplayer_btn_options:
+                songMenu.show(aupod.getCurrentSong());
+                break;
         }
     }
     
diff --git a/src/sleepchild/aupod22/TagEditorActivity.java b/src/sleepchild/aupod22/TagEditorActivity.java
new file mode 100644
index 0000000..21cfd66
--- /dev/null
+++ b/src/sleepchild/aupod22/TagEditorActivity.java
@@ -0,0 +1,13 @@
+package sleepchild.aupod22;
+
+import android.os.Bundle;
+
+public class TagEditorActivity extends BaseActivity{
+
+	@Override
+    public void onCreate(Bundle si){
+        super.onCreate(si);
+        setContentView(R.layout.activity_tageditor);
+    }
+    
+}
diff --git a/src/sleepchild/aupod22/menu/SongOptions.java b/src/sleepchild/aupod22/menu/SongOptions.java
new file mode 100644
index 0000000..484137e
--- /dev/null
+++ b/src/sleepchild/aupod22/menu/SongOptions.java
@@ -0,0 +1,107 @@
+package sleepchild.aupod22.menu;
+
+import sleepchild.aupod22.BaseActivity;
+import android.content.*;
+import android.widget.*;
+import android.view.*;
+import android.app.*;
+import sleepchild.aupod22.SongItem;
+import sleepchild.aupod22.TagEditorActivity;
+import sleepchild.aupod22.R;
+
+public class SongOptions implements View.OnClickListener
+{
+    BaseActivity ctx;
+    SongItem si;
+    RelativeLayout container;
+    TextView title, artist;
+    Dialog dlg;
+    
+    
+    public SongOptions(BaseActivity ctx){
+        this.ctx = ctx;
+        dlg = new Dialog(ctx);
+        Window w = dlg.getWindow();
+        w.requestFeature(Window.FEATURE_NO_TITLE);
+        
+        dlg.setContentView(R.layout.popup_auplayer_songoptions);
+        //
+        title = ftv(R.id.popup_auplayer_songoptions_title);
+        artist = ftv(R.id.popup_auplayer_songoptions_artist);
+        
+        LinearLayout ops = (LinearLayout) fv(R.id.popup_auplayer_songoptions_clk);
+        int cc = ops.getChildCount();
+        for(int i=0;i<cc;i++){
+            View v = ops.getChildAt(i);
+            v.setOnClickListener(this);
+        }
+    }
+    
+    private View fv(int resid){
+        return dlg.findViewById(resid);
+    }
+    
+    private TextView ftv(int resid){
+        return (TextView) fv(resid);
+    }
+    
+    public void show(SongItem si){
+        if(si==null){return;}
+        setup(si);
+        dlg.show();
+    }
+    
+    public void hide(){
+        dlg.dismiss();
+        clean();
+    }
+    
+    private void setup(SongItem si){
+        this.si = si;
+        title.setText(si.title);
+        artist.setText(si.artist);
+    }
+    
+    private void clean(){
+        title.setText("");
+        artist.setText("");
+        si = null;
+    }
+
+    @Override
+    public void onClick(View v)
+    {
+        if(v.getTag()!=null){
+            String tag = v.getTag().toString();
+            switch(tag){
+                case "showinfo":
+                    //
+                    break;
+                case "addtoplaylist":
+                    //
+                    break;
+                case "editfiletags":
+                    hide();
+                    ctx.startActivity(TagEditorActivity.class);
+                    //hide();
+                    break;
+                case "deletesong":
+                    //
+                    break;
+                /*
+                case "":
+                    //
+                    break;
+                case "":
+                    //
+                    break;
+                case "":
+                    //
+                    break;
+                //*/
+                
+            }
+        }
+    }
+    
+}