diff --git a/src/components/grid.ts b/src/components/grid.ts
index 00ae23f9..cabb2896 100644
--- a/src/components/grid.ts
+++ b/src/components/grid.ts
@@ -49,7 +49,7 @@ export default class Grid {
 
             let current: any = $(item);
 
-            if (current.next().length === 0)                
+            if (current.next().length === 0 && current.children("a").length === 0)                
                 return;
 
             var mergedContent:any;
diff --git a/src/mvc/formAction.ts b/src/mvc/formAction.ts
index bf463c11..5182551a 100644
--- a/src/mvc/formAction.ts
+++ b/src/mvc/formAction.ts
@@ -4,7 +4,6 @@ import MasterDetail from 'olive/components/masterDetail'
 import Form from 'olive/components/form'
 import Url from 'olive/components/url'
 import Config from "olive/config"
-import AjaxRedirect from 'olive/mvc/ajaxRedirect'
 import StandardAction from 'olive/mvc/standardAction'
 import LiteEvent from 'olive/components/liteEvent'
 
diff --git a/src/plugins/datePicker.ts b/src/plugins/datePicker.ts
index 433d570f..dff30784 100644
--- a/src/plugins/datePicker.ts
+++ b/src/plugins/datePicker.ts
@@ -27,7 +27,11 @@ export default class DatePicker {
                 format: Config.DATE_FORMAT,
                 useCurrent: false,
                 showTodayButton: true,
-                icons: { today: 'today' },
+                icons: { 
+                    today: "fa fa-calendar",
+                    next: "fa fa-chevron-right",
+                    previous: "fa fa-chevron-left"
+                 },
                 viewMode: viewMode,
                 keepInvalid: this.input.closest("form").find("[data-change-action]").length == 0,
                 locale: Config.DATE_LOCALE
diff --git a/src/plugins/dateTimePicker.ts b/src/plugins/dateTimePicker.ts
index fbd001d5..a28a8069 100644
--- a/src/plugins/dateTimePicker.ts
+++ b/src/plugins/dateTimePicker.ts
@@ -1,8 +1,6 @@
 
 import Modal from "olive/components/modal"
 import Config from "olive/config"
-import DatePicker from "olive/plugins/datePicker";
-import TimeControl from "olive/plugins/timeControl";
 
 export default class DateTimePicker {
     input: any;
@@ -29,8 +27,18 @@ export default class DateTimePicker {
                     sideBySide: true,
                     format: Config.DATE_TIME_FORMAT,
                     useCurrent: false,
-                    showTodayButton: true,
-                    icons: { today: 'Date' },
+                    showTodayButton: true,                    
+                    showClear: true,
+                    icons: { 
+                        today: "fa fa-calendar",
+                        clear: "fa fa-eraser",
+                        time: "fa fa-clock-o",
+                        date: "fa fa-calendar",
+                        up: "fa fa-chevron-up",
+                        down: "fa fa-chevron-down",
+                        next: "fa fa-chevron-right",
+                        previous: "fa fa-chevron-left"
+                     },
                     keepInvalid: this.input.closest("form").find("[data-change-action]").length == 0,
                     locale: Config.DATE_LOCALE
              }