diff --git a/CRM/Civirules/BAO/Condition.php b/CRM/Civirules/BAO/Condition.php
index 9a24cd2b1524dc1f04428af13767f3a513db5cd7..9563b266368b9639d5e1ca2a934c67aeb9bf228c 100755
--- a/CRM/Civirules/BAO/Condition.php
+++ b/CRM/Civirules/BAO/Condition.php
@@ -150,7 +150,7 @@ class CRM_Civirules_BAO_Condition extends CRM_Civirules_DAO_Condition {
       return false;
     }
 
-    $className = $condition->className;
+    $className = $condition->class_name;
     if (!class_exists($className)) {
       if ($abort) {
 
diff --git a/CRM/Civirules/BAO/RuleCondition.php b/CRM/Civirules/BAO/RuleCondition.php
index 2a67327961d9e18d48314ac5d10120f1c9618ed7..e2a5f68e0371fb86865b9ef0bedae67f31a1834f 100755
--- a/CRM/Civirules/BAO/RuleCondition.php
+++ b/CRM/Civirules/BAO/RuleCondition.php
@@ -129,4 +129,17 @@ class CRM_Civirules_BAO_RuleCondition extends CRM_Civirules_DAO_RuleCondition {
     }
   }
 
+  /**
+   * Function to count the number of conditions for a rule
+   *
+   * @param int $ruleId
+   * @return int
+   * @access public
+   * @static
+   */
+  public static function countConditionsForRule($ruleId) {
+    $ruleCondition = new CRM_Civirules_BAO_RuleCondition();
+    $ruleCondition->rule_id = $ruleId;
+    return $ruleCondition->count();
+  }
 }
\ No newline at end of file
diff --git a/CRM/Civirules/Form/RuleCondition.php b/CRM/Civirules/Form/RuleCondition.php
index f20e1b00f8e42634da54c33b36741279a88d8793..988ce1ba90b88f6b089ab9f7d86b93bf622ceb9e 100755
--- a/CRM/Civirules/Form/RuleCondition.php
+++ b/CRM/Civirules/Form/RuleCondition.php
@@ -31,6 +31,7 @@ class CRM_Civirules_Form_RuleCondition extends CRM_Core_Form {
    */
   function preProcess() {
     $this->ruleId = CRM_Utils_Request::retrieve('rid', 'Integer');
+    $this->assign('countRuleConditions', CRM_Civirules_BAO_RuleCondition::countConditionsForRule($this->ruleId));
     if ($this->_action == CRM_Core_Action::DELETE) {
       $ruleConditionId = CRM_Utils_Request::retrieve('id', 'Integer');
       CRM_Civirules_BAO_RuleCondition::deleteWithId($ruleConditionId);
diff --git a/templates/CRM/Civirules/Form/RuleBlocks/ConditionBlock.tpl b/templates/CRM/Civirules/Form/RuleBlocks/ConditionBlock.tpl
index 4ee6cca10c017ecf5af636a39803bc80f29187cd..ecf16b895df795bf3dfdb7da47aa9471e23aa68f 100755
--- a/templates/CRM/Civirules/Form/RuleBlocks/ConditionBlock.tpl
+++ b/templates/CRM/Civirules/Form/RuleBlocks/ConditionBlock.tpl
@@ -8,7 +8,7 @@
         <thead>
           <tr>
             <th>{ts}Link operator{/ts}</th>
-            <th>{ts}Conidtion{/ts}</th>
+            <th>{ts}Condition{/ts}</th>
             <th>{ts}Description{/ts}</th>
             <th>&nbsp;</th>
         </tr>
@@ -17,9 +17,15 @@
           {assign var="row_class" value="odd-row"}
           {foreach from=$ruleConditions key=ruleConditionIid item=ruleCondition}
             <tr class={$row_class}>
-              <td>{$ruleCondition.condition_link}</td>
+              {if $countRuleConditions > 0}
+                <td>{$ruleCondition.condition_link}</td>
+              {/if}
               <td>{$ruleCondition.name}</td>
-              <td>{if !empty($ruleCondition.formattedConditionParams)}{$ruleCondition.formattedConditionParams}{/if}</td>
+              <td>
+                {if !empty($ruleCondition.formattedConditionParams)}
+                  {$ruleCondition.formattedConditionParams}
+                {/if}
+              </td>
               <td>
                 <span>
                   {foreach from=$ruleCondition.actions item=action_link}