diff --git a/app/assets/javascripts/light/StreamTable.js b/app/assets/javascripts/light/StreamTable.js
deleted file mode 100644
index bc334d5..0000000
--- a/app/assets/javascripts/light/StreamTable.js
+++ /dev/null
@@ -1,545 +0,0 @@
-/*
- * StreamTable.js
- * version: 1.1.1 (17/12/2013)
- *
- * Licensed under the MIT:
- *   http://www.opensource.org/licenses/mit-license.php
- *
- * Copyright 2013 Jiren Patel[ jiren@joshsoftware.com ]
- *
- * Dependency:
- *  jQuery(v1.8 >=)
- */
-
-(function(window, $) {
-
-  'use strict';
-
-  var StreamTable = function(container, opts, data) {
-    return new _StreamTable(container, opts, data);
-  };
-
-  StreamTable.VERSION = '1.1.0';
-
-  $.fn.stream_table = function (opts, data) {
-    var $this = $(this);
-    if ($this.data('st')) return;
-    $this.data('st', new _StreamTable($this.selector, opts, data));
-  };
-
-  window.StreamTable = StreamTable;
-
-  var _StreamTable = function(container, opts, data) {
-    this.data = [];
-    this.main_container = container;
-    this.$container = $(container);
-    this.opts = opts;
-    this.view = this.opts.view;
-    this.text_index = [];
-    this.last_search_result = [];
-    this.last_search_text = '';
-    this.current_page = 0;
-    this.textFunc = null;
-    this.stream_after = (this.opts.stream_after || 2)*1000;
-    this.timer = null;
-    this.opts.callbacks = this.opts.callbacks || {};
-
-    if (!this.view) $.error('Add view function in options.');
-
-    if (this.$container.get(0).tagName == 'TABLE') this.$container = this.$container.find('tbody');
-
-    this.initPagination(this.opts.pagination || {});
-    this.addSearchBox();
-    this.addPerPage();
-    this.has_sorting =  $(this.main_container + ' [data-sort]').length > 0 ? true : false;
-
-    if (this.has_sorting) {
-      this.sorting_opts = {};
-      this.records_index = [];
-      this.last_search_record_index = [];
-    }
-
-    if (data) {
-      data = this.addData(data);
-      this.render(0);
-    }
-
-    this.bindEvents();
-    this.bindSortingEvents();
-    this.streamData(this.stream_after);
-  }
-
-  var _F = _StreamTable.prototype;
-
-  _F.getIndex = function(){
-    return this.last_search_text.length > 0 ? this.last_search_record_index : this.records_index
-  };
-
-  _F.getData = function(){
-    return this.last_search_text.length > 0 ? this.last_search_result : this.data;
-  };
-
-  _F.dataLength = function(){
-    return this.has_sorting ? this.getIndex().length : this.getData().length;
-  }
-
-  _F.initPagination = function(opts){
-    this.paging_opts = $.extend({
-      span: 5,
-      prev_text: '«',
-      next_text: '«',
-      per_page_select: true,
-      per_page_opts: [10,25,50]
-    }, opts);
-
-    var p_classes = ['st_pagination'];
-
-    if (opts.container_class){
-      p_classes = [].concat.apply(p_classes, [opts.container_class])
-    }
-
-    this.paging_opts.per_page = this.paging_opts.per_page_opts[0] || 10;
-    this.paging_opts.container_class = p_classes.join(' ');
-    this.paging_opts.ul_class = ['pagination', opts.ul_class].join(' ');
-    this.paging_opts.per_page_class = ['st_per_page', opts.per_page_class].join(' ');
-    this.opts.pagination = this.paging_opts;
-
-    var html = '<div class="'+ this.paging_opts.container_class  +'"></div>';
-
-    if(this.paging_opts.container){
-      $(this.paging_opts.container).html(html);
-    }else{
-      $(this.main_container).after(html);
-    }
-
-    this.$pagination = $('.' + p_classes.join('.'));
-  };
-
-  _F.bindEvents = function(){
-    var _self = this,
-        search_box = this.opts.search_box;
-
-    $(search_box).on('keyup', function(e){
-      _self.search($(this).val());
-    });
-
-    $(search_box).on('keypress', function(e){
-      if ( e.keyCode == 13 ) return false;
-    });
-
-    if (_self.paging_opts.per_page_select){
-      $(_self.paging_opts.per_page_select).on('change', function(){
-        _self.renderByPerPage($(this).val());
-      });
-    }
-
-    _self.$pagination.on('click', 'a', function(e){
-      var $this = $(this), page = parseInt($this.text()), current_page;
-
-      if (page.toString() == 'NaN'){
-        if ($this.hasClass('prev')) page = 'prev';
-        else if ($this.hasClass('next')) page = 'next';
-        else if ($this.hasClass('first')) page = 1;
-        else if ($this.hasClass('last')) page = _self.pageCount();
-      }
-
-      current_page = _self.paginate(page);
-      if (current_page >= 0) {
-        $('.st_pagination .active').removeClass('active');
-        $('.st_pagination li[data-page='+ current_page +']').addClass('active');
-      }
-
-      return false;
-    });
-
-  };
-
-  _F.addSearchBox = function(){
-    if (this.opts.search_box) return;
-    $(this.main_container).before('<input name="search" type="text" id="st_search" class="st_search" placeholder="Search here...">');
-    this.opts.search_box = '#st_search';
-  };
-
-  _F._makeTextFunc = function(record){
-    var fields = this.opts.fields, cond_str = [], textFunc, is_array = false;
-
-    if(typeof fields == 'function'){
-       textFunc = fields;
-    } else if (record.constructor == Object){
-      fields = fields || Object.keys(record)
-
-      for (var i = 0, l = fields.length; i < l; i++){
-        cond_str.push("d."+ fields[i]);
-      }
-      eval("textFunc = function(d) { return (" + cond_str.join(" + ' ' + ") + "); }");
-    }else{
-      if (fields){
-        for(var i = 0, l = fields.length; i < l ; i++){
-          cond_str.push("d["+ fields[i] + "]");
-        }
-        eval("textFunc = function(d) { return (" + cond_str.join(" + ' ' + ") + "); }");
-      }else{
-        textFunc = function(d) {
-          return d.join(' ');
-        }
-      }
-    }
-
-    return textFunc;
-  };
-
-  _F.buildTextIndex = function(data){
-    var i = 0, l = data.length;
-
-    if (!this.textFunc) {
-      this.textFunc = this._makeTextFunc(data[0]);
-    }
-
-    for(i; i < l; i++){
-      this.text_index.push(this.textFunc(data[i]).toUpperCase());
-    }
-  };
-
-  _F.render = function(page){
-    var i = (page * this.paging_opts.per_page),
-        l = (i + this.paging_opts.per_page),
-        eles = [],
-        index,
-        d = this.has_sorting ? this.getIndex() : this.getData();
-
-    if (d.length < l) l = d.length;
-
-    if (this.has_sorting){
-      for (i; i < l; i++){
-        eles.push(this.view(this.data[d[i]], (i+1)));
-      }
-    }else{
-      for (i; i < l; i++){
-        eles.push(this.view(d[i], (i+1)));
-      }
-    }
-
-    this.$container.html(eles);
-  };
-
-  _F.clearAndBuildTextIndex = function(data){
-    this.text_index = []
-    this.buildTextIndex(data)
-  };
-
-  _F.search = function(text){
-    var q = $.trim(text), count = 0;
-
-    if (q == this.last_search_text) return;
-
-    this.last_search_text = q;
-
-    if(q.length == 0 ){
-      this.render(0);
-    }else{
-      this.searchInData(q);
-      this.render(0);
-    }
-
-    this.current_page = 0;
-    this.renderPagination(this.pageCount(), this.current_page);
-    this.execCallbacks('pagination');
-  };
-
-  _F.searchInData = function(text){
-    var result = [],
-        i = 0,
-        l = this.text_index.length,
-        t = text.toUpperCase(),
-        d = this.has_sorting ? this.records_index : this.data;
-
-    if(this.has_sorting){
-      for (i; i < l; i++){
-        if (this.text_index[i].indexOf(t) != -1) result.push(i);
-      }
-      this.last_search_record_index = result
-    }else{
-      for (i; i < l; i++){
-        if (this.text_index[i].indexOf(t) != -1) result.push(this.data[i]);
-      }
-      this.last_search_result = result
-    }
-
-  };
-
-  _F.addData = function(data){
-    data = this.execCallbacks('before_add', data) || data;
-
-    if (data.length){
-      var i = this.data.length, l = data.length + i;
-
-      this.buildTextIndex(data);
-      this.data = this.data.concat(data);
-
-      if(this.has_sorting){
-        for(i; i < l; i++){
-          this.records_index.push(i);
-        }
-      }
-
-      if (this.last_search_text.length > 0){
-        this.searchInData(this.last_search_text);
-      }
-
-      if (this.opts.auto_sorting && this.current_sorting){
-        this.sort(this.current_sorting);
-      }
-
-      this.render(this.current_page);
-      this.renderPagination(this.pageCount(), this.current_page);
-      this.execCallbacks('after_add', data);
-      this.execCallbacks('pagination');
-    }
-
-    return data;
-  };
-
-  _F.fetchData = function(){
-    var _self = this, params = {q: this.last_search_text}
-
-    if (this.opts.fetch_data_limit) {
-      params['limit'] = this.opts.fetch_data_limit;
-      params['offset'] = this.data.length;
-    }
-
-    $.getJSON(this.opts.data_url, params).done(function(data){
-      data = _self.addData(data);
-
-      if (params.limit != null && (!data || !data.length ) ) {
-        _self.stopStreaming();
-      }else{
-        _self.setStreamInterval();
-      }
-
-    }).fail(function(e){
-      _self.stopStreaming();
-    });
-  };
-
-  _F.setStreamInterval = function(){
-    var _self = this;
-    if(_self.opts.stop_streaming == true) return;
-
-    _self.timer = setTimeout(function(){
-      _self.fetchData();
-    }, _self.stream_after);
-  };
-
-  _F.stopStreaming = function(){
-    this.opts.stop_streaming = true;
-    if (this.timer) clearTimeout(this.timer);
-  };
-
-  _F.streamData = function(time){
-    if (!this.opts.data_url) return;
-    var _self = this, timer;
-
-    _self.setStreamInterval();
-
-    if(!_self.opts.fetch_data_limit) _self.stopStreaming();
-  };
-
-  _F.pageCount = function(){
-    return Math.ceil(this.dataLength()/this.paging_opts.per_page);
-  };
-
-  //Render table rows for given page
-  _F.paginate = function(page){
-    var page_count = this.pageCount();
-
-    if(page == 'prev'){
-      page = this.current_page - 1;
-    }else if (page == 'next'){
-      page = this.current_page + 1;
-    }else {
-      page = page - 1;
-    }
-
-    if (page == this.current_page || page < 0 || page >= page_count) return;
-
-    this.render(page);
-    this.current_page = page;
-
-    if (this.paging_opts.span <= page_count) this.renderPagination(page_count, this.current_page);
-
-    this.execCallbacks('pagination');
-
-    return this.current_page;
-  };
-
-  // Render Pagination call after new data added or search
-  _F.renderPagination = function(page_count, current_page){
-    var i = 0,
-        l = page_count,
-        links = [ '<ul class="'+ this.paging_opts.ul_class +'">'],
-        span = this.paging_opts.span,
-        center = Math.ceil(span/2);
-
-    if (page_count > span){
-      links.push('<li><a href="#" class="first">First</a></li>');
-      if (current_page > (center - 1) ) i = current_page - center;
-      if (current_page < (page_count - center - 1) ) l = i + span;
-    }
-
-    links.push('<li><a href="#" class="prev">'+ this.paging_opts.prev_text +'</a></li>');
-
-    for(i; i < l; i++){
-      if(current_page == i){
-        links.push('<li class="active" data-page="'+ i +'"><a href="#" class="active" >'+ (i + 1) +'</a></li>');
-      }else{
-        links.push('<li  data-page="'+ i +'"><a href="#">'+ (i + 1) +'</a></li>');
-      }
-    }
-
-    links.push('<li><a href="#" class="next">'+ this.paging_opts.next_text + '</a></li>');
-
-    if (page_count > this.paging_opts.span) links.push('<li><a href="#" class="last">Last</a></li>');
-
-    links.push('</ul>');
-    this.$pagination.html(links.join(''));
-  };
-
-  _F.addPerPage = function(){
-    var per_page_select = this.paging_opts.per_page_select, html, arr;
-
-    if (per_page_select === false || typeof per_page_select == 'string') return;
-    this.paging_opts.per_page_select = '.st_per_page';
-
-    html = ['<select size="1" name="per_page" class="'+ this.paging_opts.per_page_class +'">'];
-    arr = this.paging_opts.per_page_opts;
-
-    for(var i = 0, l = arr.length; i < l; i ++)
-        html.push('<option value="'+ arr[i] + '">'+ arr[i] +'</option>');
-
-    html.push('</select>');
-    $(this.main_container).before(html.join(''));
-  };
-
-  _F.renderByPerPage = function(per_page){
-    if (this.paging_opts.per_page == per_page) return;
-
-    this.paging_opts.per_page = parseInt(per_page);
-    this.current_page = 0;
-    this.render(0)
-    this.renderPagination(this.pageCount(), 0);
-    this.execCallbacks('pagination');
-  };
-
-  _F.execCallbacks = function(type, args){
-    var callback = this.opts.callbacks[type];
-
-    if (!callback) return;
-
-    if (type == 'pagination'){
-      var f = this.paging_opts.per_page * this.current_page;
-      args = {
-        from:  (f + 1),
-        to:    (this.paging_opts.per_page + f),
-        total: this.dataLength(),
-        page:  this.current_page
-      }
-
-      if (args['total'] == 0) args['from'] = 0;
-      if (args['to'] > args['total']) args['to'] = args['total'];
-    }
-
-    return callback.call(this, args);
-  };
-
-  _F.bindSortingEvents = function(){
-    var _self = this;
-
-    $(this.main_container + ' [data-sort]').each(function(i){
-      var $el = $(this)
-          ,arr = $el.data('sort').split(':')
-          ,data = { dir: arr[1] || 'asc',
-                    type: arr[2] || 'string',
-                    field: arr[0] };
-
-      _self.sorting_opts[data.field] = {dir: data.dir, type: data.type, field: data.field }
-
-      $el.on('click', data, function(e){
-        var $this = $(this);
-
-        $this.addClass(e.data.dir);
-        _self.current_sorting = {dir: e.data.dir, type: e.data.type, field: e.data.field};
-        _self.sort(e.data);
-        _self.render(_self.current_page);
-
-        e.data.dir = e.data.dir == 'asc' ? 'desc' : 'asc';
-        $(this).removeClass(e.data.dir);
-
-        if(_self.opts.callbacks['after_sort'])
-          _self.execCallbacks('after_sort');
-      });
-
-      //Start sorting initialy.
-      if(i == 0 && _self.opts.auto_sorting) {
-        $el.trigger('click');
-      }
-    });
-  };
-
-  _F.sort = function(options){
-    options.order = options.dir == 'asc' ? 1 : -1;
-
-    return this.getIndex().sort(this._sortingFunc(this.data, options));
-  };
-
-  _F._sortingFunc = function(data, options){
-    var field = options.field, order = options.order, type = options.type;
-
-    //return this.sortingFuntions[type];
-
-    if (type ==  'number'){
-      return function(i, j){
-       return (data[i][field] - data[j][field]) * order;
-      }
-    }
-
-    return function(i, j){
-      var t1 = data[i][field].toLowerCase()
-        ,t2 = data[j][field].toLowerCase();
-
-      if (t1 < t2) return (-1 * order);
-      if (t1 > t2) return (1 * order);
-      return 0;
-    }
-  };
-
-  _F.clear = function(){
-    if (this.opts.search_box) { $(this.opts.search_box).html('')};
-    $(this.main_container).html('');
-  };
-
-  StreamTable.extend = function (name, f ) {
-    _StreamTable.prototype[name] = function () {
-      return f.apply( this, arguments );
-    };
-  };
-
-})(this, window.jQuery)
-
-//In IE indexOf method not define.
-if (!Array.prototype.indexOf) {
-  Array.prototype.indexOf = function(obj, start) {
-    for (var i = (start || 0), j = this.length; i < j; i++) {
-      if (this[i] === obj) { return i; }
-    }
-    return -1;
-  }
-}
-
-if (!Object.keys) {
-  Object.keys = function(obj){
-    var f, fields = [];
-    for(f in obj) fields.push(f);
-    return fields;
-  }
-}
-
diff --git a/app/assets/javascripts/light/application.js b/app/assets/javascripts/light/application.js
index cea679e..44d8331 100644
--- a/app/assets/javascripts/light/application.js
+++ b/app/assets/javascripts/light/application.js
@@ -16,7 +16,6 @@
 //= require bootstrap
 //= require bootstrap-datepicker
 //= require select2
-// require bootstrap-datepicker-rails
 //= require redactor-rails
 //= require redactor-rails/plugins
 //= require_tree .
diff --git a/app/assets/javascripts/light/mustache.js b/app/assets/javascripts/light/mustache.js
deleted file mode 100644
index d054e61..0000000
--- a/app/assets/javascripts/light/mustache.js
+++ /dev/null
@@ -1,578 +0,0 @@
-/*!
-* mustache.js - Logic-less {{mustache}} templates with JavaScript
-* http://github.com/janl/mustache.js
-*/
-
-/*global define: false*/
-
-(function (global, factory) {
-  if (typeof exports === "object" && exports) {
-    factory(exports); // CommonJS
-  } else if (typeof define === "function" && define.amd) {
-    define(['exports'], factory); // AMD
-  } else {
-    factory(global.Mustache = {}); // <script>
-  }
-}(this, function (mustache) {
-
-  var Object_toString = Object.prototype.toString;
-  var isArray = Array.isArray || function (object) {
-    return Object_toString.call(object) === '[object Array]';
-  };
-
-  function isFunction(object) {
-    return typeof object === 'function';
-  }
-
-  function escapeRegExp(string) {
-    return string.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&");
-  }
-
-  // Workaround for https://issues.apache.org/jira/browse/COUCHDB-577
-  // See https://github.com/janl/mustache.js/issues/189
-  var RegExp_test = RegExp.prototype.test;
-  function testRegExp(re, string) {
-    return RegExp_test.call(re, string);
-  }
-
-  var nonSpaceRe = /\S/;
-  function isWhitespace(string) {
-    return !testRegExp(nonSpaceRe, string);
-  }
-
-  var entityMap = {
-    "&": "&amp;",
-    "<": "&lt;",
-    ">": "&gt;",
-    '"': '&quot;',
-    "'": '&#39;',
-    "/": '&#x2F;'
-  };
-
-  function escapeHtml(string) {
-    return String(string).replace(/[&<>"'\/]/g, function (s) {
-      return entityMap[s];
-    });
-  }
-
-  var whiteRe = /\s*/;
-  var spaceRe = /\s+/;
-  var equalsRe = /\s*=/;
-  var curlyRe = /\s*\}/;
-  var tagRe = /#|\^|\/|>|\{|&|=|!/;
-
-  /**
-* Breaks up the given `template` string into a tree of tokens. If the `tags`
-* argument is given here it must be an array with two string values: the
-* opening and closing tags used in the template (e.g. [ "<%", "%>" ]). Of
-* course, the default is to use mustaches (i.e. mustache.tags).
-*
-* A token is an array with at least 4 elements. The first element is the
-* mustache symbol that was used inside the tag, e.g. "#" or "&". If the tag
-* did not contain a symbol (i.e. {{myValue}}) this element is "name". For
-* all text that appears outside a symbol this element is "text".
-*
-* The second element of a token is its "value". For mustache tags this is
-* whatever else was inside the tag besides the opening symbol. For text tokens
-* this is the text itself.
-*
-* The third and fourth elements of the token are the start and end indices,
-* respectively, of the token in the original template.
-*
-* Tokens that are the root node of a subtree contain two more elements: 1) an
-* array of tokens in the subtree and 2) the index in the original template at
-* which the closing tag for that section begins.
-*/
-  function parseTemplate(template, tags) {
-    if (!template)
-      return [];
-
-    var sections = []; // Stack to hold section tokens
-    var tokens = []; // Buffer to hold the tokens
-    var spaces = []; // Indices of whitespace tokens on the current line
-    var hasTag = false; // Is there a {{tag}} on the current line?
-    var nonSpace = false; // Is there a non-space char on the current line?
-
-    // Strips all whitespace tokens array for the current line
-    // if there was a {{#tag}} on it and otherwise only space.
-    function stripSpace() {
-      if (hasTag && !nonSpace) {
-        while (spaces.length)
-          delete tokens[spaces.pop()];
-      } else {
-        spaces = [];
-      }
-
-      hasTag = false;
-      nonSpace = false;
-    }
-
-    var openingTagRe, closingTagRe, closingCurlyRe;
-    function compileTags(tags) {
-      if (typeof tags === 'string')
-        tags = tags.split(spaceRe, 2);
-
-      if (!isArray(tags) || tags.length !== 2)
-        throw new Error('Invalid tags: ' + tags);
-
-      openingTagRe = new RegExp(escapeRegExp(tags[0]) + '\\s*');
-      closingTagRe = new RegExp('\\s*' + escapeRegExp(tags[1]));
-      closingCurlyRe = new RegExp('\\s*' + escapeRegExp('}' + tags[1]));
-    }
-
-    compileTags(tags || mustache.tags);
-
-    var scanner = new Scanner(template);
-
-    var start, type, value, chr, token, openSection;
-    while (!scanner.eos()) {
-      start = scanner.pos;
-
-      // Match any text between tags.
-      value = scanner.scanUntil(openingTagRe);
-
-      if (value) {
-        for (var i = 0, valueLength = value.length; i < valueLength; ++i) {
-          chr = value.charAt(i);
-
-          if (isWhitespace(chr)) {
-            spaces.push(tokens.length);
-          } else {
-            nonSpace = true;
-          }
-
-          tokens.push([ 'text', chr, start, start + 1 ]);
-          start += 1;
-
-          // Check for whitespace on the current line.
-          if (chr === '\n')
-            stripSpace();
-        }
-      }
-
-      // Match the opening tag.
-      if (!scanner.scan(openingTagRe))
-        break;
-
-      hasTag = true;
-
-      // Get the tag type.
-      type = scanner.scan(tagRe) || 'name';
-      scanner.scan(whiteRe);
-
-      // Get the tag value.
-      if (type === '=') {
-        value = scanner.scanUntil(equalsRe);
-        scanner.scan(equalsRe);
-        scanner.scanUntil(closingTagRe);
-      } else if (type === '{') {
-        value = scanner.scanUntil(closingCurlyRe);
-        scanner.scan(curlyRe);
-        scanner.scanUntil(closingTagRe);
-        type = '&';
-      } else {
-        value = scanner.scanUntil(closingTagRe);
-      }
-
-      // Match the closing tag.
-      if (!scanner.scan(closingTagRe))
-        throw new Error('Unclosed tag at ' + scanner.pos);
-
-      token = [ type, value, start, scanner.pos ];
-      tokens.push(token);
-
-      if (type === '#' || type === '^') {
-        sections.push(token);
-      } else if (type === '/') {
-        // Check section nesting.
-        openSection = sections.pop();
-
-        if (!openSection)
-          throw new Error('Unopened section "' + value + '" at ' + start);
-
-        if (openSection[1] !== value)
-          throw new Error('Unclosed section "' + openSection[1] + '" at ' + start);
-      } else if (type === 'name' || type === '{' || type === '&') {
-        nonSpace = true;
-      } else if (type === '=') {
-        // Set the tags for the next time around.
-        compileTags(value);
-      }
-    }
-
-    // Make sure there are no open sections when we're done.
-    openSection = sections.pop();
-
-    if (openSection)
-      throw new Error('Unclosed section "' + openSection[1] + '" at ' + scanner.pos);
-
-    return nestTokens(squashTokens(tokens));
-  }
-
-  /**
-* Combines the values of consecutive text tokens in the given `tokens` array
-* to a single token.
-*/
-  function squashTokens(tokens) {
-    var squashedTokens = [];
-
-    var token, lastToken;
-    for (var i = 0, numTokens = tokens.length; i < numTokens; ++i) {
-      token = tokens[i];
-
-      if (token) {
-        if (token[0] === 'text' && lastToken && lastToken[0] === 'text') {
-          lastToken[1] += token[1];
-          lastToken[3] = token[3];
-        } else {
-          squashedTokens.push(token);
-          lastToken = token;
-        }
-      }
-    }
-
-    return squashedTokens;
-  }
-
-  /**
-* Forms the given array of `tokens` into a nested tree structure where
-* tokens that represent a section have two additional items: 1) an array of
-* all tokens that appear in that section and 2) the index in the original
-* template that represents the end of that section.
-*/
-  function nestTokens(tokens) {
-    var nestedTokens = [];
-    var collector = nestedTokens;
-    var sections = [];
-
-    var token, section;
-    for (var i = 0, numTokens = tokens.length; i < numTokens; ++i) {
-      token = tokens[i];
-
-      switch (token[0]) {
-      case '#':
-      case '^':
-        collector.push(token);
-        sections.push(token);
-        collector = token[4] = [];
-        break;
-      case '/':
-        section = sections.pop();
-        section[5] = token[2];
-        collector = sections.length > 0 ? sections[sections.length - 1][4] : nestedTokens;
-        break;
-      default:
-        collector.push(token);
-      }
-    }
-
-    return nestedTokens;
-  }
-
-  /**
-* A simple string scanner that is used by the template parser to find
-* tokens in template strings.
-*/
-  function Scanner(string) {
-    this.string = string;
-    this.tail = string;
-    this.pos = 0;
-  }
-
-  /**
-* Returns `true` if the tail is empty (end of string).
-*/
-  Scanner.prototype.eos = function () {
-    return this.tail === "";
-  };
-
-  /**
-* Tries to match the given regular expression at the current position.
-* Returns the matched text if it can match, the empty string otherwise.
-*/
-  Scanner.prototype.scan = function (re) {
-    var match = this.tail.match(re);
-
-    if (!match || match.index !== 0)
-      return '';
-
-    var string = match[0];
-
-    this.tail = this.tail.substring(string.length);
-    this.pos += string.length;
-
-    return string;
-  };
-
-  /**
-* Skips all text until the given regular expression can be matched. Returns
-* the skipped string, which is the entire tail if no match can be made.
-*/
-  Scanner.prototype.scanUntil = function (re) {
-    var index = this.tail.search(re), match;
-
-    switch (index) {
-    case -1:
-      match = this.tail;
-      this.tail = "";
-      break;
-    case 0:
-      match = "";
-      break;
-    default:
-      match = this.tail.substring(0, index);
-      this.tail = this.tail.substring(index);
-    }
-
-    this.pos += match.length;
-
-    return match;
-  };
-
-  /**
-* Represents a rendering context by wrapping a view object and
-* maintaining a reference to the parent context.
-*/
-  function Context(view, parentContext) {
-    this.view = view == null ? {} : view;
-    this.cache = { '.': this.view };
-    this.parent = parentContext;
-  }
-
-  /**
-* Creates a new context using the given view with this context
-* as the parent.
-*/
-  Context.prototype.push = function (view) {
-    return new Context(view, this);
-  };
-
-  /**
-* Returns the value of the given name in this context, traversing
-* up the context hierarchy if the value is absent in this context's view.
-*/
-  Context.prototype.lookup = function (name) {
-    var cache = this.cache;
-
-    var value;
-    if (name in cache) {
-      value = cache[name];
-    } else {
-      var context = this, names, index;
-
-      while (context) {
-        if (name.indexOf('.') > 0) {
-          value = context.view;
-          names = name.split('.');
-          index = 0;
-
-          while (value != null && index < names.length)
-            value = value[names[index++]];
-        } else {
-          value = context.view[name];
-        }
-
-        if (value != null)
-          break;
-
-        context = context.parent;
-      }
-
-      cache[name] = value;
-    }
-
-    if (isFunction(value))
-      value = value.call(this.view);
-
-    return value;
-  };
-
-  /**
-* A Writer knows how to take a stream of tokens and render them to a
-* string, given a context. It also maintains a cache of templates to
-* avoid the need to parse the same template twice.
-*/
-  function Writer() {
-    this.cache = {};
-  }
-
-  /**
-* Clears all cached templates in this writer.
-*/
-  Writer.prototype.clearCache = function () {
-    this.cache = {};
-  };
-
-  /**
-* Parses and caches the given `template` and returns the array of tokens
-* that is generated from the parse.
-*/
-  Writer.prototype.parse = function (template, tags) {
-    var cache = this.cache;
-    var tokens = cache[template];
-
-    if (tokens == null)
-      tokens = cache[template] = parseTemplate(template, tags);
-
-    return tokens;
-  };
-
-  /**
-* High-level method that is used to render the given `template` with
-* the given `view`.
-*
-* The optional `partials` argument may be an object that contains the
-* names and templates of partials that are used in the template. It may
-* also be a function that is used to load partial templates on the fly
-* that takes a single argument: the name of the partial.
-*/
-  Writer.prototype.render = function (template, view, partials) {
-    var tokens = this.parse(template);
-    var context = (view instanceof Context) ? view : new Context(view);
-    return this.renderTokens(tokens, context, partials, template);
-  };
-
-  /**
-* Low-level method that renders the given array of `tokens` using
-* the given `context` and `partials`.
-*
-* Note: The `originalTemplate` is only ever used to extract the portion
-* of the original template that was contained in a higher-order section.
-* If the template doesn't use higher-order sections, this argument may
-* be omitted.
-*/
-  Writer.prototype.renderTokens = function (tokens, context, partials, originalTemplate) {
-    var buffer = '';
-
-    // This function is used to render an arbitrary template
-    // in the current context by higher-order sections.
-    var self = this;
-    function subRender(template) {
-      return self.render(template, context, partials);
-    }
-
-    var token, value;
-    for (var i = 0, numTokens = tokens.length; i < numTokens; ++i) {
-      token = tokens[i];
-
-      switch (token[0]) {
-      case '#':
-        value = context.lookup(token[1]);
-
-        if (!value)
-          continue;
-
-        if (isArray(value)) {
-          for (var j = 0, valueLength = value.length; j < valueLength; ++j) {
-            buffer += this.renderTokens(token[4], context.push(value[j]), partials, originalTemplate);
-          }
-        } else if (typeof value === 'object' || typeof value === 'string') {
-          buffer += this.renderTokens(token[4], context.push(value), partials, originalTemplate);
-        } else if (isFunction(value)) {
-          if (typeof originalTemplate !== 'string')
-            throw new Error('Cannot use higher-order sections without the original template');
-
-          // Extract the portion of the original template that the section contains.
-          value = value.call(context.view, originalTemplate.slice(token[3], token[5]), subRender);
-
-          if (value != null)
-            buffer += value;
-        } else {
-          buffer += this.renderTokens(token[4], context, partials, originalTemplate);
-        }
-
-        break;
-      case '^':
-        value = context.lookup(token[1]);
-
-        // Use JavaScript's definition of falsy. Include empty arrays.
-        // See https://github.com/janl/mustache.js/issues/186
-        if (!value || (isArray(value) && value.length === 0))
-          buffer += this.renderTokens(token[4], context, partials, originalTemplate);
-
-        break;
-      case '>':
-        if (!partials)
-          continue;
-
-        value = isFunction(partials) ? partials(token[1]) : partials[token[1]];
-
-        if (value != null)
-          buffer += this.renderTokens(this.parse(value), context, partials, value);
-
-        break;
-      case '&':
-        value = context.lookup(token[1]);
-
-        if (value != null)
-          buffer += value;
-
-        break;
-      case 'name':
-        value = context.lookup(token[1]);
-
-        if (value != null)
-          buffer += mustache.escape(value);
-
-        break;
-      case 'text':
-        buffer += token[1];
-        break;
-      }
-    }
-
-    return buffer;
-  };
-
-  mustache.name = "mustache.js";
-  mustache.version = "0.8.1";
-  mustache.tags = [ "{{", "}}" ];
-
-  // All high-level mustache.* functions use this writer.
-  var defaultWriter = new Writer();
-
-  /**
-* Clears all cached templates in the default writer.
-*/
-  mustache.clearCache = function () {
-    return defaultWriter.clearCache();
-  };
-
-  /**
-* Parses and caches the given template in the default writer and returns the
-* array of tokens it contains. Doing this ahead of time avoids the need to
-* parse templates on the fly as they are rendered.
-*/
-  mustache.parse = function (template, tags) {
-    return defaultWriter.parse(template, tags);
-  };
-
-  /**
-* Renders the `template` with the given `view` and `partials` using the
-* default writer.
-*/
-  mustache.render = function (template, view, partials) {
-    return defaultWriter.render(template, view, partials);
-  };
-
-  // This is here for backwards compatibility with 0.4.x.
-  mustache.to_html = function (template, view, partials, send) {
-    var result = mustache.render(template, view, partials);
-
-    if (isFunction(send)) {
-      send(result);
-    } else {
-      return result;
-    }
-  };
-
-  // Export the escaping function so that the user may override it.
-  // See https://github.com/janl/mustache.js/issues/244
-  mustache.escape = escapeHtml;
-
-  // Export these mainly for testing, but also for advanced usage.
-  mustache.Scanner = Scanner;
-  mustache.Context = Context;
-  mustache.Writer = Writer;
-
-}));
diff --git a/app/assets/javascripts/light/newsletters.js.coffee b/app/assets/javascripts/light/newsletters.js.coffee
deleted file mode 100644
index 24f83d1..0000000
--- a/app/assets/javascripts/light/newsletters.js.coffee
+++ /dev/null
@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/javascripts/light/spreadsheets.js.coffee b/app/assets/javascripts/light/spreadsheets.js.coffee
deleted file mode 100644
index bb6bec6..0000000
--- a/app/assets/javascripts/light/spreadsheets.js.coffee
+++ /dev/null
@@ -1,6 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://coffeescript.org/
-xyz = ->
-  alert "welcome"
-  return
\ No newline at end of file
diff --git a/app/assets/javascripts/light/users.js.coffee b/app/assets/javascripts/light/users.js.coffee
index 3abac02..ffd60f1 100644
--- a/app/assets/javascripts/light/users.js.coffee
+++ b/app/assets/javascripts/light/users.js.coffee
@@ -2,32 +2,37 @@
 # All this logic will automatically be available in application.js.
 # You can use CoffeeScript in this file: http://coffeescript.org/
 
-custom_function = ->
-  template = Mustache.compile($.trim($("#template").html()))
-  view_light = (record, index) ->
-    
-    if record.is_subscribed is true
-      record.str = "success"
-    else
-      record.str = "warning"
-    template
-      record: record
-      index: index
+@initialize_filterjs_table = (div, data, template, data_url, search_fields, pagination_container = '#pagination', per_page_container = '#per_page', pagination_values = [ 10, 20, 25 ]) ->
+  batch_size = 2000
 
-  if($("#stream_table_light").length)
-    console.log data
-    opts = {
-      view: view_light
-      data_url: '/newsletter/users.json'
-      stream_after: 1
-      fetch_data_limit: 500
-      auto_sorting: true
-    }
-    $("#stream_table_light").stream_table(opts, data)
-
-    $(".st_search").css("height",27)
-    $(".st_search").css("margin-right",10)
-
-$(document).ready(custom_function)
-$(document).on 'page:load', custom_function
+  mustache_template = $(template).html();
+  view = (data) ->
+    Mustache.to_html(mustache_template, data)
 
+  fjs = FilterJS(data, div,
+    template: template
+    view: view
+    criterias: [{
+      field: 'sidekiq_status',
+      ele: '#user_status',
+      event: 'change',
+      selector: 'select'}],
+    search:
+      ele: '#searchbox'
+      fields: ['username', 'email_id']
+      start_length: 1
+    pagination:
+      container: pagination_container
+      visiblePages: 5
+      perPage:
+        values: pagination_values
+        container: per_page_container)
+  fjs.setStreaming
+    data_url: '/newsletter/users.json'
+    stream_after: 1
+    batch_size: batch_size
+  fjs.addCallback 'beforeAddRecords', ->
+    if (@recordsCount + batch_size)  >= total_count
+      hideSpinner()
+      @stopStreaming()
+    return
diff --git a/app/assets/stylesheets/light/home.css b/app/assets/stylesheets/light/home.css
index afad32d..f04adf5 100644
--- a/app/assets/stylesheets/light/home.css
+++ b/app/assets/stylesheets/light/home.css
@@ -2,3 +2,25 @@
   Place all the styles related to the matching controller here.
   They will automatically be included in application.css.
 */
+
+.badge-users-count {
+  margin-top: 10px;
+}
+
+.btn-mail {
+  margin-top: 5px;
+}
+
+#users_per_page {
+  width: 50px;
+  height: 30px;
+}
+
+#searchbox {
+  height: 30px;
+}
+
+.brand {
+  font-weight: bold !important;
+  margin-top: 5px !important;
+}
diff --git a/app/assets/stylesheets/light/spreadsheets.css.scss b/app/assets/stylesheets/light/spreadsheets.css.scss
deleted file mode 100644
index 2f69a6e..0000000
--- a/app/assets/stylesheets/light/spreadsheets.css.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the spreadsheets controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/controllers/light/newsletters_controller.rb b/app/controllers/light/newsletters_controller.rb
index f3d6903..acabd75 100644
--- a/app/controllers/light/newsletters_controller.rb
+++ b/app/controllers/light/newsletters_controller.rb
@@ -3,7 +3,8 @@
 module Light
   class NewslettersController < ApplicationController
 
-    before_filter :load_newsletter, only: [:send_opt_in, :send_opt_in_test, :test_opt_in]
+    before_filter :load_newsletter, only: [:send_opt_in, :send_opt_in_test, :test_opt_in,
+                                           :send_opt_out, :send_opt_out_test, :test_opt_out]
 
     def index
       @newsletters = Newsletter.monthly_letters.order_by([:sent_on, :desc])
@@ -13,6 +14,10 @@ def opt_in
       @newsletters = Newsletter.opt_in_letters.order_by([:sent_on, :desc])
     end
 
+    def opt_out
+      @newsletters = Newsletter.opt_out_letters.order_by([:sent_on, :desc])
+    end
+
     def show
       @newsletter = Newsletter.find(params[:id])
     end
@@ -71,6 +76,20 @@ def send_opt_in
       redirect_to opt_in_newsletters_path
     end
     
+    def test_opt_out
+    end
+
+    def send_opt_out_test
+      emails = params[:email][:email_id].split(",")
+      Light::UserMailer.welcome_message(emails, @newsletter, 'test_user_dummy_id').deliver if @newsletter
+      redirect_to newsletter_path(@newsletter)
+    end
+
+    def send_opt_out
+      Light::OptOutWorker.perform_async(@newsletter.id.to_s)
+      redirect_to opt_out_newsletters_path
+    end
+    
     private
 
     def newsletters_params
diff --git a/app/controllers/light/users_controller.rb b/app/controllers/light/users_controller.rb
index 67096c2..4f4d2c9 100644
--- a/app/controllers/light/users_controller.rb
+++ b/app/controllers/light/users_controller.rb
@@ -6,10 +6,10 @@ class UsersController < ApplicationController
 
     def index
       offset_val = params[:offset] || 0
-      limit_val = params[:limit] || 500
+      limit_val = params[:limit] || 1000
       @users = Light::User.all.offset(offset_val).limit(limit_val)
       respond_with do |format|
-        format.json   { render json: @users }
+        format.json { render json: @users }
       end
     end
 
@@ -25,7 +25,7 @@ def create
       @user = Light::User.new(users_params)
       @user.sent_on = Array.new
       if @user.save
-        @user.update(source: "Manual", sent_on: Array.new)
+        @user.update(source: 'Manual', sent_on: Array.new, sidekiq_status: 'new user' )
         redirect_to users_path
       else
         render action: 'new'
@@ -46,13 +46,19 @@ def unsubscribe
       unless(@user.is_subscribed)
         @message = 'You have already unsubscribed!!'
       else
-        @user.update(is_subscribed: 'false')
+        @user.update(is_subscribed: 'false',
+                     unsubscribed_at: DateTime.now,
+                     sidekiq_status: 'Unsubscribed')
         @message = 'Unsubscribed successfully!!'
       end
     end
 
     def subscribe
-      @user.update(is_subscribed: 'true', subscribed_at: DateTime.now, remote_ip: request.remote_ip, user_agent: request.env['HTTP_USER_AGENT'])
+      @user.update(is_subscribed: 'true',
+                   sidekiq_status: 'Subscribed',
+                   subscribed_at: DateTime.now,
+                   remote_ip: request.remote_ip,
+                   user_agent: request.env['HTTP_USER_AGENT'])
     end
 
     def sendmailer
@@ -105,20 +111,18 @@ def auto_opt_in
     def opt_in
       @user = Light::User.where(email_id: params[:email]).first
       if @user.present?
-        if @user.is_subscribed.eql?(false)
-          Light::UserMailer.auto_opt_in(@user.email_id, @user.slug, @user.token).deliver
-          #send email
-        end
+        @user.update_attributes(is_subscribed: true,
+                                sidekiq_status: 'Subscribed',
+                                subscribed_at: DateTime.now)
       else
         u_name = params[:username].blank? ? params[:email] : params[:username]
-        @user=Light::User.new(username: u_name, 
-                              email_id: params[:email], 
-                              sidekiq_status: 'web subscription request')
-        if @user.save
-          Light::UserMailer.auto_opt_in(@user.email_id, @user.slug, @user.token).deliver
-        end
+        @user = Light::User.new(username: u_name,
+                                email_id: params[:email],
+                                source: 'web subscription request',
+                                subscribed_at: DateTime.now,
+                                sidekiq_status: 'Subscribed')
       end
-      respond_to do |format| 
+      respond_to do |format|
         format.json { head :no_content }
         format.html {redirect_to main_app.users_thank_you_path}
       end
@@ -127,7 +131,7 @@ def opt_in
     def thank_you
 
     end
-    
+
     private
     def users_params
       params.require(:user).permit(:id, :email_id, :is_subscribed, :joined_on, :source, :username)
diff --git a/app/models/light/newsletter.rb b/app/models/light/newsletter.rb
index 757adbb..828b286 100644
--- a/app/models/light/newsletter.rb
+++ b/app/models/light/newsletter.rb
@@ -4,7 +4,9 @@ class Newsletter
     include Mongoid::Slug
     include Mongoid::Paperclip
 
-    VALID_NEWSLETTER_TYPES = {MONTHLY: "Monthly Newsletter", OPT_IN: "Opt-In Letter"}
+    VALID_NEWSLETTER_TYPES = { MONTHLY: 'Monthly Newsletter',
+                               OPT_IN:  'Opt-In Letter',
+                               OPT_OUT: 'Opt-Out Letter' }
 
     field :subject,     type: String
     field :content,     type: String 
@@ -16,8 +18,9 @@ class Newsletter
     validates :subject, uniqueness: true
     validates :newsletter_type, inclusion: {in: VALID_NEWSLETTER_TYPES.values}
 
-    scope :opt_in_letters, -> {where(newsletter_type: VALID_NEWSLETTER_TYPES[:OPT_IN])}
-    scope :monthly_letters, -> {where(newsletter_type: VALID_NEWSLETTER_TYPES[:MONTHLY])}
+    scope :opt_in_letters, -> { where(newsletter_type: VALID_NEWSLETTER_TYPES[:OPT_IN]) }
+    scope :opt_out_letters, -> { where(newsletter_type: VALID_NEWSLETTER_TYPES[:OPT_OUT]) }
+    scope :monthly_letters, -> { where(newsletter_type: VALID_NEWSLETTER_TYPES[:MONTHLY]) }
     
     has_mongoid_attached_file :photo,:styles => {:original => ['1920x1680>', :png],:small  => ['240x200!', :png]}
     validates_attachment_content_type :photo, :content_type => ["image/jpg", "image/jpeg", "image/png", "application/pdf"]
@@ -31,5 +34,9 @@ def get_image
     def opt_in?
       newsletter_type.eql?(VALID_NEWSLETTER_TYPES[:OPT_IN])
     end
+
+    def opt_out?
+      newsletter_type.eql?(VALID_NEWSLETTER_TYPES[:OPT_OUT])
+    end
   end
 end
diff --git a/app/models/light/user.rb b/app/models/light/user.rb
index 98f06c4..8309e65 100644
--- a/app/models/light/user.rb
+++ b/app/models/light/user.rb
@@ -16,6 +16,7 @@ class User
     field :token
     field :opt_in_mail_sent_at, type: DateTime
     field :subscribed_at, type: DateTime
+    field :unsubscribed_at, type: DateTime
     field :remote_ip
     field :user_agent, type: String
     field :is_blocked, type: Boolean, default: false
@@ -27,7 +28,8 @@ class User
 
     slug :username
 
-    track_history on: [:opt_in_mail_sent_at, :subscribed_at, :remote_ip, :user_agent, :is_subscribed]
+    track_history on: [:opt_in_mail_sent_at, :subscribed_at, :remote_ip, 
+                       :user_agent, :is_subscribed, :unsubscribed_at]
     before_create do
       self.joined_on = Date.today
       self.sidekiq_status = NEW_USER if self.sidekiq_status.blank?
@@ -37,8 +39,14 @@ class User
       end
     end
 
-    scope :subscribed_users, -> { where is_subscribed: true}
-    scope :new_users, -> { where(is_subscribed: false, sidekiq_status: NEW_USER)}
+    scope :subscribed_users, -> { where(is_subscribed: true, sidekiq_status: 'Subscribed') }
+    scope :unsubscribed_users, -> { where(is_subscribed: false, sidekiq_status: 'Unsubscribed') }
+    scope :new_users, -> { where(is_subscribed: false, sidekiq_status: NEW_USER) }
+    scope :blocked_users, -> { where(is_subscribed: false, sidekiq_status: 'Block') }
+    scope :bounced_users, -> { where(is_subscribed: false, sidekiq_status: 'Bounced') }
+    scope :spam_users, -> { where(is_subscribed: false, sidekiq_status: 'Spam') }
+    scope :invalid_users, -> { where(is_subscribed: false, sidekiq_status: 'Invalid') }
+    scope :opt_in_users, -> { where(is_subscribed: false, sidekiq_status: 'Opt in mail sent') }
 
     def self.add_users_from_worksheet(worksheet, column = 1)
       fails = []
@@ -76,5 +84,10 @@ def self.users_for_opt_in_mail
       date = Date.today.strftime("%Y%m")
       self.new_users.where(:sent_on.nin => [date], is_blocked: false).order_by([:email_id, :asc])
     end
+
+    def self.users_for_opt_out_mail
+      date = Date.today.strftime("%Y%m")
+      self.new_users.where(:sent_on.nin => [date], is_blocked: false).order_by([:email_id, :asc])
+    end
   end
 end
diff --git a/app/views/light/newsletters/_newsletters.html.haml b/app/views/light/newsletters/_newsletters.html.haml
index 41ae578..7ca5be3 100644
--- a/app/views/light/newsletters/_newsletters.html.haml
+++ b/app/views/light/newsletters/_newsletters.html.haml
@@ -10,7 +10,8 @@
       %center
         %a.link{href: "#{newsletter_path(newsletter)}" }
           %div.tile.thumbnail
-            = image_tag newsletter.get_image
+            - if Rails.env.production?
+              = image_tag newsletter.get_image
             %div.cap
               %h4
                 = newsletter.sent_on.strftime("%B %Y")
diff --git a/app/views/light/newsletters/_top_navbar.html.haml b/app/views/light/newsletters/_top_navbar.html.haml
index 36fe45b..bbabe36 100644
--- a/app/views/light/newsletters/_top_navbar.html.haml
+++ b/app/views/light/newsletters/_top_navbar.html.haml
@@ -1,17 +1,16 @@
-= nav_bar :brand => "Newsletters", :responsive => true, :static => :top, :fluid => :true do
+= nav_bar :brand => 'Newsletters', :responsive => true, :static => :top, :fluid => :true do
   = menu_group do
     = menu_item "Add Newsletter", new_newsletter_path
     = menu_item "Opt in letters", opt_in_newsletters_path
+    = menu_item "Opt out letters", opt_out_newsletters_path
     = drop_down "Add Users" do
       = menu_item "Add Manually", new_user_path
       = menu_item "Import Opt-in Users", users_import_path
       = menu_item "Google Spreadsheets", spreadsheets_path
 
     = menu_item "Show Users", users_path, ({:method => 'get'} if params[:controller] == 'light/users' && params[:action].in?(['new', 'create']))
-    = menu_item raw ("Subscribers: #{badge(Light::User.subscribed_users.count)}")
-    = menu_item raw ("New users: #{badge(Light::User.new_users.count)}")
-  
   = menu_group :pull => :right do
-    = content_tag :a, "Send Mail", :href => sendmailer_path, :class => 'btn btn-danger', :data => { :confirm => 'Are you sure ?'}
-    = content_tag :a, "Test Mail", :href => testmail_path, :class => "btn btn-success"
+    .btn-mail
+      = content_tag :a, "Send Mail", :href => sendmailer_path, :class => 'btn btn-danger', :data => { :confirm => 'Are you sure ?'}
+      = content_tag :a, "Test Mail", :href => testmail_path, :class => 'btn btn-success'
 %br
diff --git a/app/views/light/newsletters/opt_out.html.haml b/app/views/light/newsletters/opt_out.html.haml
new file mode 100644
index 0000000..0537ed9
--- /dev/null
+++ b/app/views/light/newsletters/opt_out.html.haml
@@ -0,0 +1 @@
+= render 'newsletters'
diff --git a/app/views/light/newsletters/show.html.haml b/app/views/light/newsletters/show.html.haml
index 5f218dd..d1c70c9 100644
--- a/app/views/light/newsletters/show.html.haml
+++ b/app/views/light/newsletters/show.html.haml
@@ -5,3 +5,7 @@
     :class => 'btn btn-danger', :data => { :confirm => 'Are you sure ?'}, method: :post
   = link_to "Send Opt-In Test Mail", test_opt_in_newsletter_path(@newsletter), :class => "btn btn-success"
 
+- elsif @newsletter.opt_out?
+  = link_to "Send Opt-Out Mail", send_opt_out_newsletter_path(@newsletter),
+    :class => 'btn btn-danger', :data => { :confirm => 'Are you sure ?'}, method: :post
+  = link_to "Send Opt-Out Test Mail", test_opt_out_newsletter_path(@newsletter), :class => "btn btn-success"
diff --git a/app/views/light/newsletters/test_opt_out.html.haml b/app/views/light/newsletters/test_opt_out.html.haml
new file mode 100644
index 0000000..3636de0
--- /dev/null
+++ b/app/views/light/newsletters/test_opt_out.html.haml
@@ -0,0 +1,7 @@
+.panel.panel-primary
+  .panel-heading 
+    Test Mail
+  .panel-body
+    = form_for :email, as: :post, url: send_opt_out_test_newsletter_path(@newsletter) do |f|
+      = f.text_area :email_id
+      = f.button :submit, class: "btn btn-success"
diff --git a/app/views/light/users/_form.html.haml b/app/views/light/users/_form.html.haml
index 815dcd3..ebd213a 100644
--- a/app/views/light/users/_form.html.haml
+++ b/app/views/light/users/_form.html.haml
@@ -3,16 +3,16 @@
     New User
   .panel-body
     = simple_form_for (@user), html: {role: 'form', class: 'form-horizontal'} do |f|
-      = f.input :email_id, input_html:{class: 'span2'}
-      = f.input :username
-      = f.input :is_subscribed, :as => :select
-      = f.input :joined_on, input_html: { 'data-behaviour' => 'datepicker'}
-      = f.input :source
-      = f.button :submit, class: "btn btn-success"
+      = f.input :email_id, input_html:{class: 'span3'}
+      = f.input :username, input_html:{class: 'span3'}
+      = f.input :is_subscribed, :as => :select, input_html:{class: 'span3'}
+      = f.input :joined_on, input_html: { 'data-behaviour' => 'datepicker'}, input_html:{class: 'span3'}
+      = f.input :source, input_html:{class: 'span3'}
+      = f.button :submit, class: "btn btn-success controls"
 
 :javascript
   $('[data-behaviour~=datepicker]').datepicker({
     format: 'yyyy-mm-dd'
   })
-  
+
 
diff --git a/app/views/light/users/edit.html.haml b/app/views/light/users/edit.html.haml
index 6e3693c..a5a2d86 100644
--- a/app/views/light/users/edit.html.haml
+++ b/app/views/light/users/edit.html.haml
@@ -4,16 +4,16 @@
   %table
     %tr
       %td
-        = f.input :email_id, input_html:{class: 'span2'}
-        = f.input :username
-        = f.input :is_subscribed, :as => :select
-        = f.input :joined_on, input_html: { 'data-behaviour' => 'datepicker'}
-        = f.input :source
-        = f.button :submit, class: "btn btn-success"
+        = f.input :email_id, input_html:{class: 'span3'}
+        = f.input :username, input_html:{class: 'span3'}
+        = f.input :is_subscribed, :as => :select, input_html:{class: 'span3'}
+        = f.input :joined_on, input_html: { 'data-behaviour' => 'datepicker'}, input_html:{class: 'span3'}
+        = f.input :source, input_html:{class: 'span3'}
+        = f.button :submit, class: "btn btn-success controls"
 
 :javascript
   $('[data-behaviour~=datepicker]').datepicker({
     format: 'yyyy-mm-dd'
   })
-  
+
 
diff --git a/app/views/light/users/index.html.haml b/app/views/light/users/index.html.haml
index edab817..ce54cf5 100644
--- a/app/views/light/users/index.html.haml
+++ b/app/views/light/users/index.html.haml
@@ -1,37 +1,68 @@
 = render 'light/newsletters/top_navbar'
-%table#stream_table_light.table.table-striped 
-  %thead
-    %tr
-      %th
-        %strong 
-          = "#"
-      %th
-        %strong
-          User's Email Id 
-      %th{data: {sort: "username:asc"}}
-        %strong
-          Username
-      %th
-        %strong
-          Edit
-      %th
-        %strong
-          Delete
-  %tbody
+%nav.navbar.navbar-inverse
+  .container-fluid
+    .navbar-header
+    %ul.nav.navbar-nav
+      %li.nav-item
+        %label Per Page:
+        %span#users_per_page.content
+      %li.nav-item
+        %label.sr-only{:for => 'searchbox'} Search
+        %input#searchbox.form-control{:autocomplete => 'off', :placeholder => 'Search', :type => 'text'}/
+        %span.glyphicon.glyphicon-search.search-icon
 
-    %script#template{:type => "text/html"}
-      {{#record}}
-      %tr{class: "{{str}}"}
-        %td {{index}}
-        %td
-          %a{ :href => "/newsletter/users/{{_id.$oid}}"} {{email_id}}
-        %td {{username}}
-        %td
-          %a{ :href => "/newsletter/users/{{_id.$oid}}/edit", :class => "btn btn-mini btn-success"} Edit
-        %td
-          %a{ :href => "/newsletter/users/{{_id.$oid}}", data:{ :confirm => 'Are you sure?', method: "delete"}, :class => "btn btn-mini btn-danger" } Delete
-      {{/record}}
-  
+      %li.nav-item
+        %label Status
+        %select.form-control#user_status
+          %option{:value => 'Subscribed'} Subscribed: #{Light::User.subscribed_users.count}
+          %option{:value => 'Unsubscribed'} Unsubscribed: #{Light::User.unsubscribed_users.count}
+          %option{:value => 'new user'} New User: #{Light::User.new_users.count}
+          %option{:value => 'Block'} Blocked: #{Light::User.blocked_users.count}
+          %option{:value => 'Invalid'} Invalid: #{Light::User.invalid_users.count}
+          %option{:value => 'Bounced'} Bounced: #{Light::User.bounced_users.count}
+          %option{:value => 'Spam'} Spam: #{Light::User.spam_users.count}
+          %option{:value => 'Opt in mail sent'} Opt in Mail Sent: #{Light::User.opt_in_users.count}
+
+    %ul.nav.navbar-nav.pull-right
+      %li.badge-users-count
+        %h5= raw ("Subscribed users: #{badge(Light::User.subscribed_users.count)}")
+
+      %li.badge-users-count
+        %h5= raw ("New users: #{badge(Light::User.new_users.count)}")
+
+.row
+  .content.col-md-12
+    %div
+      %table.table.table-striped.table-hover.table-new#users
+        %thead
+          %tr
+            %th.text-center
+              %strong
+                Email Id
+            %th.text-center
+              %strong
+                Name
+            %th.text-center
+              %strong
+                Actions
+        %tbody
+          %script#user-template{:type => "text/html"}
+            %tr
+              %td.text-center= '{{email_id}}'
+              %td.text-center= '{{username}}'
+              %td.text-center
+                %a{ :href => "/newsletter/users/{{_id.$oid}}/edit", :class => 'btn btn-sm btn-success'} Edit
+
+                %a{ :href => "/newsletter/users/{{_id.$oid}}", data:{ :confirm => 'Are you sure?', method: 'delete'}, :class => 'btn btn-sm btn-danger' } Delete
+
+      .col-lg-12.padding_none.pull-right
+        #user_pagination.col-lg-12
+        .col-lg-6.content
 
 :javascript
-  data = #{@users.to_json};
+  showSpinner()
+  var users_data = #{@users.to_json}
+  var total_count = #{@users.count}
+  initialize_filterjs_table('#users tbody', users_data, '#user-template', '', [], '#user_pagination', '#users_per_page')
+  $('.per-page').css('width',90)
+  $('.per-page').css('height',30)
diff --git a/app/views/light/users/new.html.haml b/app/views/light/users/new.html.haml
index 6cd65fa..ffe0292 100644
--- a/app/views/light/users/new.html.haml
+++ b/app/views/light/users/new.html.haml
@@ -3,7 +3,7 @@
   %table
     %tr
       %td
-        = f.input :email_id, input_html:{class: 'span2'}
-        = f.input :username
-        = f.button :submit, class: "btn btn-success"
-  
+        = f.input :email_id, input_html:{class: 'span3'}
+        = f.input :username, input_html:{class: 'span3'}
+        = f.button :submit, class: "btn btn-success controls"
+
diff --git a/app/views/light/users/subscribe.html.haml b/app/views/light/users/subscribe.html.haml
index c6107f3..edc9c14 100644
--- a/app/views/light/users/subscribe.html.haml
+++ b/app/views/light/users/subscribe.html.haml
@@ -3,5 +3,5 @@
     Subscribed successfully!!
     %br
     To unsubscribe again
-    = link_to "CLICK HERE !!", main_app.users_unsubscribe_path(@user)
+    = link_to "CLICK HERE !!", main_app.users_unsubscribe_path(token: @user.token)
 
diff --git a/app/views/light/users/unsubscribe.html.haml b/app/views/light/users/unsubscribe.html.haml
index 12d897d..9261112 100644
--- a/app/views/light/users/unsubscribe.html.haml
+++ b/app/views/light/users/unsubscribe.html.haml
@@ -3,4 +3,4 @@
     = @message
     %br
     Would you like to subscribe again?
-    = link_to "CLICK HERE !!", main_app.users_subscribe_path(@user)
+    = link_to "CLICK HERE !!", main_app.users_subscribe_path(token: @user.token)
diff --git a/app/workers/light/hard_worker.rb b/app/workers/light/hard_worker.rb
index 43af2b2..1a423e3 100644
--- a/app/workers/light/hard_worker.rb
+++ b/app/workers/light/hard_worker.rb
@@ -11,7 +11,14 @@ def perform(user_ids, newsletter_id, date, status = nil)
           Light::UserMailer.welcome_message(user.email_id, newsletter, user.token).deliver
           sent_on = user.sent_on << date
           if status.present? && status.include?('Opt in')
-            user.update_attributes(sent_on: sent_on, sidekiq_status: status, opt_in_mail_sent_at: DateTime.now)
+            user.update_attributes(sent_on: sent_on,
+                                   sidekiq_status: status,
+                                   opt_in_mail_sent_at: DateTime.now)
+          elsif status.present? && status.include?('Opt out')
+            user.update_attributes(sent_on: sent_on, 
+                                   sidekiq_status: 'Subscribed',
+                                   subscribed_at: DateTime.now,
+                                   is_subscribed: true)
           else
             user.update_attributes(sent_on: sent_on, sidekiq_status: status)
           end
diff --git a/app/workers/light/opt_out_worker.rb b/app/workers/light/opt_out_worker.rb
new file mode 100644
index 0000000..72da0b3
--- /dev/null
+++ b/app/workers/light/opt_out_worker.rb
@@ -0,0 +1,28 @@
+module Light
+  class OptOutWorker
+    include Sidekiq::Worker
+    sidekiq_options :queue => :lightair
+
+    def perform(newsletter_id)
+      date = Date.today.strftime("%Y%m")
+      users = Light::User.users_for_opt_out_mail
+      number_of_opt_out_users = users.count
+      number_of_opt_out_users_count = number_of_opt_out_users
+      current_batch = 0
+      users_in_batch = 250
+      newsletter = Light::Newsletter.find_by(id: newsletter_id)
+      if newsletter
+        while number_of_opt_out_users > 0
+          user_ids = users.limit(users_in_batch).skip(users_in_batch*current_batch).collect { |user| user.id.to_s }
+          current_batch += 1
+          number_of_opt_out_users -= users_in_batch
+          Light::HardWorker.perform_async(user_ids, newsletter.id.to_s, date, 'Opt out mail sent')
+        end
+        opt_out_count = newsletter.users_count + number_of_opt_out_users_count
+        newsletter.update_attribute(:users_count, opt_out_count)
+      else
+        logger.info = 'No newsletter present'
+      end
+    end
+  end
+end
diff --git a/config/routes.rb b/config/routes.rb
index ecf4460..732fe8f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -13,12 +13,16 @@
   resources :newsletters do
     collection do
       get 'opt-in', as: 'opt_in'
+      get 'opt-out', as: 'opt_out'
     end
 
     member do
       get 'test-opt-in' , as: 'test_opt_in'
       post 'send-opt-in' , as: 'send_opt_in'
       post 'send-opt-in-test' , as: 'send_opt_in_test'
+      get 'test-opt-out' , as: 'test_opt_out'
+      post 'send-opt-out' , as: 'send_opt_out'
+      post 'send-opt-out-test' , as: 'send_opt_out_test'
     end
   end
   
diff --git a/lib/tasks/light_tasks.rake b/lib/tasks/light_tasks.rake
index 4c33ddb..bfbf7d2 100644
--- a/lib/tasks/light_tasks.rake
+++ b/lib/tasks/light_tasks.rake
@@ -23,10 +23,10 @@ namespace :light do
     puts block_emails.count
     puts spam_emails.count
 
-    Light::User.where(:email_id.in => bounce_emails).update_all(is_subscribed: false, sidekiq_status: 'Bounced')
-    Light::User.where(:email_id.in => invalid_emails).update_all(is_subscribed: false, sidekiq_status: 'Invalid')
-    Light::User.where(:email_id.in => spam_emails).update_all(is_subscribed: false, sidekiq_status: 'Spam')
-    Light::User.where(:email_id.in => block_emails).update_all(is_subscribed: false, sidekiq_status: 'Block')
+    Light::User.where(:email_id.in => bounce_emails).update_all(is_subscribed: false, sidekiq_status: 'Bounced', unsubscribed_at: DateTime.now)
+    Light::User.where(:email_id.in => invalid_emails).update_all(is_subscribed: false, sidekiq_status: 'Invalid', unsubscribed_at: DateTime.now)
+    Light::User.where(:email_id.in => spam_emails).update_all(is_subscribed: false, sidekiq_status: 'Spam', unsubscribed_at: DateTime.now)
+    Light::User.where(:email_id.in => block_emails).update_all(is_subscribed: false, sidekiq_status: 'Block', unsubscribed_at: DateTime.now)
     #clean sendgrid... 
     bounces.delete(delete_all: 1)
     invalid.delete(delete_all: 1)
diff --git a/lib/tasks/update_user_status.rake b/lib/tasks/update_user_status.rake
new file mode 100644
index 0000000..a2b2c7b
--- /dev/null
+++ b/lib/tasks/update_user_status.rake
@@ -0,0 +1,67 @@
+namespace :light do
+  desc 'Checking and updating the User status (Subscribed and Unsubscribed)'
+  task :update_user_status => :environment do
+
+    print "\n\n Update the flag is_subscribed for status: "
+    ['Bounced', 'Spam', 'Opt in mail sent', 'Invalid'].each do |status|
+      print "\n #{status} : "
+      print Light::User.where(sidekiq_status: status)
+                   .update_all(is_subscribed: false)[:n]
+      # Keeping is_blocked as is, because we have code sit in there depending on it.
+    end
+
+    print "\n\n Fix the data for Blocked Users : "
+    print "\n Update flags for Block user : "
+    print Light::User.where(sidekiq_status: 'Block')
+                 .update_all(is_subscribed: false, is_blocked: true)[:n]
+
+    print "\n Update status for new_users who are blocked : "
+    print Light::User.where(is_subscribed: false, sidekiq_status: 'new user', is_blocked: true)
+                 .update_all(sidekiq_status: 'Block')[:n]
+
+
+    print "\n\n Update one who dones't have sidekiq_status : "
+    print "\n Unsubscribed : "
+    print Light::User.where(is_subscribed: false, sidekiq_status: nil, :is_blocked.in => [false, nil])
+                 .update_all(sidekiq_status: 'Unsubscribed', unsubscribed_at: DateTime.now)[:n]
+
+    print "\n Block (is_subscribed: false) : "
+    print Light::User.where(is_subscribed: false, is_blocked: true, sidekiq_status: nil)
+                 .update_all(sidekiq_status: 'Block')[:n]
+
+    print "\n Block (is_subscribed: true) : "
+    print Light::User.where(is_subscribed: true, is_blocked: true, sidekiq_status: nil)
+                 .update_all(is_subscribed: false, sidekiq_status: 'Block')[:n]
+
+    print "\n Subscribed : "
+    print Light::User.where(is_subscribed: true, sidekiq_status: nil)
+                 .update_all(sidekiq_status: 'Subscribed')[:n]
+
+    print "\n\n Updated flag value for is_blocked: nil to flase : "
+    print Light::User.where(is_blocked: nil)
+                 .update_all(is_blocked: false)[:n]
+
+    print "\n\n Updated Status for Web Subscription Request : "
+    print Light::User.where(sidekiq_status: 'web subscription request')
+                    .update_all(source: 'web subscription request',
+                                is_subscribed: false,
+                                sidekiq_status: 'Unsubscribed',
+                                unsubscribed_at: DateTime.now)[:n]
+
+    def check_status(status)
+      Light::User.where(sidekiq_status: status).count
+    end
+
+    # Status wise count of User
+    print "\n\n Total no of User Status : " +
+         "\n Subscribed : #{check_status('Subscribed')}" +
+         "\n Unsubscribed : #{check_status('Unsubscribed')}" +
+         "\n New User : #{check_status('new user')}" +
+         "\n Invalid : #{check_status('Invalid')}" +
+         "\n Spam : #{check_status('Spam')}" +
+         "\n Blocked : #{check_status('Block')}" +
+         "\n Bounced : #{check_status('Bounced')}" +
+         "\n Opt in User: #{check_status('Opt in mail sent')} \n\n"
+ end
+end
+