diff --git a/e107_admin/cron.php b/e107_admin/cron.php
index d8bc114de..b21be360b 100644
--- a/e107_admin/cron.php
+++ b/e107_admin/cron.php
@@ -69,7 +69,7 @@ class cron_admin_ui extends e_admin_ui
          	'cron_tab'			=> array('title'=> LAN_CRON_3,		'type' => 'method',			'width' => 'auto'), // Display name
 		 	'cron_lastrun'		=> array('title'=> LAN_CRON_4,		'type' => 'datestamp',		'data' => 'int',	'width' => 'auto', 'readonly' => 2),	
      		'cron_active' 		=> array('title'=> LAN_ACTIVE,		'type' => 'boolean',		'data'=> 'int', 'thclass' => 'center', 'class'=>'center', 'filter' => true, 'batch' => true,	'width' => 'auto'),
-			'options' 			=> array('title'=> LAN_OPTIONS,		'type' => 'method',			'data'=> null, 'noedit'=>TRUE, 'forced'=>TRUE, 'width' => '10%', 'thclass' => 'center last', 'class' => 'center')
+			'options' 			=> array('title'=> LAN_OPTIONS,		'type' => 'method',			'data'=> null, 'noedit'=>TRUE, 'forced'=>TRUE, 'width' => '10%', 'thclass' => 'center last', 'class' => 'right')
 		);
 		
 		
@@ -566,13 +566,22 @@ class cron_admin_form_ui extends e_admin_form_ui
 	// Override the default Options field. 
 	function options($parms, $value, $id, $attributes)
 	{
-		
+		$att = $attributes;
 		if($attributes['mode'] == 'read')
 		{
-			$text = "<div class='btn-group'>";
-			$text .= $this->renderValue('options',$value,'',$id);
+			$func = $this->getController()->getFieldVar('cron_function');
+		//
+			if(substr($func,0,7) === '_system')
+			{
+				$att['readParms'] = array('disabled'=>'disabled');
+			}
+
+			$text = "<div class='btn-group pull-right'>";
+			$text .= $this->renderValue('options',$value,$att,$id);
 			$text .= $this->submit_image('cron_execute['.$id.']', 1, 'execute', LAN_RUN);
 			$text .= "</div>";
+
+
 			return $text;
 		}
 	}
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index 2a2212b7a..e68c38d06 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -3965,12 +3965,15 @@ e107::getDebug()->log($sc_parameters);
 						$cls = (deftrue($parms['deleteClass'])) ? constant($parms['deleteClass']) : $parms['deleteClass'];
 						if(check_class($cls))
 						{
-							$value .= $this->submit_image('etrigger_delete['.$id.']', $id, 'delete', LAN_DELETE.' [ ID: '.$id.' ]', array('class' => 'action delete btn btn-default'.$delcls));
+							$parms['class'] =  'action delete btn btn-default'.$delcls;
+							unset($parms['deleteClass']);
+							$value .= $this->submit_image('etrigger_delete['.$id.']', $id, 'delete', LAN_DELETE.' [ ID: '.$id.' ]', $parms);
 						}
 					}
 					else
 					{
-						$value .= $this->submit_image('etrigger_delete['.$id.']', $id, 'delete', LAN_DELETE.' [ ID: '.$id.' ]', array('class' => 'action delete btn btn-default'.$delcls));
+						$parms['class'] =  'action delete btn btn-default'.$delcls;
+						$value .= $this->submit_image('etrigger_delete['.$id.']', $id, 'delete', LAN_DELETE.' [ ID: '.$id.' ]', $parms);
 					}
 				}
 				//$attributes['type'] = 'text';