diff --git a/commerce_sales_popup.install b/commerce_sales_popup.install
index 86f1506..9eea977 100644
--- a/commerce_sales_popup.install
+++ b/commerce_sales_popup.install
@@ -133,6 +133,15 @@ function commerce_sales_popup_install() {
       'cardinality' => '1',
       'deleted' => '0',
     ],
+    'sales_popup_cta_label' => [
+      'field_name' => 'sales_popup_cta_label',
+      'type' => 'text',
+      'module' => 'text',
+      'active' => '1',
+      'locked' => '0',
+      'cardinality' => '1',
+      'deleted' => '0',
+    ],
   ];
 
   foreach( $fields as $key => $field ) {
@@ -234,6 +243,25 @@ function commerce_sales_popup_install() {
       ],
       'required' => TRUE,
     ],
+    'sales_popup_cta_label' => [
+      'field_name' => 'sales_popup_cta_label',
+      'label' => $t('CTA label'),
+      'description' => $t('This is going to be button text for modal, or a descriptive text for header.'),
+      'widget' => [
+        'weight' => '33',
+        'type' => 'text_textfield',
+        'module' => 'text',
+        'active' => 1,
+        'settings' => [
+          'size' => 60,
+        ],
+      ],
+      'settings' => [
+        'text_processing' => '0',
+        'user_register_form' => FALSE,
+      ],
+      'required' => TRUE,
+    ],
     'sales_popup_cta' => [
       'field_name' => 'sales_popup_cta',
       'label' => $t('CTA'),
diff --git a/commerce_sales_popup.module b/commerce_sales_popup.module
index 1d9296e..7dfc484 100644
--- a/commerce_sales_popup.module
+++ b/commerce_sales_popup.module
@@ -99,12 +99,12 @@ function commerce_sales_popup_theme() {
   $items['commerce_sales_popup_modal'] = [
     'template' => 'commerce-sales-popup-modal',
     'path' => drupal_get_path('module', 'commerce_sales_popup') . '/templates',
-    'variables' => ['node' => NULL]
+    'variables' => ['node' => NULL],
   ];
   $items['commerce_sales_popup_header'] = [
     'template' => 'commerce-sales-popup-header',
     'path' => drupal_get_path('module', 'commerce_sales_popup') . '/templates',
-    'variables' => ['node' => NULL]
+    'variables' => ['node' => NULL],
   ];
   $items['commerce_sales_extra_links'] = [
     'template' => 'commerce-sales-extra-links',
@@ -112,7 +112,17 @@ function commerce_sales_popup_theme() {
     'variables' => [
       'preview' => NULL,
       'publish' => NULL,
-    ]
+    ],
+  ];
+  $items['commerce_sales_timer_ticking'] = [
+    'template' => 'commerce-sales-timer-ticking',
+    'path' => drupal_get_path('module', 'commerce_sales_popup') . '/templates',
+    'variables' => [],
+  ];
+  $items['commerce_sales_timer_elapsed'] = [
+    'template' => 'commerce-sales-timer-elapsed',
+    'path' => drupal_get_path('module', 'commerce_sales_popup') . '/templates',
+    'variables' => [],
   ];
 
   return $items;
@@ -248,6 +258,14 @@ function commerce_sale_validate_period($wrapper) {
           ]
         ], 'setting');
 
+        $settings = [
+          'commerce_sales_popup' => [
+            'timer_ticking' => theme('commerce_sales_timer_ticking'),
+            'timer_elapsed' => theme('commerce_sales_timer_elapsed'),
+          ],
+        ];
+
+        drupal_add_js($settings, 'setting');
         drupal_add_js(drupal_get_path('module', 'commerce_sales_popup') . '/js/commerce_sales_popup_start_countdown.js', [
           'scope' => 'footer',
           'weight' => 99,
@@ -487,6 +505,7 @@ function commerce_sales_display_popup_modal($wrapper, $key = 0) {
         'background-color' => '#000',
       ],
       'animation' => 'fadeIn',
+      'modalClass' =>  'modal-commerce-sales-popup',
 //      'throbber' => theme('image', ['path' => ctools_image_path('ajax-loader.gif', 'commerce_sales_popup'), 'alt' => t('Loading...'), 'title' => t('Loading')]),
 //      'closeImage' => theme('image', ['path' => ctools_image_path('modal-close.png', 'commerce_sales_popup'), 'alt' => t('Close window'), 'title' => t('Close window')]),
     ],
diff --git a/js/commerce_sales_popup_start_countdown.js b/js/commerce_sales_popup_start_countdown.js
index a028180..3fce084 100644
--- a/js/commerce_sales_popup_start_countdown.js
+++ b/js/commerce_sales_popup_start_countdown.js
@@ -1,11 +1,17 @@
 (function ($, Drupal) {
   Drupal.behaviors.commerce_sales_popup_countdown = {
     attach: function (context, settings) {
+      var final_date = Drupal.settings.commerce_sales_popup.final_date;
+      var ticking = Drupal.settings.commerce_sales_popup.timer_ticking;
+      var elapsed = Drupal.settings.commerce_sales_popup.timer_elapsed;
 
-      $('div[id^="commerce-sales-countdown"]').countdown(Drupal.settings.commerce_sales_popup.final_date, function(event) {
-        $(this).html(
-          event.strftime('%D days , %H Hrs , %M Min , %S Sec')
-        );
+      $('div[id^="commerce-sales-countdown"]').countdown(final_date, function(event) {
+        if (event.elapsed) {
+          $(this).html(event.strftime(elapsed));
+        }
+        else {
+          $(this).html(event.strftime(ticking));
+        }
       });
     }
   };
diff --git a/templates/commerce-sales-popup-header.tpl.php b/templates/commerce-sales-popup-header.tpl.php
index 25431cb..ebb939d 100644
--- a/templates/commerce-sales-popup-header.tpl.php
+++ b/templates/commerce-sales-popup-header.tpl.php
@@ -8,10 +8,9 @@
  * - $node: Sales popup node.
  */
 
-$title = $node->title;
 $image = image_style_url('commerce_sales_popup_header', $node->sales_popup_header_image[LANGUAGE_NONE][0]['uri']);
-$text = $node->body[LANGUAGE_NONE][0]['value'];
 $cta = $node->sales_popup_cta[LANGUAGE_NONE][0]['value'];
+$cta_label = $node->sales_popup_cta_label[LANGUAGE_NONE][0]['value'];
 $classes = "commerce-sale-header-entity commerce-sale-header-entity-" . $node->nid;
 ?>
 
@@ -25,7 +24,7 @@ $classes = "commerce-sale-header-entity commerce-sale-header-entity-" . $node->n
   </div>
 
   <div id="sales-header-text">
-    <?php print $text; ?>
+    <?php print $cta_label; ?>
   </div>
 
   <div id="commerce-sales-countdown"></div>
diff --git a/templates/commerce-sales-popup-modal.tpl.php b/templates/commerce-sales-popup-modal.tpl.php
index 583f31b..b5e688e 100644
--- a/templates/commerce-sales-popup-modal.tpl.php
+++ b/templates/commerce-sales-popup-modal.tpl.php
@@ -12,6 +12,7 @@ $title = $node->title;
 $image = image_style_url('commerce_sales_popup_modal', $node->sales_popup_modal_image[LANGUAGE_NONE][0]['uri']);
 $text = $node->body[LANGUAGE_NONE][0]['value'];
 $cta = $node->sales_popup_cta[LANGUAGE_NONE][0]['value'];
+$cta_label = $node->sales_popup_cta_label[LANGUAGE_NONE][0]['value'];
 ?>
 
 <div class="sales-modal-container">
@@ -30,7 +31,7 @@ $cta = $node->sales_popup_cta[LANGUAGE_NONE][0]['value'];
   <div id="commerce-sales-countdown"></div>
 
   <div id="sales-modal-cta">
-    <?php print $title; ?>
+    <?php print $cta_label; ?>
   </div>
 
   <?php if(!empty($cta)): ?>