diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 65f3da7d..027fe152 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -2,6 +2,37 @@
   <profile version="1.0">
     <option name="myName" value="Project Default" />
     <inspection_tool class="AndroidLintContentDescription" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JavaDoc" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="TOP_LEVEL_CLASS_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="" />
+        </value>
+      </option>
+      <option name="INNER_CLASS_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="" />
+        </value>
+      </option>
+      <option name="METHOD_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="@return@param@throws or @exception" />
+        </value>
+      </option>
+      <option name="FIELD_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="" />
+        </value>
+      </option>
+      <option name="IGNORE_DEPRECATED" value="false" />
+      <option name="IGNORE_JAVADOC_PERIOD" value="true" />
+      <option name="IGNORE_DUPLICATED_THROWS" value="false" />
+      <option name="IGNORE_POINT_TO_ITSELF" value="false" />
+      <option name="myAdditionalJavadocTags" value="hide" />
+    </inspection_tool>
     <inspection_tool class="LoggerInitializedWithForeignClass" enabled="false" level="WARNING" enabled_by_default="false">
       <option name="loggerClassName" value="org.apache.log4j.Logger,org.slf4j.LoggerFactory,org.apache.commons.logging.LogFactory,java.util.logging.Logger" />
       <option name="loggerFactoryMethodName" value="getLogger,getLogger,getLog,getLogger" />
diff --git a/app/build.gradle b/app/build.gradle
index 8a664f4d..24b5acc7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.stardust.scriptdroid"
         minSdkVersion 19
         targetSdkVersion 23
-        versionCode 113
-        versionName "2.0.6 Alpha3"
+        versionCode 114
+        versionName "2.0.7 Alpha"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
 
@@ -71,7 +71,6 @@ dependencies {
     compile 'org.greenrobot:eventbus:3.0.0'
     compile 'com.bignerdranch.android:expandablerecyclerview:3.0.0-RC1'
      compile 'com.ashokvarma.android:bottom-navigation-bar:1.4.1'
-    compile 'com.github.hyb1996:node-android-lib:1.0.13'
     compile 'com.yqritc:recyclerview-flexibledivider:1.4.0'
     compile 'me.zhanghai.android.materialprogressbar:library:1.3.0'
     compile group:'com.twofortyfouram', name:'android-plugin-client-sdk-for-locale', version:'[4.0.2, 5.0['
diff --git a/app/src/main/java/com/stardust/scriptdroid/external/floating_window/view/FloatingScriptFileListView.java b/app/src/main/java/com/stardust/scriptdroid/external/floating_window/view/FloatingScriptFileListView.java
index 5c4d3488..b113ebd3 100644
--- a/app/src/main/java/com/stardust/scriptdroid/external/floating_window/view/FloatingScriptFileListView.java
+++ b/app/src/main/java/com/stardust/scriptdroid/external/floating_window/view/FloatingScriptFileListView.java
@@ -11,6 +11,7 @@ import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.widget.TextView;
 import android.widget.Toast;
+import android.workground.WrapContentLinearLayoutManager;
 
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.stardust.scriptdroid.scripts.ScriptFile;
@@ -74,7 +75,7 @@ public class FloatingScriptFileListView extends RecyclerView {
 
     private void init() {
         setAdapter(new Adapter());
-        setLayoutManager(new LinearLayoutManager(getContext()));
+        setLayoutManager(new WrapContentLinearLayoutManager(getContext()));
         addItemDecoration(new DividerItemDecoration(getContext(), DividerItemDecoration.VERTICAL));
         initScriptFileOperationPopupMenu();
     }
diff --git a/app/src/main/java/com/stardust/scriptdroid/scripts/StorageScriptProvider.java b/app/src/main/java/com/stardust/scriptdroid/scripts/StorageScriptProvider.java
index 011be748..24ee50ab 100644
--- a/app/src/main/java/com/stardust/scriptdroid/scripts/StorageScriptProvider.java
+++ b/app/src/main/java/com/stardust/scriptdroid/scripts/StorageScriptProvider.java
@@ -67,7 +67,7 @@ public class StorageScriptProvider {
 
     public void notifyDirectoryChanged(ScriptFile directory) {
         if (directory.equals(mInitialDirectory)) {
-            mInitialDirectoryScriptFiles = getInitialDirectoryScriptFiles();
+            mInitialDirectoryScriptFiles = getInitialDirectoryScriptFilesInner();
         } else {
             clearCache(directory);
         }
@@ -80,6 +80,7 @@ public class StorageScriptProvider {
         mDirectoryEventBus.post(new DirectoryChangeEvent(mInitialDirectory));
     }
 
+    @SuppressWarnings("unchecked")
     public void refreshAll() {
         Map<String, ScriptFile> files = (Map<String, ScriptFile>) mScriptFileCache.clone();
         mScriptFileCache.clear();
diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/edit/EditActivity.java b/app/src/main/java/com/stardust/scriptdroid/ui/edit/EditActivity.java
index c3e04293..868e3cac 100644
--- a/app/src/main/java/com/stardust/scriptdroid/ui/edit/EditActivity.java
+++ b/app/src/main/java/com/stardust/scriptdroid/ui/edit/EditActivity.java
@@ -16,12 +16,13 @@ import android.view.View;
 import com.afollestad.materialdialogs.DialogAction;
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.stardust.autojs.engine.JavaScriptEngine;
-import com.stardust.autojs.engine.ScriptExecutionListener;
+import com.stardust.autojs.ScriptExecutionListener;
 import com.stardust.autojs.script.FileScriptSource;
 import com.stardust.autojs.script.ScriptSource;
 import com.stardust.pio.PFile;
 import com.stardust.scriptdroid.Pref;
 import com.stardust.scriptdroid.autojs.AutoJs;
+import com.stardust.scriptdroid.scripts.ScriptFile;
 import com.stardust.scriptdroid.ui.edit.editor920.Editor920Activity;
 import com.stardust.scriptdroid.ui.edit.sidemenu.EditSideMenuFragment;
 import com.stardust.scriptdroid.ui.edit.sidemenu.FunctionListRecyclerView;
@@ -42,8 +43,6 @@ import com.stardust.theme.ThemeColorManager;
 import com.stardust.view.ViewBinder;
 
 import java.io.File;
-import java.text.DateFormat;
-import java.util.Date;
 
 import timber.log.Timber;
 
@@ -99,6 +98,10 @@ public class EditActivity extends Editor920Activity {
                 .putExtra("name", name));
     }
 
+    public static void editFile(Context context, ScriptFile file) {
+        editFile(context, file.getSimplifiedName(), file.getPath());
+    }
+
     private String mName;
     private File mFile;
     private View mView;
@@ -264,7 +267,7 @@ public class EditActivity extends Editor920Activity {
     private void run() {
         Snackbar.make(mView, R.string.text_start_running, Snackbar.LENGTH_SHORT).show();
         setMenuStatus(R.id.run, MenuDef.STATUS_DISABLED);
-        AutoJs.getInstance().getScriptEngineService().execute(new FileScriptSource(mFile), SCRIPT_EXECUTION_LISTENER);
+        AutoJs.getInstance().getScriptEngineService().execute(new FileScriptSource(mName, mFile), SCRIPT_EXECUTION_LISTENER);
     }
 
     @ViewBinding.Click(R.id.undo)
diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/edit/completion/InputMethodEnhanceBar.java b/app/src/main/java/com/stardust/scriptdroid/ui/edit/completion/InputMethodEnhanceBar.java
index 12fa3b80..44a71884 100644
--- a/app/src/main/java/com/stardust/scriptdroid/ui/edit/completion/InputMethodEnhanceBar.java
+++ b/app/src/main/java/com/stardust/scriptdroid/ui/edit/completion/InputMethodEnhanceBar.java
@@ -12,6 +12,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 import android.widget.Toast;
+import android.workground.WrapContentLinearLayoutManager;
 
 import com.stardust.scriptdroid.App;
 import com.stardust.scriptdroid.R;
@@ -77,8 +78,8 @@ public class InputMethodEnhanceBar extends RecyclerView implements CodeCompletio
 
     private void init() {
         setAdapter(new CodeCompletionAdapter());
-        setLayoutManager(new LinearLayoutManager(getContext(), HORIZONTAL, false));
-        mCodeCompletion.setFunctions(AutoJs.getInstance().getScriptEngineService().getJavaScriptEngineManager().getGlobalFunctions());
+        setLayoutManager(new WrapContentLinearLayoutManager(getContext(), HORIZONTAL, false));
+        mCodeCompletion.setFunctions(AutoJs.getInstance().getScriptEngineService().getGlobalFunctions());
     }
 
     public void setEditTextBridge(EditTextBridge editTextBridge) {
diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/help/HelpCatalogueActivity.java b/app/src/main/java/com/stardust/scriptdroid/ui/help/HelpCatalogueActivity.java
index 2b63d006..68beff98 100644
--- a/app/src/main/java/com/stardust/scriptdroid/ui/help/HelpCatalogueActivity.java
+++ b/app/src/main/java/com/stardust/scriptdroid/ui/help/HelpCatalogueActivity.java
@@ -11,6 +11,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+import android.workground.WrapContentLinearLayoutManager;
 
 import com.stardust.pio.PFile;
 import com.stardust.scriptdroid.App;
@@ -118,7 +119,7 @@ public class HelpCatalogueActivity extends BaseActivity {
 
     private void setUpRecyclerView() {
         mRecyclerView = $(R.id.catalogue);
-        mRecyclerView.setLayoutManager(new LinearLayoutManager(this));
+        mRecyclerView.setLayoutManager(new WrapContentLinearLayoutManager(this));
         mRecyclerView.setAdapter(new Adapter());
         mRecyclerView.addItemDecoration(new DividerItemDecoration(this, RecyclerView.VERTICAL));
     }
diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/main/operation/ScriptFileOperationPopupMenu.java b/app/src/main/java/com/stardust/scriptdroid/ui/main/operation/ScriptFileOperationPopupMenu.java
index f74ba861..035f2255 100644
--- a/app/src/main/java/com/stardust/scriptdroid/ui/main/operation/ScriptFileOperationPopupMenu.java
+++ b/app/src/main/java/com/stardust/scriptdroid/ui/main/operation/ScriptFileOperationPopupMenu.java
@@ -16,6 +16,7 @@ import android.view.WindowManager;
 import android.widget.ImageView;
 import android.widget.PopupWindow;
 import android.widget.TextView;
+import android.workground.WrapContentLinearLayoutManager;
 
 import com.stardust.util.ViewUtil;
 import com.stardust.scriptdroid.R;
@@ -130,7 +131,7 @@ public class ScriptFileOperationPopupMenu extends PopupWindow {
         }
 
         private void init() {
-            setLayoutManager(new LinearLayoutManager(getContext()));
+            setLayoutManager(new WrapContentLinearLayoutManager(getContext()));
             setAdapter(new Adapter<ViewHolder>() {
                 @Override
                 public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/main/sample_list/SampleScriptListRecyclerView.java b/app/src/main/java/com/stardust/scriptdroid/ui/main/sample_list/SampleScriptListRecyclerView.java
index c63acc8e..1e36c0fd 100644
--- a/app/src/main/java/com/stardust/scriptdroid/ui/main/sample_list/SampleScriptListRecyclerView.java
+++ b/app/src/main/java/com/stardust/scriptdroid/ui/main/sample_list/SampleScriptListRecyclerView.java
@@ -10,6 +10,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+import android.workground.WrapContentLinearLayoutManager;
 
 import com.bignerdranch.expandablerecyclerview.ChildViewHolder;
 import com.bignerdranch.expandablerecyclerview.ExpandableRecyclerAdapter;
@@ -96,7 +97,7 @@ public class SampleScriptListRecyclerView extends RecyclerView {
     }
 
     private void init() {
-        setLayoutManager(new LinearLayoutManager(getContext()));
+        setLayoutManager(new WrapContentLinearLayoutManager(getContext()));
         addItemDecoration(new DividerItemDecoration(getContext(), VERTICAL));
     }
 
diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/main/script_list/MyScriptListFragment.java b/app/src/main/java/com/stardust/scriptdroid/ui/main/script_list/MyScriptListFragment.java
index f32d73ab..7b3f521c 100644
--- a/app/src/main/java/com/stardust/scriptdroid/ui/main/script_list/MyScriptListFragment.java
+++ b/app/src/main/java/com/stardust/scriptdroid/ui/main/script_list/MyScriptListFragment.java
@@ -17,6 +17,7 @@ import com.stardust.scriptdroid.scripts.ScriptFile;
 import com.stardust.pio.PFile;
 import com.stardust.scriptdroid.R;
 import com.stardust.scriptdroid.scripts.StorageScriptProvider;
+import com.stardust.scriptdroid.ui.edit.EditActivity;
 import com.stardust.scriptdroid.ui.main.operation.ScriptFileOperation;
 import com.stardust.theme.dialog.ThemeColorMaterialDialogBuilder;
 import com.stardust.view.ViewBinder;
@@ -82,8 +83,7 @@ public class MyScriptListFragment extends Fragment {
         mScriptListRecyclerView.setOnItemClickListener(new ScriptAndFolderListRecyclerView.OnScriptFileClickListener() {
             @Override
             public void onClick(ScriptFile file) {
-                mSelectedScriptFile = file;
-                mScriptFileOperationDialog.show();
+                EditActivity.editFile(getContext(), file);
             }
         });
         mScriptListRecyclerView.setOnItemLongClickListener(new ScriptAndFolderListRecyclerView.OnScriptFileLongClickListener() {
diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/main/script_list/ScriptAndFolderListRecyclerView.java b/app/src/main/java/com/stardust/scriptdroid/ui/main/script_list/ScriptAndFolderListRecyclerView.java
index 6fccd29a..7ddec7af 100644
--- a/app/src/main/java/com/stardust/scriptdroid/ui/main/script_list/ScriptAndFolderListRecyclerView.java
+++ b/app/src/main/java/com/stardust/scriptdroid/ui/main/script_list/ScriptAndFolderListRecyclerView.java
@@ -4,7 +4,6 @@ import android.content.Context;
 import android.os.Bundle;
 import android.os.Parcelable;
 import android.support.annotation.Nullable;
-import android.support.v7.widget.DividerItemDecoration;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.AttributeSet;
@@ -12,14 +11,16 @@ import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
+import android.workground.WrapContentLinearLayoutManager;
 
 import com.stardust.autojs.script.FileScriptSource;
 import com.stardust.scriptdroid.autojs.AutoJs;
 import com.stardust.scriptdroid.scripts.ScriptFile;
 import com.stardust.scriptdroid.R;
 import com.stardust.scriptdroid.scripts.StorageScriptProvider;
-import com.stardust.scriptdroid.ui.main.operation.ScriptFileOperation;
+import com.yqritc.recyclerviewflexibledivider.HorizontalDividerItemDecoration;
 
 import org.greenrobot.eventbus.Subscribe;
 
@@ -58,7 +59,7 @@ public class ScriptAndFolderListRecyclerView extends RecyclerView {
             }
             ScriptFile file = mScriptFileList[getActualPosition(position)];
             if (file.isDirectory()) {
-                setCurrentFolder(file, true);
+                setCurrentDirectory(file, true);
             } else if (mOnItemClickListener != null) {
                 mOnItemClickListener.onClick(file);
             }
@@ -84,17 +85,10 @@ public class ScriptAndFolderListRecyclerView extends RecyclerView {
             AutoJs.getInstance().getScriptEngineService().execute(new FileScriptSource(file));
         }
     };
-    private OnClickListener mOnEditClickListener = new OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            int position = getChildViewHolder((View) v.getParent()).getAdapterPosition();
-            ScriptFileOperation.edit(mScriptFileList[getActualPosition(position)]);
-        }
-    };
 
     private ScriptFile[] mScriptFileList = new ScriptFile[0];
-    private ScriptFile mCurrentFolder;
-    private ScriptFile mRootFolder;
+    private ScriptFile mCurrentDirectory;
+    private ScriptFile mRootDirectory;
     private Adapter mAdapter;
     private boolean mCanGoBack = false;
     private StorageScriptProvider mStorageScriptProvider;
@@ -116,8 +110,8 @@ public class ScriptAndFolderListRecyclerView extends RecyclerView {
         init();
     }
 
-    private void setCurrentFolder(final ScriptFile folder, boolean canGoBack) {
-        mCurrentFolder = folder;
+    private void setCurrentDirectory(final ScriptFile folder, boolean canGoBack) {
+        mCurrentDirectory = folder;
         mCanGoBack = canGoBack;
         if (mFileProcessListener != null) {
             mFileProcessListener.onFilesListing();
@@ -137,9 +131,9 @@ public class ScriptAndFolderListRecyclerView extends RecyclerView {
         }).start();
     }
 
-    private void setRootFolder(ScriptFile folder) {
-        mRootFolder = folder;
-        setCurrentFolder(mRootFolder, false);
+    private void setRootDirectory(ScriptFile folder) {
+        mRootDirectory = folder;
+        setCurrentDirectory(mRootDirectory, false);
     }
 
     public void setFileProcessListener(FileProcessListener fileProcessListener) {
@@ -151,7 +145,7 @@ public class ScriptAndFolderListRecyclerView extends RecyclerView {
             mStorageScriptProvider.unregisterDirectoryChangeListener(this);
         mStorageScriptProvider = storageScriptProvider;
         mStorageScriptProvider.registerDirectoryChangeListener(this);
-        setRootFolder(mStorageScriptProvider.getInitialDirectory());
+        setRootDirectory(mStorageScriptProvider.getInitialDirectory());
     }
 
     public void setOnItemClickListener(OnScriptFileClickListener onItemClickListener) {
@@ -163,7 +157,7 @@ public class ScriptAndFolderListRecyclerView extends RecyclerView {
     }
 
     public ScriptFile getCurrentDirectory() {
-        return mCurrentFolder;
+        return mCurrentDirectory;
     }
 
     public void setScriptFileOperationEnabled(boolean scriptFileOperationEnabled) {
@@ -171,13 +165,18 @@ public class ScriptAndFolderListRecyclerView extends RecyclerView {
     }
 
     private void goBack() {
-        ScriptFile parent = mCurrentFolder.getParentFile();
-        setCurrentFolder(parent, !parent.equals(mRootFolder));
+        ScriptFile parent = mCurrentDirectory.getParentFile();
+        setCurrentDirectory(parent, !parent.equals(mRootDirectory));
     }
 
     private void init() {
-        setLayoutManager(new LinearLayoutManager(getContext()));
-        addItemDecoration(new DividerItemDecoration(getContext(), VERTICAL));
+        setLayoutManager(new WrapContentLinearLayoutManager(getContext()));
+        addItemDecoration(new HorizontalDividerItemDecoration.Builder(getContext())
+                .color(0xffd9d9d9)
+                .size(2)
+                .marginResId(R.dimen.script_and_folder_list_divider_left_margin, R.dimen.script_and_folder_list_divider_right_margin)
+                .showLastDivider()
+                .build());
         mAdapter = new Adapter();
         setAdapter(mAdapter);
     }
@@ -186,17 +185,17 @@ public class ScriptAndFolderListRecyclerView extends RecyclerView {
     protected Parcelable onSaveInstanceState() {
         Bundle bundle = new Bundle();
         bundle.putParcelable("superData", super.onSaveInstanceState());
-        bundle.putSerializable("current", mCurrentFolder);
-        bundle.putSerializable("root", mRootFolder);
+        bundle.putSerializable("current", mCurrentDirectory);
+        bundle.putSerializable("root", mRootDirectory);
         return bundle;
     }
 
     @Override
     protected void onRestoreInstanceState(Parcelable state) {
         Bundle bundle = (Bundle) state;
-        mRootFolder = (ScriptFile) bundle.getSerializable("root");
-        mCurrentFolder = (ScriptFile) bundle.getSerializable("current");
-        setCurrentFolder(mCurrentFolder, !mCurrentFolder.equals(mRootFolder));
+        mRootDirectory = (ScriptFile) bundle.getSerializable("root");
+        mCurrentDirectory = (ScriptFile) bundle.getSerializable("current");
+        setCurrentDirectory(mCurrentDirectory, !mCurrentDirectory.equals(mRootDirectory));
         super.onRestoreInstanceState(bundle.getParcelable("superData"));
     }
 
@@ -226,13 +225,13 @@ public class ScriptAndFolderListRecyclerView extends RecyclerView {
 
     @Subscribe
     public void onDirectoryChange(StorageScriptProvider.DirectoryChangeEvent event) {
-        if (event.directory.equals(mCurrentFolder)) {
-            updateCurrentFolder();
+        if (event.directory.equals(mCurrentDirectory)) {
+            updateCurrentDirectory();
         }
     }
 
-    private void updateCurrentFolder() {
-        setCurrentFolder(mCurrentFolder, mCanGoBack);
+    private void updateCurrentDirectory() {
+        setCurrentDirectory(mCurrentDirectory, mCanGoBack);
     }
 
     private class Adapter extends RecyclerView.Adapter<ViewHolder> {
@@ -244,9 +243,9 @@ public class ScriptAndFolderListRecyclerView extends RecyclerView {
         public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
             switch (viewType) {
                 case VIEW_TYPE_FILE:
-                    return new FileViewHolder(LayoutInflater.from(getContext()).inflate(R.layout.script_list_recycler_view_item, parent, false));
+                    return new FileViewHolder(LayoutInflater.from(getContext()).inflate(R.layout.script_and_folder_list_recycler_view_file, parent, false));
                 case VIEW_TYPE_FOLDER:
-                    return new ViewHolder(LayoutInflater.from(getContext()).inflate(R.layout.script_list_recycler_view_folder, parent, false));
+                    return new ViewHolder(LayoutInflater.from(getContext()).inflate(R.layout.script_and_folder_list_recycler_view_directory, parent, false));
             }
             return null;
         }
@@ -255,7 +254,6 @@ public class ScriptAndFolderListRecyclerView extends RecyclerView {
         public void onBindViewHolder(ViewHolder holder, int position) {
             if (mCanGoBack && position == 0) {
                 holder.name.setText("..");
-                holder.path.setText("");
             } else
                 holder.bind(mScriptFileList[getActualPosition(position)]);
         }
@@ -281,19 +279,30 @@ public class ScriptAndFolderListRecyclerView extends RecyclerView {
 
     private class ViewHolder extends RecyclerView.ViewHolder {
 
-        TextView name, path;
+        TextView name;
 
         ViewHolder(View itemView) {
             super(itemView);
             itemView.setOnClickListener(mOnItemClickListenerProxy);
             itemView.setOnLongClickListener(mOnItemLongClickListenerProxy);
             name = (TextView) itemView.findViewById(R.id.name);
-            path = (TextView) itemView.findViewById(R.id.path);
+            if (!mScriptFileOperationEnabled) {
+                setMarginRight(name, 0);
+            }
+        }
+
+        private void setMarginRight(View view, int marginRight) {
+            RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) view.getLayoutParams();
+            layoutParams.rightMargin = marginRight;
+            view.setLayoutParams(layoutParams);
         }
 
         public void bind(ScriptFile file) {
-            name.setText(file.getSimplifiedName());
-            path.setText(file.getSimplifiedPath());
+            if (file.isDirectory()) {
+                name.setText(file.getName());
+            } else {
+                name.setText(file.getSimplifiedName());
+            }
         }
     }
 
@@ -302,10 +311,8 @@ public class ScriptAndFolderListRecyclerView extends RecyclerView {
         FileViewHolder(View itemView) {
             super(itemView);
             if (mScriptFileOperationEnabled) {
-                itemView.findViewById(R.id.edit).setOnClickListener(mOnEditClickListener);
                 itemView.findViewById(R.id.run).setOnClickListener(mOnRunClickListener);
             } else {
-                itemView.findViewById(R.id.edit).setVisibility(GONE);
                 itemView.findViewById(R.id.run).setVisibility(GONE);
             }
         }
diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/main/script_list/ScriptListRecyclerView.java b/app/src/main/java/com/stardust/scriptdroid/ui/main/script_list/ScriptListRecyclerView.java
index cb1280e2..ad96b5fd 100644
--- a/app/src/main/java/com/stardust/scriptdroid/ui/main/script_list/ScriptListRecyclerView.java
+++ b/app/src/main/java/com/stardust/scriptdroid/ui/main/script_list/ScriptListRecyclerView.java
@@ -12,6 +12,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+import android.workground.WrapContentLinearLayoutManager;
 
 import com.stardust.scriptdroid.scripts.ScriptFile;
 import com.stardust.scriptdroid.scripts.ScriptFileList;
@@ -87,7 +88,7 @@ public class ScriptListRecyclerView extends ThemeColorRecyclerView {
 
     private void init() {
         setAdapter(new Adapter());
-        setLayoutManager(new LinearLayoutManager(getContext()));
+        setLayoutManager(new WrapContentLinearLayoutManager(getContext()));
         addItemDecoration(new DividerItemDecoration(getContext(), DividerItemDecoration.VERTICAL));
     }
 
diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/main/task/TaskListRecyclerView.java b/app/src/main/java/com/stardust/scriptdroid/ui/main/task/TaskListRecyclerView.java
new file mode 100644
index 00000000..31a94a4d
--- /dev/null
+++ b/app/src/main/java/com/stardust/scriptdroid/ui/main/task/TaskListRecyclerView.java
@@ -0,0 +1,161 @@
+package com.stardust.scriptdroid.ui.main.task;
+
+import android.content.Context;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.ThemeColorRecyclerView;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import android.workground.WrapContentLinearLayoutManager;
+
+import com.stardust.autojs.ScriptEngineService;
+import com.stardust.autojs.engine.JavaScriptEngine;
+import com.stardust.autojs.engine.JavaScriptEngineManager;
+import com.stardust.autojs.script.ScriptSource;
+import com.stardust.scriptdroid.R;
+import com.yqritc.recyclerviewflexibledivider.HorizontalDividerItemDecoration;
+
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * Created by Stardust on 2017/3/24.
+ */
+
+public class TaskListRecyclerView extends ThemeColorRecyclerView implements JavaScriptEngineManager.EngineLifecycleCallback {
+
+
+    private final OnClickListener mOnItemClickListenerProxy = new OnClickListener() {
+        @Override
+        public void onClick(View v) {
+
+        }
+    };
+
+    private final OnClickListener mOnStopClickListener = new OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            int position = getChildViewHolder((View) v.getParent()).getAdapterPosition();
+            mScriptEngines.get(position).forceStop();
+        }
+    };
+
+    private final List<JavaScriptEngine> mScriptEngines = new LinkedList<>();
+    private Adapter mAdapter;
+
+    public TaskListRecyclerView(Context context) {
+        super(context);
+        init();
+    }
+
+    public TaskListRecyclerView(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public TaskListRecyclerView(Context context, @Nullable AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        init();
+    }
+
+    private void init() {
+        setLayoutManager(new WrapContentLinearLayoutManager(getContext()));
+        addItemDecoration(new HorizontalDividerItemDecoration.Builder(getContext())
+                .color(0xffd9d9d9)
+                .size(2)
+                .marginResId(R.dimen.script_and_folder_list_divider_left_margin, R.dimen.script_and_folder_list_divider_right_margin)
+                .showLastDivider()
+                .build());
+        mAdapter = new Adapter();
+        setAdapter(mAdapter);
+    }
+
+    private void updateEngineList() {
+        mScriptEngines.clear();
+        mScriptEngines.addAll(ScriptEngineService.getInstance().getEngines());
+    }
+
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        updateEngineList();
+        mAdapter.notifyDataSetChanged();
+        ScriptEngineService.getInstance().registerEngineLifecycleCallback(this);
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        ScriptEngineService.getInstance().unregisterEngineLifecycleCallback(this);
+    }
+
+    @Override
+    public void onEngineCreate(final JavaScriptEngine engine) {
+        synchronized (mScriptEngines) {
+            post(new Runnable() {
+                @Override
+                public void run() {
+                    mScriptEngines.add(engine);
+                    getAdapter().notifyItemInserted(mScriptEngines.size() - 1);
+                }
+            });
+        }
+    }
+
+    @Override
+    public void onEngineRemove(final JavaScriptEngine engine) {
+        post(new Runnable() {
+            @Override
+            public void run() {
+                final int i = mScriptEngines.indexOf(engine);
+                mScriptEngines.remove(i);
+                mAdapter.notifyItemRemoved(i);
+            }
+        });
+    }
+
+    private class Adapter extends RecyclerView.Adapter<ViewHolder> {
+
+        @Override
+        public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+            return new ViewHolder(LayoutInflater.from(getContext()).inflate(R.layout.task_list_recycler_view_item, parent, false));
+        }
+
+        @Override
+        public void onBindViewHolder(ViewHolder holder, int position) {
+            holder.bind(mScriptEngines.get(position).getExecutedScript());
+        }
+
+        @Override
+        public int getItemCount() {
+            return mScriptEngines.size();
+        }
+    }
+
+    private class ViewHolder extends RecyclerView.ViewHolder {
+
+        TextView name, detail;
+        View stop;
+
+        ViewHolder(View itemView) {
+            super(itemView);
+            itemView.setOnClickListener(mOnItemClickListenerProxy);
+            name = (TextView) itemView.findViewById(R.id.name);
+            detail = (TextView) itemView.findViewById(R.id.detail);
+            stop = itemView.findViewById(R.id.stop);
+            stop.setOnClickListener(mOnStopClickListener);
+        }
+
+        public void bind(ScriptSource source) {
+            if (source == null)
+                return;
+            name.setText(source.getName());
+            detail.setText(source.toString());
+        }
+    }
+
+}
diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/main/task/TaskManagerFragment.java b/app/src/main/java/com/stardust/scriptdroid/ui/main/task/TaskManagerFragment.java
index ada56a97..0a4e8073 100644
--- a/app/src/main/java/com/stardust/scriptdroid/ui/main/task/TaskManagerFragment.java
+++ b/app/src/main/java/com/stardust/scriptdroid/ui/main/task/TaskManagerFragment.java
@@ -2,20 +2,59 @@ package com.stardust.scriptdroid.ui.main.task;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
 import com.stardust.app.Fragment;
+import com.stardust.autojs.ScriptEngineService;
+import com.stardust.scriptdroid.R;
+import com.stardust.view.ViewBinder;
+import com.stardust.view.ViewBinding;
+import com.stardust.widget.SimpleAdapterDataObserver;
 
 /**
  * Created by Stardust on 2017/3/24.
  */
 
 public class TaskManagerFragment extends Fragment {
+
+    private TaskListRecyclerView mTaskListRecyclerView;
+    private View mCloseAllView;
+    private View mNoRunningScriptNotice;
+
     @Nullable
     @Override
     public View createView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        return null;
+        return inflater.inflate(R.layout.fragment_task_manager, container, false);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        ViewBinder.bind(this, view);
+        init();
+    }
+
+    private void init() {
+        mNoRunningScriptNotice = $(R.id.notice_no_running_script);
+        mCloseAllView = $(R.id.close_all);
+        mTaskListRecyclerView = $(R.id.task_list);
+        mTaskListRecyclerView.getAdapter().registerAdapterDataObserver(new SimpleAdapterDataObserver() {
+
+            @Override
+            public void onSomethingChanged() {
+                boolean noRunningScript = mTaskListRecyclerView.getAdapter().getItemCount() == 0;
+                mNoRunningScriptNotice.setVisibility(noRunningScript ? View.VISIBLE : View.GONE);
+                mCloseAllView.setVisibility(noRunningScript ? View.GONE : View.VISIBLE);
+            }
+
+        });
+    }
+
+    @ViewBinding.Click(R.id.close_all)
+    private void closeAllRunningScripts() {
+        ScriptEngineService.getInstance().stopAll();
     }
 }
diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/main/task/TaskManagerRecyclerView.java b/app/src/main/java/com/stardust/scriptdroid/ui/main/task/TaskManagerRecyclerView.java
deleted file mode 100644
index 75711884..00000000
--- a/app/src/main/java/com/stardust/scriptdroid/ui/main/task/TaskManagerRecyclerView.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.stardust.scriptdroid.ui.main.task;
-
-/**
- * Created by Stardust on 2017/3/24.
- */
-
-public class TaskManagerRecyclerView {
-}
diff --git a/app/src/main/res/drawable/ic_close.png b/app/src/main/res/drawable/ic_close.png
new file mode 100644
index 00000000..5c476fbe
Binary files /dev/null and b/app/src/main/res/drawable/ic_close.png differ
diff --git a/app/src/main/res/drawable/ic_folder_yellow_100px.png b/app/src/main/res/drawable/ic_folder_yellow_100px.png
new file mode 100644
index 00000000..62b711d4
Binary files /dev/null and b/app/src/main/res/drawable/ic_folder_yellow_100px.png differ
diff --git a/app/src/main/res/drawable/ic_folder_yellow_200px.png b/app/src/main/res/drawable/ic_folder_yellow_200px.png
deleted file mode 100644
index 81e0930e..00000000
Binary files a/app/src/main/res/drawable/ic_folder_yellow_200px.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_play.png b/app/src/main/res/drawable/ic_play.png
new file mode 100644
index 00000000..e00cacbb
Binary files /dev/null and b/app/src/main/res/drawable/ic_play.png differ
diff --git a/app/src/main/res/drawable/ic_play_with_circle.png b/app/src/main/res/drawable/ic_play_with_circle.png
new file mode 100644
index 00000000..7872c680
Binary files /dev/null and b/app/src/main/res/drawable/ic_play_with_circle.png differ
diff --git a/app/src/main/res/layout/fragment_manager.xml b/app/src/main/res/layout/fragment_manager.xml
deleted file mode 100644
index 3a15e832..00000000
--- a/app/src/main/res/layout/fragment_manager.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:orientation="vertical">
-
-    <view
-        android:id="@+id/console"
-        class="com.stardust.scriptdroid.ui.console.ConsoleActivity$ConsoleView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_my_script_list.xml b/app/src/main/res/layout/fragment_my_script_list.xml
index a5dd9bc8..88c100d6 100644
--- a/app/src/main/res/layout/fragment_my_script_list.xml
+++ b/app/src/main/res/layout/fragment_my_script_list.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             xmlns:app="http://schemas.android.com/apk/res-auto"
              android:layout_width="match_parent"
              android:layout_height="match_parent"
              android:orientation="vertical">
diff --git a/app/src/main/res/layout/fragment_task_manager.xml b/app/src/main/res/layout/fragment_task_manager.xml
new file mode 100644
index 00000000..58b4ca9b
--- /dev/null
+++ b/app/src/main/res/layout/fragment_task_manager.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent"
+             android:background="#f4f4f4">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:id="@+id/close_all"
+            android:layout_width="match_parent"
+            android:layout_height="42dp"
+            android:background="#e4e4e4"
+            android:foreground="?selectableItemBackground"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:visibility="gone">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="16dp"
+                android:text="@string/text_close_all_running_scripts"
+                android:textColor="@android:color/secondary_text_light"
+                android:textSize="16sp"/>
+        </LinearLayout>
+
+        <com.stardust.scriptdroid.ui.main.task.TaskListRecyclerView
+            android:id="@+id/task_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/notice_no_running_script"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:text="@string/notice_no_running_script"
+        android:textColor="#adadad"
+        android:textSize="16sp"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/script_and_folder_list_recycler_view_directory.xml b/app/src/main/res/layout/script_and_folder_list_recycler_view_directory.xml
new file mode 100644
index 00000000..4341d13c
--- /dev/null
+++ b/app/src/main/res/layout/script_and_folder_list_recycler_view_directory.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                xmlns:tools="http://schemas.android.com/tools"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:foreground="?android:selectableItemBackground">
+
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_alignParentLeft="true"
+        android:layout_centerVertical="true"
+        android:layout_marginBottom="4dp"
+        android:layout_marginLeft="8dp"
+        android:layout_marginTop="4dp"
+        android:contentDescription="@string/_app_name"
+        android:scaleType="fitCenter"
+        android:src="@drawable/ic_folder_yellow_100px"/>
+
+
+    <TextView
+        android:id="@+id/name"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="80dp"
+        android:layout_toRightOf="@id/icon"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="@android:color/secondary_text_light"
+        android:textSize="16sp"
+        tools:text="示例脚本"/>
+
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/script_and_folder_list_recycler_view_file.xml b/app/src/main/res/layout/script_and_folder_list_recycler_view_file.xml
new file mode 100644
index 00000000..5cd33a1d
--- /dev/null
+++ b/app/src/main/res/layout/script_and_folder_list_recycler_view_file.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                xmlns:tools="http://schemas.android.com/tools"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:foreground="?android:selectableItemBackground">
+
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_alignParentLeft="true"
+        android:layout_centerVertical="true"
+        android:layout_marginBottom="4dp"
+        android:layout_marginLeft="8dp"
+        android:layout_marginTop="4dp"
+        android:contentDescription="@string/_app_name"
+        android:scaleType="fitCenter"
+        android:src="@drawable/ic_node_js_black"/>
+
+    <TextView
+        android:id="@+id/name"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="80dp"
+        android:layout_toRightOf="@id/icon"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="@android:color/secondary_text_light"
+        android:textSize="16sp"
+        tools:text="正在运行的服务"/>
+
+
+    <LinearLayout
+        android:id="@+id/run"
+        android:layout_width="42dp"
+        android:layout_height="42dp"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
+        android:layout_marginRight="12dp"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:layout_gravity="center"
+            android:contentDescription="@string/_app_name"
+            android:src="@drawable/ic_play"/>
+
+    </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/script_and_folder_list_view.xml b/app/src/main/res/layout/script_and_folder_list_view.xml
index 2ed3a978..9b18cbf5 100644
--- a/app/src/main/res/layout/script_and_folder_list_view.xml
+++ b/app/src/main/res/layout/script_and_folder_list_view.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
        android:layout_width="match_parent"
-       android:layout_height="match_parent">
+       android:layout_height="match_parent"
+       android:background="#fefefe">
 
     <com.stardust.scriptdroid.ui.main.script_list.ScriptAndFolderListRecyclerView
         android:id="@+id/script_list_recycler_view"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="#fafafa"/>
+        android:layout_height="match_parent"/>
 
     <FrameLayout
         android:id="@+id/progressBar"
diff --git a/app/src/main/res/layout/script_list_recycler_view_folder.xml b/app/src/main/res/layout/script_list_recycler_view_folder.xml
deleted file mode 100644
index 4817e678..00000000
--- a/app/src/main/res/layout/script_list_recycler_view_folder.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:tools="http://schemas.android.com/tools"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:foreground="?android:selectableItemBackground"
-                android:orientation="vertical"
-                android:paddingBottom="8dp"
-                android:paddingLeft="8dp"
-                android:paddingTop="8dp">
-
-    <ImageView
-        android:id="@+id/icon"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:layout_alignParentLeft="true"
-        android:layout_centerVertical="true"
-        android:contentDescription="@string/_app_name"
-        android:scaleType="fitCenter"
-        android:src="@drawable/ic_folder_yellow_200px"/>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_marginLeft="56dp"
-        android:gravity="center_vertical"
-        android:orientation="vertical">
-
-        <TextView
-            android:id="@+id/name"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:textColor="@android:color/primary_text_light"
-            android:textSize="18sp"
-            tools:text="示例脚本"/>
-
-        <TextView
-            android:id="@+id/path"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:gravity="center_vertical"
-            android:textColor="#777777"
-            android:textSize="14sp"
-            tools:text="/storage/emulated/0/脚本/示例脚本"/>
-
-    </LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/task_list_recycler_view_item.xml b/app/src/main/res/layout/task_list_recycler_view_item.xml
new file mode 100644
index 00000000..af379748
--- /dev/null
+++ b/app/src/main/res/layout/task_list_recycler_view_item.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                xmlns:tools="http://schemas.android.com/tools"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:foreground="?android:selectableItemBackground">
+
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_alignParentLeft="true"
+        android:layout_centerVertical="true"
+        android:layout_marginBottom="6dp"
+        android:layout_marginLeft="8dp"
+        android:layout_marginTop="6dp"
+        android:contentDescription="@string/_app_name"
+        android:scaleType="fitCenter"
+        android:src="@drawable/ic_node_js_black"/>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="80dp"
+        android:layout_toRightOf="@id/icon"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/name"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textColor="@android:color/secondary_text_light"
+            android:textSize="16sp"
+            tools:text="正在运行的服务"/>
+
+        <TextView
+            android:id="@+id/detail"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textColor="#777777"
+            android:textSize="12sp"
+            tools:text="/storage/emulated/0/脚本/正在运行的服务.txt"/>
+
+    </LinearLayout>
+
+
+    <FrameLayout
+        android:id="@+id/stop"
+        android:layout_width="42dp"
+        android:layout_height="42dp"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
+        android:layout_marginRight="12dp"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        android:gravity="center">
+
+        <ImageView
+            android:layout_width="25dp"
+            android:layout_height="25dp"
+            android:layout_gravity="center"
+            android:contentDescription="@string/_app_name"
+            android:src="@drawable/ic_close"/>
+
+    </FrameLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 17069fde..3dcc1a91 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -157,6 +157,7 @@
     <string name="text_off">OFF</string>
     <string name="text_please_choose_file_to_import">请选择要导入的脚本</string>
     <string name="text_refresh">刷新</string>
+    <string name="notice_no_running_script"><![CDATA[没有正在运行的脚本 φ(>ω<*)]]></string>
     <string-array name="record_control_keys">
         <item>None</item>
         <item>Volume Up</item>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index f8efef39..a33277ab 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -7,4 +7,6 @@
     <dimen name="level_beam_view_line_width">6dp</dimen>
     <dimen name="level_beam_view_line_offset">2dp</dimen>
     <dimen name="level_beam_view_padding_right">-4dp</dimen>
+    <dimen name="script_and_folder_list_divider_left_margin">56dp</dimen>
+    <dimen name="script_and_folder_list_divider_right_margin">0dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4b2a0232..1db8ee04 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -187,6 +187,7 @@
     <string name="text_no_brower">没有浏览器耶o(╯□╰)o快去安装一个吧</string>
     <string name="text_please_choose_file_to_import">请选择要导入的脚本</string>
     <string name="text_refresh">刷新</string>
+    <string name="notice_no_running_script"><![CDATA[没有正在运行的脚本 φ(>ω<*)]]></string>
 
     <string-array name="record_control_keys">
         <item>无</item>
diff --git a/autojs/build.gradle b/autojs/build.gradle
index 4057becf..209fead1 100644
--- a/autojs/build.gradle
+++ b/autojs/build.gradle
@@ -26,8 +26,8 @@ dependencies {
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support:appcompat-v7:25.3.0'
     testCompile 'junit:junit:4.12'
+    compile 'com.android.support:appcompat-v7:25.3.0'
     compile 'com.github.hyb1996:node-android-lib:1.0.13'
     compile project(path: ':common')
     compile project(path: ':automator')
diff --git a/autojs/src/main/java/com/stardust/autojs/ExecutionConfig.java b/autojs/src/main/java/com/stardust/autojs/ExecutionConfig.java
index 1a1a8e4e..6f62396d 100644
--- a/autojs/src/main/java/com/stardust/autojs/ExecutionConfig.java
+++ b/autojs/src/main/java/com/stardust/autojs/ExecutionConfig.java
@@ -7,12 +7,10 @@ import java.io.Serializable;
  */
 public class ExecutionConfig implements Serializable {
 
-    private static final ExecutionConfig RUNNING_CONFIG = new ExecutionConfig();
-    public String path;
-    public String prepareScript = "";
+    private static final ExecutionConfig DEFAULT = new ExecutionConfig();
 
     public static ExecutionConfig getDefault() {
-        return RUNNING_CONFIG;
+        return DEFAULT;
     }
 
     public boolean runInNewThread = true;
@@ -22,13 +20,4 @@ public class ExecutionConfig implements Serializable {
         return this;
     }
 
-    public ExecutionConfig path(String path) {
-        this.path = path;
-        return this;
-    }
-
-    public ExecutionConfig prepareScript(String script) {
-        this.prepareScript = script;
-        return this;
-    }
 }
diff --git a/autojs/src/main/java/com/stardust/autojs/ScriptEngineService.java b/autojs/src/main/java/com/stardust/autojs/ScriptEngineService.java
index d94b06ec..90336039 100644
--- a/autojs/src/main/java/com/stardust/autojs/ScriptEngineService.java
+++ b/autojs/src/main/java/com/stardust/autojs/ScriptEngineService.java
@@ -3,17 +3,16 @@ package com.stardust.autojs;
 import android.content.Context;
 
 import com.stardust.autojs.engine.JavaScriptEngine;
+import com.stardust.autojs.engine.JavaScriptEngineManager;
 import com.stardust.autojs.engine.ScriptExecuteActivity;
-import com.stardust.autojs.engine.ScriptExecutionListener;
-import com.stardust.autojs.engine.ScriptExecutionTask;
-import com.stardust.autojs.script.ScriptSource;
-import com.stardust.autojs.engine.SimpleScriptExecutionListener;
 import com.stardust.autojs.runtime.ScriptRuntime;
 import com.stardust.autojs.runtime.api.Console;
-import com.stardust.autojs.engine.JavaScriptEngineManager;
+import com.stardust.autojs.script.ScriptSource;
 
 import java.text.DateFormat;
 import java.util.Date;
+import java.util.LinkedHashSet;
+import java.util.Set;
 
 /**
  * Created by Stardust on 2017/1/23.
@@ -31,10 +30,11 @@ public class ScriptEngineService {
         instance = service;
     }
 
-    private ScriptRuntime mRuntime;
-    private Context mContext;
-    private Console mConsole;
+    private final ScriptRuntime mRuntime;
+    private final Context mContext;
+    private final Console mConsole;
     private final JavaScriptEngineManager mJavaScriptEngineManager;
+    private final EngineLifecycleObserver mEngineLifecycleObserver = new EngineLifecycleObserver();
     private final ScriptExecutionListener mDefaultListener = new SimpleScriptExecutionListener() {
 
         @Override
@@ -57,16 +57,13 @@ public class ScriptEngineService {
         mContext = builder.mContext;
         mJavaScriptEngineManager = builder.mJavaScriptEngineManager;
         mConsole = builder.mConsole;
+        mJavaScriptEngineManager.setEngineLifecycleCallback(mEngineLifecycleObserver);
     }
 
     public ScriptRuntime getRuntime() {
         return mRuntime;
     }
 
-    public JavaScriptEngineManager getJavaScriptEngineManager() {
-        return mJavaScriptEngineManager;
-    }
-
     public Console getConsole() {
         return mConsole;
     }
@@ -79,6 +76,14 @@ public class ScriptEngineService {
         return mJavaScriptEngineManager.createEngine();
     }
 
+    public void registerEngineLifecycleCallback(JavaScriptEngineManager.EngineLifecycleCallback engineLifecycleCallback) {
+        mEngineLifecycleObserver.registerCallback(engineLifecycleCallback);
+    }
+
+    public void unregisterEngineLifecycleCallback(JavaScriptEngineManager.EngineLifecycleCallback engineLifecycleCallback) {
+        mEngineLifecycleObserver.unregisterCallback(engineLifecycleCallback);
+    }
+
     public static boolean causedByInterruptedException(Throwable e) {
         while (e != null) {
             if (e instanceof InterruptedException) {
@@ -89,19 +94,34 @@ public class ScriptEngineService {
         return false;
     }
 
-    public void execute(ScriptExecutionTask task) {
+    public ScriptExecution execute(ScriptExecutionTask task) {
         ScriptExecutionListener listener = task.getExecutionListenerOrDefault(mDefaultListener);
-        ScriptSource source = task.getScriptSource();
+        ScriptSource source = task.getSource();
         int mode = source.getExecutionMode();
         if ((mode & ScriptSource.EXECUTION_MODE_UI) != 0) {
             ScriptExecuteActivity.execute(mContext, task);
+            return null;
         } else {
-            new Thread(new ScriptExecution(source, listener, task.getExecutionConfig())).start();
+            RunnableScriptExecution scriptExecution = new RunnableScriptExecution(source, listener, task.getConfig());
+            if (task.getConfig().runInNewThread) {
+                new Thread(scriptExecution).start();
+            } else {
+                scriptExecution.run();
+            }
+            return scriptExecution;
         }
     }
 
-    public void execute(ScriptSource source, ScriptExecutionListener listener, ExecutionConfig config) {
-        execute(new ScriptExecutionTask(source, listener, config));
+    public ScriptExecution execute(ScriptSource source, ScriptExecutionListener listener, ExecutionConfig config) {
+        return execute(new ScriptExecutionTask(source, listener, config));
+    }
+
+    public ScriptExecution execute(ScriptSource source, ScriptExecutionListener listener) {
+        return execute(source, listener, ExecutionConfig.getDefault());
+    }
+
+    public ScriptExecution execute(ScriptSource source) {
+        return execute(source, mDefaultListener, ExecutionConfig.getDefault());
     }
 
     public int stopAll() {
@@ -117,24 +137,71 @@ public class ScriptEngineService {
             mRuntime.toast(mContext.getString(R.string.text_no_running_script));
     }
 
-    public void execute(ScriptSource source, ScriptExecutionListener listener) {
-        execute(source, listener, ExecutionConfig.getDefault());
+    public String[] getGlobalFunctions() {
+        return mJavaScriptEngineManager.getGlobalFunctions();
     }
 
-    public void execute(ScriptSource source) {
-        execute(source, mDefaultListener, ExecutionConfig.getDefault());
+    public Set<JavaScriptEngine> getEngines() {
+        return mJavaScriptEngineManager.getEngines();
     }
 
-    private class ScriptExecution extends ScriptExecutionTask implements Runnable {
+    private class RunnableScriptExecution extends ScriptExecutionTask implements ScriptExecution, Runnable {
 
-        public ScriptExecution(ScriptSource source, ScriptExecutionListener listener, ExecutionConfig config) {
+        private JavaScriptEngine mJavaScriptEngine;
+
+        RunnableScriptExecution(ScriptSource source, ScriptExecutionListener listener, ExecutionConfig config) {
             super(source, listener, config);
         }
 
         @Override
         public void run() {
-            execute(mRuntime, mJavaScriptEngineManager.createEngine());
+            mJavaScriptEngine = createScriptEngine();
+            execute(mRuntime, mJavaScriptEngine);
         }
 
+        @Override
+        public JavaScriptEngine getEngine() {
+            return mJavaScriptEngine;
+        }
+
+        @Override
+        public ScriptRuntime getRuntime() {
+            return mRuntime;
+        }
+    }
+
+    private static class EngineLifecycleObserver implements JavaScriptEngineManager.EngineLifecycleCallback {
+
+        private final Set<JavaScriptEngineManager.EngineLifecycleCallback> mEngineLifecycleCallbacks = new LinkedHashSet<>();
+
+        @Override
+        public void onEngineCreate(JavaScriptEngine engine) {
+            synchronized (mEngineLifecycleCallbacks) {
+                for (JavaScriptEngineManager.EngineLifecycleCallback callback : mEngineLifecycleCallbacks) {
+                    callback.onEngineCreate(engine);
+                }
+            }
+        }
+
+        @Override
+        public void onEngineRemove(JavaScriptEngine engine) {
+            synchronized (mEngineLifecycleCallbacks) {
+                for (JavaScriptEngineManager.EngineLifecycleCallback callback : mEngineLifecycleCallbacks) {
+                    callback.onEngineRemove(engine);
+                }
+            }
+        }
+
+        void registerCallback(JavaScriptEngineManager.EngineLifecycleCallback callback) {
+            synchronized (mEngineLifecycleCallbacks) {
+                mEngineLifecycleCallbacks.add(callback);
+            }
+        }
+
+        void unregisterCallback(JavaScriptEngineManager.EngineLifecycleCallback callback) {
+            synchronized (mEngineLifecycleCallbacks) {
+                mEngineLifecycleCallbacks.remove(callback);
+            }
+        }
     }
 }
diff --git a/autojs/src/main/java/com/stardust/autojs/ScriptExecution.java b/autojs/src/main/java/com/stardust/autojs/ScriptExecution.java
new file mode 100644
index 00000000..fd983ef0
--- /dev/null
+++ b/autojs/src/main/java/com/stardust/autojs/ScriptExecution.java
@@ -0,0 +1,22 @@
+package com.stardust.autojs;
+
+import com.stardust.autojs.engine.JavaScriptEngine;
+import com.stardust.autojs.runtime.ScriptRuntime;
+import com.stardust.autojs.script.ScriptSource;
+
+/**
+ * Created by Stardust on 2017/4/3.
+ */
+
+public interface ScriptExecution {
+
+    JavaScriptEngine getEngine();
+
+    ScriptRuntime getRuntime();
+
+    ScriptSource getSource();
+
+    ScriptExecutionListener getListener();
+
+    ExecutionConfig getConfig();
+}
diff --git a/autojs/src/main/java/com/stardust/autojs/engine/ScriptExecutionListener.java b/autojs/src/main/java/com/stardust/autojs/ScriptExecutionListener.java
similarity index 83%
rename from autojs/src/main/java/com/stardust/autojs/engine/ScriptExecutionListener.java
rename to autojs/src/main/java/com/stardust/autojs/ScriptExecutionListener.java
index 5b9477b6..2ab43a6b 100644
--- a/autojs/src/main/java/com/stardust/autojs/engine/ScriptExecutionListener.java
+++ b/autojs/src/main/java/com/stardust/autojs/ScriptExecutionListener.java
@@ -1,5 +1,6 @@
-package com.stardust.autojs.engine;
+package com.stardust.autojs;
 
+import com.stardust.autojs.engine.JavaScriptEngine;
 import com.stardust.autojs.script.ScriptSource;
 
 import java.io.Serializable;
diff --git a/autojs/src/main/java/com/stardust/autojs/engine/ScriptExecutionTask.java b/autojs/src/main/java/com/stardust/autojs/ScriptExecutionTask.java
similarity index 85%
rename from autojs/src/main/java/com/stardust/autojs/engine/ScriptExecutionTask.java
rename to autojs/src/main/java/com/stardust/autojs/ScriptExecutionTask.java
index 19b5e5a6..0d14c805 100644
--- a/autojs/src/main/java/com/stardust/autojs/engine/ScriptExecutionTask.java
+++ b/autojs/src/main/java/com/stardust/autojs/ScriptExecutionTask.java
@@ -1,6 +1,6 @@
-package com.stardust.autojs.engine;
+package com.stardust.autojs;
 
-import com.stardust.autojs.ExecutionConfig;
+import com.stardust.autojs.engine.JavaScriptEngine;
 import com.stardust.autojs.runtime.ScriptRuntime;
 import com.stardust.autojs.script.ScriptSource;
 
@@ -22,15 +22,15 @@ public class ScriptExecutionTask implements Serializable {
         mExecutionConfig = config;
     }
 
-    public ScriptSource getScriptSource() {
+    public ScriptSource getSource() {
         return mScriptSource;
     }
 
-    public ScriptExecutionListener getExecutionListener() {
+    public ScriptExecutionListener getListener() {
         return mExecutionListener;
     }
 
-    public ExecutionConfig getExecutionConfig() {
+    public ExecutionConfig getConfig() {
         return mExecutionConfig;
     }
 
@@ -41,9 +41,10 @@ public class ScriptExecutionTask implements Serializable {
             }
             mExecutionListener.onStart(engine, mScriptSource);
             mExecutionListener.onSuccess(engine, mScriptSource, engine.execute(mScriptSource));
-            engine.stop();
         } catch (Exception e) {
             mExecutionListener.onException(engine, mScriptSource, e);
+        } finally {
+            engine.destroy();
         }
     }
 
diff --git a/autojs/src/main/java/com/stardust/autojs/engine/SimpleScriptExecutionListener.java b/autojs/src/main/java/com/stardust/autojs/SimpleScriptExecutionListener.java
similarity index 78%
rename from autojs/src/main/java/com/stardust/autojs/engine/SimpleScriptExecutionListener.java
rename to autojs/src/main/java/com/stardust/autojs/SimpleScriptExecutionListener.java
index aa6b2737..980bd607 100644
--- a/autojs/src/main/java/com/stardust/autojs/engine/SimpleScriptExecutionListener.java
+++ b/autojs/src/main/java/com/stardust/autojs/SimpleScriptExecutionListener.java
@@ -1,5 +1,7 @@
-package com.stardust.autojs.engine;
+package com.stardust.autojs;
 
+import com.stardust.autojs.ScriptExecutionListener;
+import com.stardust.autojs.engine.JavaScriptEngine;
 import com.stardust.autojs.script.ScriptSource;
 
 /**
diff --git a/autojs/src/main/java/com/stardust/autojs/engine/JavaScriptEngine.java b/autojs/src/main/java/com/stardust/autojs/engine/JavaScriptEngine.java
index 10dc4339..d9c86852 100644
--- a/autojs/src/main/java/com/stardust/autojs/engine/JavaScriptEngine.java
+++ b/autojs/src/main/java/com/stardust/autojs/engine/JavaScriptEngine.java
@@ -4,19 +4,31 @@ import com.stardust.autojs.script.ScriptSource;
 
 /**
  * Created by Stardust on 2017/4/2.
+ * <p>
+ * <p>
+ * A JavaScriptEngine is created by {@link JavaScriptEngineManager#createEngine()}, and then can be
+ * used to execute script with {@link JavaScriptEngine#execute(ScriptSource)} in the **same** thread.
+ * When the execution finish successfully, the engine should be destroy in the thread that created it.
+ * <p>
+ * If you want to stop the engine in other threads, you should call {@link JavaScriptEngine#forceStop()}.
+ * It will throw a {@link com.stardust.autojs.runtime.ScriptStopException}.
  */
 
 public interface JavaScriptEngine {
 
+
     void put(String name, Object value);
 
     Object execute(ScriptSource scriptSource);
 
-    void stop();
+    ScriptSource getExecutedScript();
 
-    void stopNotRemoveFromManager();
+    void forceStop();
 
     void destroy();
 
+    /**
+     * @hide
+     */
     void init();
 }
diff --git a/autojs/src/main/java/com/stardust/autojs/engine/JavaScriptEngineManager.java b/autojs/src/main/java/com/stardust/autojs/engine/JavaScriptEngineManager.java
index 10a34ef2..f623713e 100644
--- a/autojs/src/main/java/com/stardust/autojs/engine/JavaScriptEngineManager.java
+++ b/autojs/src/main/java/com/stardust/autojs/engine/JavaScriptEngineManager.java
@@ -1,10 +1,10 @@
 package com.stardust.autojs.engine;
 
 import android.content.Context;
-import android.util.Log;
 
 import com.stardust.autojs.BuildConfig;
 import com.stardust.autojs.script.ScriptSource;
+import com.stardust.autojs.script.StringScriptSource;
 import com.stardust.pio.PFile;
 
 import java.io.IOException;
@@ -19,19 +19,26 @@ import java.util.Set;
 
 public abstract class JavaScriptEngineManager {
 
+    public interface EngineLifecycleCallback {
+
+        void onEngineCreate(JavaScriptEngine engine);
+
+        void onEngineRemove(JavaScriptEngine engine);
+    }
+
     private static final String TAG = "JavaScriptEngineManager";
 
     private Map<String, Object> mGlobalVariableMap = new HashMap<>();
     private final Set<JavaScriptEngine> mEngines = new HashSet<>();
     private boolean mIsStopping = false;
-
+    private EngineLifecycleCallback mEngineLifecycleCallback;
     private final ScriptSource INIT_SCRIPT;
 
     private android.content.Context mContext;
 
     public JavaScriptEngineManager(Context context) {
         mContext = context;
-        INIT_SCRIPT = ScriptSource.of(readInitScript());
+        INIT_SCRIPT = new StringScriptSource(readInitScript());
     }
 
     public JavaScriptEngine createEngine() {
@@ -40,6 +47,9 @@ public abstract class JavaScriptEngineManager {
         engine.init();
         synchronized (mEngines) {
             mEngines.add(engine);
+            if(mEngineLifecycleCallback != null){
+                mEngineLifecycleCallback.onEngineCreate(engine);
+            }
         }
         return engine;
     }
@@ -48,6 +58,14 @@ public abstract class JavaScriptEngineManager {
         mGlobalVariableMap.put(varName, value);
     }
 
+    public void setEngineLifecycleCallback(EngineLifecycleCallback engineLifecycleCallback) {
+        mEngineLifecycleCallback = engineLifecycleCallback;
+    }
+
+    public Set<JavaScriptEngine> getEngines() {
+        return mEngines;
+    }
+
     protected abstract JavaScriptEngine createEngineInner();
 
     public abstract String[] getGlobalFunctions();
@@ -62,11 +80,14 @@ public abstract class JavaScriptEngineManager {
         }
     }
 
-    void removeEngine(RhinoJavaScriptEngine rhinoJavaScriptEngine) {
+    void removeEngine(JavaScriptEngine engine) {
         synchronized (mEngines) {
             if (mIsStopping)
                 return;
-            mEngines.remove(rhinoJavaScriptEngine);
+            mEngines.remove(engine);
+            if(mEngineLifecycleCallback != null){
+                mEngineLifecycleCallback.onEngineRemove(engine);
+            }
         }
     }
 
@@ -81,7 +102,7 @@ public abstract class JavaScriptEngineManager {
     public ScriptSource getInitScript() {
         if (BuildConfig.DEBUG) {
             // 调试时不缓存INIT_SCRIPT否则修改javascript_engine_init.js后不会更新
-            return ScriptSource.of(readInitScript());
+            return new StringScriptSource(readInitScript());
         } else {
             return INIT_SCRIPT;
         }
@@ -93,7 +114,10 @@ public abstract class JavaScriptEngineManager {
             mIsStopping = true;
             int n = mEngines.size();
             for (JavaScriptEngine engine : mEngines) {
-                engine.stopNotRemoveFromManager();
+                engine.forceStop();
+                if(mEngineLifecycleCallback != null){
+                    mEngineLifecycleCallback.onEngineRemove(engine);
+                }
             }
             mEngines.clear();
             mIsStopping = false;
diff --git a/autojs/src/main/java/com/stardust/autojs/engine/RhinoJavaScriptEngine.java b/autojs/src/main/java/com/stardust/autojs/engine/RhinoJavaScriptEngine.java
index 0d8d76f5..f8d0e09e 100644
--- a/autojs/src/main/java/com/stardust/autojs/engine/RhinoJavaScriptEngine.java
+++ b/autojs/src/main/java/com/stardust/autojs/engine/RhinoJavaScriptEngine.java
@@ -23,6 +23,7 @@ public class RhinoJavaScriptEngine implements JavaScriptEngine {
     private Scriptable mScriptable;
     private Thread mThread;
     private RhinoJavaScriptEngineManager mEngineManager;
+    private ScriptSource mScriptSource;
 
     public RhinoJavaScriptEngine(RhinoJavaScriptEngineManager engineManager) {
         mEngineManager = engineManager;
@@ -38,22 +39,17 @@ public class RhinoJavaScriptEngine implements JavaScriptEngine {
 
     @Override
     public Object execute(ScriptSource source) {
-        try {
-            return mContext.evaluateString(mScriptable, source.getScript(), "<script>", 1, null);
-        } catch (Exception e) {
-            stop();
-            throw e;
-        }
+        mScriptSource = source;
+        return mContext.evaluateString(mScriptable, source.getScript(), "<script>", 1, null);
     }
 
     @Override
-    public void stop() {
-        mEngineManager.removeEngine(this);
-        stopNotRemoveFromManager();
+    public ScriptSource getExecutedScript() {
+        return mScriptSource;
     }
 
     @Override
-    public void stopNotRemoveFromManager() {
+    public void forceStop() {
         mThread.interrupt();
     }
 
@@ -63,7 +59,8 @@ public class RhinoJavaScriptEngine implements JavaScriptEngine {
 
     @Override
     public void destroy() {
-
+        Context.exit();
+        mEngineManager.removeEngine(this);
     }
 
     @Override
@@ -99,8 +96,7 @@ public class RhinoJavaScriptEngine implements JavaScriptEngine {
         @Override
         protected void observeInstructionCount(Context cx, int instructionCount) {
             if (Thread.currentThread().isInterrupted()) {
-                Context.exit();
-                throw new ScriptStopException();
+                throw new ScriptStopException(new InterruptedException());
             }
         }
 
diff --git a/autojs/src/main/java/com/stardust/autojs/engine/RhinoJavaScriptEngineManager.java b/autojs/src/main/java/com/stardust/autojs/engine/RhinoJavaScriptEngineManager.java
index 3ebb3632..5c5f8ec1 100644
--- a/autojs/src/main/java/com/stardust/autojs/engine/RhinoJavaScriptEngineManager.java
+++ b/autojs/src/main/java/com/stardust/autojs/engine/RhinoJavaScriptEngineManager.java
@@ -3,6 +3,7 @@ package com.stardust.autojs.engine;
 
 import com.stardust.autojs.runtime.ScriptRuntime;
 import com.stardust.autojs.script.ScriptSource;
+import com.stardust.autojs.script.StringScriptSource;
 
 import org.mozilla.javascript.Context;
 import org.mozilla.javascript.Scriptable;
@@ -64,13 +65,13 @@ public class RhinoJavaScriptEngineManager extends JavaScriptEngineManager {
 
     private String[] getGlobalFunctionsInner() {
         JavaScriptEngine engine = createEngine();
-        Scriptable scriptable = (Scriptable) engine.execute(ScriptSource.of("this"));
+        Scriptable scriptable = (Scriptable) engine.execute(new StringScriptSource("this"));
         Object[] ids = scriptable.getIds();
         String[] functions = new String[ids.length];
         for (int i = 0; i < ids.length; i++) {
             functions[i] = ids[i].toString();
         }
-        engine.stop();
+        engine.destroy();
         return functions;
     }
 
diff --git a/autojs/src/main/java/com/stardust/autojs/engine/ScriptExecuteActivity.java b/autojs/src/main/java/com/stardust/autojs/engine/ScriptExecuteActivity.java
index 34aca806..5315ece5 100644
--- a/autojs/src/main/java/com/stardust/autojs/engine/ScriptExecuteActivity.java
+++ b/autojs/src/main/java/com/stardust/autojs/engine/ScriptExecuteActivity.java
@@ -6,6 +6,8 @@ import android.content.Intent;
 import android.os.Bundle;
 
 import com.stardust.autojs.ScriptEngineService;
+import com.stardust.autojs.ScriptExecutionListener;
+import com.stardust.autojs.ScriptExecutionTask;
 import com.stardust.autojs.script.ScriptSource;
 
 /**
@@ -37,8 +39,8 @@ public class ScriptExecuteActivity extends Activity {
 
     private void handleIntent(Intent intent) {
         ScriptExecutionTask scriptExecutionTask = (ScriptExecutionTask) intent.getSerializableExtra(EXTRA_TASK);
-        mExecutionListener = scriptExecutionTask.getExecutionListener();
-        mScriptSource = scriptExecutionTask.getScriptSource();
+        mExecutionListener = scriptExecutionTask.getListener();
+        mScriptSource = scriptExecutionTask.getSource();
     }
 
     private void runScript() {
@@ -61,7 +63,7 @@ public class ScriptExecuteActivity extends Activity {
     protected void onDestroy() {
         super.onDestroy();
         mJavaScriptEngine.put("activity", null);
-        mJavaScriptEngine.stop();
+        mJavaScriptEngine.destroy();
     }
 
 }
diff --git a/autojs/src/main/java/com/stardust/autojs/script/FileScriptSource.java b/autojs/src/main/java/com/stardust/autojs/script/FileScriptSource.java
index d819bac5..28c63161 100644
--- a/autojs/src/main/java/com/stardust/autojs/script/FileScriptSource.java
+++ b/autojs/src/main/java/com/stardust/autojs/script/FileScriptSource.java
@@ -15,6 +15,7 @@ public class FileScriptSource extends ScriptSource {
     private String mScript;
 
     public FileScriptSource(File file) {
+        super(PFile.getNameWithoutExtension(file.getName()));
         mFile = file;
     }
 
@@ -22,6 +23,11 @@ public class FileScriptSource extends ScriptSource {
         this(new File(path));
     }
 
+    public FileScriptSource(String name, File file) {
+        super(name);
+        mFile = file;
+    }
+
     @Override
     public String getScript() {
         if (mScript == null)
diff --git a/autojs/src/main/java/com/stardust/autojs/script/MultiScriptSource.java b/autojs/src/main/java/com/stardust/autojs/script/MultiScriptSource.java
index bd31d9dc..9903cb33 100644
--- a/autojs/src/main/java/com/stardust/autojs/script/MultiScriptSource.java
+++ b/autojs/src/main/java/com/stardust/autojs/script/MultiScriptSource.java
@@ -7,14 +7,16 @@ package com.stardust.autojs.script;
 public class MultiScriptSource extends ScriptSource {
 
     private String mScript;
+    private FileScriptSource mFileScriptSource;
 
-    public MultiScriptSource(ScriptSource... sources) {
+
+    public MultiScriptSource(StringScriptSource stringScriptSource, FileScriptSource fileScriptSource) {
+        super(fileScriptSource.getName());
+        mFileScriptSource = fileScriptSource;
         StringBuilder stringBuilder = new StringBuilder();
-        for (ScriptSource source : sources) {
-            String script = source.getScript();
-            if (script != null)
-                stringBuilder.append(script).append("\n");
-        }
+        if (stringScriptSource.getScript() != null)
+            stringBuilder.append(stringScriptSource.getScript()).append("\n");
+        stringBuilder.append(fileScriptSource.getScript());
         mScript = stringBuilder.toString();
     }
 
@@ -22,4 +24,10 @@ public class MultiScriptSource extends ScriptSource {
     public String getScript() {
         return mScript;
     }
+
+    @Override
+    public String toString() {
+        return mFileScriptSource.toString();
+    }
+
 }
diff --git a/autojs/src/main/java/com/stardust/autojs/script/ScriptSource.java b/autojs/src/main/java/com/stardust/autojs/script/ScriptSource.java
index 06ef0aea..ef8e5464 100644
--- a/autojs/src/main/java/com/stardust/autojs/script/ScriptSource.java
+++ b/autojs/src/main/java/com/stardust/autojs/script/ScriptSource.java
@@ -26,7 +26,15 @@ public abstract class ScriptSource implements Serializable {
     private static final int EXECUTION_MODE_STRING_MAX_LENGTH = 7;
 
     private int mExecutionMode = -1;
+    private String mName;
 
+    public ScriptSource(String name) {
+        mName = name;
+    }
+
+    public String getName() {
+        return mName;
+    }
 
     public abstract String getScript();
 
@@ -38,7 +46,7 @@ public abstract class ScriptSource implements Serializable {
     }
 
     private int parseExecutionMode(String script) {
-        if (script.charAt(0) != '"')
+        if (script == null || script.length() == 0 || script.charAt(0) != '"')
             return EXECUTION_MODE_NORMAL;
         int i = script.lastIndexOf("\";", EXECUTION_MODE_STRING_MAX_LENGTH + 2);
         if (i == -1)
@@ -58,7 +66,4 @@ public abstract class ScriptSource implements Serializable {
         return mode;
     }
 
-    public static ScriptSource of(String script) {
-        return new StringScriptSource(script);
-    }
 }
diff --git a/autojs/src/main/java/com/stardust/autojs/script/StringScriptSource.java b/autojs/src/main/java/com/stardust/autojs/script/StringScriptSource.java
index 42070b07..6d10c722 100644
--- a/autojs/src/main/java/com/stardust/autojs/script/StringScriptSource.java
+++ b/autojs/src/main/java/com/stardust/autojs/script/StringScriptSource.java
@@ -10,6 +10,12 @@ public class StringScriptSource extends ScriptSource {
     private String mScript;
 
     public StringScriptSource(String script) {
+        super("Tmp");
+        mScript = script;
+    }
+
+    public StringScriptSource(String name, String script) {
+        super(name);
         mScript = script;
     }
 
diff --git a/automator/src/main/java/com/stardust/automator/UiObjectCollection.java b/automator/src/main/java/com/stardust/automator/UiObjectCollection.java
index 76b0b637..9dfe5342 100644
--- a/automator/src/main/java/com/stardust/automator/UiObjectCollection.java
+++ b/automator/src/main/java/com/stardust/automator/UiObjectCollection.java
@@ -7,7 +7,6 @@ import android.view.accessibility.AccessibilityNodeInfo;
 import com.stardust.util.Consumer;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.*;
diff --git a/common/build.gradle b/common/build.gradle
index 67ac40ae..5e4b8d4b 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -28,5 +28,4 @@ dependencies {
     })
     compile 'com.android.support:appcompat-v7:25.3.0'
     testCompile 'junit:junit:4.12'
-    compile 'org.testng:testng:6.9.6'
 }
diff --git a/common/src/main/java/com/stardust/pio/PFile.java b/common/src/main/java/com/stardust/pio/PFile.java
index 2b900cd2..28d3ccad 100644
--- a/common/src/main/java/com/stardust/pio/PFile.java
+++ b/common/src/main/java/com/stardust/pio/PFile.java
@@ -1,6 +1,7 @@
 package com.stardust.pio;
 
 import android.content.Context;
+import android.util.Log;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -16,6 +17,8 @@ import java.io.OutputStream;
 
 public class PFile {
 
+    private static final String TAG = "PFile";
+
     private static final int BUFFER_SIZE = 8192;
 
     public static PFile open(String path, String mode) {
@@ -203,12 +206,11 @@ public class PFile {
         int a = fileName.lastIndexOf('/');
         if (a < 0)
             a = fileName.lastIndexOf('\\');
-        int b = fileName.lastIndexOf('.');
         if (a < 0)
             a = -1;
+        int b = fileName.indexOf('.', a + 1);
         if (b < 0)
             b = fileName.length();
-        // FIXME: 2017/4/3 StringOutOfBoundsException
         fileName = fileName.substring(a + 1, b);
         return fileName;
     }
diff --git a/common/src/main/java/com/stardust/util/FileSorter.java b/common/src/main/java/com/stardust/util/FileSorter.java
index 2ad3d032..ae32368e 100644
--- a/common/src/main/java/com/stardust/util/FileSorter.java
+++ b/common/src/main/java/com/stardust/util/FileSorter.java
@@ -1,8 +1,5 @@
 package com.stardust.util;
 
-import org.junit.Assert;
-import org.junit.Test;
-
 import java.io.File;
 import java.util.Arrays;
 import java.util.Comparator;
@@ -24,56 +21,4 @@ public class FileSorter {
         });
     }
 
-    public static class TestSuite {
-
-        @Test
-        public void testEngFileSort() {
-            File file1 = new File("d:/a.txt");
-            File file2 = new File("e:/b.txt");
-            File file3 = new File("c:/c.txt");
-            File[] files = {file2, file3, file1};
-            sort(files);
-            Assert.assertArrayEquals(new File[]{file1, file2, file3}, files);
-        }
-
-        @Test
-        public void testEngFileSortWithDirectory() {
-            File dir1 = new File("d:/");
-            File dir2 = new File("e:/");
-            File file1 = new File("e:/a.txt");
-            File file2 = new File("e:/b.txt");
-            File file3 = new File("d:/c.txt");
-            Assert.assertTrue(dir1.isDirectory());
-            Assert.assertTrue(dir2.isDirectory());
-            File[] files = {file2, file3, dir1, file1, dir2};
-            sort(files);
-            Assert.assertArrayEquals(new File[]{dir1, dir2, file1, file2, file3}, files);
-        }
-
-        @Test
-        public void testCnFileSort() {
-            File file1 = new File("a.txt");
-            File file2 = new File("b.txt");
-            File file3 = new File("啊.txt");
-            File file4 = new File("啊啊.txt");
-            File[] files = {file2, file4, file3, file1};
-            sort(files);
-            Assert.assertArrayEquals(new File[]{file1, file2, file3, file4}, files);
-        }
-
-        @Test
-        public void testCnFileSortWithDirectory() {
-            File dir1 = new File("d:/整理/");
-            File dir2 = new File("d:/迅雷下载/");
-            File file1 = new File("d:/整理/a.txt");
-            File file2 = new File("啊.txt");
-            File file3 = new File("啊啊.txt");
-            Assert.assertTrue(dir1.isDirectory());
-            Assert.assertTrue(dir2.isDirectory());
-            File[] files = {file2, file3, dir1, file1, dir2};
-            sort(files);
-            Assert.assertArrayEquals(new File[]{dir1, dir2, file1, file2, file3}, files);
-        }
-    }
-
 }
diff --git a/common/src/main/java/com/stardust/util/LimitedHashMap.java b/common/src/main/java/com/stardust/util/LimitedHashMap.java
index a3203f27..0026264b 100644
--- a/common/src/main/java/com/stardust/util/LimitedHashMap.java
+++ b/common/src/main/java/com/stardust/util/LimitedHashMap.java
@@ -1,12 +1,7 @@
 package com.stardust.util;
 
-import org.junit.Test;
-
 import java.util.LinkedHashMap;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
 /**
  * Created by Stardust on 2017/3/31.
  */
@@ -26,33 +21,4 @@ public class LimitedHashMap<K, V> extends LinkedHashMap<K, V> {
     }
 
 
-    public static class TestSuite {
-
-        @org.testng.annotations.Test
-        public void testAutoRemove() {
-            LimitedHashMap<String, Integer> hashMap = new LimitedHashMap<>(5);
-            hashMap.put("a", 1);
-            hashMap.put("b", 2);
-            hashMap.put("c", 3);
-            hashMap.put("d", 4);
-            hashMap.put("e", 5);
-            hashMap.put("f", 6);
-            assertFalse(hashMap.containsKey("a"));
-        }
-
-        @Test
-        public void testAutoReorder() {
-            LimitedHashMap<String, Integer> hashMap = new LimitedHashMap<>(5);
-            hashMap.put("a", 1);
-            hashMap.put("b", 2);
-            hashMap.put("c", 3);
-            hashMap.put("d", 4);
-            hashMap.put("e", 5);
-            hashMap.get("a");
-            hashMap.put("f", 6);
-            assertTrue(hashMap.containsKey("a"));
-            assertFalse(hashMap.containsKey("b"));
-        }
-
-    }
 }
diff --git a/common/src/main/java/com/stardust/util/SdkVersionUtil.java b/common/src/main/java/com/stardust/util/SdkVersionUtil.java
index 98216a45..d66be0a7 100644
--- a/common/src/main/java/com/stardust/util/SdkVersionUtil.java
+++ b/common/src/main/java/com/stardust/util/SdkVersionUtil.java
@@ -1,12 +1,5 @@
 package com.stardust.util;
 
-import android.os.Build;
-
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
-
 /**
  * Created by Stardust on 2017/4/3.
  */
@@ -27,14 +20,5 @@ public class SdkVersionUtil {
         return SDK_VERSIONS[i - 1];
     }
 
-    public static final class TestSuite {
 
-        @Test
-        public void test() {
-            assertEquals("5.0", sdkIntToString(21));
-            assertEquals("8.0", sdkIntToString(26));
-            assertEquals("Unknown", sdkIntToString(27));
-        }
-
-    }
 }
diff --git a/common/src/main/java/com/stardust/util/ViewUtil.java b/common/src/main/java/com/stardust/util/ViewUtil.java
index a5dd6faf..45abae58 100644
--- a/common/src/main/java/com/stardust/util/ViewUtil.java
+++ b/common/src/main/java/com/stardust/util/ViewUtil.java
@@ -3,6 +3,8 @@ package com.stardust.util;
 import android.content.Context;
 import android.support.annotation.IdRes;
 import android.view.View;
+import android.view.ViewGroup;
+import android.widget.RelativeLayout;
 
 /**
  * Created by Stardust on 2017/1/24.
@@ -23,4 +25,6 @@ public class ViewUtil {
         }
         return result;
     }
+
+
 }