diff --git a/src/main/java/net/micode/notes/model/WorkingNote.java b/src/main/java/net/micode/notes/model/WorkingNote.java
index a1a2455..be081e4 100644
--- a/src/main/java/net/micode/notes/model/WorkingNote.java
+++ b/src/main/java/net/micode/notes/model/WorkingNote.java
@@ -38,7 +38,7 @@ public class WorkingNote {
     // Note Id
     private long mNoteId;
     // Note content
-    public String mContent;
+    private String mContent;
     // Note mode
     private int mMode;
 
diff --git a/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/main/java/net/micode/notes/ui/NoteEditActivity.java
index 2ecc671..9a6e656 100644
--- a/src/main/java/net/micode/notes/ui/NoteEditActivity.java
+++ b/src/main/java/net/micode/notes/ui/NoteEditActivity.java
@@ -19,37 +19,24 @@ package net.micode.notes.ui;
 import android.app.Activity;
 import android.app.AlarmManager;
 import android.app.AlertDialog;
+import android.app.Dialog;
 import android.app.PendingIntent;
 import android.app.SearchManager;
 import android.appwidget.AppWidgetManager;
-import android.content.ContentResolver;
 import android.content.ContentUris;
-import android.content.ContentValues;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.database.Cursor;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Matrix;
 import android.graphics.Paint;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.os.Build;
+import android.graphics.Typeface;
 import android.os.Bundle;
-import android.os.Environment;
 import android.preference.PreferenceManager;
-import android.provider.DocumentsContract;
-import android.provider.MediaStore;
-import android.text.Editable;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.TextUtils;
 import android.text.format.DateUtils;
 import android.text.style.BackgroundColorSpan;
-import android.text.style.ImageSpan;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -58,12 +45,10 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.WindowManager;
-import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.EditText;
-import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -82,7 +67,6 @@ import net.micode.notes.ui.NoteEditText.OnTextViewChangeListener;
 import net.micode.notes.widget.NoteWidgetProvider_2x;
 import net.micode.notes.widget.NoteWidgetProvider_4x;
 
-import java.io.FileNotFoundException;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -92,6 +76,9 @@ import java.util.regex.Pattern;
 
 public class NoteEditActivity extends Activity implements OnClickListener,
         NoteSettingChangedListener, OnTextViewChangeListener {
+    private Dialog alertDialog2;
+    private NotesListAdapter mNotesListAdapter;
+
     private class HeadViewHolder {
         public TextView tvModified;
 
@@ -101,7 +88,6 @@ public class NoteEditActivity extends Activity implements OnClickListener,
 
         public ImageView ibSetBgColor;
     }
-
     private static final Map<Integer, Integer> sBgSelectorBtnsMap = new HashMap<Integer, Integer>();
     static {
         sBgSelectorBtnsMap.put(R.id.iv_bg_yellow, ResourceParser.YELLOW);
@@ -166,9 +152,6 @@ public class NoteEditActivity extends Activity implements OnClickListener,
 
     private String mUserQuery;
     private Pattern mPattern;
-
-    private final int PHOTO_REQUEST = 1;//请求码
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -179,27 +162,12 @@ public class NoteEditActivity extends Activity implements OnClickListener,
             return;
         }
         initResources();
-
-
-        //根据id获取添加图片按钮
-        final ImageButton add_img_btn = (ImageButton) findViewById(R.id.add_img_btn);
-        //为点击图片按钮设置监听器
-        add_img_btn.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                Log.d(TAG, "onClick: click add image button");
-                //ACTION_GET_CONTENT: 允许用户选择特殊种类的数据，并返回（特殊种类的数据：照一张相片或录一段音）
-                Intent loadImage = new Intent(Intent.ACTION_GET_CONTENT);
-                //Category属性用于指定当前动作（Action）被执行的环境.
-                //CATEGORY_OPENABLE; 用来指示一个ACTION_GET_CONTENT的intent
-                loadImage.addCategory(Intent.CATEGORY_OPENABLE);
-                loadImage.setType("image/*");
-                startActivityForResult(loadImage, PHOTO_REQUEST);
-            }
-        });
     }
 
-
+    /**
+     * Current activity may be killed when the memory is low. Once it is killed, for another time
+     * user load this activity, we should restore the former state
+     */
     @Override
     protected void onRestoreInstanceState(Bundle savedInstanceState) {
         super.onRestoreInstanceState(savedInstanceState);
@@ -298,13 +266,14 @@ public class NoteEditActivity extends Activity implements OnClickListener,
     }
 
     @Override
-    protected void onResume() {//能获得用户焦点：可以操作
+    protected void onResume() {
         super.onResume();
-        initNoteScreen();//初始化便签屏幕
+        initNoteScreen();
     }
 
     private void initNoteScreen() {
-        mNoteEditor.setTextAppearance(this, TextAppearanceResources.getTexAppearanceResource(mFontSizeId));
+        mNoteEditor.setTextAppearance(this, TextAppearanceResources
+                .getTexAppearanceResource(mFontSizeId));
         if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
             switchToListMode(mWorkingNote.getContent());
         } else {
@@ -322,9 +291,11 @@ public class NoteEditActivity extends Activity implements OnClickListener,
                         | DateUtils.FORMAT_NUMERIC_DATE | DateUtils.FORMAT_SHOW_TIME
                         | DateUtils.FORMAT_SHOW_YEAR));
 
+        /**
+         * TODO: Add the menu for setting alert. Currently disable it because the DateTimePicker
+         * is not ready
+         */
         showAlertHeader();
-        //将有图片路径的位置转换为图片
-        convertToImage();
     }
 
     private void showAlertHeader() {
@@ -344,47 +315,6 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         };
     }
 
-    //路径字符串格式 转换为 图片image格式
-    private void convertToImage() {
-        NoteEditText noteEditText = (NoteEditText) findViewById(R.id.note_edit_view); //获取当前的edit
-        Editable editable = noteEditText.getText();//1.获取text
-        String noteText = editable.toString(); //2.将note内容转换为字符串
-        int length = editable.length(); //内容的长度
-        //3.截取img片段 [local]+uri+[local]，提取uri
-        for(int i = 0; i < length; i++) {
-            for(int j = i; j < length; j++) {
-                String img_fragment = noteText.substring(i, j+1); //img_fragment：关于图片路径的片段
-                if(img_fragment.length() > 15 && img_fragment.endsWith("[/local]") && img_fragment.startsWith("[local]")){
-                    int limit = 7;  //[local]为7个字符
-                    //[local][/local]共15个字符，剩下的为真正的path长度
-                    int len = img_fragment.length()-15;
-                    //从[local]之后的len个字符就是path
-                    String path = img_fragment.substring(limit,limit+len);//获取到了图片路径
-                    Bitmap bitmap = null;
-                    Log.d(TAG, "图片的路径是："+path);
-                    try {
-                        bitmap = BitmapFactory.decodeFile(path);//将图片路径解码为图片格式
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                    if(bitmap!=null){  //若图片存在
-                        Log.d(TAG, "图片不为null");
-                        ImageSpan imageSpan = new ImageSpan(NoteEditActivity.this, bitmap);
-                        //4.创建一个SpannableString对象，以便插入用ImageSpan对象封装的图像
-                        String ss = "[local]" + path + "[/local]";
-                        SpannableString spannableString = new SpannableString(ss);
-                        //5.将指定的标记对象附加到文本的开始...结束范围
-                        spannableString.setSpan(imageSpan, 0, ss.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-                        Log.d(TAG, "Create spannable string success!");
-                        Editable edit_text = noteEditText.getEditableText();
-                        edit_text.delete(i,i+len+15); //6.删掉图片路径的文字
-                        edit_text.insert(i, spannableString); //7.在路径的起始位置插入图片
-                    }
-                }
-            }
-        }
-    }
-
     @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
@@ -620,6 +550,9 @@ public class NoteEditActivity extends Activity implements OnClickListener,
             case R.id.menu_delete_remind:
                 mWorkingNote.setAlertDate(0, false);
                 break;
+            case R.id.menu_font_select:
+                showSingleAlertDiglog();
+                break;
             default:
                 break;
         }
@@ -636,6 +569,10 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         d.show();
     }
 
+    /**
+     * Share note to apps that support {@link Intent#ACTION_SEND} action
+     * and {@text/plain} type
+     */
     private void sendTo(Context context, String info) {
         Intent intent = new Intent(Intent.ACTION_SEND);
         intent.putExtra(Intent.EXTRA_TEXT, info);
@@ -842,12 +779,12 @@ public class NoteEditActivity extends Activity implements OnClickListener,
             switchToListMode(mNoteEditor.getText().toString());
         } else {
             if (!getWorkingText()) {
-                mWorkingNote.setWorkingText(mWorkingNote.getContent().replace(TAG_UNCHECKED + " ", ""));
+                mWorkingNote.setWorkingText(mWorkingNote.getContent().replace(TAG_UNCHECKED + " ",
+                        ""));
             }
             mNoteEditor.setText(getHighlightQueryResult(mWorkingNote.getContent(), mUserQuery));
             mEditTextList.setVisibility(View.GONE);
             mNoteEditor.setVisibility(View.VISIBLE);
-            convertToImage(); //退出清单模式，应该将有图片的地方显示出来
         }
     }
 
@@ -939,147 +876,43 @@ public class NoteEditActivity extends Activity implements OnClickListener,
     private void showToast(int resId, int duration) {
         Toast.makeText(this, resId, duration).show();
     }
-
-    @Override
-    //重写onActivityResult()来处理返回的数据
-    protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
-        super.onActivityResult(requestCode, resultCode, intent);
-        ContentResolver resolver = getContentResolver();
-        switch (requestCode) {
-            case PHOTO_REQUEST:
-                Uri originalUri = intent.getData(); //1.获得图片的真实路径
-                Bitmap bitmap = null;
-                try {
-                    bitmap = BitmapFactory.decodeStream(resolver.openInputStream(originalUri));//2.解码图片
-                } catch (FileNotFoundException e) {
-                    Log.d(TAG, "onActivityResult: get file_exception");
-                    e.printStackTrace();
-                }
-
-                if(bitmap != null){
-                    //3.根据Bitmap对象创建ImageSpan对象
-                    Log.d(TAG, "onActivityResult: bitmap is not null");
-                    ImageSpan imageSpan = new ImageSpan(NoteEditActivity.this, bitmap);
-                    String path = getPath(this,originalUri);
-                    //4.使用[local][/local]将path括起来，用于之后方便识别图片路径在note中的位置
-                    String img_fragment= "[local]" + path + "[/local]";
-                    //创建一个SpannableString对象，以便插入用ImageSpan对象封装的图像
-                    SpannableString spannableString = new SpannableString(img_fragment);
-                    spannableString.setSpan(imageSpan, 0, img_fragment.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-                    //5.将选择的图片追加到EditText中光标所在位置
-                    NoteEditText e = (NoteEditText) findViewById(R.id.note_edit_view);
-                    int index = e.getSelectionStart(); //获取光标所在位置
-                    Log.d(TAG, "Index是: " + index);
-                    Editable edit_text = e.getEditableText();
-                    edit_text.insert(index, spannableString); //将图片插入到光标所在位置
-
-                    mWorkingNote.mContent = e.getText().toString();
-                    //6.把改动提交到数据库中,两个数据库表都要改的
-                    ContentResolver contentResolver = getContentResolver();
-                    ContentValues contentValues = new ContentValues();
-                    final long id = mWorkingNote.getNoteId();
-                    contentValues.put("snippet",mWorkingNote.mContent);
-                    contentResolver.update(Uri.parse("content://micode_notes/note"), contentValues,"_id=?",new String[]{""+id});
-                    ContentValues contentValues1 = new ContentValues();
-                    contentValues1.put("content",mWorkingNote.mContent);
-                    contentResolver.update(Uri.parse("content://micode_notes/data"), contentValues1,"mime_type=? and note_id=?", new String[]{"vnd.android.cursor.item/text_note",""+id});
-
-                }else{
-                    Toast.makeText(NoteEditActivity.this, "获取图片失败", Toast.LENGTH_SHORT).show();
+    public void showSingleAlertDiglog(){
+        final String[] items={"仿宋","黑体","楷体","宋体","新宋体"};
+        AlertDialog.Builder alertBuilder=new AlertDialog.Builder(this);
+        alertBuilder.setTitle("字体选择");
+        alertBuilder.setSingleChoiceItems(items,0,(dialogInterface, i) ->  {
+                switch (i) {
+                    case 0:
+                        Typeface typeface0 = Typeface.createFromAsset(getAssets(), "Fonts/simfang.ttf");
+                        mNoteEditor.setTypeface(typeface0);
+                        break;
+                    case 1:
+                        Typeface typeface1 = Typeface.createFromAsset(getAssets(), "Fonts/simhei.ttf");
+                        mNoteEditor.setTypeface(typeface1);
+                        break;
+                    case 2:
+                        Typeface typeface2 = Typeface.createFromAsset(getAssets(), "Fonts/simkai.ttf");
+                        mNoteEditor.setTypeface(typeface2);
+                        break;
+                    case 3:
+                        Typeface typeface3 = Typeface.createFromAsset(getAssets(), "Fonts/simsunb.ttf");
+                        mNoteEditor.setTypeface(typeface3);
+                        break;
+                    case 4:
+                        Typeface typeface4 = Typeface.createFromAsset(getAssets(), "Fonts/simsun.ttc");
+                        mNoteEditor.setTypeface(typeface4);
+                        break;
                 }
-                break;
-            default:
-                break;
-        }
-    }
-
-
-    //获取文件的real path
-    public String getPath(final Context context, final Uri uri) {
-
-        final boolean isKitKat = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;
-
-        // DocumentProvider
-        if (isKitKat && DocumentsContract.isDocumentUri(context, uri)) {
-            // ExternalStorageProvider
-//            if (isExternalStorageDocument(uri)) {
-//                final String docId = DocumentsContract.getDocumentId(uri);
-//                final String[] split = docId.split(":");
-//                final String type = split[0];
-//
-//                if ("primary".equalsIgnoreCase(type)) {
-//                    return Environment.getExternalStorageDirectory() + "/" + split[1];
-//                }
-//            }
-//            // DownloadsProvider
-//            else if (isDownloadsDocument(uri)) {
-//                final String id = DocumentsContract.getDocumentId(uri);
-//                final Uri contentUri = ContentUris.withAppendedId(Uri.parse("content://downloads/public_downloads"), Long.valueOf(id));
-//                return getDataColumn(context, contentUri, null, null);
-//            }
-            // MediaProvider
-//            else
-                if (isMediaDocument(uri)) {
-                final String docId = DocumentsContract.getDocumentId(uri);
-                final String[] split = docId.split(":");
-                final String type = split[0];
-
-                Uri contentUri = null;
-                if ("image".equals(type)) {
-                    contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
-                }
-
-                final String selection = "_id=?";
-                final String[] selectionArgs = new String[]{split[1]};
-
-                return getDataColumn(context, contentUri, selection, selectionArgs);
-            }
-        }
-        // Media
-        else if ("content".equalsIgnoreCase(uri.getScheme())) {
-            return getDataColumn(context, uri, null, null);
-        }
-        // File
-        else if ("file".equalsIgnoreCase(uri.getScheme())) {
-            return uri.getPath();
-        }
-        return null;
-    }
-
-
-    //获取数据列_获取此 Uri 的数据列的值。这对MediaStore Uris 和其他基于文件的 ContentProvider。
-    public String getDataColumn(Context context, Uri uri, String selection, String[] selectionArgs) {
-
-        Cursor cursor = null;
-        final String column = "_data";
-        final String[] projection = {column};
-
-        try {
-            cursor = context.getContentResolver().query(uri, projection, selection, selectionArgs, null);
-            if (cursor != null && cursor.moveToFirst()) {
-                final int column_index = cursor.getColumnIndexOrThrow(column);
-                return cursor.getString(column_index);
-            }
-        } finally {
-            if (cursor != null)
-                cursor.close();
+                Toast.makeText(NoteEditActivity.this,items[i],Toast.LENGTH_SHORT).show();
+            });
+        alertBuilder.setPositiveButton("确定",(dialogInterface, i) -> {
+            alertDialog2.dismiss();
+        });
+        alertBuilder.setNegativeButton("取消",(dialogInterface, i) -> {
+            alertDialog2.dismiss();
+        });
+        alertDialog2=alertBuilder.create();
+        alertDialog2.show();
         }
-        return null;
-    }
-
-
-    //是否为外部存储文件
-//    public boolean isExternalStorageDocument(Uri uri) {
-//        return "com.android.externalstorage.documents".equals(uri.getAuthority());
-//    }
-//
-//    //是否为下载文件
-//    public boolean isDownloadsDocument(Uri uri) {
-//        return "com.android.providers.downloads.documents".equals(uri.getAuthority());
-//    }
-
-    //是否为媒体文件
-    public boolean isMediaDocument(Uri uri) {
-        return "com.android.providers.media.documents".equals(uri.getAuthority());
-    }
 }
+
diff --git a/src/main/java/net/micode/notes/ui/NoteEditText.java b/src/main/java/net/micode/notes/ui/NoteEditText.java
index 2afe2a8..9896f24 100644
--- a/src/main/java/net/micode/notes/ui/NoteEditText.java
+++ b/src/main/java/net/micode/notes/ui/NoteEditText.java
@@ -31,6 +31,7 @@ import android.view.MenuItem;
 import android.view.MenuItem.OnMenuItemClickListener;
 import android.view.MotionEvent;
 import android.widget.EditText;
+import android.widget.TextView;
 
 import net.micode.notes.R;
 
diff --git a/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/main/java/net/micode/notes/ui/NotesListActivity.java
index 6169405..6adb7e7 100644
--- a/src/main/java/net/micode/notes/ui/NotesListActivity.java
+++ b/src/main/java/net/micode/notes/ui/NotesListActivity.java
@@ -79,7 +79,6 @@ import java.io.InputStreamReader;
 import java.util.HashSet;
 
 public class NotesListActivity extends Activity implements OnClickListener, OnItemLongClickListener {
-    private int mode = -1;
     private static final int FOLDER_NOTE_LIST_QUERY_TOKEN = 0;
 
     private static final int FOLDER_LIST_QUERY_TOKEN      = 1;
@@ -140,7 +139,6 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.note_list);
-        getWindow().setBackgroundDrawableResource(R.drawable.menu_lover);
         initResources();
 
         /**
@@ -777,31 +775,16 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         } else {
             Log.e(TAG, "Wrong state:" + mState);
         }
-        if(mode == -1){
-            menu.findItem(R.id.menu_lover).setVisible(false);
-        }
-        else if(mode == 1)
-        {
-            menu.findItem(R.id.menu_young).setVisible(false);
-        }
         return true;
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
-            case R.id.menu_young:{
-                mode = 1;
-                getWindow().setBackgroundDrawableResource(R.drawable.menu_young);
-                break;
-            }
-
-            case R.id.menu_lover:{
-                mode = -1;
-                getWindow().setBackgroundDrawableResource(R.drawable.menu_lover);
+            case R.id.menu_countallNotes: {
+                showNumberofNotes();
                 break;
             }
-
             case R.id.menu_new_folder: {
                 showCreateOrModifyFolderDialog(true);
                 break;
@@ -839,6 +822,13 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         return true;
     }
 
+    private void showNumberofNotes() {
+        AlertDialog.Builder btr =new AlertDialog.Builder(this);
+        btr.setTitle("目前便签数");
+        btr.setMessage("目前有 "+Integer.toString(mNotesListAdapter.retCount())+"个便签");
+        btr.show();
+    }
+
     @Override
     public boolean onSearchRequested() {
         startSearch(null, false, null /* appData */, false);
diff --git a/src/main/java/net/micode/notes/ui/NotesListAdapter.java b/src/main/java/net/micode/notes/ui/NotesListAdapter.java
index 51c9cb9..3410bef 100644
--- a/src/main/java/net/micode/notes/ui/NotesListAdapter.java
+++ b/src/main/java/net/micode/notes/ui/NotesListAdapter.java
@@ -18,6 +18,7 @@ package net.micode.notes.ui;
 
 import android.content.Context;
 import android.database.Cursor;
+import android.text.AlteredCharSequence;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
@@ -181,4 +182,21 @@ public class NotesListAdapter extends CursorAdapter {
             }
         }
     }
+    public int retCount(){
+        int NotesCount=mNotesCount;
+        int ItemCount=getCount();
+        for (int i = 0; i < ItemCount; i++) {
+            Cursor c = (Cursor) getItem(i);
+            if (c != null) {
+                if (NoteItemData.getNoteType(c) == Notes.TYPE_NOTE) {
+                    NoteItemData NoteItem=new NoteItemData(mContext,c);
+                    NotesCount+=NoteItem.getNotesCount();
+                }
+            } else {
+                Log.e(TAG, "Invalid cursor");
+                return -1;
+            }
+        }
+        return NotesCount;
+    }
 }
diff --git a/src/main/res/drawable-hdpi/.idea/.gitignore b/src/main/res/drawable-hdpi/.idea/.gitignore
deleted file mode 100644
index 26d3352..0000000
--- a/src/main/res/drawable-hdpi/.idea/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
diff --git a/src/main/res/drawable-hdpi/.idea/drawable-hdpi.iml b/src/main/res/drawable-hdpi/.idea/drawable-hdpi.iml
deleted file mode 100644
index d6ebd48..0000000
--- a/src/main/res/drawable-hdpi/.idea/drawable-hdpi.iml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/src/main/res/drawable-hdpi/.idea/misc.xml b/src/main/res/drawable-hdpi/.idea/misc.xml
deleted file mode 100644
index 639900d..0000000
--- a/src/main/res/drawable-hdpi/.idea/misc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/res/drawable-hdpi/.idea/modules.xml b/src/main/res/drawable-hdpi/.idea/modules.xml
deleted file mode 100644
index 370b9c9..0000000
--- a/src/main/res/drawable-hdpi/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/drawable-hdpi.iml" filepath="$PROJECT_DIR$/.idea/drawable-hdpi.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/res/drawable-hdpi/menu_lover.png b/src/main/res/drawable-hdpi/menu_lover.png
deleted file mode 100644
index a0e8a2c..0000000
Binary files a/src/main/res/drawable-hdpi/menu_lover.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/menu_young.png b/src/main/res/drawable-hdpi/menu_young.png
deleted file mode 100644
index 3ecaa3d..0000000
Binary files a/src/main/res/drawable-hdpi/menu_young.png and /dev/null differ
diff --git a/src/main/res/layout/note_edit.xml b/src/main/res/layout/note_edit.xml
index 1dd486b..dca097c 100644
--- a/src/main/res/layout/note_edit.xml
+++ b/src/main/res/layout/note_edit.xml
@@ -40,6 +40,7 @@
                 android:layout_marginRight="8dip"
                 android:textAppearance="@style/TextAppearanceSecondaryItem" />
 
+
             <ImageView
                 android:id="@+id/iv_alert_icon"
                 android:layout_width="wrap_content"
@@ -92,6 +93,7 @@
                         android:layout_width="fill_parent"
                         android:layout_height="wrap_content"
                         android:gravity="left|top"
+                        android:typeface="sans"
                         android:background="@null"
                         android:autoLink="all"
                         android:linksClickable="false"
@@ -397,13 +399,4 @@
                 android:src="@drawable/selected" />
         </FrameLayout>
     </LinearLayout>
-
-    <ImageButton
-        android:id="@+id/add_img_btn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="7dp"
-        android:layout_marginTop="600dp"
-        android:layout_marginBottom="7dp"
-        android:src="@android:drawable/ic_menu_gallery" />
 </FrameLayout>
diff --git a/src/main/res/layout/note_list.xml b/src/main/res/layout/note_list.xml
index 50d3a00..6b25d38 100644
--- a/src/main/res/layout/note_list.xml
+++ b/src/main/res/layout/note_list.xml
@@ -18,8 +18,8 @@
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-    <!--android:background="@drawable/list_background"-->
+    android:layout_height="fill_parent"
+    android:background="@drawable/list_background">
 
     <LinearLayout
         android:layout_width="fill_parent"
diff --git a/src/main/res/menu/note_edit.xml b/src/main/res/menu/note_edit.xml
index 35cacd1..8f7d145 100644
--- a/src/main/res/menu/note_edit.xml
+++ b/src/main/res/menu/note_edit.xml
@@ -22,6 +22,10 @@
         android:id="@+id/menu_new_note"
         android:title="@string/notelist_menu_new"/>
 
+    <item
+        android:id="@+id/menu_font_select"
+        android:title="@string/menu_font_style" />
+
     <item
         android:id="@+id/menu_delete"
         android:title="@string/menu_delete"/>
@@ -49,4 +53,5 @@
     <item
         android:id="@+id/menu_delete_remind"
         android:title="@string/menu_remove_remind" />
+
 </menu>
\ No newline at end of file
diff --git a/src/main/res/menu/note_list.xml b/src/main/res/menu/note_list.xml
index 948f41b..cde38e5 100644
--- a/src/main/res/menu/note_list.xml
+++ b/src/main/res/menu/note_list.xml
@@ -38,10 +38,6 @@
         android:title="@string/menu_search"/>
 
     <item
-        android:id="@+id/menu_lover"
-        android:title="@string/background_lover"/>
-
-    <item
-        android:id="@+id/menu_young"
-        android:title="@string/background_young"/>
+        android:id="@+id/menu_countallNotes"
+        android:title="@string/menu_countallNotes"/>
 </menu>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 09f75ed..90bf60e 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -32,8 +32,10 @@
     <string name="notealert_ok">知道了</string>
     <string name="notealert_enter">查看</string>
     <string name="note_link_tel">呼叫电话</string>
+    <string name="menu_countallNotes">显示目前便签数量</string>
     <string name="note_link_email">发送邮件</string>
     <string name="note_link_web">浏览网页</string>
+    <string name="menu_font_style">选择字体</string>
     <string name="note_link_other">打开地图</string>
     <!-- note list string -->
     <string name="menu_create_folder">新建文件夹</string>
diff --git a/src/main/res/values/ids.xml b/src/main/res/values/ids.xml
deleted file mode 100644
index 6e79f82..0000000
--- a/src/main/res/values/ids.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <item name="menu_young" type="id">menu_young</item>
-</resources>
\ No newline at end of file
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index ae2b092..0273d95 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -36,10 +36,10 @@
     <string name="note_link_web">Browse web</string>
     <string name="note_link_other">Open map</string>
     <!-- Text export file information -->
-    <string name="file_path" translatable="false">/MIUI/notes/</string>
-    <string name="file_name_txt_format" translatable="false">notes_%s.txt</string>
+    <string name="file_path">/MIUI/notes/</string>
+    <string name="file_name_txt_format">notes_%s.txt</string>
     <!-- notes list string -->
-    <string name="format_folder_files_count" translatable="false">(%d)</string>
+    <string name="format_folder_files_count">(%d)</string>
     <string name="menu_create_folder">New Folder</string>
     <string name="menu_export_text">Export text</string>
     <string name="menu_sync">Sync</string>
@@ -57,6 +57,7 @@
     <string name="menu_font_normal">Medium</string>
     <string name="menu_font_large">Large</string>
     <string name="menu_font_super">Super</string>
+    <string name="menu_font_style" translatable="false">Select font</string>
     <string name="menu_list_mode">Enter check list</string>
     <string name="menu_normal_mode">Leave check list</string>
     <string name="menu_folder_view">View folder</string>
@@ -101,7 +102,7 @@
     <string name="preferences_account_title">Sync account</string>
     <string name="preferences_account_summary">Sync notes with google task</string>
     <string name="preferences_last_sync_time">Last sync time %1$s</string>
-    <string name="preferences_last_sync_time_format" translatable="false">yyyy-MM-dd hh:mm:ss</string>
+    <string name="preferences_last_sync_time_format">yyyy-MM-dd hh:mm:ss</string>
     <string name="preferences_add_account">Add account</string>
     <string name="preferences_menu_change_account">Change sync account</string>
     <string name="preferences_menu_remove_account">Remove sync account</string>
@@ -126,8 +127,7 @@
     <string name="search">Notes</string>
     <string name="datetime_dialog_ok">set</string>
     <string name="datetime_dialog_cancel">cancel</string>
-    <string name="background_lover" translatable="false">Background:lover</string>
-    <string name="background_young" translatable="false">Background:young</string>
+    <string name="menu_countallNotes" />
     <plurals name="search_results_title">
          <item quantity="one"><xliff:g id="number" example="1">%1$s</xliff:g> result for \"<xliff:g id="search" example="???">%2$s</xliff:g>\"</item>
         <!-- Case of 0 or 2 or more results. -->
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index d750e65..76e8d4e 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -63,7 +63,7 @@
     </style>
 
     <style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
-        <item name="android:displayOptions" />
-        <item name="android:visibility">gone</item>
+        <!--item name="android:displayOptions" /-->
+        <item name="android:visibility">visible</item>
     </style>
 </resources>
\ No newline at end of file