diff --git a/assets/css/admin.css b/assets/css/admin.css
index 81efe73cb..e9c031cac 100644
--- a/assets/css/admin.css
+++ b/assets/css/admin.css
@@ -3983,7 +3983,7 @@ ul.cpm-files li .cpm-file-action .comment-number {
 .cpm .half-modal .cpm-modal-conetnt .cpm-empty-task-details .cpm-help-text {
   font-size: 10px;
   background: #f5f5f5;
-  width: 30%;
+  width: 100%;
   padding: 0 7px;
 }
 .cpm .half-modal .cpm-modal-conetnt .task-details .cpm-desc-field,
diff --git a/assets/js/task-components.js b/assets/js/task-components.js
index 2fcc28987..21d413a2f 100644
--- a/assets/js/task-components.js
+++ b/assets/js/task-components.js
@@ -969,15 +969,26 @@ Vue.component('new-task-form', {
             submit_disabled: false,
             before_edit: jQuery.extend( true, {}, this.task ),
             show_spinner: false,
+            date_from: '',
+            date_to: '',
         }
     },
 
     // Initial action for this component
     created: function() {
-        this.$root.$on( 'cpm_date_picker', this.getDatePicker );
+        this.$on( 'cpm_date_picker', this.getDatePicker );
     },
 
     watch: {
+        date_from: function(new_date) {
+            this.task.start_date = new_date;
+        },
+
+        date_to: function(new_date) {
+            this.task.due_date = new_date;
+            console.log( this.task.due_date );
+
+        },
         /**
          * Live check is the task private or not
          * 
@@ -1062,11 +1073,11 @@ Vue.component('new-task-form', {
         getDatePicker: function( data ) {
             
             if ( data.field == 'datepicker_from' ) {
-                this.task.start_date = data.date;
+                //this.task.start_date = data.date;
             }
 
             if ( data.field == 'datepicker_to' ) {
-                this.task.due_date = data.date;
+                //this.task.due_date = data.date;
             }
         },
 
@@ -2453,5 +2464,29 @@ Vue.component( 'cpm-todo-lists-drop-down', {
     }
 });
 
+Vue.component('cpm-datepickter', {
+    template: '<input type="text" :value="value">',
+    props: ['value', 'dependency'],
+    mounted: function() {
+        var self = this,
+            limit_date = ( self.dependency == 'cpm-datepickter-from' ) ? "maxDate" : "minDate";
+
+        jQuery( self.$el ).datepicker({
+            dateFormat: 'yy-mm-dd',
+            changeYear: true,
+            changeMonth: true,
+            numberOfMonths: 1,
+            onClose: function( selectedDate ) {
+                jQuery( "."+ self.dependency ).datepicker( "option", limit_date, selectedDate );
+            },
+            onSelect: function(dateText) {
+               self.$emit('input', dateText);
+            }
+        });
+    },
+
+});
+
+
 
 
diff --git a/assets/js/task-vue.js b/assets/js/task-vue.js
index c7b6c5444..2410c9626 100644
--- a/assets/js/task-vue.js
+++ b/assets/js/task-vue.js
@@ -43,14 +43,13 @@
                     // send data to the server
                     $.post( CPM_Vars.ajaxurl, data, function( response ) {
                         if (response.success) {
-                            console.log(response.data);
                         }
                     } );
                 }
             });
         },
 
-        datepicker: function() {
+        datepicker: function(el, binding, vnode) {
             $( '.cpm-date-field').datepicker({
                 dateFormat: 'yy-mm-dd',
                 changeMonth: true,
@@ -135,11 +134,11 @@
     var CPM_Task_Router = new VueRouter(CPM_Task_Routes);
 
 
-    // Register a global custom directive called v-cpm-datepicker
+    //Register a global custom directive called v-cpm-datepicker
     Vue.directive('cpm-datepicker', {
-        inserted: function (el) {
-            CPM_Task.datepicker( el );
-        }
+        inserted: function (el, binding, vnode) {
+            CPM_Task.datepicker( el, binding, vnode );
+        },
     });
 
     // Register a global custom directive called v-cpm-sortable
diff --git a/changelog.txt b/changelog.txt
index 41be69220..c7c63e7b5 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,33 @@
+= 1.6.8 - August 17, 2017 =
+
+ * [Fix] Prevent the loading trix-editor for all WP page.
+ * [Fix] Text formating retained got from others editor.
+ * [Fix] Creating second task does change the date of first task.
+ * [new] Add new component cpm-datepicker
+
+= 1.6.7 - August 01, 2017 =
+
+ * [new] Js Tiptip library has been added.
+ * [update] Condition applied when showing calender on setting tast start date.
+ * [update] Date icon has been shown if no date was set.
+ * [update] Description icon has been shown if no description was set.
+ * [update] Co-Worker icon has been shown if no Co-Worker was set in the task.
+ * [fix] Double date picker shown at task date update time.
+ * [fix] Undefined index errors.
+
+= 1.6.6 - July 31, 2017 =
+
+ * [new] Task title update from single task page.
+ * [new] Task privacy update from single task page.
+ * [new] Task description update from single task page.
+ * [new] Task start and end date update from single task page.
+ * [new] Add user/co-worker/client from single task page.
+ * [fix] Unable to complete task.
+ * [fix] When complete a task then this completed task shown double in the to-do list.
+ * [fix] Double "New To-Do" button shown.
+ * [update] 'Get porject id' function always return false.
+ * [update] Design change for single task page. 
+ 
 = 1.6.5 - July 6, 2017 =
 
  * [fix] Co-worker can not show the list corner menu.
diff --git a/class/ajax.php b/class/ajax.php
index 00fe97631..dc5301b49 100644
--- a/class/ajax.php
+++ b/class/ajax.php
@@ -665,7 +665,7 @@ function update_task() {
         $project_id = isset( $posted[ 'project_id' ] ) ? intval( $posted[ 'project_id' ] ) : 0;
         $task_id    = isset( $posted[ 'task_id' ] ) ? intval( $posted[ 'task_id' ] ) : 0;
         $type       = isset( $posted[ 'type' ] ) ? $posted[ 'type' ] : 'html';
-        $single     = ( int ) $posted[ 'single' ];
+        $single     = empty( $posted[ 'single' ] ) ? false : $posted[ 'single' ];
         $response   = array ( 'success' => false );
         
         if ( cpm_user_can_delete_edit( $project_id, $task_id, true ) ) {
@@ -1779,12 +1779,9 @@ function get_todo_single() {
         $task_id    = sanitize_text_field( $_POST[ 'task_id' ] );
         $project_id = sanitize_text_field( $_POST[ 'project_id' ] );
         $task       = $task_obj->get_task( $task_id);
-        //$task       = $task_obj->set_todo_extra_data( $project_id, $task->post_parent, $task);
-        
-        $task->post_content = cpm_get_content( $task->post_content );
-        $task->post_content = wp_strip_all_tags( $task->post_content );
+
         $task->can_del_edit = cpm_user_can_delete_edit( $project_id, $task );
-        
+
         wp_send_json_success( array( 'task' => $task ) );
     }
 
diff --git a/class/loader.php b/class/loader.php
index 1aeba60bc..194b76a77 100644
--- a/class/loader.php
+++ b/class/loader.php
@@ -67,4 +67,7 @@ function project_nav_links( $link ) {
 
 }
 
-new CPM_Free_Loader();
+if ( ! cpm_is_pro() ) {
+    new CPM_Free_Loader();
+}
+
diff --git a/class/message.php b/class/message.php
index 0138d8eb2..7cb20f178 100644
--- a/class/message.php
+++ b/class/message.php
@@ -11,6 +11,7 @@ class CPM_Message {
 
     public function __construct() {
         add_filter( 'init', array( $this, 'register_post_type' ) );
+        add_action( 'cpm_admin_scripts', array ( $this, 'message_scripts' ) );
     }
 
     public static function getInstance() {
@@ -87,6 +88,28 @@ function get_all( $project_id, $privacy = false ) {
         return $messages;
     }
 
+    function message_scripts() {
+        if ( isset( $_GET[ 'tab' ] ) AND $_GET[ 'tab' ] == 'message' ) {
+            
+            $scripts = array(
+                'cpm-trix-editor'
+            );
+
+            $scripts = apply_filters( 'cpm_message_scripts', $scripts );
+
+            do_action( 'cpm_before_message_scripts' );
+
+            foreach( $scripts as $script ) {
+                do_action( 'before-'. $script );
+                wp_enqueue_script( $script );
+                wp_enqueue_style( $script );
+                do_action( 'after-'. $script );
+            }
+
+            do_action( 'cpm_after_message_scripts' );
+        }
+    }
+
     /**
      * Get All message created User as Authore. 
      * @since 1.5.1
diff --git a/class/milestone.php b/class/milestone.php
index 1148d3c57..c7c528ac6 100644
--- a/class/milestone.php
+++ b/class/milestone.php
@@ -6,6 +6,7 @@ class CPM_Milestone {
 
     public function __construct() {
         add_filter( 'init', array( $this, 'register_post_type' ) );
+        add_action( 'cpm_admin_scripts', array ( $this, 'milestone_scripts' ) );
     }
 
     public static function getInstance() {
@@ -52,6 +53,28 @@ function register_post_type() {
         ) );
     }
 
+    function milestone_scripts() {
+        if ( isset( $_GET[ 'tab' ] ) AND $_GET[ 'tab' ] == 'milestone' ) {
+            
+            $scripts = array(
+                'cpm-trix-editor'
+            );
+
+            $scripts = apply_filters( 'cpm_milestone_scripts', $scripts );
+
+            do_action( 'cpm_before_milestone_scripts' );
+
+            foreach( $scripts as $script ) {
+                do_action( 'before-'. $script );
+                wp_enqueue_script( $script );
+                wp_enqueue_style( $script );
+                do_action( 'after-'. $script );
+            }
+
+            do_action( 'cpm_after_milestone_scripts' );
+        }
+    }
+
     function create( $project_id, $milestone_id = 0 ) {
         $posted    = $_POST;
         $is_update = $milestone_id ? true : false;
diff --git a/class/task.php b/class/task.php
index f44262e72..957f7a924 100644
--- a/class/task.php
+++ b/class/task.php
@@ -831,11 +831,10 @@ function set_task_meta( &$task ) {
         $task->start_date   = get_post_meta( $task->ID, '_start', true );
         $task->task_privacy = get_post_meta( $task->ID, '_task_privacy', true );
         $task->comments     = $this->get_task_comments( $task->ID );
-        $task->post_content = wp_strip_all_tags( $task->post_content );
+        $task->post_content = cpm_get_content( $task->post_content );
         $task->edit_mode    = false;
 
         $task = apply_filters( 'cpm_set_task_meta', $task );
-       // var_dump( $task ); die();
     }
 
     /**
diff --git a/cpm.php b/cpm.php
index 3c2cad213..a5957a657 100644
--- a/cpm.php
+++ b/cpm.php
@@ -5,7 +5,7 @@
  * Description: WordPress Project Management plugin. Manage your projects and tasks, get things done.
  * Author: Tareq Hasan
  * Author URI: https://tareq.co
- * Version: 1.6.7
+ * Version: 1.6.8
  * License: GPL2
  */
 /**
@@ -49,7 +49,7 @@ class WeDevs_CPM {
      *
      * @var string
      */
-    public $version = '1.6.7';
+    public $version = '1.6.8';
 
      /**
      * Plugin Database version
@@ -384,7 +384,7 @@ static function admin_scripts() {
         wp_enqueue_script( 'jquery-prettyPhoto', plugins_url( 'assets/js/jquery.prettyPhoto.js', __FILE__ ), array( 'jquery' ), false, true );
         wp_enqueue_script( 'jquery-chosen', plugins_url( 'assets/js/chosen.jquery.min.js', __FILE__ ), array( 'jquery' ), false, true );
         wp_enqueue_script( 'cpm_chart', plugins_url( 'assets/js/chart.js', __FILE__ ), array( 'jquery' ), false, true );
-        wp_enqueue_script( 'trix_editor', plugins_url( 'assets/js/trix.js', __FILE__ ), array( 'jquery' ), false, true );
+        wp_register_script( 'cpm-trix-editor', plugins_url( 'assets/js/trix.js', __FILE__ ), array( 'jquery' ), false, true );
         wp_enqueue_script( 'validate', plugins_url( 'assets/js/jquery.validate.min.js', __FILE__ ), array( 'jquery' ), false, false );
         wp_enqueue_script( 'plupload-handlers' );
         //wp_enqueue_script( 'cpm_vue-multiselect', plugins_url( 'assets/js/multiselect.js', __FILE__ ), array ( 'jquery', 'plupload-handlers' ), false, true );
@@ -447,14 +447,13 @@ static function admin_scripts() {
         wp_register_style( 'cpm-tiptip', CPM_URL . '/assets/js/tiptip/tipTip.css' );
         wp_register_style( 'cpm-vue-multiselect', CPM_URL . '/assets/css/vue-multiselect/vue-multiselect.min.css' );
 
-        wp_register_style( 'cpm-trix', CPM_URL . '/assets/css/trix/trix.css' );
+        wp_register_style( 'cpm-trix-editor', CPM_URL . '/assets/css/trix/trix.css' );
         wp_register_style( 'cpm-tiny-mce', site_url( '/wp-includes/css/editor.css' ) );
         wp_register_style( 'cpm-toastr', CPM_URL . '/assets/css/toastr/toastr.min.css' );
         wp_enqueue_style( 'atwhocss', plugins_url( 'assets/css/jquery.atwho.css', __FILE__ ) );
         wp_enqueue_style( 'cpm_prettyPhoto', plugins_url( 'assets/css/prettyPhoto.css', __FILE__ ) );
         wp_enqueue_style( 'jquery-ui', plugins_url( 'assets/css/jquery-ui-1.9.1.custom.css', __FILE__ ) );
         wp_enqueue_style( 'jquery-chosen', plugins_url( 'assets/css/chosen.css', __FILE__ ) );
-        wp_enqueue_style( 'trix_editor_style', plugins_url( 'assets/css/trix.css', __FILE__ ) );
         wp_enqueue_style( 'cpm_admin', plugins_url( 'assets/css/admin.css', __FILE__ ) );
         wp_enqueue_style( 'fontawesome', CPM_URL . '/assets/css/fontawesome/font-awesome.min.css' );
         wp_enqueue_style( 'dashicons' );
diff --git a/languages/cpm.pot b/languages/cpm.pot
index b5c884f3a..2d9f7d621 100644
--- a/languages/cpm.pot
+++ b/languages/cpm.pot
@@ -5,7 +5,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: "
 "http://wedevs.com/support/forum/plugin-support/wp-project-manager/\n"
-"POT-Creation-Date: 2017-08-01 05:16:22+00:00\n"
+"POT-Creation-Date: 2017-08-17 04:22:44+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -341,7 +341,7 @@ msgstr ""
 msgid "The task has been deleted successfully."
 msgstr ""
 
-#: class/ajax.php:810 class/ajax.php:859 class/task.php:219
+#: class/ajax.php:810 class/ajax.php:859 class/task.php:221
 #: includes/cpm-api/class-cpm-json-lists.php:165
 #: includes/cpm-api/class-cpm-json-lists.php:211
 msgid "Task list name is required."
@@ -383,12 +383,12 @@ msgstr ""
 msgid "Create a new user?"
 msgstr ""
 
-#: class/ajax.php:1900 includes/functions.php:245
+#: class/ajax.php:1897 includes/functions.php:245
 #: views/js-templates/file-uploader.php:9
 msgid "Delete File"
 msgstr ""
 
-#: class/ajax.php:1935
+#: class/ajax.php:1932
 msgid "Successfully reordered"
 msgstr ""
 
@@ -452,102 +452,102 @@ msgstr ""
 msgid "Upgrade to Pro Version"
 msgstr ""
 
-#: class/message.php:26 class/message.php:42
+#: class/message.php:27 class/message.php:43
 msgid "Messages"
 msgstr ""
 
-#: class/message.php:27
+#: class/message.php:28
 msgid "message post type"
 msgstr ""
 
-#: class/message.php:43 class/message.php:44 views/emails/mention.php:13
+#: class/message.php:44 class/message.php:45 views/emails/mention.php:13
 #: views/emails/new-comment.php:14 views/emails/new-message.php:67
 #: views/emails/update-comment.php:14
 msgid "Message"
 msgstr ""
 
-#: class/message.php:45 includes/html.php:611 includes/html.php:697
+#: class/message.php:46 includes/html.php:611 includes/html.php:697
 msgid "Add Message"
 msgstr ""
 
-#: class/message.php:46
+#: class/message.php:47
 msgid "Add New Message"
 msgstr ""
 
-#: class/message.php:47 class/milestone.php:42 class/project.php:51
+#: class/message.php:48 class/milestone.php:43 class/project.php:51
 #: class/task.php:114 class/task.php:148 views/project/header.php:24
 msgid "Edit"
 msgstr ""
 
-#: class/message.php:48
+#: class/message.php:49
 msgid "Edit Message"
 msgstr ""
 
-#: class/message.php:49 views/emails/new-message.php:40
+#: class/message.php:50 views/emails/new-message.php:40
 msgid "New Message"
 msgstr ""
 
-#: class/message.php:50 class/message.php:51 views/emails/new-message.php:77
+#: class/message.php:51 class/message.php:52 views/emails/new-message.php:77
 msgid "View Message"
 msgstr ""
 
-#: class/message.php:52
+#: class/message.php:53
 msgid "Search Messages"
 msgstr ""
 
-#: class/message.php:53
+#: class/message.php:54
 msgid "No messages found."
 msgstr ""
 
-#: class/message.php:54
+#: class/message.php:55
 msgid "No messages found in Trash."
 msgstr ""
 
-#: class/message.php:55
+#: class/message.php:56
 msgid "Parent Message"
 msgstr ""
 
-#: class/milestone.php:21 class/milestone.php:22 class/milestone.php:37
-#: class/milestone.php:38 class/milestone.php:39 includes/functions.php:514
+#: class/milestone.php:22 class/milestone.php:23 class/milestone.php:38
+#: class/milestone.php:39 class/milestone.php:40 includes/functions.php:514
 msgid "Milestone"
 msgstr ""
 
-#: class/milestone.php:40 includes/html.php:815
+#: class/milestone.php:41 includes/html.php:815
 #: views/blanktemplate/milestone.php:20
 #: views/js-templates/blanktemplate/milestone.php:12
 #: views/milestone/index.php:40
 msgid "Add Milestone"
 msgstr ""
 
-#: class/milestone.php:41
+#: class/milestone.php:42
 msgid "Add New Milestone"
 msgstr ""
 
-#: class/milestone.php:43 includes/html.php:911
+#: class/milestone.php:44 includes/html.php:911
 msgid "Edit Milestone"
 msgstr ""
 
-#: class/milestone.php:44
+#: class/milestone.php:45
 msgid "New Milestone"
 msgstr ""
 
-#: class/milestone.php:45 class/milestone.php:46
+#: class/milestone.php:46 class/milestone.php:47
 msgid "View Milestone"
 msgstr ""
 
-#: class/milestone.php:47
+#: class/milestone.php:48
 msgid "Search Milestone"
 msgstr ""
 
-#: class/milestone.php:48
+#: class/milestone.php:49
 msgid "No milestones found."
 msgstr ""
 
-#: class/milestone.php:49
+#: class/milestone.php:50
 msgid "No milestones found in Trash."
 msgstr ""
 
-#: class/milestone.php:50
+#: class/milestone.php:51
 msgid "Parent Milestone"
 msgstr ""
 
@@ -579,7 +579,7 @@ msgstr ""
 msgid "[%s][%s] New Task Assigned: %s"
 msgstr ""
 
-#: class/notification.php:420
+#: class/notification.php:421
 msgid "[%s][%s] New Sub Task Assigned: %s"
 msgstr ""
 
@@ -663,7 +663,7 @@ msgstr ""
 msgid "New Project Category Name"
 msgstr ""
 
-#: class/project.php:80 cpm.php:477
+#: class/project.php:80 cpm.php:476
 msgid "Categories"
 msgstr ""
 
@@ -723,7 +723,7 @@ msgstr ""
 #: includes/html.php:494 includes/html.php:677 includes/html.php:755
 #: includes/html.php:863 includes/html.php:1092
 #: includes/lib/class-wedevs-insights.php:623
-#: views/js-templates/new-task-form.php:52
+#: views/js-templates/new-task-form.php:53
 #: views/js-templates/todo-list-form.php:29
 msgid "Cancel"
 msgstr ""
@@ -761,7 +761,6 @@ msgstr ""
 #: class/task.php:57 includes/html.php:217 includes/html.php:218
 #: includes/integrations/erp/views/task-form.php:59
 #: views/js-templates/new-task-form.php:15
-#: views/js-templates/new-task-form.php:16
 #: views/js-templates/task-start-date.php:4
 #: views/js-templates/task-start-date.php:8
 msgid "Start Date"
@@ -769,8 +768,7 @@ msgstr ""
 
 #: class/task.php:58 includes/html.php:223 includes/html.php:224
 #: includes/html.php:844 includes/integrations/erp/views/task-form.php:71
-#: views/emails/new-task.php:8 views/js-templates/new-task-form.php:21
-#: views/js-templates/new-task-form.php:22
+#: views/emails/new-task.php:8 views/js-templates/new-task-form.php:22
 #: views/js-templates/task-end-date.php:4
 msgid "Due Date"
 msgstr ""
@@ -791,7 +789,7 @@ msgstr ""
 msgid "Attachments"
 msgstr ""
 
-#: class/task.php:63 views/js-templates/task-single.php:142
+#: class/task.php:63 views/js-templates/task-single.php:169
 #: views/js-templates/todo-list.php:51
 msgid "Comments"
 msgstr ""
@@ -903,7 +901,7 @@ msgstr ""
 msgid "Parent Task List"
 msgstr ""
 
-#: class/task.php:127 class/task.php:144 class/task.php:145 class/task.php:1080
+#: class/task.php:127 class/task.php:144 class/task.php:145 class/task.php:1081
 #: includes/functions.php:496 includes/html.php:1564
 #: views/emails/mention.php:25 views/emails/new-comment.php:26
 #: views/emails/update-comment.php:26 views/project/overview.php:43
@@ -925,7 +923,7 @@ msgid "Edit Task"
 msgstr ""
 
 #: class/task.php:150 views/js-templates/new-task-button.php:2
-#: views/js-templates/new-task-form.php:51
+#: views/js-templates/new-task-form.php:52
 msgid "New Task"
 msgstr ""
 
@@ -951,20 +949,20 @@ msgstr ""
 msgid "Parent Task"
 msgstr ""
 
-#: class/task.php:279 includes/cpm-api/class-cpm-json-tasks.php:171
+#: class/task.php:281 includes/cpm-api/class-cpm-json-tasks.php:171
 #: includes/cpm-api/class-cpm-json-tasks.php:253
 msgid "Task name is required."
 msgstr ""
 
-#: class/task.php:1113
+#: class/task.php:1114
 msgid "Current Task"
 msgstr ""
 
-#: class/task.php:1114
+#: class/task.php:1115
 msgid "Outstanding Task"
 msgstr ""
 
-#: class/task.php:1115
+#: class/task.php:1116
 msgid "Completed Task"
 msgstr ""
 
@@ -1010,7 +1008,7 @@ msgstr ""
 msgid "Pro Version"
 msgstr ""
 
-#: cpm.php:196 cpm.php:479
+#: cpm.php:196 cpm.php:478
 msgid "Add-ons"
 msgstr ""
 
@@ -1018,11 +1016,11 @@ msgstr ""
 msgid "Allowed Files"
 msgstr ""
 
-#: cpm.php:474 views/project/index.php:21
+#: cpm.php:473 views/project/index.php:21
 msgid "Project Manager"
 msgstr ""
 
-#: cpm.php:475 includes/html.php:1444
+#: cpm.php:474 includes/html.php:1444
 msgid "Projects"
 msgstr ""
 
@@ -1265,8 +1263,8 @@ msgid "Select all"
 msgstr ""
 
 #: includes/functions.php:213 views/js-templates/assign-user.php:23
-#: views/js-templates/new-task-form.php:37
-#: views/js-templates/task-single.php:91
+#: views/js-templates/new-task-form.php:38
+#: views/js-templates/task-single.php:96
 #: views/js-templates/todo-lists-drop-down.php:20
 msgid "Select User"
 msgstr ""
@@ -1930,7 +1928,7 @@ msgstr ""
 msgid "Assign User"
 msgstr ""
 
-#: views/js-templates/assign-user.php:34 views/js-templates/task-single.php:102
+#: views/js-templates/assign-user.php:34 views/js-templates/task-single.php:107
 msgid "No Man’s Sky"
 msgstr ""
 
@@ -1943,7 +1941,7 @@ msgstr ""
 msgid "Discuss this task list"
 msgstr ""
 
-#: views/js-templates/new-task-form.php:50
+#: views/js-templates/new-task-form.php:51
 msgid "Update Task"
 msgstr ""
 
@@ -1968,13 +1966,17 @@ msgstr ""
 msgid "Edit Task Title"
 msgstr ""
 
-#: views/js-templates/task-single.php:121
-#: views/js-templates/task-single.php:127
-#: views/js-templates/task-single.php:153
+#: views/js-templates/task-single.php:126
+#: views/js-templates/task-single.php:132
+#: views/js-templates/task-single.php:152
 msgid "Edit Task Description"
 msgstr ""
 
-#: views/js-templates/task-single.php:165
+#: views/js-templates/task-single.php:180
+msgid "Update Description"
+msgstr ""
+
+#: views/js-templates/task-single.php:193
 msgid "Shift+Enter for line break"
 msgstr ""
 
diff --git a/package-lock.json b/package-lock.json
index 8a1d3a7d6..8b9830584 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "wp-project-manager",
-  "version": "1.6.7",
+  "version": "1.6.8",
   "lockfileVersion": 1,
   "dependencies": {
     "abbrev": {
diff --git a/package.json b/package.json
index de9f85aa0..c88427e07 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wedevs-project-manager",
-  "version": "1.6.7",
+  "version": "1.6.8",
   "description": "A project management plugin built on top of WordPress. It simply mimics the simpleness of basecamp.",
   "author": "Tareq Hasan",
   "license": "GPL",
diff --git a/readme.md b/readme.md
index 06109a8bf..75675c2e5 100644
--- a/readme.md
+++ b/readme.md
@@ -7,7 +7,7 @@
 
 **Requires at least:** 3.5
 
-**Tested up to:** 4.8
+**Tested up to:** 4.8.1
 
 **Stable tag:** trunk
 
@@ -106,6 +106,13 @@ A. Found any bugs? Please create an [issue](https://github.com/tareq1988/wp-proj
 
 ## Changelog ##
 
+## 1.6.8 - August 17, 2017 ##
+
+ * [Fix] Prevent the loading trix-editor for all WP page.
+ * [Fix] Text formating retained got from others editor.
+ * [Fix] Creating second task does change the date of first task.
+ * [new] Add new component cpm-datepicker
+
 ## 1.6.7 - August 01, 2017 ##
 
  * [new] Js Tiptip library has been added.
diff --git a/readme.txt b/readme.txt
index 3084534e5..6e53dce0e 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,7 +3,7 @@ Contributors: tareq1988, wedevs, asaquzzaman, wpasikur, mdmamun-1
 Donate Link: https://tareq.co/donate/
 Tags: project, manager, project manager, project management, todo, todo list, task, basecamp, milestone, message, file, comment, client, team, tracking, planning, lists, reporting, project management plugin for wordpress, project manager, project manager plugin for wordpress, wordpress project management
 Requires at least: 4.0
-Tested up to: 4.8
+Tested up to: 4.8.1
 Stable tag: trunk
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -122,6 +122,13 @@ A. Found any bugs? Please create an [issue](https://github.com/tareq1988/wp-proj
 
 == Changelog ==
 
+= 1.6.8 - August 17, 2017 =
+
+ * [Fix] Prevent the loading trix-editor for all WP page.
+ * [Fix] Text formating retained got from others editor.
+ * [Fix] Creating second task does change the date of first task.
+ * [new] Add new component cpm-datepicker
+
 = 1.6.7 - August 01, 2017 =
 
  * [new] Js Tiptip library has been added.
diff --git a/views/js-templates/new-task-form.php b/views/js-templates/new-task-form.php
index b68e5324d..6a66827f8 100644
--- a/views/js-templates/new-task-form.php
+++ b/views/js-templates/new-task-form.php
@@ -13,13 +13,14 @@
             
             <div class="cpm-task-start-field" v-if="task_start_field">
                 <label><?php _e( 'Start Date', 'cpm' ); ?></label>
-                <input v-model="task.start_date" v-cpm-datepicker  type="text" autocomplete="off" class="cpm-date-picker-from" placeholder="<?php esc_attr_e( 'Start Date', 'cpm' ); ?>" value="" name="task_start" />
+                <cpm-datepickter v-model="task.start_date" class="cpm-datepickter-from" dependency="cpm-datepickter-to"></cpm-datepickter>
+                
             </div>
             
 
             <div class="cpm-task-due-field">
                 <label><?php _e( 'Due Date', 'cpm' ); ?></label>
-                <input v-model="task.due_date" type="text" v-cpm-datepicker autocomplete="off" class="cpm-date-picker-to" placeholder="<?php esc_attr_e( 'Due Date', 'cpm' ); ?>" value="" name="task_due" />
+                <cpm-datepickter v-model="task.due_date" class="cpm-datepickter-to" dependency="cpm-datepickter-from"></cpm-datepickter>
             </div>
         </div>
 
diff --git a/views/js-templates/task-single.php b/views/js-templates/task-single.php
index 02ecf03b1..3765b0c86 100644
--- a/views/js-templates/task-single.php
+++ b/views/js-templates/task-single.php
@@ -82,8 +82,8 @@ class="cpm-task-title-activity cpm-task-title-field"
                                                 >
                                                 <i style="font-size: 20px;" class="fa fa-user" aria-hidden="true"></i>
                                             </span>
-
-    <div v-if="task_assign.length" @click.prevent="afterSelect" class="cpm-multiselect cpm-multiselect-single-task" v-if="is_enable_multi_select">
+    
+    <div v-if="task_assign.length && is_enable_multi_select" @click.prevent="afterSelect" class="cpm-multiselect cpm-multiselect-single-task">
 
         <multiselect 
             v-model="task_assign" 
@@ -176,7 +176,7 @@ class="cpm-task-title-activity cpm-task-title-field"
                                     <!--v-if-->
                                     
                                     <p class="cpm-des-area cpm-desc-content" v-if="!is_task_details_edit_mode" @click.prevent="isTaskDetailsEditMode()">
-                                        <span v-if="!task.post_content == ''">{{ task.post_content }}</span>
+                                        <span v-if="!task.post_content == ''" v-html="task.post_content"></span>
                                         <span style="margin-left: -3px;" v-if="task.post_content == ''"><i style="font-size: 16px;"  class="fa fa-pencil" aria-hidden="true"></i>&nbsp;&nbsp<?php _e( 'Update Description', 'cpm' ); ?></span>
 
                                     </p>
diff --git a/views/js-templates/tasks.php b/views/js-templates/tasks.php
index df898360f..803dc3ddb 100644
--- a/views/js-templates/tasks.php
+++ b/views/js-templates/tasks.php
@@ -33,7 +33,7 @@
                                 
                                 <span class='cpm-assigned-user' 
                                     v-for="user in getUsers( task.assigned_to )" 
-                                    v-html="user.user_url">
+                                    v-html="user.user_url" :key="user.ID">
 
                                 </span>
 
@@ -112,7 +112,7 @@
                 </div>
             </li>
 
-            <li :data-id="task.ID" :data-order="task.menu_order" class="cpm-todo" v-for="(task, task_index) in getCompletedTask" :class="'cpm-todo cpm-fade-out-'+task.ID">
+            <li :data-id="task.ID" :data-order="task.menu_order" class="cpm-todo" v-for="(task, task_index) in getCompletedTask" :key="task.ID" :class="'cpm-todo cpm-fade-out-'+task.ID">
                 
                 <div class="cpm-todo-wrap clearfix">
                     <div class="cpm-todo-content" >
@@ -133,7 +133,7 @@
 
                                 <span class='cpm-assigned-user' 
                                     v-for="user in getUsers( task.assigned_to )" 
-                                    v-html="user.user_url">
+                                    v-html="user.user_url" :key="user.ID">
 
                                 </span>
 
@@ -235,7 +235,7 @@
                                 
                                 <span class='cpm-assigned-user' 
                                     v-for="user in getUsers( task.assigned_to )" 
-                                    v-html="user.user_url">
+                                    v-html="user.user_url" :key="user.ID">
 
                                 </span>
 
@@ -313,7 +313,7 @@
 
     <div class="cpm-completed-tasks">
         <ul v-cpm-sortable v-if="is_single_list"  v-cpm-sortable class="cpm-todos cpm-todolist-content cpm-todo-completed">
-            <li :data-id="task.ID" :data-order="task.menu_order" v-for="(task, task_index) in getCompletedTask" :class="'cpm-todo cpm-fade-out-'+task.ID">
+            <li :data-id="task.ID" :data-order="task.menu_order" v-for="(task, task_index) in getCompletedTask" :key="task.ID" :class="'cpm-todo cpm-fade-out-'+task.ID">
                 
                 <div class="cpm-todo-wrap clearfix">
                     <div class="cpm-todo-content" >
@@ -334,7 +334,7 @@
 
                                 <span class='cpm-assigned-user' 
                                     v-for="user in getUsers( task.assigned_to )" 
-                                    v-html="user.user_url">
+                                    v-html="user.user_url" :key="user.ID">
 
                                 </span>