diff --git a/Block/Search/Result.php b/Block/Search/Result.php
index 202a649..4f483a2 100644
--- a/Block/Search/Result.php
+++ b/Block/Search/Result.php
@@ -1,18 +1,18 @@
 <?php
 /**
  * Venustheme
- * 
+ *
  * NOTICE OF LICENSE
- * 
+ *
  * This source file is subject to the Venustheme.com license that is
  * available through the world-wide-web at this URL:
  * http://www.venustheme.com/license-agreement.html
- * 
+ *
  * DISCLAIMER
- * 
+ *
  * Do not edit or add to this file if you wish to upgrade this extension to newer
  * version in the future.
- * 
+ *
  * @category   Venustheme
  * @package    Ves_Blog
  * @copyright  Copyright (c) 2016 Venustheme (http://www.venustheme.com/)
@@ -119,13 +119,14 @@ public function getCollection(){
      * @return $this
      */
     protected function _prepareLayout()
-    {	
+    {
         $searchKey = $this->_request->getParam('s');
+        $searchKey = $this->_blogHelper->xss_clean($searchKey);
     	$page_title = __("Search result for: '%1'", $searchKey);
     	$this->pageConfig->addBodyClass('vesblog-page');
         $this->pageConfig->addBodyClass('blog-searchresult');
     	if($page_title){
-    		$this->pageConfig->getTitle()->set($page_title);   
+    		$this->pageConfig->getTitle()->set($page_title);
     	}
     	return parent::_prepareLayout();
     }
@@ -151,7 +152,7 @@ public function getPostsBlock()
         $html = $block->toHtml();
         if ($html) {
             return $html;
-        }   
+        }
     }
 
     /**
@@ -178,6 +179,7 @@ protected function _beforeToHtml()
 
         $store = $this->_storeManager->getStore();
         $searchKey = $this->_request->getParam('s');
+        $searchKey = $this->_blogHelper->xss_clean($searchKey);
         $itemsperpage = (int)$this->getConfig('blog_page/item_per_page');
         $orderby = $this->getConfig('blog_page/orderby');
         $orderby = $orderby?$orderby:"DESC";
@@ -210,4 +212,4 @@ protected function _beforeToHtml()
         }
         return parent::_beforeToHtml();
     }
-}
\ No newline at end of file
+}
diff --git a/Controller/Comment/Add.php b/Controller/Comment/Add.php
index 64378ad..c04f382 100644
--- a/Controller/Comment/Add.php
+++ b/Controller/Comment/Add.php
@@ -1,18 +1,18 @@
 <?php
 /**
  * Venustheme
- * 
+ *
  * NOTICE OF LICENSE
- * 
+ *
  * This source file is subject to the Venustheme.com license that is
  * available through the world-wide-web at this URL:
  * http://www.venustheme.com/license-agreement.html
- * 
+ *
  * DISCLAIMER
- * 
+ *
  * Do not edit or add to this file if you wish to upgrade this extension to newer
  * version in the future.
- * 
+ *
  * @category   Venustheme
  * @package    Ves_Blog
  * @copyright  Copyright (c) 2016 Venustheme (http://www.venustheme.com/)
@@ -83,14 +83,14 @@ class Add extends \Magento\Framework\App\Action\Action
 
     /**
      * [__construct description]
-     * @param Context                                             $context              
-     * @param \Magento\Framework\View\Result\PageFactory          $resultPageFactory    
-     * @param \Ves\Blog\Helper\Data                               $blogHelper           
-     * @param \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory 
-     * @param \Magento\Framework\Translate\Inline\StateInterface  $inlineTranslation    
-     * @param \Magento\Framework\Mail\Template\TransportBuilder   $transportBuilder     
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface  $scopeConfig          
-     * @param \Magento\Store\Model\StoreManagerInterface          $storeManager         
+     * @param Context                                             $context
+     * @param \Magento\Framework\View\Result\PageFactory          $resultPageFactory
+     * @param \Ves\Blog\Helper\Data                               $blogHelper
+     * @param \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory
+     * @param \Magento\Framework\Translate\Inline\StateInterface  $inlineTranslation
+     * @param \Magento\Framework\Mail\Template\TransportBuilder   $transportBuilder
+     * @param \Magento\Framework\App\Config\ScopeConfigInterface  $scopeConfig
+     * @param \Magento\Store\Model\StoreManagerInterface          $storeManager
      */
     public function __construct(
         Context $context,
@@ -148,6 +148,7 @@ public function execute()
             if (isset($data['content']) && $allowableTags) {
                 $data['content'] = strip_tags($data['content'], $allowableTags);
             }
+            $data['content'] = $this->_blogHelper->xss_clean($data['content']);
 
             $model = $this->_objectManager->create('Ves\Blog\Model\Comment');
             $store = $this->_storeManager->getStore();
@@ -231,4 +232,4 @@ public function execute()
         }
         return $resultRedirect->setRefererOrBaseUrl();
     }
-}
\ No newline at end of file
+}
diff --git a/Helper/Data.php b/Helper/Data.php
index 982472b..441892f 100644
--- a/Helper/Data.php
+++ b/Helper/Data.php
@@ -1,419 +1,504 @@
-<?php
-/**
- * Venustheme
- * 
- * NOTICE OF LICENSE
- * 
- * This source file is subject to the Venustheme.com license that is
- * available through the world-wide-web at this URL:
- * http://www.venustheme.com/license-agreement.html
- * 
- * DISCLAIMER
- * 
- * Do not edit or add to this file if you wish to upgrade this extension to newer
- * version in the future.
- * 
- * @category   Venustheme
- * @package    Ves_Blog
- * @copyright  Copyright (c) 2016 Venustheme (http://www.venustheme.com/)
- * @license    http://www.venustheme.com/LICENSE-1.0.html
- */
-namespace Ves\Blog\Helper;
-
-class Data extends \Magento\Framework\App\Helper\AbstractHelper
-{
-    /**
-     * Group Collection
-     */
-    protected $_groupCollection;
-
-    /** @var \Magento\Store\Model\StoreManagerInterface */
-    protected $_storeManager;
-
-    protected $_config = [];
-
-    /**
-     * Template filter factory
-     *
-     * @var \Magento\Catalog\Model\Template\Filter\Factory
-     */
-    protected $_templateFilterFactory;
-
-    /**
-     * @var \Magento\Cms\Model\Template\FilterProvider
-     */
-    protected $_filterProvider;
-
-    protected $_postCategories = NULL;
-
-    /**
-     * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-     */
-    protected $_localeDate;
-
-    protected $_postFactory;
-
-    /**
-     * @var \Magento\Framework\Registry
-     */
-    protected $_coreRegistry;
-
-    protected $_request;
-
-    const XML_PATH_AJAXSCROLL_ENABLED = 'ajaxscroll_selectors/enable_ajaxscroll';
-    const XML_PATH_BLOG_ENABLED = 'general_settings/enable';
-
-	/**
-     * @param \Magento\Framework\App\Helper\Context
-     * @param \Magento\Store\Model\StoreManagerInterface
-     * @param \Magento\Cms\Model\Template\FilterProvider
-     * @param \Magento\Framework\App\ResourceConnection
-     * @param \Magento\Framework\UrlInterface
-     * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-     * @param \Magento\User\Model\User
-     * @param \Ves\Blog\Model\Post
-     * @param \Magento\Framework\Registry
-     */
-    public function __construct(
-        \Magento\Framework\App\Helper\Context $context,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Cms\Model\Template\FilterProvider $filterProvider,
-        \Magento\Framework\App\ResourceConnection $resource,
-        \Magento\Framework\Url $frontendUrlBuilder,
-        \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
-        \Magento\User\Model\User $userFactory,
-        \Ves\Blog\Model\Post $postFactory,
-        \Ves\Blog\Model\Author $authorFactory,
-        \Magento\Framework\Registry $registry
-        ) {
-        parent::__construct($context);
-        $this->_request            = $context->getRequest();
-        $this->_filterProvider     = $filterProvider;
-        $this->_storeManager       = $storeManager;
-        $this->_resource           = $resource;
-        $this->_frontendUrlBuilder = $frontendUrlBuilder;
-        $this->_userFactory        = $userFactory;
-        $this->_localeDate         = $localeDate;
-        $this->_postFactory        = $postFactory;
-        $this->_coreRegistry       = $registry;
-        $this->_authorFactory      = $authorFactory;
-    }
-
-    /**
-     * Retrieve translated & formated date
-     * @param  string $format
-     * @param  string $dateOrTime
-     * @return string
-     */
-    public static function getTranslatedDate($format, $dateOrTime)
-    {
-        $time = is_numeric($dateOrTime) ? $dateOrTime : strtotime($dateOrTime);
-        $month = ['F' => '%1', 'M' => '%2'];
-
-        foreach ($month as $from => $to) {
-            $format = str_replace($from, $to, $format);
-        }
-
-        $date = date($format, $time);
-
-        foreach ($month as $to => $from) {
-            $date = str_replace($from, __(date($to, $time)), $date);
-        }
-
-        return $date;
-    }
-
-    /**
-     * Return brand config value by key and store
-     *
-     * @param string $key
-     * @param \Magento\Store\Model\Store|int|string $store
-     * @return string|null
-     */
-    public function getConfig($key, $store = null)
-    {
-        $store = $this->_storeManager->getStore($store);
-        $websiteId = $store->getWebsiteId();
-
-        $result = $this->scopeConfig->getValue(
-            'vesblog/'.$key,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-            $store);
-
-        return $result;
-    }
-
-    public function filter($str)
-    {
-        $html = $this->_filterProvider->getPageFilter()->filter($str);
-        return $html;
-    }
-
-    public function getAuthorUrl($author)
-    {
-        if($author) {
-            $url = $this->_storeManager->getStore()->getBaseUrl();
-            $url_prefix = $this->getConfig('general_settings/url_prefix');
-            $url_suffix = $this->getConfig('general_settings/url_suffix');
-            $urlPrefix = '';
-            if($url_prefix){
-                $urlPrefix = $url_prefix.'/';
-            }
-            return $url . $urlPrefix . 'author/' . $author->getUserName();
-        } 
-        return "";
-    }
-
-    public function getCategoryUrl($alias)
-    {
-        $url = $this->_storeManager->getStore()->getBaseUrl();
-        $url_prefix = $this->getConfig('general_settings/url_prefix');
-        $url_suffix = $this->getConfig('general_settings/url_suffix');
-        $urlPrefix = '';
-        if($url_prefix){
-            $urlPrefix = $url_prefix.'/';
-        }
-        return $url . $urlPrefix . $alias . $url_suffix;
-    }
-
-    public function getPostAuthor($post){
-        $authorId = $post->getUserId();
-        $author = $this->_authorFactory->loadByUserId($authorId);
-        if($author->getIsView()) {
-            return $author;
-        }
-        return false;
-    }
-
-    public function getTagUrl($alias){
-        $url = $this->_storeManager->getStore()->getBaseUrl();
-        $url_prefix = $this->getConfig('general_settings/url_prefix');
-        $url_suffix = $this->getConfig('general_settings/url_suffix');
-        $urlPrefix = '';
-        if($url_prefix){
-            $urlPrefix = $url_prefix.'/';
-        }
-        return $url . $urlPrefix . 'tag/' . $alias;
-    }
-
-    public function getLatestPageUrl(){
-        $url = $this->_storeManager->getStore()->getBaseUrl();
-        $url_prefix = $this->getConfig('general_settings/url_prefix');
-        $url_suffix = $this->getConfig('general_settings/url_suffix');
-        $urlPrefix = '';
-        if($url_prefix){
-            $urlPrefix = $url_prefix.'/';
-        }
-        return $url . $urlPrefix;
-    }
-
-    public function getAuthorsPageUrl(){
-        $url = $this->_storeManager->getStore()->getBaseUrl();
-        $blog_url_prefix = $this->getConfig('general_settings/url_prefix');
-        $url_prefix = $this->getConfig('other_settings/authors_url');
-        $urlPrefix = $blog_url_prefix.'/author/list/';
-        if($url_prefix){
-            $urlPrefix = $blog_url_prefix."/".$url_prefix.'/';
-        }
-        return $url . $urlPrefix;
-    }
-
-    public function formatDate(
-        $date = null,
-        $format = \IntlDateFormatter::SHORT,
-        $showTime = false,
-        $timezone = null
-        ) {
-        $date = $date instanceof \DateTimeInterface ? $date : new \DateTime($date);
-        return $this->_localeDate->formatDateTime(
-            $date,
-            $format,
-            $showTime ? $format : \IntlDateFormatter::NONE,
-            null,
-            $timezone
-            );
-    }
-
-    public function getFormatDate($date, $type = 'full'){
-        $result = '';
-        switch ($type) {
-            case 'full':
-            $result = $this->formatDate($date, \IntlDateFormatter::FULL);
-            break;
-            case 'long':
-            $result = $this->formatDate($date, \IntlDateFormatter::LONG);
-            break;
-            case 'medium':
-            $result = $this->formatDate($date, \IntlDateFormatter::MEDIUM);
-            break;
-            case 'short':
-            $result = $this->formatDate($date, \IntlDateFormatter::SHORT);
-            break;
-        }
-        return $result;
-    }
-
-    public function getPostUrlLinkAttr($post){
-        $attr = '';
-        $enable_custom_post_url = $this->getConfig("other_settings/use_custom_post_link");
-        $link_follow = $this->getConfig("other_settings/link_follow");
-        $real_post_url = $post->getData("real_post_url");
-        if($enable_custom_post_url && $post->hasData("real_post_url") && $link_follow && $real_post_url){
-            return ' rel="'.$link_follow.'"';
-        }
-        return $attr;
-    }
-    
-    public function getPostUrl($post)
-    {
-        $enable_custom_post_url = $this->getConfig("other_settings/use_custom_post_link");
-        $real_post_url = $post->getData("real_post_url");
-        if($enable_custom_post_url && $post->hasData("real_post_url") && $real_post_url){
-            return $real_post_url;
-        }
-
-        $url = $this->_storeManager->getStore()->getBaseUrl();
-        $url_prefix = $this->getConfig('general_settings/url_prefix');
-        $url_suffix = $this->getConfig('general_settings/url_suffix');
-        $categoriesUrls = $this->getConfig('general_settings/categories_urls');
-        $urlPrefix = '';
-        if($url_prefix){
-            $urlPrefix = $url_prefix.'/';
-        }
-        $categoryUrl = '';
-
-        if($categoriesUrls){
-            $category = $post->getData("categories");
-            if($category && isset($category[0]['identifier']) && $category[0]['identifier']!=''){
-                $categoryUrl = $category[0]['identifier'] . '/';
-            }
-
-        }
-        return $url . $urlPrefix . $categoryUrl . $post->getIdentifier() . $url_suffix;
-    }
-
-
-    public function getPostPreviewUrl($post)
-    {
-        $url_prefix = $this->getConfig('general_settings/url_prefix');
-        $url_suffix = $this->getConfig('general_settings/url_suffix');
-        $categoriesUrls = $this->getConfig('general_settings/categories_urls');
-        $urlPrefix = '';
-        if($url_prefix){
-            $urlPrefix = $url_prefix.'/';
-        }
-        $categoryUrl = '';
-
-        if($categoriesUrls){
-            $category = $post["categories"];
-            if($category && isset($category[0]['identifier']) && $category[0]['identifier']!=''){
-                $categoryUrl = $category[0]['identifier'] . '/';
-            }
-
-        }
-        return $urlPrefix . $categoryUrl . $post['identifier'] . $url_suffix;
-    }
-
-    public function getSearchFormUrl(){
-        $url        = $this->_storeManager->getStore()->getBaseUrl();
-        $url_prefix = $this->getConfig('general_settings/url_prefix');
-        $url_suffix = $this->getConfig('general_settings/url_suffix');
-        $urlPrefix  = '';
-        if ($url_prefix) {
-            $urlPrefix = $url_prefix . '/';
-        }
-        return $url . $urlPrefix . 'search';
-    }
-
-
-    public function getPostCategories($postId){
-        if($this->_postCategories == NULL){
-            $connection = $this->_resource->getConnection();
-            $select = 'SELECT * FROM ' . $this->_resource->getTableName('ves_blog_post_category') . ' WHERE post_id = ' . $postId . ' ORDER BY position ASC';
-            $this->_postCategories = $connection->fetchAll($select);
-        }
-        return $this->_postCategories;
-    }
-
-    public function subString( $text, $length = 100, $replacer ='...', $is_striped=true ){
-        if($length == 0) return $text;
-        $text = ($is_striped==true)?strip_tags($text):$text;
-        if(strlen($text) <= $length){
-            return $text;
-        }
-        $text = substr($text,0,$length);
-        $pos_space = strrpos($text,' ');
-        return substr($text,0,$pos_space).$replacer;
-    }
-
-    /**
-     * @param string|null $route
-     * @param array|null $params
-     * @return string
-     */
-    public function getUrl($route, $params = [])
-    {
-        return $this->_frontendUrlBuilder->getUrl($route, $params);
-    }
-
-    public function getPostCategoryUrl($post)
-    {
-        $category = '';
-        $categories = $this->getPostCategories($post->getPostId());
-        if(!empty($categories)){
-            $connection = $this->_resource->getConnection();
-            $select = 'SELECT * FROM ' . $this->_resource->getTableName('ves_blog_category') . ' WHERE category_id = ' . $categories[0]['category_id'];
-            $category = $connection->fetchAll($select);
-            return $category;
-        }
-        return $category;
-    }
-
-    /**
-     * @param string $file
-     * @return string
-     */
-    public function getMediaUrl($file)
-    {
-        $parsed = parse_url($file);
-        if (empty($parsed['scheme'])) {
-            return $this->_storeManager->getStore()->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA) . $file;
-        }else{
-            return $file;
-        }
-    }
-
-    public function getPostByCategory($categoryId){
-        $collection = $this->_postFactory->getCollection();
-    }
-
-    public function getCoreRegistry(){
-        return $this->_coreRegistry;
-    }
-
-    public function getSearchKey(){
-        return $this->_request->getParam('s');
-    }
-    public function isEnabled($storeId = null)
-    {
-        return $this->getConfig(self::XML_PATH_BLOG_ENABLED, $storeId);
-    }
-    /**
-     * Escape quotes in java script
-     *
-     * @param mixed $data
-     * @param string $quote
-     * @return mixed
-     */
-    public function jsQuoteEscape($data, $quote='\'')
-    {
-        if (is_array($data)) {
-            $result = array();
-            foreach ($data as $item) {
-                $result[] = str_replace($quote, '\\'.$quote, $item);
-            }
-            return $result;
-        }
-        return str_replace($quote, '\\'.$quote, $data);
-    }
-}
\ No newline at end of file
+<?php
+/**
+ * Venustheme
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Venustheme.com license that is
+ * available through the world-wide-web at this URL:
+ * http://www.venustheme.com/license-agreement.html
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade this extension to newer
+ * version in the future.
+ *
+ * @category   Venustheme
+ * @package    Ves_Blog
+ * @copyright  Copyright (c) 2016 Venustheme (http://www.venustheme.com/)
+ * @license    http://www.venustheme.com/LICENSE-1.0.html
+ */
+namespace Ves\Blog\Helper;
+
+class Data extends \Magento\Framework\App\Helper\AbstractHelper
+{
+    /**
+     * Group Collection
+     */
+    protected $_groupCollection;
+
+    /** @var \Magento\Store\Model\StoreManagerInterface */
+    protected $_storeManager;
+
+    protected $_config = [];
+
+    /**
+     * Template filter factory
+     *
+     * @var \Magento\Catalog\Model\Template\Filter\Factory
+     */
+    protected $_templateFilterFactory;
+
+    /**
+     * @var \Magento\Cms\Model\Template\FilterProvider
+     */
+    protected $_filterProvider;
+
+    protected $_postCategories = NULL;
+
+    /**
+     * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
+     */
+    protected $_localeDate;
+
+    protected $_postFactory;
+
+    /**
+     * @var \Magento\Framework\Registry
+     */
+    protected $_coreRegistry;
+
+    protected $_request;
+
+    const XML_PATH_AJAXSCROLL_ENABLED = 'ajaxscroll_selectors/enable_ajaxscroll';
+    const XML_PATH_BLOG_ENABLED = 'general_settings/enable';
+
+	/**
+     * @param \Magento\Framework\App\Helper\Context
+     * @param \Magento\Store\Model\StoreManagerInterface
+     * @param \Magento\Cms\Model\Template\FilterProvider
+     * @param \Magento\Framework\App\ResourceConnection
+     * @param \Magento\Framework\UrlInterface
+     * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface
+     * @param \Magento\User\Model\User
+     * @param \Ves\Blog\Model\Post
+     * @param \Magento\Framework\Registry
+     */
+    public function __construct(
+        \Magento\Framework\App\Helper\Context $context,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        \Magento\Cms\Model\Template\FilterProvider $filterProvider,
+        \Magento\Framework\App\ResourceConnection $resource,
+        \Magento\Framework\Url $frontendUrlBuilder,
+        \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
+        \Magento\User\Model\User $userFactory,
+        \Ves\Blog\Model\Post $postFactory,
+        \Ves\Blog\Model\Author $authorFactory,
+        \Magento\Framework\Registry $registry
+        ) {
+        parent::__construct($context);
+        $this->_request            = $context->getRequest();
+        $this->_filterProvider     = $filterProvider;
+        $this->_storeManager       = $storeManager;
+        $this->_resource           = $resource;
+        $this->_frontendUrlBuilder = $frontendUrlBuilder;
+        $this->_userFactory        = $userFactory;
+        $this->_localeDate         = $localeDate;
+        $this->_postFactory        = $postFactory;
+        $this->_coreRegistry       = $registry;
+        $this->_authorFactory      = $authorFactory;
+    }
+
+    /**
+     * Retrieve translated & formated date
+     * @param  string $format
+     * @param  string $dateOrTime
+     * @return string
+     */
+    public static function getTranslatedDate($format, $dateOrTime)
+    {
+        $time = is_numeric($dateOrTime) ? $dateOrTime : strtotime($dateOrTime);
+        $month = ['F' => '%1', 'M' => '%2'];
+
+        foreach ($month as $from => $to) {
+            $format = str_replace($from, $to, $format);
+        }
+
+        $date = date($format, $time);
+
+        foreach ($month as $to => $from) {
+            $date = str_replace($from, __(date($to, $time)), $date);
+        }
+
+        return $date;
+    }
+
+    /**
+     * Return brand config value by key and store
+     *
+     * @param string $key
+     * @param \Magento\Store\Model\Store|int|string $store
+     * @return string|null
+     */
+    public function getConfig($key, $store = null)
+    {
+        $store = $this->_storeManager->getStore($store);
+        $websiteId = $store->getWebsiteId();
+
+        $result = $this->scopeConfig->getValue(
+            'vesblog/'.$key,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            $store);
+
+        return $result;
+    }
+
+    public function filter($str)
+    {
+        $html = $this->_filterProvider->getPageFilter()->filter($str);
+        return $html;
+    }
+
+    public function getAuthorUrl($author)
+    {
+        if($author) {
+            $url = $this->_storeManager->getStore()->getBaseUrl();
+            $url_prefix = $this->getConfig('general_settings/url_prefix');
+            $url_suffix = $this->getConfig('general_settings/url_suffix');
+            $urlPrefix = '';
+            if($url_prefix){
+                $urlPrefix = $url_prefix.'/';
+            }
+            return $url . $urlPrefix . 'author/' . $author->getUserName();
+        }
+        return "";
+    }
+
+    public function getCategoryUrl($alias)
+    {
+        $url = $this->_storeManager->getStore()->getBaseUrl();
+        $url_prefix = $this->getConfig('general_settings/url_prefix');
+        $url_suffix = $this->getConfig('general_settings/url_suffix');
+        $urlPrefix = '';
+        if($url_prefix){
+            $urlPrefix = $url_prefix.'/';
+        }
+        return $url . $urlPrefix . $alias . $url_suffix;
+    }
+
+    public function getPostAuthor($post){
+        $authorId = $post->getUserId();
+        $author = $this->_authorFactory->loadByUserId($authorId);
+        if($author->getIsView()) {
+            return $author;
+        }
+        return false;
+    }
+
+    public function getTagUrl($alias){
+        $url = $this->_storeManager->getStore()->getBaseUrl();
+        $url_prefix = $this->getConfig('general_settings/url_prefix');
+        $url_suffix = $this->getConfig('general_settings/url_suffix');
+        $urlPrefix = '';
+        if($url_prefix){
+            $urlPrefix = $url_prefix.'/';
+        }
+        return $url . $urlPrefix . 'tag/' . $alias;
+    }
+
+    public function getLatestPageUrl(){
+        $url = $this->_storeManager->getStore()->getBaseUrl();
+        $url_prefix = $this->getConfig('general_settings/url_prefix');
+        $url_suffix = $this->getConfig('general_settings/url_suffix');
+        $urlPrefix = '';
+        if($url_prefix){
+            $urlPrefix = $url_prefix.'/';
+        }
+        return $url . $urlPrefix;
+    }
+
+    public function getAuthorsPageUrl(){
+        $url = $this->_storeManager->getStore()->getBaseUrl();
+        $blog_url_prefix = $this->getConfig('general_settings/url_prefix');
+        $url_prefix = $this->getConfig('other_settings/authors_url');
+        $urlPrefix = $blog_url_prefix.'/author/list/';
+        if($url_prefix){
+            $urlPrefix = $blog_url_prefix."/".$url_prefix.'/';
+        }
+        return $url . $urlPrefix;
+    }
+
+    public function formatDate(
+        $date = null,
+        $format = \IntlDateFormatter::SHORT,
+        $showTime = false,
+        $timezone = null
+        ) {
+        $date = $date instanceof \DateTimeInterface ? $date : new \DateTime($date);
+        return $this->_localeDate->formatDateTime(
+            $date,
+            $format,
+            $showTime ? $format : \IntlDateFormatter::NONE,
+            null,
+            $timezone
+            );
+    }
+
+    public function getFormatDate($date, $type = 'full'){
+        $result = '';
+        switch ($type) {
+            case 'full':
+            $result = $this->formatDate($date, \IntlDateFormatter::FULL);
+            break;
+            case 'long':
+            $result = $this->formatDate($date, \IntlDateFormatter::LONG);
+            break;
+            case 'medium':
+            $result = $this->formatDate($date, \IntlDateFormatter::MEDIUM);
+            break;
+            case 'short':
+            $result = $this->formatDate($date, \IntlDateFormatter::SHORT);
+            break;
+        }
+        return $result;
+    }
+
+    public function getPostUrlLinkAttr($post){
+        $attr = '';
+        $enable_custom_post_url = $this->getConfig("other_settings/use_custom_post_link");
+        $link_follow = $this->getConfig("other_settings/link_follow");
+        $real_post_url = $post->getData("real_post_url");
+        if($enable_custom_post_url && $post->hasData("real_post_url") && $link_follow && $real_post_url){
+            return ' rel="'.$link_follow.'"';
+        }
+        return $attr;
+    }
+
+    public function getPostUrl($post)
+    {
+        $enable_custom_post_url = $this->getConfig("other_settings/use_custom_post_link");
+        $real_post_url = $post->getData("real_post_url");
+        if($enable_custom_post_url && $post->hasData("real_post_url") && $real_post_url){
+            return $real_post_url;
+        }
+
+        $url = $this->_storeManager->getStore()->getBaseUrl();
+        $url_prefix = $this->getConfig('general_settings/url_prefix');
+        $url_suffix = $this->getConfig('general_settings/url_suffix');
+        $categoriesUrls = $this->getConfig('general_settings/categories_urls');
+        $urlPrefix = '';
+        if($url_prefix){
+            $urlPrefix = $url_prefix.'/';
+        }
+        $categoryUrl = '';
+
+        if($categoriesUrls){
+            $category = $post->getData("categories");
+            if($category && isset($category[0]['identifier']) && $category[0]['identifier']!=''){
+                $categoryUrl = $category[0]['identifier'] . '/';
+            }
+
+        }
+        return $url . $urlPrefix . $categoryUrl . $post->getIdentifier() . $url_suffix;
+    }
+
+
+    public function getPostPreviewUrl($post)
+    {
+        $url_prefix = $this->getConfig('general_settings/url_prefix');
+        $url_suffix = $this->getConfig('general_settings/url_suffix');
+        $categoriesUrls = $this->getConfig('general_settings/categories_urls');
+        $urlPrefix = '';
+        if($url_prefix){
+            $urlPrefix = $url_prefix.'/';
+        }
+        $categoryUrl = '';
+
+        if($categoriesUrls){
+            $category = $post["categories"];
+            if($category && isset($category[0]['identifier']) && $category[0]['identifier']!=''){
+                $categoryUrl = $category[0]['identifier'] . '/';
+            }
+
+        }
+        return $urlPrefix . $categoryUrl . $post['identifier'] . $url_suffix;
+    }
+
+    public function getSearchFormUrl(){
+        $url        = $this->_storeManager->getStore()->getBaseUrl();
+        $url_prefix = $this->getConfig('general_settings/url_prefix');
+        $url_suffix = $this->getConfig('general_settings/url_suffix');
+        $urlPrefix  = '';
+        if ($url_prefix) {
+            $urlPrefix = $url_prefix . '/';
+        }
+        return $url . $urlPrefix . 'search';
+    }
+
+
+    public function getPostCategories($postId){
+        if($this->_postCategories == NULL){
+            $connection = $this->_resource->getConnection();
+            $select = 'SELECT * FROM ' . $this->_resource->getTableName('ves_blog_post_category') . ' WHERE post_id = ' . $postId . ' ORDER BY position ASC';
+            $this->_postCategories = $connection->fetchAll($select);
+        }
+        return $this->_postCategories;
+    }
+
+    public function subString( $text, $length = 100, $replacer ='...', $is_striped=true ){
+        if($length == 0) return $text;
+        $text = ($is_striped==true)?strip_tags($text):$text;
+        if(strlen($text) <= $length){
+            return $text;
+        }
+        $text = substr($text,0,$length);
+        $pos_space = strrpos($text,' ');
+        return substr($text,0,$pos_space).$replacer;
+    }
+
+    /**
+     * @param string|null $route
+     * @param array|null $params
+     * @return string
+     */
+    public function getUrl($route, $params = [])
+    {
+        return $this->_frontendUrlBuilder->getUrl($route, $params);
+    }
+
+    public function getPostCategoryUrl($post)
+    {
+        $category = '';
+        $categories = $this->getPostCategories($post->getPostId());
+        if(!empty($categories)){
+            $connection = $this->_resource->getConnection();
+            $select = 'SELECT * FROM ' . $this->_resource->getTableName('ves_blog_category') . ' WHERE category_id = ' . $categories[0]['category_id'];
+            $category = $connection->fetchAll($select);
+            return $category;
+        }
+        return $category;
+    }
+
+    /**
+     * @param string $file
+     * @return string
+     */
+    public function getMediaUrl($file)
+    {
+        $parsed = parse_url($file);
+        if (empty($parsed['scheme'])) {
+            return $this->_storeManager->getStore()->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA) . $file;
+        }else{
+            return $file;
+        }
+    }
+
+    public function getPostByCategory($categoryId){
+        $collection = $this->_postFactory->getCollection();
+    }
+
+    public function getCoreRegistry(){
+        return $this->_coreRegistry;
+    }
+
+    public function getSearchKey(){
+        return $this->_request->getParam('s');
+    }
+    public function isEnabled($storeId = null)
+    {
+        return $this->getConfig(self::XML_PATH_BLOG_ENABLED, $storeId);
+    }
+    /**
+     * Escape quotes in java script
+     *
+     * @param mixed $data
+     * @param string $quote
+     * @return mixed
+     */
+    public function jsQuoteEscape($data, $quote='\'')
+    {
+        if (is_array($data)) {
+            $result = array();
+            foreach ($data as $item) {
+                $result[] = str_replace($quote, '\\'.$quote, $item);
+            }
+            return $result;
+        }
+        return str_replace($quote, '\\'.$quote, $data);
+    }
+
+    /**
+     * @param $data_array
+     * @return array
+     */
+    public function xss_clean_array($data_array)
+    {
+        $result = [];
+        if (is_array($data_array)) {
+            foreach ($data_array as $key => $val) {
+                $val = $this->xss_clean($val);
+                $result[$key] = $val;
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * @param $data
+     * @return string|string[]|null
+     */
+    public function xss_clean($data)
+    {
+        if (!is_string($data)) {
+            return $data;
+        }
+        // Fix &entity\n;
+        $data = str_replace(['&amp;', '&lt;', '&gt;'], ['&amp;amp;', '&amp;lt;', '&amp;gt;'], $data);
+        $data = preg_replace('/(&#*\w+)[\x00-\x20]+;/u', '$1;', $data);
+        $data = preg_replace('/(&#x*[0-9A-F]+);*/iu', '$1;', $data);
+        $data = html_entity_decode($data, ENT_COMPAT, 'UTF-8');
+
+        // Remove any attribute starting with "on" or xmlns
+        $data = preg_replace('#(<[^>]+?[\x00-\x20"\'])(?:on|xmlns)[^>]*+>#iu', '$1>', $data);
+
+        // Remove javascript: and vbscript: protocols
+        $data = preg_replace(
+            '#([a-z]*)[\x00-\x20]*=[\x00-\x20]*([`\'"]*)[\x00-\x20]*j[\x00-\x20]*a[\x00-\x20]*v[\x00-\x20]*a[\x00-\x20]*s[\x00-\x20]*c[\x00-\x20]*r[\x00-\x20]*i[\x00-\x20]*p[\x00-\x20]*t[\x00-\x20]*:#iu',
+            '$1=$2nojavascript...',
+            $data
+        );
+        $data = preg_replace(
+            '#([a-z]*)[\x00-\x20]*=([\'"]*)[\x00-\x20]*v[\x00-\x20]*b[\x00-\x20]*s[\x00-\x20]*c[\x00-\x20]*r[\x00-\x20]*i[\x00-\x20]*p[\x00-\x20]*t[\x00-\x20]*:#iu',
+            '$1=$2novbscript...',
+            $data
+        );
+        $data = preg_replace(
+            '#([a-z]*)[\x00-\x20]*=([\'"]*)[\x00-\x20]*-moz-binding[\x00-\x20]*:#u',
+            '$1=$2nomozbinding...',
+            $data
+        );
+
+        // Only works in IE: <span style="width: expression(alert('Ping!'));"></span>
+        $data = preg_replace(
+            '#(<[^>]+?)style[\x00-\x20]*=[\x00-\x20]*[`\'"]*.*?expression[\x00-\x20]*\([^>]*+>#i',
+            '$1>',
+            $data
+        );
+        $data = preg_replace(
+            '#(<[^>]+?)style[\x00-\x20]*=[\x00-\x20]*[`\'"]*.*?behaviour[\x00-\x20]*\([^>]*+>#i',
+            '$1>',
+            $data
+        );
+        $data = preg_replace(
+            '#(<[^>]+?)style[\x00-\x20]*=[\x00-\x20]*[`\'"]*.*?s[\x00-\x20]*c[\x00-\x20]*r[\x00-\x20]*i[\x00-\x20]*p[\x00-\x20]*t[\x00-\x20]*:*[^>]*+>#iu',
+            '$1>',
+            $data
+        );
+
+        // Remove namespaced elements (we do not need them)
+        $data = preg_replace('#</*\w+:\w[^>]*+>#i', '', $data);
+
+        do {
+            // Remove really unwanted tags
+            $old_data = $data;
+            $data = preg_replace(
+                '#</*(?:applet|b(?:ase|gsound|link)|embed|frame(?:set)?|i(?:frame|layer)|l(?:ayer|ink)|meta|object|s(?:cript|tyle)|title|xml)[^>]*+>#i',
+                '',
+                $data
+            );
+        } while ($old_data !== $data);
+
+        // we are done...
+        return $data;
+    }
+}
diff --git a/view/frontend/templates/archive.phtml b/view/frontend/templates/archive.phtml
index 4e34b67..19e8bf9 100644
--- a/view/frontend/templates/archive.phtml
+++ b/view/frontend/templates/archive.phtml
@@ -8,7 +8,7 @@ $archiveblockTitle = $helper->getConfig('sidebar/archiveblock_title');
     <div class="ves-block block blog-archive">
         <?php if($archiveblockTitle){ ?>
             <div class="block-title">
-                <strong><?php echo __($archiveblockTitle) ?></strong>
+                <strong><?= __($archiveblockTitle) ?></strong>
             </div>
             <?php } ?>
             <div class="block-content blog-widget-content">
@@ -20,12 +20,12 @@ $archiveblockTitle = $helper->getConfig('sidebar/archiveblock_title');
                     $title = $block->escapeHtml($title, null, true);
                     ?>
                     <div class="item">
-                        <a title="<?php echo __('Archive ') . $title ?>" class="archive-item-link" href="<?php echo $block->getTimeUrl($time['time']) ?>">
-                            <i class="fa fa-angle-right"></i> <?php echo $title; ?>
+                        <a title="<?= __('Archive ') . $title ?>" class="archive-item-link" href="<?= $block->getTimeUrl($time['time']) ?>">
+                            <i class="fa fa-angle-right"></i> <?= $title; ?>
                         </a>
-                        <span>(<?php echo $time['count']; ?>)</span>
+                        <span>(<?= $time['count']; ?>)</span>
                     </div>
                     <?php } ?>
                 </div>
             </div>
-            <?php } ?>
\ No newline at end of file
+            <?php } ?>
diff --git a/view/frontend/templates/archive/view.phtml b/view/frontend/templates/archive/view.phtml
index 344ef41..5d19834 100644
--- a/view/frontend/templates/archive/view.phtml
+++ b/view/frontend/templates/archive/view.phtml
@@ -1,110 +1,110 @@
-<?php
-$collection  = $this->getCollection();
-$helper      = $this->helper("Ves\Blog\Helper\Data");
-$imageHelper = $this->helper("Ves\Blog\Helper\Image");
-
-/** General Settings **/
-$maincontainer_selector     = $helper->getConfig("general_settings/maincontainer_selector");
-$maincontainer_selector = $maincontainer_selector?$maincontainer_selector:'.column.main';
-$dateFormat         = $this->getConfig("general_settings/dateformat");
-$twitterUsername    = $this->getConfig("general_settings/twitter_username");
-$enableNetworks     = $this->getConfig("general_settings/enable_networks");
-$networks           = array_flip(explode(",", $this->getConfig("general_settings/networks")));
-$layout             = $this->getConfig("blog_page/layout_type");
-$show_toolbartop    = $this->getConfig("blog_page/show_toolbartop");
-$show_toolbarbottom = $this->getConfig("blog_page/show_toolbarbottom");
-$postsStyles        = $this->getConfig('blog_page/posts_styles');
-
-$itemsperpage       = (int)$this->getConfig('blog_page/item_per_page',20);
-$lg_column_item     = (int)$this->getConfig('blog_page/lg_column_item',6);
-$md_column_item     = (int)$this->getConfig('blog_page/md_column_item',6);
-$sm_column_item     = (int)$this->getConfig('blog_page/sm_column_item',6);
-$xs_column_item     = (int)$this->getConfig('blog_page/xs_column_item',6);
-$lg_column          = 12/$lg_column_item;
-$md_column          = 12/$md_column_item;
-$sm_column          = 12/$sm_column_item;
-$xs_column          = 12/$xs_column_item;
-
-/** POST Settings **/
-$show_image             = $this->getConfig("blog_page/show_image");
-$keep_ratio             = $this->getConfig("blog_page/keep_ratio");
-$keep_frame             = $this->getConfig("blog_page/keep_frame");
-$image_width            = (int)$this->getConfig("blog_page/image_width");
-$image_height           = (int)$this->getConfig("blog_page/image_height");
-$show_title             = $this->getConfig("blog_page/show_title");
-$show_shortdescription  = $this->getConfig("blog_page/show_shortdescription");
-$shortdescription_count = $this->getConfig("blog_page/shortdescription_count");
-$show_readmorelink		= $this->getConfig("blog_page/show_readmorelink");
-$show_categories        = $this->getConfig("blog_page/show_categories");
-$show_author            = $this->getConfig("blog_page/show_author");
-$show_commentcount      = $this->getConfig("blog_page/show_commentcount");
-$disable_comment 		= $this->getConfig('general_settings/disable_comment');
-if($disable_comment) {
-	$show_commentcount = false;
-}
-$show_updatedtime       = $this->getConfig("blog_page/show_updatedtime");
-$show_createdtime       = $this->getConfig("blog_page/show_createdtime");
-$show_hits              = $this->getConfig("blog_page/show_hits");
-$show_image             = $this->getConfig("blog_page/show_image");
-$show_tags              = $this->getConfig("blog_page/show_tags");
-$blockId = 'blog-' . $layout . time();
-?>
-
-<?php if($collection->count()){ ?>
-<?php $total = count($collection->getItems()); ?>
-<div class="ves-blog post-list postsstyle-<?php echo $postsStyles ?>">
-	<?php if($show_toolbartop){ ?>
-	<div class="blog-toolbar">
-		<?php echo $block->getChildHtml('toolbar'); ?>
-	</div>
-	<?php } ?>
-	<div class="blog-<?php echo $layout ?> <?php echo $blockId; ?>  blog-posts">
-		<?php echo $this->getPostsBlock(); ?>
-	</div>
-	<?php if($show_toolbarbottom){ ?>
-	<div class="blog-toolbar">
-		<?php echo $block->getChildHtml('toolbar'); ?>
-	</div>
-	<?php } ?>
-</div>
-<?php if($layout=='masonry'){ ?>
-	<script>
-		function initBlogMasonryLayout($, Masonry){
-			var width = $(window).width();
-			var column = <?php echo $lg_column_item ?>;
-			if(width<480){
-				column = <?php echo $xs_column_item ?>;
-				w = w - 20;
-			}
-			if(width>=480){
-				column = <?php echo $sm_column_item ?>;
-			}
-			if(width>=992){
-				column = <?php echo $md_column_item ?>;
-			}
-			if(width>=1200){
-				column = <?php echo $lg_column_item ?>;
-			}
-			var w = $('<?php echo $maincontainer_selector ; ?>').width() + 20;
-			$('.<?php echo $blockId; ?>').css({"width":w+"px"});
-			var masoW = 100/column;
-			$('.blog-masonry .post-item').css({"width":masoW+"%","margin-bottom":"20px"});
-			new Masonry( '.blog-masonry', {
-				itemSelector: '.post-item'
-			});
-			$('.blog-masonry').css('visibility', 'visible');
-		}
-		require([
-			'jquery',
-			'Ves_Blog/js/masonry.pkgd.min'
-			], function($, Masonry){
-				jQuery(document).ready(function($) {
-					$(window).on("resize", function(){
-						initBlogMasonryLayout($, Masonry);
-					}).resize();
-				});
-			});
-	</script>
-	<?php } ?>
-
-	<?php } ?>
\ No newline at end of file
+<?php
+$collection  = $this->getCollection();
+$helper      = $this->helper("Ves\Blog\Helper\Data");
+$imageHelper = $this->helper("Ves\Blog\Helper\Image");
+
+/** General Settings **/
+$maincontainer_selector     = $helper->getConfig("general_settings/maincontainer_selector");
+$maincontainer_selector = $maincontainer_selector?$maincontainer_selector:'.column.main';
+$dateFormat         = $this->getConfig("general_settings/dateformat");
+$twitterUsername    = $this->getConfig("general_settings/twitter_username");
+$enableNetworks     = $this->getConfig("general_settings/enable_networks");
+$networks           = array_flip(explode(",", $this->getConfig("general_settings/networks")));
+$layout             = $this->getConfig("blog_page/layout_type");
+$show_toolbartop    = $this->getConfig("blog_page/show_toolbartop");
+$show_toolbarbottom = $this->getConfig("blog_page/show_toolbarbottom");
+$postsStyles        = $this->getConfig('blog_page/posts_styles');
+
+$itemsperpage       = (int)$this->getConfig('blog_page/item_per_page',20);
+$lg_column_item     = (int)$this->getConfig('blog_page/lg_column_item',6);
+$md_column_item     = (int)$this->getConfig('blog_page/md_column_item',6);
+$sm_column_item     = (int)$this->getConfig('blog_page/sm_column_item',6);
+$xs_column_item     = (int)$this->getConfig('blog_page/xs_column_item',6);
+$lg_column          = 12/$lg_column_item;
+$md_column          = 12/$md_column_item;
+$sm_column          = 12/$sm_column_item;
+$xs_column          = 12/$xs_column_item;
+
+/** POST Settings **/
+$show_image             = $this->getConfig("blog_page/show_image");
+$keep_ratio             = $this->getConfig("blog_page/keep_ratio");
+$keep_frame             = $this->getConfig("blog_page/keep_frame");
+$image_width            = (int)$this->getConfig("blog_page/image_width");
+$image_height           = (int)$this->getConfig("blog_page/image_height");
+$show_title             = $this->getConfig("blog_page/show_title");
+$show_shortdescription  = $this->getConfig("blog_page/show_shortdescription");
+$shortdescription_count = $this->getConfig("blog_page/shortdescription_count");
+$show_readmorelink		= $this->getConfig("blog_page/show_readmorelink");
+$show_categories        = $this->getConfig("blog_page/show_categories");
+$show_author            = $this->getConfig("blog_page/show_author");
+$show_commentcount      = $this->getConfig("blog_page/show_commentcount");
+$disable_comment 		= $this->getConfig('general_settings/disable_comment');
+if($disable_comment) {
+	$show_commentcount = false;
+}
+$show_updatedtime       = $this->getConfig("blog_page/show_updatedtime");
+$show_createdtime       = $this->getConfig("blog_page/show_createdtime");
+$show_hits              = $this->getConfig("blog_page/show_hits");
+$show_image             = $this->getConfig("blog_page/show_image");
+$show_tags              = $this->getConfig("blog_page/show_tags");
+$blockId = 'blog-' . $layout . time();
+?>
+
+<?php if($collection->count()){ ?>
+<?php $total = count($collection->getItems()); ?>
+<div class="ves-blog post-list postsstyle-<?= $postsStyles ?>">
+	<?php if($show_toolbartop){ ?>
+	<div class="blog-toolbar">
+		<?= $block->getChildHtml('toolbar'); ?>
+	</div>
+	<?php } ?>
+	<div class="blog-<?= $layout ?> <?= $blockId; ?>  blog-posts">
+		<?= $this->getPostsBlock(); ?>
+	</div>
+	<?php if($show_toolbarbottom){ ?>
+	<div class="blog-toolbar">
+		<?= $block->getChildHtml('toolbar'); ?>
+	</div>
+	<?php } ?>
+</div>
+<?php if($layout=='masonry'){ ?>
+	<script>
+		function initBlogMasonryLayout($, Masonry){
+			var width = $(window).width();
+			var column = <?= $lg_column_item ?>;
+			if(width<480){
+				column = <?= $xs_column_item ?>;
+				w = w - 20;
+			}
+			if(width>=480){
+				column = <?= $sm_column_item ?>;
+			}
+			if(width>=992){
+				column = <?= $md_column_item ?>;
+			}
+			if(width>=1200){
+				column = <?= $lg_column_item ?>;
+			}
+			var w = $('<?= $maincontainer_selector ; ?>').width() + 20;
+			$('.<?= $blockId; ?>').css({"width":w+"px"});
+			var masoW = 100/column;
+			$('.blog-masonry .post-item').css({"width":masoW+"%","margin-bottom":"20px"});
+			new Masonry( '.blog-masonry', {
+				itemSelector: '.post-item'
+			});
+			$('.blog-masonry').css('visibility', 'visible');
+		}
+		require([
+			'jquery',
+			'Ves_Blog/js/masonry.pkgd.min'
+			], function($, Masonry){
+				jQuery(document).ready(function($) {
+					$(window).on("resize", function(){
+						initBlogMasonryLayout($, Masonry);
+					}).resize();
+				});
+			});
+	</script>
+	<?php } ?>
+
+	<?php } ?>
diff --git a/view/frontend/templates/author/list.phtml b/view/frontend/templates/author/list.phtml
index 2a758b3..965f85d 100644
--- a/view/frontend/templates/author/list.phtml
+++ b/view/frontend/templates/author/list.phtml
@@ -7,30 +7,30 @@ $blockId = 'blog-list'. time();
 <?php if($collection->count()){ ?>
 <?php $total = count($collection->getItems()); ?>
 <div class="ves-blog authors-list">
-	<div class="blog-list <?php echo $blockId; ?>  blog-authors">
+	<div class="blog-list <?= $blockId; ?>  blog-authors">
 		<!-- List author: name with link, avatar, number posts, social, website -->
 		<ul class="authors-listing">
 		<?php $i = 1; ?>
 		<?php foreach($collection as $author) { ?>
 		<?php $class = (($i/2)==0)?'list-obb':''; $i++; ?>
-		<li <?php echo $class?('class="'.$class.'"'):''; ?>>
+		<li <?= $class?('class="'.$class.'"'):''; ?>>
 			<div id="author-box">
-				<div class="block-title"><h2><a href="<?php echo $helper->getAuthorUrl($author); ?>" title="<?php echo $author->getNickName() ?>"><?php echo $author->getNickName(); ?></a></h2></div>
+				<div class="block-title"><h2><a href="<?= $helper->getAuthorUrl($author); ?>" title="<?= $author->getNickName() ?>"><?= $author->getNickName(); ?></a></h2></div>
 				<div class="block-content">
 					<?php if($avatar = $author->getAvatar()){ ?>
 					<div class="author-avatar">
-					<a href="<?php echo $helper->getAuthorUrl($author); ?>" title="<?php echo $author->getNickName() ?>">
-						<img src="<?php echo $imageHelper->resizeImage($avatar, 125, 125) ?>" alt="" height="125" width="125">
+					<a href="<?= $helper->getAuthorUrl($author); ?>" title="<?= $author->getNickName() ?>">
+						<img src="<?= $imageHelper->resizeImage($avatar, 125, 125) ?>" alt="" height="125" width="125">
 					</a>
 					</div>
 					<?php } ?>
 
 					<?php if($number_posts = $author->getTotalPosts()){ ?>
-					<div class="author-posts"><a href="<?php echo $helper->getAuthorUrl($author); ?>" title="<?php echo __("View all posts") ?>"><?php echo __("%1 posts", $number_posts); ?></a></div>
+					<div class="author-posts"><a href="<?= $helper->getAuthorUrl($author); ?>" title="<?= __("View all posts") ?>"><?= __("%1 posts", $number_posts); ?></a></div>
 					<?php } ?>
 
 					<?php if($bio = $author->getDescription()){ ?>
-					<div class="author-description"><?php echo $helper->filter($bio) ?></div>
+					<div class="author-description"><?= $helper->filter($bio) ?></div>
 					<?php } ?>
 
 					<?php $authorSocials = unserialize($author->getSocialNetworks()); ?>
@@ -38,7 +38,7 @@ $blockId = 'blog-list'. time();
 					<div class="author-social flat-social">
 						<?php foreach ($authorSocials as $k => $v) { ?>
 							<?php if(trim($v)!=''){ ?>
-							<a class="social-<?php echo $k ?>" href="<?php echo $v; ?>"><i class="fa fa-<?php echo $k ?>"></i></a>
+							<a class="social-<?= $k ?>" href="<?= $v; ?>"><i class="fa fa-<?= $k ?>"></i></a>
 							<?php } ?>
 						<?php } ?>
 					</div>
@@ -50,7 +50,7 @@ $blockId = 'blog-list'. time();
 		</ul>
 	</div>
 	<div class="blog-toolbar">
-		<?php echo $block->getChildHtml('toolbar'); ?>
+		<?= $block->getChildHtml('toolbar'); ?>
 	</div>
 </div>
-<?php } ?>
\ No newline at end of file
+<?php } ?>
diff --git a/view/frontend/templates/author/posts.phtml b/view/frontend/templates/author/posts.phtml
index 0588318..7a4f183 100644
--- a/view/frontend/templates/author/posts.phtml
+++ b/view/frontend/templates/author/posts.phtml
@@ -57,18 +57,18 @@ $author_name = $author->getNickName();
 <?php $total = count($collection->getItems()); ?>
 <?php if($show_author_info && $author) { ?>
 <div id="author-box">
-	<div class="block-title"><h2><strong><?php echo __('Author'); ?></strong></h2></div>
+	<div class="block-title"><h2><strong><?= __('Author'); ?></strong></h2></div>
 	<div class="block-content">
 		<?php if($avatar = $author->getAvatar()){ ?>
 		<div class="author-avatar">
-		<a href="<?php echo $helper->getAuthorUrl($author); ?>" title="<?php echo $author->getNickName() ?>">
-			<img src="<?php echo $imageHelper->resizeImage($avatar, 125, 125) ?>" alt="" height="125" width="125">
+		<a href="<?= $helper->getAuthorUrl($author); ?>" title="<?= $author->getNickName() ?>">
+			<img src="<?= $imageHelper->resizeImage($avatar, 125, 125) ?>" alt="" height="125" width="125">
 		</a>
 		</div>
 		<?php } ?>
-		<h3 style="margin-top: 0;"><?php echo $author->getNickName(); ?></h3>
+		<h3 style="margin-top: 0;"><?= $author->getNickName(); ?></h3>
 		<?php if($bio = $author->getDescription()){ ?>
-		<div class="author-description"><?php echo $helper->filter($bio) ?></div>
+		<div class="author-description"><?= $helper->filter($bio) ?></div>
 		<?php } ?>
 
 		<?php $authorSocials = unserialize($author->getSocialNetworks()); ?>
@@ -76,7 +76,7 @@ $author_name = $author->getNickName();
 		<div class="author-social flat-social">
 			<?php foreach ($authorSocials as $k => $v) { ?>
 				<?php if(trim($v)!=''){ ?>
-				<a class="social-<?php echo $k ?>" href="<?php echo $v; ?>"><i class="fa fa-<?php echo $k ?>"></i></a>
+				<a class="social-<?= $k ?>" href="<?= $v; ?>"><i class="fa fa-<?= $k ?>"></i></a>
 				<?php } ?>
 			<?php } ?>
 		</div>
@@ -84,20 +84,20 @@ $author_name = $author->getNickName();
 	</div>
 </div>
 <?php } ?>
-<h2><?php echo __("All blog posts of the author %1", $author_name); ?></h2>
-<div class="ves-blog post-list postsstyle-<?php echo $postsStyles ?>">
+<h2><?= __("All blog posts of the author %1", $author_name); ?></h2>
+<div class="ves-blog post-list postsstyle-<?= $postsStyles ?>">
 
 	<?php if($show_toolbartop){ ?>
 	<div class="blog-toolbar">
-		<?php echo $block->getChildHtml('toolbar'); ?>
+		<?= $block->getChildHtml('toolbar'); ?>
 	</div>
 	<?php } ?>
-	<div class="blog-<?php echo $layout ?> <?php echo $blockId; ?>  blog-posts">
-		<?php echo $this->getPostsBlock(); ?>
+	<div class="blog-<?= $layout ?> <?= $blockId; ?>  blog-posts">
+		<?= $this->getPostsBlock(); ?>
 	</div>
 	<?php if($show_toolbarbottom){ ?>
 	<div class="blog-toolbar">
-		<?php echo $block->getChildHtml('toolbar'); ?>
+		<?= $block->getChildHtml('toolbar'); ?>
 	</div>
 	<?php } ?>
 </div>
@@ -105,22 +105,22 @@ $author_name = $author->getNickName();
 	<script>
 		function initBlogMasonryLayout($, Masonry){
 			var width = $(window).width();
-			var column = <?php echo $lg_column_item ?>;
+			var column = <?= $lg_column_item ?>;
 			if(width<480){
-				column = <?php echo $xs_column_item ?>;
+				column = <?= $xs_column_item ?>;
 				w = w - 20;
 			}
 			if(width>=480){
-				column = <?php echo $sm_column_item ?>;
+				column = <?= $sm_column_item ?>;
 			}
 			if(width>=992){
-				column = <?php echo $md_column_item ?>;
+				column = <?= $md_column_item ?>;
 			}
 			if(width>=1200){
-				column = <?php echo $lg_column_item ?>;
+				column = <?= $lg_column_item ?>;
 			}
-			var w = $('<?php echo $maincontainer_selector ; ?>').width() + 20;
-			$('.<?php echo $blockId; ?>').css({"width":w+"px"});
+			var w = $('<?= $maincontainer_selector ; ?>').width() + 20;
+			$('.<?= $blockId; ?>').css({"width":w+"px"});
 			var masoW = 100/column;
 			$('.blog-masonry .post-item').css({"width":masoW+"%","margin-bottom":"20px"});
 			new Masonry( '.blog-masonry', {
@@ -141,4 +141,4 @@ $author_name = $author->getNickName();
 	</script>
 	<?php } ?>
 
-	<?php } else { echo __("No Posts Found."); } ?>
\ No newline at end of file
+	<?php } else { echo __("No Posts Found."); } ?>
diff --git a/view/frontend/templates/category/head.phtml b/view/frontend/templates/category/head.phtml
index e66163f..2939573 100644
--- a/view/frontend/templates/category/head.phtml
+++ b/view/frontend/templates/category/head.phtml
@@ -7,5 +7,5 @@ if($canonicalUrl==''){
 }
 ?>
 <?php if($category->getIsActive()){ ?>
-<link rel="canonical" href="<?php echo $canonicalUrl ?>" />
-<?php } ?>
\ No newline at end of file
+<link rel="canonical" href="<?= $canonicalUrl ?>" />
+<?php } ?>
diff --git a/view/frontend/templates/category/list.phtml b/view/frontend/templates/category/list.phtml
index 7efc64a..6c0fc21 100644
--- a/view/frontend/templates/category/list.phtml
+++ b/view/frontend/templates/category/list.phtml
@@ -8,12 +8,12 @@ $html       = $block->drawItem($collection);
 <div class="ves-block block blog-cats">
 	<?php if($title){ ?>
 	<div class="block-title">
-		<strong><?php echo $title ?></strong>
+		<strong><?= $title ?></strong>
 	</div>
 	<?php } ?>
 	<div class="block-content blog-widget-content">
-		<ul id="blog-cats<?php echo $id ?>" class="blog-cats">
-		<?php echo $block->getCategoryHtml(); ?>
+		<ul id="blog-cats<?= $id ?>" class="blog-cats">
+		<?= $block->getCategoryHtml(); ?>
 		</ul>
 		<script type="text/javascript">
 		require([
@@ -23,7 +23,7 @@ $html       = $block->drawItem($collection);
              <?php endif; ?>
 			], function(){
 			jQuery(document).ready(function($){
-				$('#blog-cats<?php echo $id ?> .opener').on('click', function(e) {
+				$('#blog-cats<?= $id ?> .opener').on('click', function(e) {
 					e.preventDefault();
 					var parent = $(this).parents("li").eq(0);
 					$(this).toggleClass('item-active');
@@ -35,4 +35,4 @@ $html       = $block->drawItem($collection);
 		});
 		</script>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/view/frontend/templates/category/meta.phtml b/view/frontend/templates/category/meta.phtml
index ff7ca07..0ca5f08 100644
--- a/view/frontend/templates/category/meta.phtml
+++ b/view/frontend/templates/category/meta.phtml
@@ -6,8 +6,8 @@ $description = $category->getDescription();
 ?>
 <?php if($image!='' && $category->getIsActive()){ ?>
 <?php $imgUrl = $helper->getMediaUrl($image); ?>
-<img src="<?php echo $imgUrl ?>" alt="<?php echo $category->getName() ?>"/>
+<img src="<?= $imgUrl ?>" alt="<?= $category->getName() ?>"/>
 <?php } ?>
 <?php if($description && $category->getIsActive()){ ?>
-<div class="blogcat-description"><?php echo $description ?></div>
-<?php } ?>
\ No newline at end of file
+<div class="blogcat-description"><?= $description ?></div>
+<?php } ?>
diff --git a/view/frontend/templates/category/posts.phtml b/view/frontend/templates/category/posts.phtml
index 2d2860a..95bd913 100644
--- a/view/frontend/templates/category/posts.phtml
+++ b/view/frontend/templates/category/posts.phtml
@@ -10,7 +10,7 @@ $maincontainer_selector = $maincontainer_selector?$maincontainer_selector:'.colu
 $dateFormat         = $helper->getConfig("general_settings/dateformat");
 $twitterUsername    = $helper->getConfig("general_settings/twitter_username");
 $enableNetworks     = $helper->getConfig("general_settings/enable_networks");
-$networks           = array_flip(explode(",", $helper->getConfig("general_settings/networks"))); 
+$networks           = array_flip(explode(",", $helper->getConfig("general_settings/networks")));
 $layout             = $category->getLayoutType();
 $show_toolbartop    = $helper->getConfig("category_page/show_toolbartop");
 $show_toolbarbottom = $helper->getConfig("category_page/show_toolbarbottom");
@@ -59,18 +59,18 @@ $blockId = 'blog-' . $layout . time();
 
 <?php if($collection->count()){ ?>
 <?php $total = count($collection->getItems()); ?>
-<div class="ves-blog post-list postsstyle-<?php echo $postsStyles ?>">
+<div class="ves-blog post-list postsstyle-<?= $postsStyles ?>">
 	<?php if($show_toolbartop){ ?>
 	<div class="blog-toolbar">
-		<?php echo $block->getChildHtml('toolbar'); ?>
+		<?= $block->getChildHtml('toolbar'); ?>
 	</div>
 	<?php } ?>
-	<div class="blog-<?php echo $layout ?> blog-<?php echo $layout ?> <?php echo $blockId; ?>  blog-posts">
-		<?php echo $this->getPostsBlock(); ?>
+	<div class="blog-<?= $layout ?> blog-<?= $layout ?> <?= $blockId; ?>  blog-posts">
+		<?= $this->getPostsBlock(); ?>
 	</div>
 	<?php if($show_toolbarbottom){ ?>
 	<div class="blog-toolbar">
-		<?php echo $block->getChildHtml('toolbar'); ?>
+		<?= $block->getChildHtml('toolbar'); ?>
 	</div>
 	<?php } ?>
 </div>
@@ -78,22 +78,22 @@ $blockId = 'blog-' . $layout . time();
 	<script>
 		function initBlogMasonryLayout($, Masonry){
 			var width = $(window).width();
-			var column = <?php echo $lg_column_item ?>;
+			var column = <?= $lg_column_item ?>;
 			if(width<480){
-				column = <?php echo $xs_column_item ?>;
+				column = <?= $xs_column_item ?>;
 				w = w - 20;
 			}
 			if(width>=480){
-				column = <?php echo $sm_column_item ?>;
+				column = <?= $sm_column_item ?>;
 			}
 			if(width>=992){
-				column = <?php echo $md_column_item ?>;
+				column = <?= $md_column_item ?>;
 			}
 			if(width>=1200){
-				column = <?php echo $lg_column_item ?>;
+				column = <?= $lg_column_item ?>;
 			}
-			var w = $('<?php echo $maincontainer_selector ; ?>').width() + 20;
-			$('.<?php echo $blockId; ?>').css({"width":w+"px"});
+			var w = $('<?= $maincontainer_selector ; ?>').width() + 20;
+			$('.<?= $blockId; ?>').css({"width":w+"px"});
 			var masoW = 100/column;
 			$('.blog-masonry .post-item').css({"width":masoW+"%","margin-bottom":"20px"});
 			new Masonry( '.blog-masonry', {
@@ -114,5 +114,5 @@ $blockId = 'blog-' . $layout . time();
 	</script>
 	<?php } ?>
 	<?php }else{ ?>
-	<?php echo __('There are no posts yet'); ?>
-	<?php } ?>
\ No newline at end of file
+	<?= __('There are no posts yet'); ?>
+	<?php } ?>
diff --git a/view/frontend/templates/comment/recentcomments.phtml b/view/frontend/templates/comment/recentcomments.phtml
index 041ffa3..3c8cb8b 100644
--- a/view/frontend/templates/comment/recentcomments.phtml
+++ b/view/frontend/templates/comment/recentcomments.phtml
@@ -9,7 +9,7 @@ $title      = $helper->getConfig('sidebar/recentcommentsblock_title');
 <div class="ves-block block blog-recentcomments">
 	<?php if($title){ ?>
 	<div class="block-title">
-		<strong><?php echo $title ?></strong>
+		<strong><?= $title ?></strong>
 	</div>
 	<?php } ?>
 	<div class="block-content blog-widget-content">
@@ -18,11 +18,11 @@ $title      = $helper->getConfig('sidebar/recentcommentsblock_title');
 			<?php if(!isset($posts[$_comment->getPostId()])) continue; ?>
 			<?php $_post = $posts[$_comment->getPostId()]; ?>
 			<li>
-				<a href="<?php echo $helper->getPostUrl($_post) . '#comment' . $_comment->getCommentId()  ?>"><?php echo $_post->getTitle() ?></a>
-				<div class="post-shortcontent"><?php echo $helper->subString($_comment->getContent(), 50); ?></div>
+				<a href="<?= $helper->getPostUrl($_post) . '#comment' . $_comment->getCommentId()  ?>"><?= $_post->getTitle() ?></a>
+				<div class="post-shortcontent"><?= $helper->subString($_comment->getContent(), 50); ?></div>
 			</li>
 			<?php } ?>
 		</ul>
 	</div>
 </div>
-<?php } ?>
\ No newline at end of file
+<?php } ?>
diff --git a/view/frontend/templates/init_ajaxscroll.phtml b/view/frontend/templates/init_ajaxscroll.phtml
index 3e2663b..2e66136 100644
--- a/view/frontend/templates/init_ajaxscroll.phtml
+++ b/view/frontend/templates/init_ajaxscroll.phtml
@@ -1,19 +1,19 @@
-<?php  
-$helper = $this->helper('Ves\Blog\Helper\Data'); 
+<?php
+$helper = $this->helper('Ves\Blog\Helper\Data');
 $limit_chars 		   = $helper->getConfig("post_page/limit_chars");
 $limit_chars 		   = $limit_chars?(int)$limit_chars:10;
 $enable = $block->isEnable();
-if($enable) { ?>  
+if($enable) { ?>
 <script>
 	require(['jquery',
-		'Ves_Blog/js/ajaxscroll'	
+		'Ves_Blog/js/ajaxscroll'
 		], function ($) {
 
-			$('<?php echo $helper->getConfig('ajaxscroll_selectors/toolbar') ?>').<?php echo $helper->getConfig('ajaxscroll_selectors/hide_toolbar') ? 'hide' : 'show' ?>();
+			$('<?= $helper->getConfig('ajaxscroll_selectors/toolbar') ?>').<?= $helper->getConfig('ajaxscroll_selectors/hide_toolbar') ? 'hide' : 'show' ?>();
 			windowLoadedFlag = false;
 			window.onload = function () {
 				windowLoadedFlag = true;
-			};   
+			};
 			var jQueryWaiter = function () {
 				var functions = [];
 				var timer = function() {
@@ -39,38 +39,38 @@ if($enable) { ?>
 
 			window.SgyIAS = {
 				debug: false,
-				_log: function(object) { 
-					//console.log(object); 
+				_log: function(object) {
+					//console.log(object);
 				},
-				init: function(){ 
+				init: function(){
 					jQuery(function($) {
 						var config = {
-							item: '<?php echo $helper->getConfig('ajaxscroll_selectors/grid_mode') ?>',
-							container : '<?php echo $helper->getConfig('ajaxscroll_selectors/content'); ?>',
-							next: '<?php echo $helper->getConfig('ajaxscroll_selectors/next') ?>',
-							pagination: '<?php echo $helper->getConfig('ajaxscroll_selectors/pagination') ?>',
-							parameter: '<?php echo $helper->getConfig('ajaxscroll_selectors/enable_parameter') ?>',
+							item: '<?= $helper->getConfig('ajaxscroll_selectors/grid_mode') ?>',
+							container : '<?= $helper->getConfig('ajaxscroll_selectors/content'); ?>',
+							next: '<?= $helper->getConfig('ajaxscroll_selectors/next') ?>',
+							pagination: '<?= $helper->getConfig('ajaxscroll_selectors/pagination') ?>',
+							parameter: '<?= $helper->getConfig('ajaxscroll_selectors/enable_parameter') ?>',
 							delay: 600,
-							negativeMargin: <?php echo (int) $helper->getConfig('ajaxscroll_selectors/buffer') ?>,
+							negativeMargin: <?= (int) $helper->getConfig('ajaxscroll_selectors/buffer') ?>,
 							history: {
 								prev: '.prev'
 							},
 							noneleft: {
-								text: '<?php echo $helper->jsQuoteEscape(__($helper->getConfig('ajaxscroll_selectors/done_text'))) ?>',
+								text: '<?= $helper->jsQuoteEscape(__($helper->getConfig('ajaxscroll_selectors/done_text'))) ?>',
 								html: '<div class="ias-noneleft" style="text-align: center;">{text}</div>'
 							},
 							spinner: {
 								<?php if($block->getLoaderImage() !== false): ?>
-								src: '<?php echo $block->getLoaderImage(); ?>',
+								src: '<?= $block->getLoaderImage(); ?>',
 							<?php endif; ?>
-							html: '<div class="ias-spinner" style="text-align: center;"><img style="display:inline" src="{src}"/> <?php echo $helper->jsQuoteEscape(__($helper->getConfig('ajaxscroll_selectors/loading_text'))); ?></div>'
-						},  
+							html: '<div class="ias-spinner" style="text-align: center;"><img style="display:inline" src="{src}"/> <?= $helper->jsQuoteEscape(__($helper->getConfig('ajaxscroll_selectors/loading_text'))); ?></div>'
+						},
 						trigger: {
-							text: '<?php echo $helper->jsQuoteEscape(__($helper->getConfig('ajaxscroll_selectors/load_more_text'))) ?>',
+							text: '<?= $helper->jsQuoteEscape(__($helper->getConfig('ajaxscroll_selectors/load_more_text'))) ?>',
 							html: '<div class="ias-trigger ias-trigger-next" style="text-align: center; cursor: pointer;"><a>{text}</a></div>',
-							textPrev: '<?php echo $helper->jsQuoteEscape(__($helper->getConfig('ajaxscroll_selectors/load_more_text'))) ?>',
+							textPrev: '<?= $helper->jsQuoteEscape(__($helper->getConfig('ajaxscroll_selectors/load_more_text'))) ?>',
 							htmlPrev: '<div class="ias-trigger ias-trigger-prev" style="text-align: center; cursor: pointer;"><a>{text}</a></div>',
-							offset: <?php echo (int) $helper->getConfig('ajaxscroll_selectors/load_more') ?>
+							offset: <?= (int) $helper->getConfig('ajaxscroll_selectors/load_more') ?>
 						}
 
 					};
@@ -94,7 +94,7 @@ if($enable) { ?>
 					window.ias.extension(new IASNoneLeftExtension(config.noneleft));
 
 					SgyIAS._log({extension: 'trigger'});
-					window.ias.extension(new IASTriggerExtension(config.trigger)); 	
+					window.ias.extension(new IASTriggerExtension(config.trigger));
 
 						// debug events
 						window.ias.on('scroll', function(scrollOffset, scrollThreshold){
@@ -122,8 +122,8 @@ if($enable) { ?>
 									initBlogMasonryLayout($, Masonry);
 								});
 							}
-							
-						}); 
+
+						});
 						window.ias.on('noneLeft', function(){
 							SgyIAS._log({eventName: 'noneLeft'});
 						});
diff --git a/view/frontend/templates/latest.phtml b/view/frontend/templates/latest.phtml
index c578562..3b53d06 100644
--- a/view/frontend/templates/latest.phtml
+++ b/view/frontend/templates/latest.phtml
@@ -54,18 +54,18 @@ $blockId = 'blog-' . $layout . time();
 
 <?php if($collection->count()){ ?>
 <?php $total = count($collection->getItems()); ?>
-<div class="ves-blog post-list postsstyle-<?php echo $postsStyles ?>">
+<div class="ves-blog post-list postsstyle-<?= $postsStyles ?>">
 	<?php if($show_toolbartop){ ?>
 	<div class="blog-toolbar">
-		<?php echo $block->getChildHtml('toolbar'); ?>
+		<?= $block->getChildHtml('toolbar'); ?>
 	</div>
 	<?php } ?>
-	<div class="blog-<?php echo $layout ?> <?php echo $blockId; ?>  blog-posts">
-		<?php echo $this->getPostsBlock(); ?>
+	<div class="blog-<?= $layout ?> <?= $blockId; ?>  blog-posts">
+		<?= $this->getPostsBlock(); ?>
 	</div>
 	<?php if($show_toolbarbottom){ ?>
 	<div class="blog-toolbar">
-		<?php echo $block->getChildHtml('toolbar'); ?>
+		<?= $block->getChildHtml('toolbar'); ?>
 	</div>
 	<?php } ?>
 </div>
@@ -73,22 +73,22 @@ $blockId = 'blog-' . $layout . time();
 	<script>
 		function initBlogMasonryLayout($, Masonry) {
 			var width = $(window).width();
-						var w = $('<?php echo $maincontainer_selector; ?>').width() + 20;
-						var column = <?php echo $lg_column_item ?>;
+						var w = $('<?= $maincontainer_selector; ?>').width() + 20;
+						var column = <?= $lg_column_item ?>;
 						if(width<480){
-							column = <?php echo $xs_column_item ?>;
+							column = <?= $xs_column_item ?>;
 							w = w - 20;
 						}
 						if(width>=480){
-							column = <?php echo $sm_column_item ?>;
+							column = <?= $sm_column_item ?>;
 						}
 						if(width>=992){
-							column = <?php echo $md_column_item ?>;
+							column = <?= $md_column_item ?>;
 						}
 						if(width>=1200){
-							column = <?php echo $lg_column_item ?>;
+							column = <?= $lg_column_item ?>;
 						}
-						$('.<?php echo $blockId; ?>').css({"width":w+"px"});
+						$('.<?= $blockId; ?>').css({"width":w+"px"});
 						var masoW = 100/column;
 						$('.blog-masonry .post-item').css({"width":masoW+"%","margin-bottom":"20px"});
 						new Masonry( '.blog-masonry', {
@@ -119,4 +119,4 @@ $blockId = 'blog-' . $layout . time();
 		}
 	</script>
 	<?php } ?>
-	<?php } ?>
\ No newline at end of file
+	<?php } ?>
diff --git a/view/frontend/templates/latest/head.phtml b/view/frontend/templates/latest/head.phtml
index 8b1ddbf..f5b0c1f 100644
--- a/view/frontend/templates/latest/head.phtml
+++ b/view/frontend/templates/latest/head.phtml
@@ -3,5 +3,5 @@ $helper = $this->helper('\Ves\Blog\Helper\Data');
 $canonicalUrl = $helper->getLatestPageUrl();
 ?>
 <?php if($helper->getConfig('general_settings/enable')){ ?>
-<link rel="canonical" href="<?php echo $canonicalUrl ?>" />
-<?php } ?>
\ No newline at end of file
+<link rel="canonical" href="<?= $canonicalUrl ?>" />
+<?php } ?>
diff --git a/view/frontend/templates/post/comment.phtml b/view/frontend/templates/post/comment.phtml
index eea2ea1..57bd37f 100644
--- a/view/frontend/templates/post/comment.phtml
+++ b/view/frontend/templates/post/comment.phtml
@@ -30,14 +30,14 @@ $current_url = $urlInterface->getCurrentUrl();
 <div id="disqus_thread"></div>
 <script>
 	var disqus_config = function () {
-		this.page.url = '<?= $postUrl ?>';
-		this.page.identifier = '<?= $_post->getIdenfitier() ?>';
+		this.page.url = '<?= $block->escapeUrl($postUrl) ?>';
+		this.page.identifier = '<?= $block->escapeUrl($_post->getIdenfitier()) ?>';
 	};
 	(function() {  // DON'T EDIT BELOW THIS LINE
 		var d = document, s = d.createElement('script');
-		
+
 		s.src = '//<?= $disqus_shortname; ?>.disqus.com/embed.js';
-		
+
 		s.setAttribute('data-timestamp', +new Date());
 		(d.head || d.body).appendChild(s);
 	})();
@@ -68,7 +68,7 @@ $current_url = $urlInterface->getCurrentUrl();
 		<?= $this->getChildHtml("rsslink"); ?>
 		<?php if( $comments ) : ?>
 			<div class="comments-list">
-				<?php 
+				<?php
 				function vesBlogGenerateComments($comment, $level = 1, $level_max = 4, $i = 0, $helper=null, $block=null, $current_url = "") {
 					$dateFormat            = $helper->getConfig("general_settings/dateformat");
 					$enable_comment_reply  = $helper->getConfig("post_page/enable_comment_reply");
@@ -84,43 +84,43 @@ $current_url = $urlInterface->getCurrentUrl();
 					$user_name = $comment->getData('user_name');
 					$comment_content = $comment->getData('content');
 					?>
-					<li class="<?= ( $i%2==0?"even":"odd") ; ?>" id="comment<?= $comment_id; ?>">
-						<div class="avatar"><img src="https://www.gravatar.com/avatar/<?= $email_hash?>?d=&s=60"></div>
+					<li class="<?= ( $i%2==0?"even":"odd") ; ?>" id="comment<?= (int)$comment_id; ?>">
+						<div class="avatar"><img src="https://www.gravatar.com/avatar/<?= $email_hash; ?>?d=&s=60"></div>
 						<?php $createdTime = $helper->getFormatDate($creation_time, $dateFormat); ?>
-						<span class="comment-author"><?= $user_name; ?></span><br/>
-						<span class="comment-date"><?= $createdTime ?></span>
-						<div class="comment-content"><?= $comment_content; ?></div>
-						<?php if($enable_comment_reply && $level < $level_max) { ?>
+						<span class="comment-author"><?= $block->escapeHtml($user_name); ?></span><br/>
+						<span class="comment-date"><?= $block->escapeHtml($createdTime); ?></span>
+						<div class="comment-content"><?= $block->escapeHtml($comment_content); ?></div>
+						<?php if($enable_comment_reply && $level < $level_max) : ?>
 						<div class="reply">
-							<a href="<?= $current_url; ?>?replytocom=<?= $comment_id; ?>#form-comment" data-coment="<?= $comment_id; ?>" class="comment-reply-link"><?= __("Reply");?></a>
+							<a href="<?= $block->escapeUrl($current_url); ?>?replytocom=<?= (int)$comment_id; ?>#form-comment" data-coment="<?= (int)$comment_id; ?>" class="comment-reply-link"><?= $block->escapeHtml(__("Reply"));?></a>
 						</div>
-						<?php } ?>
+						<?php endif; ?>
 					<?php
-					if($level < $level_max) {
+					if($level < $level_max) :
 						$level++;
 						$child_comments = $block->getCommentsByParentId($comment_id);
-						if($child_comments->getSize()){
-							echo '<ul class="comment-level-'.$level.' comment-multi-level children-level">';
+						if ($child_comments->getSize()) :
+							echo '<ul class="comment-level-'.(int)$level.' comment-multi-level children-level">';
 							$k = 0;
-							foreach($child_comments as $child_comment) {
+							foreach($child_comments as $child_comment) :
 								vesBlogGenerateComments($child_comment, $level, $level_max, $k, $helper, $block, $current_url);
 								$k++;
-							}
-							
+                            endforeach;
+
 							echo '</ul>';
-						}
-					}
+						endif;
+					endif;
 					?>
 					</li>
 					<?php
 				}
 				?>
 				<ul>
-					<?php 
+					<?php
 						$i=0; $level=1;
 						foreach( $comments as $comment ):
 							vesBlogGenerateComments($comment, $level, $limit_level, $i, $helper, $block, $current_url);
-							$i++; 
+							$i++;
 						endforeach;
 					?>
 				</ul>
@@ -136,36 +136,36 @@ $current_url = $urlInterface->getCurrentUrl();
 						<ul class="form-list">
 							<li class="fields user-name">
 								<?php if($customer): ?>
-									<?php 
+									<?php
 										$customerName = $customer->getFirstName();
 										if($customer->getMiddlename()) $customerName .= ' ' .$customer->getMiddlename();
 										$customerName .= ' ' . $this->getLastname();
 									?>
-									<input type="hidden" name="user_name" value="<?= $customerName ?>" />
+									<input type="hidden" name="user_name" value="<?= $block->escapeHtmlAttr($customerName) ?>" />
 								<?php else: ?>
 									<div class="field">
 										<label class="required" for="user_name"><em>*</em><?= __('Name') ?></label>
 									</div>
 									<div class="input-box">
-										<input id="user_name" name="user_name" title="<?= $block->escapeHtml(__('Name')) ?>" class="input-text required-entry" />
+										<input id="user_name" name="user_name" title="<?= $block->escapeHtmlAttr(__('Name')) ?>" class="input-text required-entry" />
 									</div>
 								<?php endif; ?>
 							</li>
 							<li class="fields user-email">
 								<?php if($customer): ?>
-									<input type="hidden" name="user_email" value="<?= $customer->getEmail() ?>" />
+									<input type="hidden" name="user_email" value="<?= $block->escapeHtml($customer->getEmail()) ?>" />
 								<?php else: ?>
 									<div class="field">
 										<label class="required" for="user_email"><em>*</em><?= __('Email') ?></label>
 									</div>
 									<div class="input-box">
-										<input id="user_email" name="user_email" title="<?= $block->escapeHtml(__('Email')); ?>" class="input-text required-entry validate-email" />
+										<input id="user_email" name="user_email" title="<?= $block->escapeHtmlAttr(__('Email')); ?>" class="input-text required-entry validate-email" />
 									</div>
 								<?php endif; ?>
 							</li>
 						</ul>
-						<input type="hidden" name="post_id" value="<?= $_post->getPostId(); ?>"/>
-						<input type="hidden" name="post_title" value="<?= $_post->getTitle(); ?>"/>
+						<input type="hidden" name="post_id" value="<?= (int)$_post->getPostId(); ?>"/>
+						<input type="hidden" name="post_title" value="<?= $block->escapeHtml($_post->getTitle()); ?>"/>
 						<input type="hidden" name="comment_parent" id="comment_parent" value="<?= $replytocom; ?>"/>
 					</div>
 					<div class="mid-inputs">
@@ -227,4 +227,4 @@ $current_url = $urlInterface->getCurrentUrl();
 		<?php endif; ?>
 	<?php endif; ?>
 <?php endif; ?>
-</div>
\ No newline at end of file
+</div>
diff --git a/view/frontend/templates/post/head.phtml b/view/frontend/templates/post/head.phtml
index 726e07d..4b7d64c 100644
--- a/view/frontend/templates/post/head.phtml
+++ b/view/frontend/templates/post/head.phtml
@@ -7,5 +7,5 @@ if($canonicalUrl==''){
 }
 ?>
 <?php if($post->getIsActive()){ ?>
-<link rel="canonical" href="<?php echo $canonicalUrl ?>" />
-<?php } ?>
\ No newline at end of file
+<link rel="canonical" href="<?= $canonicalUrl ?>" />
+<?php } ?>
diff --git a/view/frontend/templates/post/init_ajaxscroll.phtml b/view/frontend/templates/post/init_ajaxscroll.phtml
index f792d32..559ea8e 100644
--- a/view/frontend/templates/post/init_ajaxscroll.phtml
+++ b/view/frontend/templates/post/init_ajaxscroll.phtml
@@ -1,19 +1,19 @@
-<?php  
+<?php
 $helper = $this->helper('Ves\Blog\Helper\Data');
 $limit_chars 		   = $helper->getConfig("post_page/limit_chars");
 $limit_chars 		   = $limit_chars?(int)$limit_chars:10;
 $enable = $block->isEnable();
-if($enable) { ?>  
+if($enable) { ?>
 <script>
 	require(['jquery',
-		'Ves_Blog/js/ajaxscroll'	
+		'Ves_Blog/js/ajaxscroll'
 		], function ($) {
 
-			$('<?php echo $helper->getConfig('ajaxscroll_selectors/toolbar') ?>').<?php echo $helper->getConfig('ajaxscroll_selectors/hide_toolbar') ? 'hide' : 'show' ?>();
+			$('<?= $helper->getConfig('ajaxscroll_selectors/toolbar') ?>').<?= $helper->getConfig('ajaxscroll_selectors/hide_toolbar') ? 'hide' : 'show' ?>();
 			windowLoadedFlag = false;
 			window.onload = function () {
 				windowLoadedFlag = true;
-			};   
+			};
 			var jQueryWaiter = function () {
 				var functions = [];
 				var timer = function() {
@@ -39,38 +39,38 @@ if($enable) { ?>
 
 			window.SgyIAS = {
 				debug: false,
-				_log: function(object) { 
-					//console.log(object); 
+				_log: function(object) {
+					//console.log(object);
 				},
-				init: function(){ 
+				init: function(){
 					jQuery(function($) {
 						var config = {
 							item: '.comments-list',
 							container : '.blog-comments',
-							next: '<?php echo $helper->getConfig('ajaxscroll_selectors/next') ?>',
-							pagination: '<?php echo $helper->getConfig('ajaxscroll_selectors/pagination') ?>',
-							parameter: '<?php echo $helper->getConfig('ajaxscroll_selectors/enable_parameter') ?>',
+							next: '<?= $helper->getConfig('ajaxscroll_selectors/next') ?>',
+							pagination: '<?= $helper->getConfig('ajaxscroll_selectors/pagination') ?>',
+							parameter: '<?= $helper->getConfig('ajaxscroll_selectors/enable_parameter') ?>',
 							delay: 600,
-							negativeMargin: <?php echo (int) $helper->getConfig('ajaxscroll_selectors/buffer') ?>,
+							negativeMargin: <?= (int) $helper->getConfig('ajaxscroll_selectors/buffer') ?>,
 							history: {
 								prev: '.prev'
 							},
 							noneleft: {
-								text: '<?php echo $helper->jsQuoteEscape(__($helper->getConfig('ajaxscroll_selectors/done_text'))) ?>',
+								text: '<?= $helper->jsQuoteEscape(__($helper->getConfig('ajaxscroll_selectors/done_text'))) ?>',
 								html: '<div class="ias-noneleft" style="text-align: center;">{text}</div>'
 							},
 							spinner: {
 								<?php if($block->getLoaderImage() !== false): ?>
-								src: '<?php echo $block->getLoaderImage(); ?>',
+								src: '<?= $block->getLoaderImage(); ?>',
 							<?php endif; ?>
-							html: '<div class="ias-spinner" style="text-align: center;"><img style="display:inline" src="{src}"/> <?php echo $helper->jsQuoteEscape(__($helper->getConfig('ajaxscroll_selectors/loading_text'))); ?></div>'
-						},  
+							html: '<div class="ias-spinner" style="text-align: center;"><img style="display:inline" src="{src}"/> <?= $helper->jsQuoteEscape(__($helper->getConfig('ajaxscroll_selectors/loading_text'))); ?></div>'
+						},
 						trigger: {
-							text: '<?php echo $helper->jsQuoteEscape(__($helper->getConfig('ajaxscroll_selectors/load_more_text'))) ?>',
+							text: '<?= $helper->jsQuoteEscape(__($helper->getConfig('ajaxscroll_selectors/load_more_text'))) ?>',
 							html: '<div class="ias-trigger ias-trigger-next" style="text-align: center; cursor: pointer;"><a>{text}</a></div>',
-							textPrev: '<?php echo $helper->jsQuoteEscape(__($helper->getConfig('ajaxscroll_selectors/load_more_text'))) ?>',
+							textPrev: '<?= $helper->jsQuoteEscape(__($helper->getConfig('ajaxscroll_selectors/load_more_text'))) ?>',
 							htmlPrev: '<div class="ias-trigger ias-trigger-prev" style="text-align: center; cursor: pointer;"><a>{text}</a></div>',
-							offset: <?php echo (int) $helper->getConfig('ajaxscroll_selectors/load_more') ?>
+							offset: <?= (int) $helper->getConfig('ajaxscroll_selectors/load_more') ?>
 						}
 
 					};
@@ -94,7 +94,7 @@ if($enable) { ?>
 					window.ias.extension(new IASNoneLeftExtension(config.noneleft));
 
 					SgyIAS._log({extension: 'trigger'});
-					window.ias.extension(new IASTriggerExtension(config.trigger)); 	
+					window.ias.extension(new IASTriggerExtension(config.trigger));
 
 						// debug events
 						window.ias.on('scroll', function(scrollOffset, scrollThreshold){
@@ -132,7 +132,7 @@ if($enable) { ?>
 							<?php } ?>
 
 							initReplyComment($);
-						}); 
+						});
 						window.ias.on('noneLeft', function(){
 							SgyIAS._log({eventName: 'noneLeft'});
 						});
diff --git a/view/frontend/templates/post/list.phtml b/view/frontend/templates/post/list.phtml
index ee1e048..6d97924 100644
--- a/view/frontend/templates/post/list.phtml
+++ b/view/frontend/templates/post/list.phtml
@@ -54,29 +54,29 @@ $total = $collection->count();
 <?php if( $lg_column_item == 1 || $x%$lg_column_item == 0){ ?>
 <div class="row">
 	<?php } ?>
-	<div class="col-lg-<?php echo $lg_column ?> col-md-<?php echo $md_column ?> col-sm-<?php echo $sm_column ?> col-xs-<?php echo $xs_column ?>">
+	<div class="col-lg-<?= $lg_column ?> col-md-<?= $md_column ?> col-sm-<?= $sm_column ?> col-xs-<?= $xs_column ?>">
 		<?php } ?>
 		<div class="ves-post post-item">
 			<?php if($show_image){ ?>
 			<div class="post-image">
-				<a href="<?php echo $postUrl ?>" <?php echo $postLinkAttr;?> title="<?php echo $_post->getTitle(); ?>">
+				<a href="<?= $postUrl ?>" <?= $postLinkAttr;?> title="<?= $_post->getTitle(); ?>">
 					<?php if( $_post->getThumbnailType() == 1 && $_post->getPostThumbnail()!=''){ ?>
-					<img src="<?php echo $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height) ?>" height="<?php echo $image_height ?>" width="<?php echo $image_width ?>" alt="<?php echo $_post->getTitle(); ?>"/>
+					<img src="<?= $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height) ?>" height="<?= $image_height ?>" width="<?= $image_width ?>" alt="<?= $_post->getTitle(); ?>"/>
 					<?php }else if($_post->getThumbnailType() == 2){ ?>
 					<?php if($_post->getThumbnailVideoType()==1 && $_post->getThumbnailVideoId()!=''){ ?>
-					<iframe width="<?php echo $image_width ?>" height="<?php echo $image_height ?>" src="https://www.youtube.com/embed/<?php echo $_post->getThumbnailVideoId() ?>" frameborder="0" allowfullscreen></iframe>
+					<iframe width="<?= $image_width ?>" height="<?= $image_height ?>" src="https://www.youtube.com/embed/<?= $_post->getThumbnailVideoId() ?>" frameborder="0" allowfullscreen></iframe>
 					<?php }else if($_post->getThumbnailVideoType()==2 && $_post->getThumbnailVideoId()!=''){ ?>
-					<iframe src="https://player.vimeo.com/video/<?php echo $_post->getThumbnailVideoId() ?>?color=3498DB&title=0&byline=0&portrait=0" width="<?php echo $image_width ?>" height="<?php echo $image_height ?>" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
+					<iframe src="https://player.vimeo.com/video/<?= $_post->getThumbnailVideoId() ?>?color=3498DB&title=0&byline=0&portrait=0" width="<?= $image_width ?>" height="<?= $image_height ?>" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
 					<?php } ?>
 					<?php } ?>
 				</a>
 			</div>
 			<?php } ?>
-			
+
 				<?php if($show_title){ ?>
-					<h3 class="post-title"><a href="<?php echo $postUrl ?>"  <?php echo $postLinkAttr;?> title="<?php echo $_post->getTitle(); ?>"><?php echo $_post->getTitle(); ?></a></h3>
+					<h3 class="post-title"><a href="<?= $postUrl ?>"  <?= $postLinkAttr;?> title="<?= $_post->getTitle(); ?>"><?= $_post->getTitle(); ?></a></h3>
 				<?php if($show_socialnetworks){ ?>
-				<div class="addthis_toolbox addthis_default_style" data-title="<?php echo $_post->getTitle(); ?>" addthis:url="<?php echo $postUrl ?>">
+				<div class="addthis_toolbox addthis_default_style" data-title="<?= $_post->getTitle(); ?>" addthis:url="<?= $postUrl ?>">
 					<a class="addthis_button_facebook"></a>
 					<a class="addthis_button_twitter"></a>
 					<a class="addthis_button_google"></a>
@@ -90,40 +90,40 @@ $total = $collection->count();
 				<?php if($show_author){ ?>
 				<div class="post-author">
 					<?php $author = $helper->getPostAuthor($_post);?>
-					<i class="fa fa-user"></i> <a href="<?php echo $helper->getAuthorUrl($author); ?>" title="<?php echo $author->getNickName() ?>"><?php echo $author->getNickName() ?></a>
+					<i class="fa fa-user"></i> <a href="<?= $helper->getAuthorUrl($author); ?>" title="<?= $author->getNickName() ?>"><?= $author->getNickName() ?></a>
 				</div>
 				<?php } ?>
 				<?php if($show_createdtime || $show_updatedtime){ ?>
 				<div class="post-date">
 					<?php if($show_createdtime){ ?>
 					<?php $createdTime = $helper->getFormatDate($_post->getCreationTime(), $dateFormat); ?>
-					<span><?php echo ' - ' . $createdTime; ?></span>
+					<span><?= ' - ' . $createdTime; ?></span>
 					<?php } ?>
 					<?php if($show_updatedtime){ ?>
 					<?php $updateTime = $helper->getFormatDate($_post->getUpdateTime(), $dateFormat); ?>
-					<span><?php echo __('Updated on %1', $updateTime); ?></span>
+					<span><?= __('Updated on %1', $updateTime); ?></span>
 					<?php } ?>
 				</div>
 				<?php } ?>
 				<?php if($show_hits){ ?>
-				<div class="post-hits"><span></span><strong><?php echo ' - ' . (int)$_post->getHits(); ?></strong> <?php echo __("times"); ?></div>
+				<div class="post-hits"><span></span><strong><?= ' - ' . (int)$_post->getHits(); ?></strong> <?= __("times"); ?></div>
 				<?php } ?>
 				<?php if($show_commentcount){ ?>
 				<div class="post-comment">
-					<a href="<?php echo $postUrl ?>#comments"  <?php echo $postLinkAttr;?>><?php echo $_post->getCommentCount(); ?></a>
+					<a href="<?= $postUrl ?>#comments"  <?= $postLinkAttr;?>><?= $_post->getCommentCount(); ?></a>
 				</div>
-				
+
 			</div>
 				<?php } ?>
 				<?php if($show_categories){ ?>
 				<div class="post-categories">
-					<span><?php echo __('Pubslished In: ') ?></span>
+					<span><?= __('Pubslished In: ') ?></span>
 					<?php
 					$categories = $_post->getData('categories');
 					$count = count($categories);
 					?>
 					<?php foreach ($categories as $k => $v) { ?>
-					<a href="<?php echo $helper->getCategoryUrl($v['identifier'])  ?>" title="<?php echo $v['name'] ?>"><?php echo $v['name'] ?></a>
+					<a href="<?= $helper->getCategoryUrl($v['identifier'])  ?>" title="<?= $v['name'] ?>"><?= $v['name'] ?></a>
 					<?php if(isset($categories[$k+1])) echo __(', '); ?>
 					<?php } ?>
 				</div>
@@ -132,9 +132,9 @@ $total = $collection->count();
 				<?php $tags = $_post->getTag(); ?>
 				<?php if(!empty($tags)){ ?>
 				<div class="post-tag">
-					<span><?php echo __('Tags:'); ?></span>
+					<span><?= __('Tags:'); ?></span>
 					<?php foreach ($tags as $k => $v) { ?>
-					<a href="<?php echo $helper->getTagUrl($v['alias']) ?>"><?php echo trim($v['name']) ?></a>
+					<a href="<?= $helper->getTagUrl($v['alias']) ?>"><?= trim($v['name']) ?></a>
 					<?php if(isset($tags[$k+1]) && $tags[$k+1]!='') echo __(', '); ?>
 					<?php } ?>
 				</div>
@@ -143,19 +143,19 @@ $total = $collection->count();
 				<?php if($show_shortdescription){ ?>
 				<div class="post-summary">
 					<?php $shortContent = $_post->getShortContent(); ?>
-					<?php echo $helper->subString($shortContent, (int)$shortdescription_count); ?>
+					<?= $helper->subString($shortContent, (int)$shortdescription_count); ?>
 				</div>
 				<?php if($show_readmorelink){ ?>
-					<div class="post-readmore"><a href="<?php echo $postUrl ?>" <?php echo $postLinkAttr;?> title="<?php echo $_post->getTitle(); ?>"><?php echo __('Read more') ?></a></div>
-					<?php } ?>	
+					<div class="post-readmore"><a href="<?= $postUrl ?>" <?= $postLinkAttr;?> title="<?= $_post->getTitle(); ?>"><?= __('Read more') ?></a></div>
+					<?php } ?>
 				<?php } ?>
 		</div>
 
 		<?php if($layout == 'grid'){ ?>
-	</div>	
+	</div>
 	<?php if( $lg_column_item == 1 || ($x+1)%$lg_column_item == 0 || $i == $total ) {  ?>
 </div>
 <?php } ?>
 <?php $i++; $x++; ?>
 <?php } ?>
-<?php } ?>
\ No newline at end of file
+<?php } ?>
diff --git a/view/frontend/templates/post/nextprev.phtml b/view/frontend/templates/post/nextprev.phtml
index 4adb703..50e2e8c 100644
--- a/view/frontend/templates/post/nextprev.phtml
+++ b/view/frontend/templates/post/nextprev.phtml
@@ -31,43 +31,43 @@ if($next_collection && $next_collection->getSize()){
 <div class="ves-block block block-row next-prev-block">
 	<?php if($hasPrev) { ?>
 	<?php  $prev_post = $prev_collection->getFirstItem(); ?>
-	<?php 
+	<?php
 	$prev_postUrl = $helper->getPostUrl($prev_post);
 	$prev_postLinkAttr = $helper->getPostUrlLinkAttr($prev_post);
 	?>
 	<div class="block-span6 post-prev-post">
 		<div class="post-next-prev-content">
 			<?php if($show_icon){ ?><i class="fa fa-angle-left" aria-hidden="true"></i><?php } ?>
-			<?php if($show_label) { ?><span><?php echo __("Previous Post") ?></span><?php } ?>
+			<?php if($show_label) { ?><span><?= __("Previous Post") ?></span><?php } ?>
 			<?php if($show_image) { ?>
 			<?php if( $prev_post->getThumbnailType() == 1 && $prev_post->getPostThumbnail()!=''){ ?>
-				<a href="<?php echo $prev_postUrl; ?>" <?php echo $prev_postLinkAttr;?>><img src="<?php echo $imageHelper->resizeImage($prev_post->getPostThumbnail(), $image_width, $image_height) ?>" height="<?php echo $image_height ?>" width="<?php echo $image_width ?>" alt="<?php echo $prev_post->getTitle(); ?>"/></a>
+				<a href="<?= $prev_postUrl; ?>" <?= $prev_postLinkAttr;?>><img src="<?= $imageHelper->resizeImage($prev_post->getPostThumbnail(), $image_width, $image_height) ?>" height="<?= $image_height ?>" width="<?= $image_width ?>" alt="<?= $prev_post->getTitle(); ?>"/></a>
 				<?php } ?>
-			<?php } ?> 
-			<?php if($show_title){ ?><a href="<?php echo $prev_postUrl; ?>" <?php echo $prev_postLinkAttr;?>><?php echo $prev_post->getTitle();?></a><?php } ?>
+			<?php } ?>
+			<?php if($show_title){ ?><a href="<?= $prev_postUrl; ?>" <?= $prev_postLinkAttr;?>><?= $prev_post->getTitle();?></a><?php } ?>
 		</div>
 	</div>
 	<div class="next-prev-separator"></div>
 	<?php } ?>
 	<?php if($hasNext) { ?>
 	<?php  $next_post = $next_collection->getFirstItem(); ?>
-	<?php 
+	<?php
 	$next_postUrl = $helper->getPostUrl($next_post);
 	$next_postLinkAttr = $helper->getPostUrlLinkAttr($next_post);
 	?>
 	<div class="block-span6 post-next-post">
 		<div class="post-next-prev-content">
-			<?php if($show_title){ ?><a href="<?php echo $next_postUrl; ?>" <?php echo $next_postLinkAttr;?>><?php echo $next_post->getTitle();?></a><?php } ?>
+			<?php if($show_title){ ?><a href="<?= $next_postUrl; ?>" <?= $next_postLinkAttr;?>><?= $next_post->getTitle();?></a><?php } ?>
 			<?php if($show_image) { ?>
 			<?php if( $next_post->getThumbnailType() == 1 && $next_post->getPostThumbnail()!=''){ ?>
-				<a href="<?php echo $next_postUrl; ?>" <?php echo $next_postLinkAttr;?>><img src="<?php echo $imageHelper->resizeImage($next_post->getPostThumbnail(), $image_width, $image_height) ?>" height="<?php echo $image_height ?>" width="<?php echo $image_width ?>" alt="<?php echo $next_post->getTitle(); ?>"/></a>
+				<a href="<?= $next_postUrl; ?>" <?= $next_postLinkAttr;?>><img src="<?= $imageHelper->resizeImage($next_post->getPostThumbnail(), $image_width, $image_height) ?>" height="<?= $image_height ?>" width="<?= $image_width ?>" alt="<?= $next_post->getTitle(); ?>"/></a>
 				<?php } ?>
-				<?php if($show_label) { ?><span><?php echo __("Next Post") ?></span><?php } ?>
+				<?php if($show_label) { ?><span><?= __("Next Post") ?></span><?php } ?>
 				<?php if($show_icon){ ?><i class="fa fa-angle-right" aria-hidden="true"></i><?php } ?>
-			<?php } ?> 
-			
+			<?php } ?>
+
 		</div>
 	</div>
 	<?php } ?>
 </div>
-<?php } ?>
\ No newline at end of file
+<?php } ?>
diff --git a/view/frontend/templates/post/posts.phtml b/view/frontend/templates/post/posts.phtml
index 065d88c..8d2feb4 100644
--- a/view/frontend/templates/post/posts.phtml
+++ b/view/frontend/templates/post/posts.phtml
@@ -53,15 +53,15 @@ $blockId = 'blog-' . $layout . time();
 <div class="ves-blog">
 	<?php if($show_toolbartop){ ?>
 	<div class="blog-toolbar">
-		<?php echo $block->getChildHtml('toolbar'); ?>
+		<?= $block->getChildHtml('toolbar'); ?>
 	</div>
 	<?php } ?>
-	<div class="blog-<?php echo $layout ?> blog-posts">
-		<?php echo $this->getPostsBlock(); ?>
+	<div class="blog-<?= $layout ?> blog-posts">
+		<?= $this->getPostsBlock(); ?>
 	</div>
 	<?php if($show_toolbarbottom){ ?>
 	<div class="blog-toolbar">
-		<?php echo $block->getChildHtml('toolbar'); ?>
+		<?= $block->getChildHtml('toolbar'); ?>
 	</div>
 	<?php } ?>
 </div>
@@ -69,22 +69,22 @@ $blockId = 'blog-' . $layout . time();
 <script>
 	function initBlogMasonryLayout($, Masonry) {
 		var width = $(window).width();
-		var column = <?php echo $lg_column_item ?>;
+		var column = <?= $lg_column_item ?>;
 		if(width<480){
-			column = <?php echo $xs_column_item ?>;
+			column = <?= $xs_column_item ?>;
 			w = w - 20;
 		}
 		if(width>=480){
-			column = <?php echo $sm_column_item ?>;
+			column = <?= $sm_column_item ?>;
 		}
 		if(width>=992){
-			column = <?php echo $md_column_item ?>;
+			column = <?= $md_column_item ?>;
 		}
 		if(width>=1200){
-			column = <?php echo $lg_column_item ?>;
+			column = <?= $lg_column_item ?>;
 		}
-		var w = $('<?php echo $maincontainer_selector ; ?>').width() + 20;
-		$('.<?php echo $blockId; ?>').css({"width":w+"px"});
+		var w = $('<?= $maincontainer_selector ; ?>').width() + 20;
+		$('.<?= $blockId; ?>').css({"width":w+"px"});
 		var masoW = 100/column;
 		$('.blog-masonry .post-item').css({"width":masoW+"%","margin-bottom":"20px"});
 		new Masonry( '.blog-masonry', {
@@ -105,4 +105,4 @@ $blockId = 'blog-' . $layout . time();
 	</script>
 	<?php } ?>
 
-	<?php } ?>
\ No newline at end of file
+	<?php } ?>
diff --git a/view/frontend/templates/post/products_related.phtml b/view/frontend/templates/post/products_related.phtml
index 80efa49..a18b21e 100644
--- a/view/frontend/templates/post/products_related.phtml
+++ b/view/frontend/templates/post/products_related.phtml
@@ -1,167 +1,167 @@
-<?php
-/**
- * Copyright © 2016 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-// @codingStandardsIgnoreFile
-
-?>
-<?php
-/**
- * Template for displaying new products widget
- *
- * @var $block \Magento\Catalog\Block\Product\Widget\NewWidget
- */
-if ($exist = ($block->getCollection() && $block->getCollection()->getSize())) {
-    $helper      = $this->helper("Ves\Blog\Helper\Data");
-    $imageHelper = $this->helper("Ves\Blog\Helper\Image");
-
-    $layout             = $helper->getConfig("post_page/related_products_carousel_layout");
-    $default_items      = (int)$helper->getConfig('post_page/default_items_products');
-    $mobile_items       = (int)$helper->getConfig('post_page/mobile_items_products');
-    $tablet_small_items = (int)$helper->getConfig('post_page/tablet_small_items_products');
-    $tablet_items       = (int)$helper->getConfig('post_page/tablet_items_products');
-    $portrait_items     = (int)$helper->getConfig('post_page/portrait_items_products');
-    $large_items        = (int)$helper->getConfig('post_page/large_items_products');
-    $autoplay           = $helper->getConfig('post_page/autoplay_products');
-    $autoplay_timeout   = $helper->getConfig('post_page/autoplay_timeout_products');
-    $dots               = $helper->getConfig('post_page/dots_products');
-    $nav                = $helper->getConfig('post_page/nav_products');
-    $nav_prev           = $helper->getConfig('post_page/nav_prev_products');
-    $nav_next           = $helper->getConfig('post_page/nav_next_products');
-
-    $type = 'widget-new-grid';
-
-    $mode = 'grid';
-
-    $image = 'new_products_content_widget_grid';
-    $title = __('New Products');
-    $items = $block->getCollection()->getItems();
-
-    $showWishlist = true;
-    $showCompare = true;
-    $showCart = true;
-    $templateType = \Magento\Catalog\Block\Product\ReviewRendererInterface::DEFAULT_VIEW;
-    $description = false;
-    $blockId = time() . rand();
-
-    $carousel = '';
-    if($layout == 'owl_carousel') {
-        $carousel .= 'data-items="3" data-rtl="false" data-loop="false" data-nav="';
-        $carousel .= $nav?'true':'false';
-        $carousel .= '"';
-        $carousel .= 'data-dots="';
-        $carousel .= $dots?'true':'false';
-        $carousel .= '" data-responsive-refresh-rate="false"';
-        if($autoplay) {
-            $carousel .= 'data-autoplay="true" data-autoplay-pauonhover="true" data-autoplay-timeout="';    
-            $carousel .= $autoplay_timeout;
-            $carousel .= '" ';
-        }
-        $carousel .= 'data-mobile-items="'.$mobile_items.'" ';
-        $carousel .= 'data-tablet-small-items="'.$tablet_small_items.'" ';
-        $carousel .= 'data-tablet-items="'.$tablet_items.'" ';
-        $carousel .= 'data-portrait-items="'.$portrait_items.'" ';
-        $carousel .= 'data-large-items="'.$large_items.'" ';
-        $carousel .= 'data-large-max-items="'.$large_items.'" ';
-        $carousel .= 'data-nav-text-owlpre="' . $nav_prev . '" ';
-        $carousel .= 'data-nav-text-owlnext="' . $nav_next . '" ';
-        $carousel .= 'data-margin="10" ';
-    }
-}
-?>
-
-<?php if ($exist):?>
-    <div class="block widget products-related blog-widget">
-        <div class="block-title">
-            <h2><strong><?php echo __('Related Products'); ?></strong></h2>
-        </div>
-        <div class="block-content">
-            <div class="products-<?php /* @escapeNotVerified */ echo $mode; ?>" style="float: left; width: 100%">
-                <ol class="<?php if($layout == 'owl_carousel'){ ?>product-items products-related product-items<?php echo $blockId ?> owl-carousel <?php /* @escapeNotVerified */ echo $type; ?>" <?php echo $carousel; } ?>>
-                    <?php $iterator = 1; ?>
-                    <?php foreach ($items as $_item): ?>
-                        <?php /* @escapeNotVerified */ echo($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
-                        <div class="product-item-info">
-                            <a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-photo">
-                                <?php echo $block->getImage($_item, $image)->toHtml(); ?>
-                            </a>
-                            <div class="product-item-details">
-                                <strong class="product-item-name">
-                                    <a title="<?php echo $block->escapeHtml($_item->getName()) ?>"
-                                       href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>"
-                                       class="product-item-link">
-                                       <?php echo $block->escapeHtml($_item->getName()) ?>
-                                   </a>
-                               </strong>
-                               <?php
-                               echo $block->getVesProductPriceHtml($_item);
-                               ?>
-
-                               <?php if ($templateType): ?>
-                                <?php echo $block->getReviewsSummaryHtml($_item, $templateType, true) ?>
-                            <?php endif; ?>
-
-                            <?php if ($showWishlist || $showCompare || $showCart): ?>
-                                <div class="product-item-actions">
-                                    <?php if ($showCart): ?>
-                                        <div class="actions-primary">
-                                            <?php if ($_item->isSaleable()): ?>
-                                                <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
-                                                    <button class="action tocart primary"
-                                                    data-mage-init='{"redirectUrl":{"url":"<?php /* @escapeNotVerified */ echo $block->getAddToCartUrl($_item) ?>"}}'
-                                                    type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                                    <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
-                                                </button>
-                                            <?php else: ?>
-                                                <?php
-                                                $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
-                                                $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
-                                                ?>
-                                                <button class="action tocart primary"
-                                                data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'
-                                                type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                                <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
-                                            </button>
-                                        <?php endif; ?>
-                                    <?php else: ?>
-                                        <?php if ($_item->getIsSalable()): ?>
-                                            <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
-                                        <?php else: ?>
-                                            <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span></div>
-                                        <?php endif; ?>
-                                    <?php endif; ?>
-                                </div>
-                            <?php endif; ?>
-                            <?php if ($showWishlist || $showCompare): ?>
-                                <div class="actions-secondary" data-role="add-to-links">
-                                    <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
-                                        <a href="#"
-                                        data-post='<?php /* @escapeNotVerified */ echo $block->getAddToWishlistParams($_item); ?>'
-                                        class="action towishlist" data-action="add-to-wishlist"
-                                        title="<?php /* @escapeNotVerified */ echo __('Add to Wish List') ?>">
-                                        <span><?php /* @escapeNotVerified */ echo __('Add to Wish List') ?></span>
-                                    </a>
-                                <?php endif; ?>
-                                <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
-                                    <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');?>
-                                    <a href="#" class="action tocompare"
-                                    data-post='<?php /* @escapeNotVerified */ echo $compareHelper->getPostDataParams($_item);?>'
-                                    title="<?php /* @escapeNotVerified */ echo __('Add to Compare') ?>">
-                                    <span><?php /* @escapeNotVerified */ echo __('Add to Compare') ?></span>
-                                </a>
-                            <?php endif; ?>
-                        </div>
-                    <?php endif; ?>
-                </div>
-            <?php endif; ?>
-        </div>
-    </div>
-    <?php echo($iterator == count($items)+1) ? '</li>' : '' ?>
-<?php endforeach ?>
-</ol>
-</div>
-</div>
-</div>
-<?php endif;?>
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+// @codingStandardsIgnoreFile
+
+?>
+<?php
+/**
+ * Template for displaying new products widget
+ *
+ * @var $block \Magento\Catalog\Block\Product\Widget\NewWidget
+ */
+if ($exist = ($block->getCollection() && $block->getCollection()->getSize())) {
+    $helper      = $this->helper("Ves\Blog\Helper\Data");
+    $imageHelper = $this->helper("Ves\Blog\Helper\Image");
+
+    $layout             = $helper->getConfig("post_page/related_products_carousel_layout");
+    $default_items      = (int)$helper->getConfig('post_page/default_items_products');
+    $mobile_items       = (int)$helper->getConfig('post_page/mobile_items_products');
+    $tablet_small_items = (int)$helper->getConfig('post_page/tablet_small_items_products');
+    $tablet_items       = (int)$helper->getConfig('post_page/tablet_items_products');
+    $portrait_items     = (int)$helper->getConfig('post_page/portrait_items_products');
+    $large_items        = (int)$helper->getConfig('post_page/large_items_products');
+    $autoplay           = $helper->getConfig('post_page/autoplay_products');
+    $autoplay_timeout   = $helper->getConfig('post_page/autoplay_timeout_products');
+    $dots               = $helper->getConfig('post_page/dots_products');
+    $nav                = $helper->getConfig('post_page/nav_products');
+    $nav_prev           = $helper->getConfig('post_page/nav_prev_products');
+    $nav_next           = $helper->getConfig('post_page/nav_next_products');
+
+    $type = 'widget-new-grid';
+
+    $mode = 'grid';
+
+    $image = 'new_products_content_widget_grid';
+    $title = __('New Products');
+    $items = $block->getCollection()->getItems();
+
+    $showWishlist = true;
+    $showCompare = true;
+    $showCart = true;
+    $templateType = \Magento\Catalog\Block\Product\ReviewRendererInterface::DEFAULT_VIEW;
+    $description = false;
+    $blockId = time() . rand();
+
+    $carousel = '';
+    if($layout == 'owl_carousel') {
+        $carousel .= 'data-items="3" data-rtl="false" data-loop="false" data-nav="';
+        $carousel .= $nav?'true':'false';
+        $carousel .= '"';
+        $carousel .= 'data-dots="';
+        $carousel .= $dots?'true':'false';
+        $carousel .= '" data-responsive-refresh-rate="false"';
+        if($autoplay) {
+            $carousel .= 'data-autoplay="true" data-autoplay-pauonhover="true" data-autoplay-timeout="';
+            $carousel .= $autoplay_timeout;
+            $carousel .= '" ';
+        }
+        $carousel .= 'data-mobile-items="'.$mobile_items.'" ';
+        $carousel .= 'data-tablet-small-items="'.$tablet_small_items.'" ';
+        $carousel .= 'data-tablet-items="'.$tablet_items.'" ';
+        $carousel .= 'data-portrait-items="'.$portrait_items.'" ';
+        $carousel .= 'data-large-items="'.$large_items.'" ';
+        $carousel .= 'data-large-max-items="'.$large_items.'" ';
+        $carousel .= 'data-nav-text-owlpre="' . $nav_prev . '" ';
+        $carousel .= 'data-nav-text-owlnext="' . $nav_next . '" ';
+        $carousel .= 'data-margin="10" ';
+    }
+}
+?>
+
+<?php if ($exist):?>
+    <div class="block widget products-related blog-widget">
+        <div class="block-title">
+            <h2><strong><?= __('Related Products'); ?></strong></h2>
+        </div>
+        <div class="block-content">
+            <div class="products-<?php /* @escapeNotVerified */ echo $mode; ?>" style="float: left; width: 100%">
+                <ol class="<?php if($layout == 'owl_carousel'){ ?>product-items products-related product-items<?= $blockId ?> owl-carousel <?php /* @escapeNotVerified */ echo $type; ?>" <?= $carousel; } ?>>
+                    <?php $iterator = 1; ?>
+                    <?php foreach ($items as $_item): ?>
+                        <?php /* @escapeNotVerified */ echo($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
+                        <div class="product-item-info">
+                            <a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-photo">
+                                <?= $block->getImage($_item, $image)->toHtml(); ?>
+                            </a>
+                            <div class="product-item-details">
+                                <strong class="product-item-name">
+                                    <a title="<?= $block->escapeHtml($_item->getName()) ?>"
+                                       href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>"
+                                       class="product-item-link">
+                                       <?= $block->escapeHtml($_item->getName()) ?>
+                                   </a>
+                               </strong>
+                               <?php
+                               echo $block->getVesProductPriceHtml($_item);
+                               ?>
+
+                               <?php if ($templateType): ?>
+                                <?= $block->getReviewsSummaryHtml($_item, $templateType, true) ?>
+                            <?php endif; ?>
+
+                            <?php if ($showWishlist || $showCompare || $showCart): ?>
+                                <div class="product-item-actions">
+                                    <?php if ($showCart): ?>
+                                        <div class="actions-primary">
+                                            <?php if ($_item->isSaleable()): ?>
+                                                <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
+                                                    <button class="action tocart primary"
+                                                    data-mage-init='{"redirectUrl":{"url":"<?php /* @escapeNotVerified */ echo $block->getAddToCartUrl($_item) ?>"}}'
+                                                    type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
+                                                    <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                                </button>
+                                            <?php else: ?>
+                                                <?php
+                                                $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
+                                                $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
+                                                ?>
+                                                <button class="action tocart primary"
+                                                data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'
+                                                type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
+                                                <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                            </button>
+                                        <?php endif; ?>
+                                    <?php else: ?>
+                                        <?php if ($_item->getIsSalable()): ?>
+                                            <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
+                                        <?php else: ?>
+                                            <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span></div>
+                                        <?php endif; ?>
+                                    <?php endif; ?>
+                                </div>
+                            <?php endif; ?>
+                            <?php if ($showWishlist || $showCompare): ?>
+                                <div class="actions-secondary" data-role="add-to-links">
+                                    <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
+                                        <a href="#"
+                                        data-post='<?php /* @escapeNotVerified */ echo $block->getAddToWishlistParams($_item); ?>'
+                                        class="action towishlist" data-action="add-to-wishlist"
+                                        title="<?php /* @escapeNotVerified */ echo __('Add to Wish List') ?>">
+                                        <span><?php /* @escapeNotVerified */ echo __('Add to Wish List') ?></span>
+                                    </a>
+                                <?php endif; ?>
+                                <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
+                                    <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');?>
+                                    <a href="#" class="action tocompare"
+                                    data-post='<?php /* @escapeNotVerified */ echo $compareHelper->getPostDataParams($_item);?>'
+                                    title="<?php /* @escapeNotVerified */ echo __('Add to Compare') ?>">
+                                    <span><?php /* @escapeNotVerified */ echo __('Add to Compare') ?></span>
+                                </a>
+                            <?php endif; ?>
+                        </div>
+                    <?php endif; ?>
+                </div>
+            <?php endif; ?>
+        </div>
+    </div>
+    <?=($iterator == count($items)+1) ? '</li>' : '' ?>
+<?php endforeach ?>
+</ol>
+</div>
+</div>
+</div>
+<?php endif;?>
diff --git a/view/frontend/templates/post/recensposts.phtml b/view/frontend/templates/post/recensposts.phtml
index dacbc18..c8e0203 100644
--- a/view/frontend/templates/post/recensposts.phtml
+++ b/view/frontend/templates/post/recensposts.phtml
@@ -49,20 +49,20 @@ $title = $helper->getConfig('sidebar/recentpostsblock_title');
 <div class="ves-block block recentposts-block">
 	<?php if($title){ ?>
 	<div class="block-title">
-		<strong><?php echo $title; ?></strong>
+		<strong><?= $title; ?></strong>
 	</div>
 	<?php } ?>
 	<div class="block-content post-list">
 		<ul class="post-listing">
 			<?php foreach ($collection as $_post) { ?>
-			<?php 
+			<?php
 			$postUrl = $helper->getPostUrl($_post);
 			$postLinkAttr = $helper->getPostUrlLinkAttr($_post);
 			?>
 			<li class="ves-post post-item">
 				<?php if($show_image){ ?>
 			<div class="post-image">
-				<a href="<?php echo $postUrl ?>" <?php echo $postLinkAttr;?> title="<?php echo $_post->getTitle(); ?>">
+				<a href="<?= $postUrl ?>" <?= $postLinkAttr;?> title="<?= $_post->getTitle(); ?>">
 					<?php if( $_post->getThumbnailType() == 1 && $_post->getPostThumbnail()!=''){ ?>
 						<?php if($_post->getImageType() == 2 && $_post->getImageVideoId()!=''){ ?>
 						<span class="fa overlay-icon"></span>
@@ -70,15 +70,15 @@ $title = $helper->getConfig('sidebar/recentpostsblock_title');
 						<span class="fa overlay-icon"></span>
 					<?php } ?>
 					<?php if($image_width>0){ ?>
-					<img src="<?php echo $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height) ?>" height="<?php echo $image_height ?>" width="<?php echo $image_width ?>" alt="<?php echo $_post->getTitle(); ?>"/>
+					<img src="<?= $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height) ?>" height="<?= $image_height ?>" width="<?= $image_width ?>" alt="<?= $_post->getTitle(); ?>"/>
 					<?php }else{ ?>
-					<img src="<?php echo $helper->getMediaUrl($_post->getPostThumbnail()) ?>" alt="<?php echo $_post->getTitle(); ?>"/>
+					<img src="<?= $helper->getMediaUrl($_post->getPostThumbnail()) ?>" alt="<?= $_post->getTitle(); ?>"/>
 					<?php } ?>
 					<?php }else if($_post->getThumbnailType() == 2){ ?>
 					<?php if($_post->getThumbnailVideoType()==1 && $_post->getThumbnailVideoId()!=''){ ?>
-					<iframe width="<?php echo $image_width ?>" height="<?php echo $image_height ?>" src="https://www.youtube.com/embed/<?php echo $_post->getThumbnailVideoId() ?>" frameborder="0" allowfullscreen></iframe>
+					<iframe width="<?= $image_width ?>" height="<?= $image_height ?>" src="https://www.youtube.com/embed/<?= $_post->getThumbnailVideoId() ?>" frameborder="0" allowfullscreen></iframe>
 					<?php }else if($_post->getThumbnailVideoType()==2 && $_post->getThumbnailVideoId()!=''){ ?>
-					<iframe src="https://player.vimeo.com/video/<?php echo $_post->getThumbnailVideoId() ?>?color=3498DB&title=0&byline=0&portrait=0" width="<?php echo $image_width ?>" height="<?php echo $image_height ?>" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
+					<iframe src="https://player.vimeo.com/video/<?= $_post->getThumbnailVideoId() ?>?color=3498DB&title=0&byline=0&portrait=0" width="<?= $image_width ?>" height="<?= $image_height ?>" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
 					<?php } ?>
 					<?php } ?>
 				</a>
@@ -87,57 +87,57 @@ $title = $helper->getConfig('sidebar/recentpostsblock_title');
 				<div class="post-meta">
 					<?php if($show_title){ ?>
 					<div class="post-title">
-						<a href="<?php echo $postUrl ?>" <?php echo $postLinkAttr;?> title="<?php echo $_post->getTitle(); ?>"><?php echo $_post->getTitle(); ?></a>
+						<a href="<?= $postUrl ?>" <?= $postLinkAttr;?> title="<?= $_post->getTitle(); ?>"><?= $_post->getTitle(); ?></a>
 					</div>
 					<?php } ?>
 					<?php if($show_author){ ?>
 				<div class="post-author">
 					<?php $author = $helper->getPostAuthor($_post);?>
-					<i class="fa fa-user"></i> <a href="<?php echo $helper->getAuthorUrl($author); ?>" title="<?php echo $author->getNickName() ?>"><?php echo $author->getNickName() ?></a>
+					<i class="fa fa-user"></i> <a href="<?= $helper->getAuthorUrl($author); ?>" title="<?= $author->getNickName() ?>"><?= $author->getNickName() ?></a>
 				</div>
 				<?php } ?>
 					<?php if($show_createdtime || $show_updatedtime){ ?>
 					<div class="post-date">
 						<?php if($show_createdtime){ ?>
 						<?php $createdTime = $helper->getFormatDate($_post->getCreationTime(), $dateFormat); ?>
-						<span><i class="fa fa-clock-o"></i><?php echo $createdTime; ?></span>
+						<span><i class="fa fa-clock-o"></i><?= $createdTime; ?></span>
 						<?php } ?>
 						<?php if($show_updatedtime){ ?>
 						<?php $updateTime = $helper->getFormatDate($_post->getUpdateTime(), $dateFormat); ?>
-						<span><i class="fa fa-clock-o"></i><?php echo __('Updated on %1', $updateTime); ?></span>
+						<span><i class="fa fa-clock-o"></i><?= __('Updated on %1', $updateTime); ?></span>
 						<?php } ?>
 					</div>
 					<?php } ?>
 					<?php if($show_commentcount){ ?>
 					<div class="post-comment">
 						<i class="fa fa-comments"></i>
-						<a href="<?php echo $postUrl ?>#comments" <?php echo $postLinkAttr;?>><?php echo $_post->getCommentCount(); ?></a>
+						<a href="<?= $postUrl ?>#comments" <?= $postLinkAttr;?>><?= $_post->getCommentCount(); ?></a>
 					</div>
 					<?php } ?>
 					<?php if($show_categories){ ?>
 					<div class="post-categories">
-						<?php echo __('Pubslished In: ') ?>
+						<?= __('Pubslished In: ') ?>
 						<?php
 						$categories = $_post->getData('categories');
 						$count = count($categories);
 						?>
 						<i class="fa fa-folder"></i>
 						<?php foreach ($categories as $k => $v) { ?>
-						<a href="<?php echo $helper->getCategoryUrl($v['identifier'])  ?>" title="<?php echo $v['name'] ?>"><?php echo $v['name'] ?></a>
+						<a href="<?= $helper->getCategoryUrl($v['identifier'])  ?>" title="<?= $v['name'] ?>"><?= $v['name'] ?></a>
 						<?php if(isset($categories[$k+1])) echo __(', '); ?>
 						<?php } ?>
 					</div>
 					<?php } ?>
 					<?php if($show_hits){ ?>
-					<div class="post-hits"><i class="fa fa-eye"></i> <span><?php echo (int)$_post->getHits(); ?></span></div>
+					<div class="post-hits"><i class="fa fa-eye"></i> <span><?= (int)$_post->getHits(); ?></span></div>
 					<?php } ?>
 					<?php if($show_tags){ ?>
 					<?php $tags = $_post->getTag(); ?>
 					<?php if(!empty($tags)){ ?>
 					<div class="post-tag">
-						<span><?php echo __('Tags:'); ?></span>
+						<span><?= __('Tags:'); ?></span>
 						<?php foreach ($tags as $k => $v) { ?>
-						<a href="<?php echo $helper->getTagUrl($v['alias']) ?>"><?php echo $v['name'] ?></a>
+						<a href="<?= $helper->getTagUrl($v['alias']) ?>"><?= $v['name'] ?></a>
 						<?php if(isset($tags[$k+1])) echo __(', '); ?>
 						<?php } ?>
 					</div>
@@ -146,10 +146,10 @@ $title = $helper->getConfig('sidebar/recentpostsblock_title');
 					<?php if($show_shortdescription){ ?>
 					<div class="post-summary">
 						<?php $shortContent = $_post->getShortContent(); ?>
-						<?php echo $helper->subString($shortContent, (int)$shortdescription_count); ?>
+						<?= $helper->subString($shortContent, (int)$shortdescription_count); ?>
 						<?php if($show_readmorelink){ ?>
-						<a href="<?php echo $postUrl ?>" <?php echo $postLinkAttr;?> title="<?php echo $_post->getTitle(); ?>"><?php echo __('Read more') ?></a>
-						<?php } ?>	
+						<a href="<?= $postUrl ?>" <?= $postLinkAttr;?> title="<?= $_post->getTitle(); ?>"><?= __('Read more') ?></a>
+						<?php } ?>
 					</div>
 					<?php } ?>
 				</div>
@@ -158,4 +158,4 @@ $title = $helper->getConfig('sidebar/recentpostsblock_title');
 		</ul>
 	</div>
 </div>
-<?php } ?>
\ No newline at end of file
+<?php } ?>
diff --git a/view/frontend/templates/post/related.phtml b/view/frontend/templates/post/related.phtml
index 975a7dc..f8ceab5 100644
--- a/view/frontend/templates/post/related.phtml
+++ b/view/frontend/templates/post/related.phtml
@@ -57,7 +57,7 @@ if($layout == 'owl_carousel') {
 	$carousel .= $dots?'true':'false';
 	$carousel .= '" data-responsive-refresh-rate="false"';
 	if($autoplay) {
-		$carousel .= 'data-autoplay="true" data-autoplay-pauonhover="true" data-autoplay-timeout="';	
+		$carousel .= 'data-autoplay="true" data-autoplay-pauonhover="true" data-autoplay-timeout="';
 		$carousel .= $autoplay_timeout;
 		$carousel .= '" ';
 	}
@@ -75,12 +75,12 @@ if($layout == 'owl_carousel') {
 <?php if($total>0){ ?>
 <div class="ves-block blog-posts post-list posts-related blog-widget">
 	<div class="block-title">
-		<h2><strong><?php echo __('Related Posts') ?></strong></h2>
+		<h2><strong><?= __('Related Posts') ?></strong></h2>
 	</div>
 	<div class="block-content">
-		<ul class="<?php if($layout == 'owl_carousel'){ ?>post-owl owl-carousel post-listing" <?php echo $carousel; } ?>>
+		<ul class="<?php if($layout == 'owl_carousel'){ ?>post-owl owl-carousel post-listing" <?= $carousel; } ?>>
 			<?php foreach ($collection as $_post) {  ?>
-			<?php  
+			<?php
 			$postUrl = $helper->getPostUrl($_post);
 			$postLinkAttr = $helper->getPostUrlLinkAttr($_post);
 			?>
@@ -91,8 +91,8 @@ if($layout == 'owl_carousel') {
 				<?php if($_post->getImageType() == 2 && $_post->getImageVideoId()!=''){
 					$imageClass = ' post-video';
 				} ?>
-			<div class="post-image <?php echo $imageClass; ?>">
-				<a href="<?php echo $postUrl ?>" <?php echo $postLinkAttr; ?> title="<?php echo $_post->getTitle(); ?>">
+			<div class="post-image <?= $imageClass; ?>">
+				<a href="<?= $postUrl ?>" <?= $postLinkAttr; ?> title="<?= $_post->getTitle(); ?>">
 					<?php if( $_post->getThumbnailType() == 1 && $_post->getPostThumbnail()!=''){ ?>
 						<?php if($_post->getImageType() == 2 && $_post->getImageVideoId()!=''){ ?>
 						<span class="fa overlay-icon"></span>
@@ -100,15 +100,15 @@ if($layout == 'owl_carousel') {
 						<span class="fa overlay-icon"></span>
 					<?php } ?>
 					<?php if($image_width>0){ ?>
-					<img src="<?php echo $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height) ?>" height="<?php echo $image_height ?>" width="<?php echo $image_width ?>" alt="<?php echo $_post->getTitle(); ?>"/>
+					<img src="<?= $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height) ?>" height="<?= $image_height ?>" width="<?= $image_width ?>" alt="<?= $_post->getTitle(); ?>"/>
 					<?php }else{ ?>
-					<img src="<?php echo $helper->getMediaUrl($_post->getPostThumbnail()) ?>" alt="<?php echo $_post->getTitle(); ?>"/>
+					<img src="<?= $helper->getMediaUrl($_post->getPostThumbnail()) ?>" alt="<?= $_post->getTitle(); ?>"/>
 					<?php } ?>
 					<?php }else if($_post->getThumbnailType() == 2){ ?>
 					<?php if($_post->getThumbnailVideoType()==1 && $_post->getThumbnailVideoId()!=''){ ?>
-					<iframe width="<?php echo $image_width ?>" height="<?php echo $image_height ?>" src="https://www.youtube.com/embed/<?php echo $_post->getThumbnailVideoId() ?>" frameborder="0" allowfullscreen></iframe>
+					<iframe width="<?= $image_width ?>" height="<?= $image_height ?>" src="https://www.youtube.com/embed/<?= $_post->getThumbnailVideoId() ?>" frameborder="0" allowfullscreen></iframe>
 					<?php }else if($_post->getThumbnailVideoType()==2 && $_post->getThumbnailVideoId()!=''){ ?>
-					<iframe src="https://player.vimeo.com/video/<?php echo $_post->getThumbnailVideoId() ?>?color=3498DB&title=0&byline=0&portrait=0" width="<?php echo $image_width ?>" height="<?php echo $image_height ?>" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
+					<iframe src="https://player.vimeo.com/video/<?= $_post->getThumbnailVideoId() ?>?color=3498DB&title=0&byline=0&portrait=0" width="<?= $image_width ?>" height="<?= $image_height ?>" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
 					<?php } ?>
 					<?php } ?>
 				</a>
@@ -119,58 +119,58 @@ if($layout == 'owl_carousel') {
 					<?php if($show_title){ ?>
 					<div class="post-title">
 						<?php if($layout == 'list'){ ?>
-						<a href="<?php echo $postUrl ?>"  <?php echo $postLinkAttr; ?> title="<?php echo $_post->getTitle(); ?>"><?php echo $i .') ' . $_post->getTitle(); ?></a>
+						<a href="<?= $postUrl ?>"  <?= $postLinkAttr; ?> title="<?= $_post->getTitle(); ?>"><?= $i .') ' . $_post->getTitle(); ?></a>
 						<?php }else{ ?>
-						<a href="<?php echo $postUrl ?>"  <?php echo $postLinkAttr; ?> title="<?php echo $_post->getTitle(); ?>"><?php echo $_post->getTitle(); ?></a>
+						<a href="<?= $postUrl ?>"  <?= $postLinkAttr; ?> title="<?= $_post->getTitle(); ?>"><?= $_post->getTitle(); ?></a>
 						<?php } ?>
 					</div>
 					<?php } ?>
 					<?php if($show_author){ ?>
 				<div class="post-author">
 					<?php $author = $helper->getPostAuthor($_post);?>
-					<i class="fa fa-user"></i> <a href="<?php echo $helper->getAuthorUrl($author); ?>" title="<?php echo $author->getNickName() ?>"><?php echo $author->getNickName() ?></a>
+					<i class="fa fa-user"></i> <a href="<?= $helper->getAuthorUrl($author); ?>" title="<?= $author->getNickName() ?>"><?= $author->getNickName() ?></a>
 				</div>
 				<?php } ?>
 					<?php if($show_createdtime || $show_updatedtime){ ?>
 					<div class="post-date">
 						<?php if($show_createdtime){ ?>
 						<?php $createdTime = $helper->getFormatDate($_post->getCreationTime(), $dateFormat); ?>
-						<span><?php echo __('Created on %1', $createdTime); ?></span>
+						<span><?= __('Created on %1', $createdTime); ?></span>
 						<?php } ?>
 						<?php if($show_updatedtime){ ?>
 						<?php $updateTime = $helper->getFormatDate($_post->getUpdateTime(), $dateFormat); ?>
-						<span><?php echo __('Updated on %1', $updateTime); ?></span>
+						<span><?= __('Updated on %1', $updateTime); ?></span>
 						<?php } ?>
 					</div>
 					<?php } ?>
 					<?php if($show_commentcount){ ?>
 					<div class="post-comment">
-						<?php echo __('%1 comments', $_post->getCommentCount()); ?>
+						<?= __('%1 comments', $_post->getCommentCount()); ?>
 					</div>
 					<?php } ?>
 					<?php if($show_categories){ ?>
 					<div class="post-categories">
-						<?php echo __('Pubslished In: ') ?>
+						<?= __('Pubslished In: ') ?>
 						<?php
 						$categories = $_post->getData('categories');
 						$count = count($categories);
 						?>
 						<?php foreach ($categories as $k => $v) { ?>
-						<a href="<?php echo $helper->getCategoryUrl($v['identifier'])  ?>" title="<?php echo $v['name'] ?>"><?php echo $v['name'] ?></a>
+						<a href="<?= $helper->getCategoryUrl($v['identifier'])  ?>" title="<?= $v['name'] ?>"><?= $v['name'] ?></a>
 						<?php if(isset($categories[$k+1])) echo __(', '); ?>
 						<?php } ?>
 					</div>
 					<?php } ?>
 					<?php if($show_hits){ ?>
-					<div class="post-hits"><span><?php echo __("Read");?></span> <strong><?php echo (int)$_post->getHits(); ?></strong> <?php echo __("Times"); ?></div>
+					<div class="post-hits"><span><?= __("Read");?></span> <strong><?= (int)$_post->getHits(); ?></strong> <?= __("Times"); ?></div>
 					<?php } ?>
 					<?php if($show_tags){ ?>
 					<?php $tags = $_post->getTags(); ?>
 					<?php if(!empty($tags)){ ?>
 					<div class="post-tag">
-						<span><?php echo __('Tags:'); ?></span>
+						<span><?= __('Tags:'); ?></span>
 						<?php foreach ($tags as $k => $v) { ?>
-						<a href="<?php echo $helper->getTagUrl($v['alias']) ?>"><?php echo $v['name'] ?></a>
+						<a href="<?= $helper->getTagUrl($v['alias']) ?>"><?= $v['name'] ?></a>
 						<?php if(isset($tags[$k+1])) echo __(', '); ?>
 						<?php } ?>
 					</div>
@@ -179,10 +179,10 @@ if($layout == 'owl_carousel') {
 					<?php if($show_shortdescription){ ?>
 					<div class="post-summary">
 						<?php $shortContent = $_post->getShortContent(); ?>
-						<?php echo $helper->subString($shortContent, (int)$shortdescription_count); ?>
+						<?= $helper->subString($shortContent, (int)$shortdescription_count); ?>
 						<?php if($show_readmorelink){ ?>
-						<a href="<?php echo $postUrl ?>" <?php echo $postLinkAttr; ?> title="<?php echo $_post->getTitle(); ?>"><?php echo __('Read more') ?></a>
-						<?php } ?>	
+						<a href="<?= $postUrl ?>" <?= $postLinkAttr; ?> title="<?= $_post->getTitle(); ?>"><?= __('Read more') ?></a>
+						<?php } ?>
 					</div>
 					<?php } ?>
 				</div>
diff --git a/view/frontend/templates/post/style/style1.phtml b/view/frontend/templates/post/style/style1.phtml
index 736ad3a..565da90 100644
--- a/view/frontend/templates/post/style/style1.phtml
+++ b/view/frontend/templates/post/style/style1.phtml
@@ -1,184 +1,184 @@
-<?php
-$collection  = $this->getCollection();
-$helper      = $this->helper("Ves\Blog\Helper\Data");
-$imageHelper = $this->helper("Ves\Blog\Helper\Image");
-
-/** General Settings **/
-$dateFormat         = $helper->getConfig("general_settings/dateformat");
-$twitterUsername    = $helper->getConfig("general_settings/twitter_username");
-$enableNetworks     = $helper->getConfig("general_settings/enable_networks");
-$networks           = array_flip(explode(",", $helper->getConfig("general_settings/networks")));
-$layout             = $this->getConfig("layout_type");
-$show_toolbartop    = $this->getConfig("show_toolbartop");
-$show_toolbarbottom = $this->getConfig("show_toolbarbottom");
-
-$itemsperpage       = (int)$this->getConfig('item_per_page',20);
-$itemsperpage 		= $itemsperpage?$itemsperpage:8;
-$lg_column_item     = (int)$this->getConfig('lg_column_item',6);
-$lg_column_item 	= $lg_column_item?$lg_column_item:4;
-$md_column_item     = (int)$this->getConfig('md_column_item',6);
-$md_column_item 	= $md_column_item?$md_column_item:4;
-$sm_column_item     = (int)$this->getConfig('sm_column_item',6);
-$sm_column_item 	= $sm_column_item?$sm_column_item:2;
-$xs_column_item     = (int)$this->getConfig('xs_column_item',6);
-$xs_column_item 	= $xs_column_item?$xs_column_item:1;
-$lg_column          = 12/$lg_column_item;
-$md_column          = 12/$md_column_item;
-$sm_column          = 12/$sm_column_item;
-$xs_column          = 12/$xs_column_item;
-
-/** POST Settings **/
-$show_image             = $this->getConfig("show_image");
-$image_width            = (int)$this->getConfig("image_width", 800);
-$image_height           = (int)$this->getConfig("image_height");
-$keep_ratio             = $this->getConfig("keep_ratio");
-$keep_frame             = $this->getConfig("keep_frame");
-$show_title             = $this->getConfig("show_title");
-$show_shortdescription  = $this->getConfig("show_shortdescription");
-$shortdescription_count = $this->getConfig("shortdescription_count");
-$show_readmorelink      = $this->getConfig("show_readmorelink");
-$show_categories        = $this->getConfig("show_categories");
-$show_author            = $this->getConfig("show_author");
-$show_commentcount      = $this->getConfig("show_commentcount");
-$disable_comment 		= $helper->getConfig('general_settings/disable_comment');
-if($disable_comment) {
-	$show_commentcount = false;
-}
-$show_updatedtime       = $this->getConfig("show_updatedtime");
-$show_createdtime       = $this->getConfig("show_createdtime");
-$show_hits              = $this->getConfig("show_hits");
-$show_tags              = $this->getConfig("show_tags");
-$show_socialnetworks    = $this->getConfig("show_socialnetworks");
-
-$i = 1;
-$x = 0;
-$total = $collection->count();
-?>
-<?php foreach ($collection as $_post) { ?>
-<?php $postUrl = $helper->getPostUrl($_post); ?>
-<?php $postLinkAttr = $helper->getPostUrlLinkAttr($_post); ?>
-<?php if($layout == 'grid'){ ?>
-<?php if( $lg_column_item == 1 || $x%$lg_column_item == 0){ ?>
-<div class="row">
-	<?php } ?>
-	<div class="col-lg-<?php echo $lg_column ?> col-md-<?php echo $md_column ?> col-sm-<?php echo $sm_column ?> col-xs-<?php echo $xs_column ?>">
-		<?php } ?>
-		<div class="ves-post post-item">
-		<div class="post-wrapper">
-			<?php if($show_image){ ?>
-				<?php $imageClass = ''; ?>
-				<?php if($_post->getImageType() == 2 && $_post->getImageVideoId()!=''){
-					$imageClass = ' post-video';
-				} ?>
-			<div class="post-image <?php echo $imageClass ?>">
-				<a href="<?php echo $postUrl ?>" <?php echo $postLinkAttr;?> title="<?php echo $_post->getTitle(); ?>">
-					<?php if( $_post->getThumbnailType() == 1 && $_post->getPostThumbnail()!=''){ ?>
-						<?php if($_post->getImageType() == 2 && $_post->getImageVideoId()!=''){ ?>
-						<span class="fa overlay-icon"></span>
-					<?php }else{ ?>
-						<span class="fa overlay-icon"></span>
-					<?php } ?>
-					<?php if($image_width>0 && $_post->getPostThumbnail()){ ?>
-					<img src="<?php echo $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height, 100, $keep_ratio, $keep_frame) ?>" height="<?php echo $image_height ?>" width="<?php echo $image_width ?>" alt="<?php echo $_post->getTitle(); ?>"/>
-					<?php }else{ ?>
-					<img src="<?php echo $helper->getMediaUrl($_post->getPostThumbnail()) ?>" alt="<?php echo $_post->getTitle(); ?>"/>
-					<?php } ?>
-					<?php }else if($_post->getThumbnailType() == 2){ ?>
-					<?php if($_post->getThumbnailVideoType()==1 && $_post->getThumbnailVideoId()!=''){ ?>
-					<iframe width="<?php echo $image_width ?>" height="<?php echo $image_height ?>" src="https://www.youtube.com/embed/<?php echo $_post->getThumbnailVideoId() ?>" frameborder="0" allowfullscreen></iframe>
-					<?php }else if($_post->getThumbnailVideoType()==2 && $_post->getThumbnailVideoId()!=''){ ?>
-					<iframe src="https://player.vimeo.com/video/<?php echo $_post->getThumbnailVideoId() ?>?color=3498DB&title=0&byline=0&portrait=0" width="<?php echo $image_width ?>" height="<?php echo $image_height ?>" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
-					<?php } ?>
-					<?php } ?>
-				</a>
-
-				<?php if($show_categories){ ?>
-				<div class="post-categories">
-					<?php
-					$categories = $_post->getData('categories');
-					$count = count($categories);
-					?>
-					<?php foreach ($categories as $k => $v) { ?>
-					<a href="<?php echo $helper->getCategoryUrl($v['identifier'])  ?>" title="<?php echo $v['name'] ?>"><?php echo $v['name'] ?></a>
-					<?php } ?>
-				</div>
-				<?php } ?>
-
-			</div>
-			<?php } ?>
-			
-				<?php if($show_title){ ?>
-					<h3 class="post-title"><a href="<?php echo $postUrl ?>" <?php echo $postLinkAttr;?> title="<?php echo $_post->getTitle(); ?>"><?php echo $_post->getTitle(); ?></a></h3>
-				<?php if($show_socialnetworks){ ?>
-				<div class="addthis_toolbox addthis_default_style" data-title="<?php echo $_post->getTitle(); ?>" addthis:url="<?php echo $postUrl ?>">
-					<a class="addthis_button_facebook"></a>
-					<a class="addthis_button_twitter"></a>
-					<a class="addthis_button_google"></a>
-					<a class="addthis_button_email"></a>
-					<a class="addthis_button_pinterest_share"></a>
-					<a class="addthis_button_compact"></a>
-				</div>
-				<?php } ?>
-				<?php } ?>
-				<div class="post-meta">
-				<?php if($show_author){ ?>
-				<div class="post-author">
-					<?php $author = $helper->getPostAuthor($_post);?>
-					<?php if($author) { ?>
-					<i class="fa fa-user"></i> <a href="<?php echo $helper->getAuthorUrl($author); ?>" title="<?php echo $author->getNickName() ?>"><?php echo $author->getNickName() ?></a>
-					<?php } ?>
-				</div>
-				<?php } ?>
-				<?php if($show_createdtime || $show_updatedtime){ ?>
-				<div class="post-date">
-					<?php if($show_createdtime){ ?>
-					<?php $createdTime = $helper->getFormatDate($_post->getCreationTime(), $dateFormat); ?>
-					<i class="fa fa-clock-o"></i> <span><?php echo $createdTime; ?></span>
-					<?php } ?>
-					<?php if($show_updatedtime){ ?>
-					<?php $updateTime = $helper->getFormatDate($_post->getUpdateTime(), $dateFormat); ?>
-					<i class="fa fa-clock-o"></i> <span><?php echo __('Updated on %1', $updateTime); ?></span>
-					<?php } ?>
-				</div>
-				<?php } ?>
-				<?php if($show_hits){ ?>
-				<div class="post-hits"><i class="fa fa-eye"></i> <span><?php echo (int)$_post->getHits(); ?></span></div>
-				<?php } ?>
-				<?php if($show_commentcount){ ?>
-				<div class="post-comment">
-					<i class="fa fa-comments"></i>
-					<a href="<?php echo $postUrl ?>#comments" <?php echo $postLinkAttr;?>><?php echo $_post->getCommentCount(); ?></a>
-				</div>
-				<?php } ?>				
-			</div>
-				<?php if($show_tags){ ?>
-				<?php $tags = $_post->getTag(); ?>
-				<?php if(!empty($tags)){ ?>
-				<div class="post-tag">
-					<span><?php echo __('Tags:'); ?></span>
-					<?php foreach ($tags as $k => $v) { ?>
-					<a href="<?php echo $helper->getTagUrl($v['alias']) ?>"><?php echo trim($v['name']) ?></a>
-					<?php if(isset($tags[$k+1])) echo __(', '); ?>
-					<?php } ?>
-				</div>
-				<?php } ?>
-				<?php } ?>
-				<?php if($show_shortdescription){ ?>
-				<div class="post-summary">
-					<?php $shortContent = $_post->getShortContent(); ?>
-					<?php echo $helper->subString($shortContent, (int)$shortdescription_count); ?>
-				</div>
-				<?php if($show_readmorelink){ ?>
-					<div class="post-readmore"><a href="<?php echo $postUrl ?>" <?php echo $postLinkAttr;?> title="<?php echo $_post->getTitle(); ?>"><?php echo __('Read more') ?></a></div>
-					<?php } ?>	
-				<?php } ?>
-		</div>
-		</div>
-		<?php if($layout == 'grid'){ ?>
-	</div>	
-	<?php if( $lg_column_item == 1 || ($x+1)%$lg_column_item == 0 || $i == $total ) {  ?>
-</div>
-<?php } ?>
-<?php $i++; $x++; ?>
-<?php } ?>
-<?php } ?>
\ No newline at end of file
+<?php
+$collection  = $this->getCollection();
+$helper      = $this->helper("Ves\Blog\Helper\Data");
+$imageHelper = $this->helper("Ves\Blog\Helper\Image");
+
+/** General Settings **/
+$dateFormat         = $helper->getConfig("general_settings/dateformat");
+$twitterUsername    = $helper->getConfig("general_settings/twitter_username");
+$enableNetworks     = $helper->getConfig("general_settings/enable_networks");
+$networks           = array_flip(explode(",", $helper->getConfig("general_settings/networks")));
+$layout             = $this->getConfig("layout_type");
+$show_toolbartop    = $this->getConfig("show_toolbartop");
+$show_toolbarbottom = $this->getConfig("show_toolbarbottom");
+
+$itemsperpage       = (int)$this->getConfig('item_per_page',20);
+$itemsperpage 		= $itemsperpage?$itemsperpage:8;
+$lg_column_item     = (int)$this->getConfig('lg_column_item',6);
+$lg_column_item 	= $lg_column_item?$lg_column_item:4;
+$md_column_item     = (int)$this->getConfig('md_column_item',6);
+$md_column_item 	= $md_column_item?$md_column_item:4;
+$sm_column_item     = (int)$this->getConfig('sm_column_item',6);
+$sm_column_item 	= $sm_column_item?$sm_column_item:2;
+$xs_column_item     = (int)$this->getConfig('xs_column_item',6);
+$xs_column_item 	= $xs_column_item?$xs_column_item:1;
+$lg_column          = 12/$lg_column_item;
+$md_column          = 12/$md_column_item;
+$sm_column          = 12/$sm_column_item;
+$xs_column          = 12/$xs_column_item;
+
+/** POST Settings **/
+$show_image             = $this->getConfig("show_image");
+$image_width            = (int)$this->getConfig("image_width", 800);
+$image_height           = (int)$this->getConfig("image_height");
+$keep_ratio             = $this->getConfig("keep_ratio");
+$keep_frame             = $this->getConfig("keep_frame");
+$show_title             = $this->getConfig("show_title");
+$show_shortdescription  = $this->getConfig("show_shortdescription");
+$shortdescription_count = $this->getConfig("shortdescription_count");
+$show_readmorelink      = $this->getConfig("show_readmorelink");
+$show_categories        = $this->getConfig("show_categories");
+$show_author            = $this->getConfig("show_author");
+$show_commentcount      = $this->getConfig("show_commentcount");
+$disable_comment 		= $helper->getConfig('general_settings/disable_comment');
+if($disable_comment) {
+	$show_commentcount = false;
+}
+$show_updatedtime       = $this->getConfig("show_updatedtime");
+$show_createdtime       = $this->getConfig("show_createdtime");
+$show_hits              = $this->getConfig("show_hits");
+$show_tags              = $this->getConfig("show_tags");
+$show_socialnetworks    = $this->getConfig("show_socialnetworks");
+
+$i = 1;
+$x = 0;
+$total = $collection->count();
+?>
+<?php foreach ($collection as $_post) { ?>
+<?php $postUrl = $helper->getPostUrl($_post); ?>
+<?php $postLinkAttr = $helper->getPostUrlLinkAttr($_post); ?>
+<?php if($layout == 'grid'){ ?>
+<?php if( $lg_column_item == 1 || $x%$lg_column_item == 0){ ?>
+<div class="row">
+	<?php } ?>
+	<div class="col-lg-<?= $lg_column ?> col-md-<?= $md_column ?> col-sm-<?= $sm_column ?> col-xs-<?= $xs_column ?>">
+		<?php } ?>
+		<div class="ves-post post-item">
+		<div class="post-wrapper">
+			<?php if($show_image){ ?>
+				<?php $imageClass = ''; ?>
+				<?php if($_post->getImageType() == 2 && $_post->getImageVideoId()!=''){
+					$imageClass = ' post-video';
+				} ?>
+			<div class="post-image <?= $imageClass ?>">
+				<a href="<?= $postUrl ?>" <?= $postLinkAttr;?> title="<?= $_post->getTitle(); ?>">
+					<?php if( $_post->getThumbnailType() == 1 && $_post->getPostThumbnail()!=''){ ?>
+						<?php if($_post->getImageType() == 2 && $_post->getImageVideoId()!=''){ ?>
+						<span class="fa overlay-icon"></span>
+					<?php }else{ ?>
+						<span class="fa overlay-icon"></span>
+					<?php } ?>
+					<?php if($image_width>0 && $_post->getPostThumbnail()){ ?>
+					<img src="<?= $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height, 100, $keep_ratio, $keep_frame) ?>" height="<?= $image_height ?>" width="<?= $image_width ?>" alt="<?= $_post->getTitle(); ?>"/>
+					<?php }else{ ?>
+					<img src="<?= $helper->getMediaUrl($_post->getPostThumbnail()) ?>" alt="<?= $_post->getTitle(); ?>"/>
+					<?php } ?>
+					<?php }else if($_post->getThumbnailType() == 2){ ?>
+					<?php if($_post->getThumbnailVideoType()==1 && $_post->getThumbnailVideoId()!=''){ ?>
+					<iframe width="<?= $image_width ?>" height="<?= $image_height ?>" src="https://www.youtube.com/embed/<?= $_post->getThumbnailVideoId() ?>" frameborder="0" allowfullscreen></iframe>
+					<?php }else if($_post->getThumbnailVideoType()==2 && $_post->getThumbnailVideoId()!=''){ ?>
+					<iframe src="https://player.vimeo.com/video/<?= $_post->getThumbnailVideoId() ?>?color=3498DB&title=0&byline=0&portrait=0" width="<?= $image_width ?>" height="<?= $image_height ?>" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
+					<?php } ?>
+					<?php } ?>
+				</a>
+
+				<?php if($show_categories){ ?>
+				<div class="post-categories">
+					<?php
+					$categories = $_post->getData('categories');
+					$count = count($categories);
+					?>
+					<?php foreach ($categories as $k => $v) { ?>
+					<a href="<?= $helper->getCategoryUrl($v['identifier'])  ?>" title="<?= $v['name'] ?>"><?= $v['name'] ?></a>
+					<?php } ?>
+				</div>
+				<?php } ?>
+
+			</div>
+			<?php } ?>
+
+				<?php if($show_title){ ?>
+					<h3 class="post-title"><a href="<?= $postUrl ?>" <?= $postLinkAttr;?> title="<?= $_post->getTitle(); ?>"><?= $_post->getTitle(); ?></a></h3>
+				<?php if($show_socialnetworks){ ?>
+				<div class="addthis_toolbox addthis_default_style" data-title="<?= $_post->getTitle(); ?>" addthis:url="<?= $postUrl ?>">
+					<a class="addthis_button_facebook"></a>
+					<a class="addthis_button_twitter"></a>
+					<a class="addthis_button_google"></a>
+					<a class="addthis_button_email"></a>
+					<a class="addthis_button_pinterest_share"></a>
+					<a class="addthis_button_compact"></a>
+				</div>
+				<?php } ?>
+				<?php } ?>
+				<div class="post-meta">
+				<?php if($show_author){ ?>
+				<div class="post-author">
+					<?php $author = $helper->getPostAuthor($_post);?>
+					<?php if($author) { ?>
+					<i class="fa fa-user"></i> <a href="<?= $helper->getAuthorUrl($author); ?>" title="<?= $author->getNickName() ?>"><?= $author->getNickName() ?></a>
+					<?php } ?>
+				</div>
+				<?php } ?>
+				<?php if($show_createdtime || $show_updatedtime){ ?>
+				<div class="post-date">
+					<?php if($show_createdtime){ ?>
+					<?php $createdTime = $helper->getFormatDate($_post->getCreationTime(), $dateFormat); ?>
+					<i class="fa fa-clock-o"></i> <span><?= $createdTime; ?></span>
+					<?php } ?>
+					<?php if($show_updatedtime){ ?>
+					<?php $updateTime = $helper->getFormatDate($_post->getUpdateTime(), $dateFormat); ?>
+					<i class="fa fa-clock-o"></i> <span><?= __('Updated on %1', $updateTime); ?></span>
+					<?php } ?>
+				</div>
+				<?php } ?>
+				<?php if($show_hits){ ?>
+				<div class="post-hits"><i class="fa fa-eye"></i> <span><?= (int)$_post->getHits(); ?></span></div>
+				<?php } ?>
+				<?php if($show_commentcount){ ?>
+				<div class="post-comment">
+					<i class="fa fa-comments"></i>
+					<a href="<?= $postUrl ?>#comments" <?= $postLinkAttr;?>><?= $_post->getCommentCount(); ?></a>
+				</div>
+				<?php } ?>
+			</div>
+				<?php if($show_tags){ ?>
+				<?php $tags = $_post->getTag(); ?>
+				<?php if(!empty($tags)){ ?>
+				<div class="post-tag">
+					<span><?= __('Tags:'); ?></span>
+					<?php foreach ($tags as $k => $v) { ?>
+					<a href="<?= $helper->getTagUrl($v['alias']) ?>"><?= trim($v['name']) ?></a>
+					<?php if(isset($tags[$k+1])) echo __(', '); ?>
+					<?php } ?>
+				</div>
+				<?php } ?>
+				<?php } ?>
+				<?php if($show_shortdescription){ ?>
+				<div class="post-summary">
+					<?php $shortContent = $_post->getShortContent(); ?>
+					<?= $helper->subString($shortContent, (int)$shortdescription_count); ?>
+				</div>
+				<?php if($show_readmorelink){ ?>
+					<div class="post-readmore"><a href="<?= $postUrl ?>" <?= $postLinkAttr;?> title="<?= $_post->getTitle(); ?>"><?= __('Read more') ?></a></div>
+					<?php } ?>
+				<?php } ?>
+		</div>
+		</div>
+		<?php if($layout == 'grid'){ ?>
+	</div>
+	<?php if( $lg_column_item == 1 || ($x+1)%$lg_column_item == 0 || $i == $total ) {  ?>
+</div>
+<?php } ?>
+<?php $i++; $x++; ?>
+<?php } ?>
+<?php } ?>
diff --git a/view/frontend/templates/post/style/style2.phtml b/view/frontend/templates/post/style/style2.phtml
index b20515c..b6fdd81 100644
--- a/view/frontend/templates/post/style/style2.phtml
+++ b/view/frontend/templates/post/style/style2.phtml
@@ -1,203 +1,203 @@
-<?php
-$collection  = $this->getCollection();
-$helper      = $this->helper("Ves\Blog\Helper\Data");
-$imageHelper = $this->helper("Ves\Blog\Helper\Image");
-
-/** General Settings **/
-$dateFormat         = $helper->getConfig("general_settings/dateformat");
-$twitterUsername    = $helper->getConfig("general_settings/twitter_username");
-$enableNetworks     = $helper->getConfig("general_settings/enable_networks");
-$networks           = array_flip(explode(",", $helper->getConfig("general_settings/networks")));
-$layout             = $this->getConfig("layout_type");
-$show_toolbartop    = $this->getConfig("show_toolbartop");
-$show_toolbarbottom = $this->getConfig("show_toolbarbottom");
-
-$itemsperpage       = (int)$this->getConfig('item_per_page',20);
-$itemsperpage 		= $itemsperpage?$itemsperpage:8;
-$lg_column_item     = (int)$this->getConfig('lg_column_item',6);
-$lg_column_item 	= $lg_column_item?$lg_column_item:4;
-$md_column_item     = (int)$this->getConfig('md_column_item',6);
-$md_column_item 	= $md_column_item?$md_column_item:4;
-$sm_column_item     = (int)$this->getConfig('sm_column_item',6);
-$sm_column_item 	= $sm_column_item?$sm_column_item:2;
-$xs_column_item     = (int)$this->getConfig('xs_column_item',6);
-$xs_column_item 	= $xs_column_item?$xs_column_item:1;
-$lg_column          = 12/$lg_column_item;
-$md_column          = 12/$md_column_item;
-$sm_column          = 12/$sm_column_item;
-$xs_column          = 12/$xs_column_item;
-
-/** POST Settings **/
-$show_image             = $this->getConfig("show_image");
-$image_width            = (int)$this->getConfig("image_width", 800);
-$image_height           = (int)$this->getConfig("image_height");
-$keep_ratio             = $this->getConfig("keep_ratio");
-$keep_frame             = $this->getConfig("keep_frame");
-$show_title             = $this->getConfig("show_title");
-$show_shortdescription  = $this->getConfig("show_shortdescription");
-$shortdescription_count = $this->getConfig("shortdescription_count");
-$show_readmorelink      = $this->getConfig("show_readmorelink");
-$show_categories        = $this->getConfig("show_categories");
-$show_author            = $this->getConfig("show_author");
-$show_commentcount      = $this->getConfig("show_commentcount");
-$disable_comment 		= $helper->getConfig('general_settings/disable_comment');
-if($disable_comment) {
-	$show_commentcount = false;
-}
-$show_updatedtime       = $this->getConfig("show_updatedtime");
-$show_createdtime       = $this->getConfig("show_createdtime");
-$show_hits              = $this->getConfig("show_hits");
-$show_tags              = $this->getConfig("show_tags");
-$show_socialnetworks    = $this->getConfig("show_socialnetworks");
-
-$i = 1;
-$x = 0;
-$total = $collection->count();
-?>
-<?php foreach ($collection as $_post) { ?>
-<?php $postUrl = $helper->getPostUrl($_post); ?>
-<?php $postLinkAttr = $helper->getPostUrlLinkAttr($_post); ?>
-<?php if($layout == 'grid'){ ?>
-<?php if( $lg_column_item == 1 || $x%$lg_column_item == 0){ ?>
-<div class="row">
-	<?php } ?>
-	<div class="col-lg-<?php echo $lg_column ?> col-md-<?php echo $md_column ?> col-sm-<?php echo $sm_column ?> col-xs-<?php echo $xs_column ?>">
-		<?php } ?>
-		<div class="ves-post post-item">
-			<div class="post-wrapper">
-			<?php // IMAGE ?>
-			<?php if($show_image){ ?>
-				<?php $imageClass = ''; ?>
-				<?php if($_post->getImageType() == 2 && $_post->getImageVideoId()!=''){
-					$imageClass = ' post-video';
-				} ?>
-			<div class="post-image <?php echo $imageClass ?>">
-				<a href="<?php echo $postUrl ?>" <?php echo $postLinkAttr; ?> title="<?php echo $_post->getTitle(); ?>">
-					<?php if( $_post->getThumbnailType() == 1 && $_post->getPostThumbnail()!=''){ ?>
-						<?php if($_post->getImageType() == 2 && $_post->getImageVideoId()!=''){ ?>
-						<span class="fa overlay-icon"></span>
-					<?php }else{ ?>
-						<span class="fa overlay-icon"></span>
-					<?php } ?>
-					<?php if($image_width>0){ ?>
-					<img src="<?php echo $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height, 100, $keep_ratio, $keep_frame) ?>" height="<?php echo $image_height ?>" width="<?php echo $image_width ?>" alt="<?php echo $_post->getTitle(); ?>"/>
-					<?php }else{ ?>
-					<img src="<?php echo $helper->getMediaUrl($_post->getPostThumbnail()) ?>" alt="<?php echo $_post->getTitle(); ?>"/>
-					<?php } ?>
-					<?php }else if($_post->getThumbnailType() == 2){ ?>
-					<?php if($_post->getThumbnailVideoType()==1 && $_post->getThumbnailVideoId()!=''){ ?>
-					<iframe width="<?php echo $image_width ?>" height="<?php echo $image_height ?>" src="https://www.youtube.com/embed/<?php echo $_post->getThumbnailVideoId() ?>" frameborder="0" allowfullscreen></iframe>
-					<?php }else if($_post->getThumbnailVideoType()==2 && $_post->getThumbnailVideoId()!=''){ ?>
-					<iframe src="https://player.vimeo.com/video/<?php echo $_post->getThumbnailVideoId() ?>?color=3498DB&title=0&byline=0&portrait=0" width="<?php echo $image_width ?>" height="<?php echo $image_height ?>" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
-					<?php } ?>
-					<?php } ?>
-				</a>
-
-
-
-			</div>
-			<?php } ?>
-			<?php // TITLE ?>
-			<?php if($show_title){ ?>
-					<h3 class="post-title"><a href="<?php echo $postUrl ?>" <?php echo $postLinkAttr; ?> title="<?php echo $_post->getTitle(); ?>"><?php echo $_post->getTitle(); ?></a></h3>
-				<?php if($show_socialnetworks){ ?>
-				<div class="addthis_toolbox addthis_default_style" data-title="<?php echo $_post->getTitle(); ?>" addthis:url="<?php echo $postUrl ?>">
-					<a class="addthis_button_facebook"></a>
-					<a class="addthis_button_twitter"></a>
-					<a class="addthis_button_google"></a>
-					<a class="addthis_button_email"></a>
-					<a class="addthis_button_pinterest_share"></a>
-					<a class="addthis_button_compact"></a>
-				</div>
-				<?php } ?>
-				<?php } ?>
-				
-				<div class="post-meta">
-				<?php if($show_author){ ?>
-				<div class="post-author">
-					<?php $author = $helper->getPostAuthor($_post);?>
-					<?php if($author) { ?>
-					<i class="fa fa-user"></i> <a href="<?php echo $helper->getAuthorUrl($author); ?>" title="<?php echo $author->getNickName() ?>"><?php echo $author->getNickName() ?></a>
-					<?php } ?>
-				</div>
-				<?php } ?>
-				<?php if($show_createdtime || $show_updatedtime){ ?>
-				<div class="post-date">
-					<?php if($show_createdtime){ ?>
-					<?php $createdTime = $helper->getFormatDate($_post->getCreationTime(), $dateFormat); ?>
-					<i class="fa fa-clock-o"></i> <span><?php echo $createdTime; ?></span>
-					<?php } ?>
-					<?php if($show_updatedtime){ ?>
-					<?php $updateTime = $helper->getFormatDate($_post->getUpdateTime(), $dateFormat); ?>
-					<i class="fa fa-clock-o"></i> <span><?php echo __('Updated on %1', $updateTime); ?></span>
-					<?php } ?>
-				</div>
-				<?php } ?>
-				<?php if($show_categories){ ?>
-				<div class="post-categories">
-					<?php
-					$categories = $_post->getData('categories');
-					$count = count($categories);
-					?>
-					<i class="fa fa-folder"></i>
-					<?php foreach ($categories as $k => $v) { ?>
-					<a href="<?php echo $helper->getCategoryUrl($v['identifier'])  ?>" title="<?php echo $v['name'] ?>"><?php echo $v['name'] ?></a>
-					<?php if(isset($categories[$k+1])) echo __(', '); ?>
-					<?php } ?>
-				</div>
-				<?php } ?>
-				<?php if($show_hits){ ?>
-				<div class="post-hits"><i class="fa fa-eye"></i> <span><?php echo (int)$_post->getHits(); ?></span></div>
-				<?php } ?>
-				<?php if($show_commentcount){ ?>
-				<div class="post-comment">
-					<i class="fa fa-comments"></i>
-					<a href="<?php echo $postUrl ?>#comments" <?php echo $postLinkAttr; ?>><?php echo $_post->getCommentCount(); ?></a>
-				</div>
-				<?php } ?>				
-			</div>
-
-				<?php if($show_tags){ ?>
-				<?php $tags = $_post->getTag(); ?>
-				<?php if(!empty($tags)){ ?>
-				<div class="post-tag">
-					<span><?php echo __('Tags:'); ?></span>
-					<?php foreach ($tags as $k => $v) { ?>
-					<a href="<?php echo $helper->getTagUrl($v['alias']) ?>"><?php echo trim($v['name']) ?></a>
-					<?php if(isset($tags[$k+1])) echo __(', '); ?>
-					<?php } ?>
-				</div>
-				<?php } ?>
-				<?php } ?>
-
-				<?php if($show_categories){ ?>
-				<div class="post-categories">
-					<?php
-					$categories = $_post->getData('categories');
-					$count = count($categories);
-					?>
-					<?php foreach ($categories as $k => $v) { ?>
-					<a href="<?php echo $helper->getCategoryUrl($v['identifier'])  ?>" title="<?php echo $v['name'] ?>"><?php echo $v['name'] ?></a>
-					<?php } ?>
-				</div>
-				<?php } ?>
-
-				<?php if($show_shortdescription){ ?>
-				<div class="post-summary">
-					<?php $shortContent = $_post->getShortContent(); ?>
-					<?php echo $helper->subString($shortContent, (int)$shortdescription_count); ?>
-				</div>
-				<?php if($show_readmorelink){ ?>
-					<div class="post-readmore"><a href="<?php echo $postUrl ?>" <?php echo $postLinkAttr; ?> title="<?php echo $_post->getTitle(); ?>"><?php echo __('Read more') ?></a></div>
-					<?php } ?>	
-				<?php } ?>
-		</div>
-		</div>
-		<?php if($layout == 'grid'){ ?>
-	</div>	
-	<?php if( $lg_column_item == 1 || ($x+1)%$lg_column_item == 0 || $i == $total ) {  ?>
-</div>
-<?php } ?>
-<?php $i++; $x++; ?>
-<?php } ?>
-<?php } ?>
\ No newline at end of file
+<?php
+$collection  = $this->getCollection();
+$helper      = $this->helper("Ves\Blog\Helper\Data");
+$imageHelper = $this->helper("Ves\Blog\Helper\Image");
+
+/** General Settings **/
+$dateFormat         = $helper->getConfig("general_settings/dateformat");
+$twitterUsername    = $helper->getConfig("general_settings/twitter_username");
+$enableNetworks     = $helper->getConfig("general_settings/enable_networks");
+$networks           = array_flip(explode(",", $helper->getConfig("general_settings/networks")));
+$layout             = $this->getConfig("layout_type");
+$show_toolbartop    = $this->getConfig("show_toolbartop");
+$show_toolbarbottom = $this->getConfig("show_toolbarbottom");
+
+$itemsperpage       = (int)$this->getConfig('item_per_page',20);
+$itemsperpage 		= $itemsperpage?$itemsperpage:8;
+$lg_column_item     = (int)$this->getConfig('lg_column_item',6);
+$lg_column_item 	= $lg_column_item?$lg_column_item:4;
+$md_column_item     = (int)$this->getConfig('md_column_item',6);
+$md_column_item 	= $md_column_item?$md_column_item:4;
+$sm_column_item     = (int)$this->getConfig('sm_column_item',6);
+$sm_column_item 	= $sm_column_item?$sm_column_item:2;
+$xs_column_item     = (int)$this->getConfig('xs_column_item',6);
+$xs_column_item 	= $xs_column_item?$xs_column_item:1;
+$lg_column          = 12/$lg_column_item;
+$md_column          = 12/$md_column_item;
+$sm_column          = 12/$sm_column_item;
+$xs_column          = 12/$xs_column_item;
+
+/** POST Settings **/
+$show_image             = $this->getConfig("show_image");
+$image_width            = (int)$this->getConfig("image_width", 800);
+$image_height           = (int)$this->getConfig("image_height");
+$keep_ratio             = $this->getConfig("keep_ratio");
+$keep_frame             = $this->getConfig("keep_frame");
+$show_title             = $this->getConfig("show_title");
+$show_shortdescription  = $this->getConfig("show_shortdescription");
+$shortdescription_count = $this->getConfig("shortdescription_count");
+$show_readmorelink      = $this->getConfig("show_readmorelink");
+$show_categories        = $this->getConfig("show_categories");
+$show_author            = $this->getConfig("show_author");
+$show_commentcount      = $this->getConfig("show_commentcount");
+$disable_comment 		= $helper->getConfig('general_settings/disable_comment');
+if($disable_comment) {
+	$show_commentcount = false;
+}
+$show_updatedtime       = $this->getConfig("show_updatedtime");
+$show_createdtime       = $this->getConfig("show_createdtime");
+$show_hits              = $this->getConfig("show_hits");
+$show_tags              = $this->getConfig("show_tags");
+$show_socialnetworks    = $this->getConfig("show_socialnetworks");
+
+$i = 1;
+$x = 0;
+$total = $collection->count();
+?>
+<?php foreach ($collection as $_post) { ?>
+<?php $postUrl = $helper->getPostUrl($_post); ?>
+<?php $postLinkAttr = $helper->getPostUrlLinkAttr($_post); ?>
+<?php if($layout == 'grid'){ ?>
+<?php if( $lg_column_item == 1 || $x%$lg_column_item == 0){ ?>
+<div class="row">
+	<?php } ?>
+	<div class="col-lg-<?= $lg_column ?> col-md-<?= $md_column ?> col-sm-<?= $sm_column ?> col-xs-<?= $xs_column ?>">
+		<?php } ?>
+		<div class="ves-post post-item">
+			<div class="post-wrapper">
+			<?php // IMAGE ?>
+			<?php if($show_image){ ?>
+				<?php $imageClass = ''; ?>
+				<?php if($_post->getImageType() == 2 && $_post->getImageVideoId()!=''){
+					$imageClass = ' post-video';
+				} ?>
+			<div class="post-image <?= $imageClass ?>">
+				<a href="<?= $postUrl ?>" <?= $postLinkAttr; ?> title="<?= $_post->getTitle(); ?>">
+					<?php if( $_post->getThumbnailType() == 1 && $_post->getPostThumbnail()!=''){ ?>
+						<?php if($_post->getImageType() == 2 && $_post->getImageVideoId()!=''){ ?>
+						<span class="fa overlay-icon"></span>
+					<?php }else{ ?>
+						<span class="fa overlay-icon"></span>
+					<?php } ?>
+					<?php if($image_width>0){ ?>
+					<img src="<?= $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height, 100, $keep_ratio, $keep_frame) ?>" height="<?= $image_height ?>" width="<?= $image_width ?>" alt="<?= $_post->getTitle(); ?>"/>
+					<?php }else{ ?>
+					<img src="<?= $helper->getMediaUrl($_post->getPostThumbnail()) ?>" alt="<?= $_post->getTitle(); ?>"/>
+					<?php } ?>
+					<?php }else if($_post->getThumbnailType() == 2){ ?>
+					<?php if($_post->getThumbnailVideoType()==1 && $_post->getThumbnailVideoId()!=''){ ?>
+					<iframe width="<?= $image_width ?>" height="<?= $image_height ?>" src="https://www.youtube.com/embed/<?= $_post->getThumbnailVideoId() ?>" frameborder="0" allowfullscreen></iframe>
+					<?php }else if($_post->getThumbnailVideoType()==2 && $_post->getThumbnailVideoId()!=''){ ?>
+					<iframe src="https://player.vimeo.com/video/<?= $_post->getThumbnailVideoId() ?>?color=3498DB&title=0&byline=0&portrait=0" width="<?= $image_width ?>" height="<?= $image_height ?>" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
+					<?php } ?>
+					<?php } ?>
+				</a>
+
+
+
+			</div>
+			<?php } ?>
+			<?php // TITLE ?>
+			<?php if($show_title){ ?>
+					<h3 class="post-title"><a href="<?= $postUrl ?>" <?= $postLinkAttr; ?> title="<?= $_post->getTitle(); ?>"><?= $_post->getTitle(); ?></a></h3>
+				<?php if($show_socialnetworks){ ?>
+				<div class="addthis_toolbox addthis_default_style" data-title="<?= $_post->getTitle(); ?>" addthis:url="<?= $postUrl ?>">
+					<a class="addthis_button_facebook"></a>
+					<a class="addthis_button_twitter"></a>
+					<a class="addthis_button_google"></a>
+					<a class="addthis_button_email"></a>
+					<a class="addthis_button_pinterest_share"></a>
+					<a class="addthis_button_compact"></a>
+				</div>
+				<?php } ?>
+				<?php } ?>
+
+				<div class="post-meta">
+				<?php if($show_author){ ?>
+				<div class="post-author">
+					<?php $author = $helper->getPostAuthor($_post);?>
+					<?php if($author) { ?>
+					<i class="fa fa-user"></i> <a href="<?= $helper->getAuthorUrl($author); ?>" title="<?= $author->getNickName() ?>"><?= $author->getNickName() ?></a>
+					<?php } ?>
+				</div>
+				<?php } ?>
+				<?php if($show_createdtime || $show_updatedtime){ ?>
+				<div class="post-date">
+					<?php if($show_createdtime){ ?>
+					<?php $createdTime = $helper->getFormatDate($_post->getCreationTime(), $dateFormat); ?>
+					<i class="fa fa-clock-o"></i> <span><?= $createdTime; ?></span>
+					<?php } ?>
+					<?php if($show_updatedtime){ ?>
+					<?php $updateTime = $helper->getFormatDate($_post->getUpdateTime(), $dateFormat); ?>
+					<i class="fa fa-clock-o"></i> <span><?= __('Updated on %1', $updateTime); ?></span>
+					<?php } ?>
+				</div>
+				<?php } ?>
+				<?php if($show_categories){ ?>
+				<div class="post-categories">
+					<?php
+					$categories = $_post->getData('categories');
+					$count = count($categories);
+					?>
+					<i class="fa fa-folder"></i>
+					<?php foreach ($categories as $k => $v) { ?>
+					<a href="<?= $helper->getCategoryUrl($v['identifier'])  ?>" title="<?= $v['name'] ?>"><?= $v['name'] ?></a>
+					<?php if(isset($categories[$k+1])) echo __(', '); ?>
+					<?php } ?>
+				</div>
+				<?php } ?>
+				<?php if($show_hits){ ?>
+				<div class="post-hits"><i class="fa fa-eye"></i> <span><?= (int)$_post->getHits(); ?></span></div>
+				<?php } ?>
+				<?php if($show_commentcount){ ?>
+				<div class="post-comment">
+					<i class="fa fa-comments"></i>
+					<a href="<?= $postUrl ?>#comments" <?= $postLinkAttr; ?>><?= $_post->getCommentCount(); ?></a>
+				</div>
+				<?php } ?>
+			</div>
+
+				<?php if($show_tags){ ?>
+				<?php $tags = $_post->getTag(); ?>
+				<?php if(!empty($tags)){ ?>
+				<div class="post-tag">
+					<span><?= __('Tags:'); ?></span>
+					<?php foreach ($tags as $k => $v) { ?>
+					<a href="<?= $helper->getTagUrl($v['alias']) ?>"><?= trim($v['name']) ?></a>
+					<?php if(isset($tags[$k+1])) echo __(', '); ?>
+					<?php } ?>
+				</div>
+				<?php } ?>
+				<?php } ?>
+
+				<?php if($show_categories){ ?>
+				<div class="post-categories">
+					<?php
+					$categories = $_post->getData('categories');
+					$count = count($categories);
+					?>
+					<?php foreach ($categories as $k => $v) { ?>
+					<a href="<?= $helper->getCategoryUrl($v['identifier'])  ?>" title="<?= $v['name'] ?>"><?= $v['name'] ?></a>
+					<?php } ?>
+				</div>
+				<?php } ?>
+
+				<?php if($show_shortdescription){ ?>
+				<div class="post-summary">
+					<?php $shortContent = $_post->getShortContent(); ?>
+					<?= $helper->subString($shortContent, (int)$shortdescription_count); ?>
+				</div>
+				<?php if($show_readmorelink){ ?>
+					<div class="post-readmore"><a href="<?= $postUrl ?>" <?= $postLinkAttr; ?> title="<?= $_post->getTitle(); ?>"><?= __('Read more') ?></a></div>
+					<?php } ?>
+				<?php } ?>
+		</div>
+		</div>
+		<?php if($layout == 'grid'){ ?>
+	</div>
+	<?php if( $lg_column_item == 1 || ($x+1)%$lg_column_item == 0 || $i == $total ) {  ?>
+</div>
+<?php } ?>
+<?php $i++; $x++; ?>
+<?php } ?>
+<?php } ?>
diff --git a/view/frontend/templates/post/style/style3.phtml b/view/frontend/templates/post/style/style3.phtml
index 4e52f1d..a6ecc94 100644
--- a/view/frontend/templates/post/style/style3.phtml
+++ b/view/frontend/templates/post/style/style3.phtml
@@ -1,185 +1,185 @@
-<?php
-$collection  = $this->getCollection();
-$helper      = $this->helper("Ves\Blog\Helper\Data");
-$imageHelper = $this->helper("Ves\Blog\Helper\Image");
-
-/** General Settings **/
-$dateFormat         = $helper->getConfig("general_settings/dateformat");
-$twitterUsername    = $helper->getConfig("general_settings/twitter_username");
-$enableNetworks     = $helper->getConfig("general_settings/enable_networks");
-$networks           = array_flip(explode(",", $helper->getConfig("general_settings/networks")));
-$layout             = $this->getConfig("layout_type");
-$show_toolbartop    = $this->getConfig("show_toolbartop");
-$show_toolbarbottom = $this->getConfig("show_toolbarbottom");
-
-$itemsperpage       = (int)$this->getConfig('item_per_page',20);
-$itemsperpage 		= $itemsperpage?$itemsperpage:8;
-$lg_column_item     = (int)$this->getConfig('lg_column_item',6);
-$lg_column_item 	= $lg_column_item?$lg_column_item:4;
-$md_column_item     = (int)$this->getConfig('md_column_item',6);
-$md_column_item 	= $md_column_item?$md_column_item:4;
-$sm_column_item     = (int)$this->getConfig('sm_column_item',6);
-$sm_column_item 	= $sm_column_item?$sm_column_item:2;
-$xs_column_item     = (int)$this->getConfig('xs_column_item',6);
-$xs_column_item 	= $xs_column_item?$xs_column_item:1;
-$lg_column          = 12/$lg_column_item;
-$md_column          = 12/$md_column_item;
-$sm_column          = 12/$sm_column_item;
-$xs_column          = 12/$xs_column_item;
-
-/** POST Settings **/
-$show_image             = $this->getConfig("show_image");
-$image_width            = (int)$this->getConfig("image_width", 800);
-$image_height           = (int)$this->getConfig("image_height");
-$keep_ratio             = $this->getConfig("keep_ratio");
-$keep_frame             = $this->getConfig("keep_frame");
-$show_title             = $this->getConfig("show_title");
-$show_shortdescription  = $this->getConfig("show_shortdescription");
-$shortdescription_count = $this->getConfig("shortdescription_count");
-$show_readmorelink      = $this->getConfig("show_readmorelink");
-$show_categories        = $this->getConfig("show_categories");
-$show_author            = $this->getConfig("show_author");
-$show_commentcount      = $this->getConfig("show_commentcount");
-$disable_comment 		= $helper->getConfig('general_settings/disable_comment');
-if($disable_comment) {
-	$show_commentcount = false;
-}
-$show_updatedtime       = $this->getConfig("show_updatedtime");
-$show_createdtime       = $this->getConfig("show_createdtime");
-$show_hits              = $this->getConfig("show_hits");
-$show_tags              = $this->getConfig("show_tags");
-$show_socialnetworks    = $this->getConfig("show_socialnetworks");
-
-$i = 1;
-$x = 0;
-$total = $collection->count();
-?>
-<?php foreach ($collection as $_post) { ?>
-<?php $postUrl = $helper->getPostUrl($_post); ?>
-<?php $postLinkAttr = $helper->getPostUrlLinkAttr($_post); ?>
-<?php if($layout == 'grid'){ ?>
-<?php if( $lg_column_item == 1 || $x%$lg_column_item == 0){ ?>
-<div class="row">
-	<?php } ?>
-	<div class="col-lg-<?php echo $lg_column ?> col-md-<?php echo $md_column ?> col-sm-<?php echo $sm_column ?> col-xs-<?php echo $xs_column ?>">
-		<?php } ?>
-		<div class="ves-post post-item">
-		<div class="post-wrapper">
-		<?php if($show_title){ ?>
-					<h3 class="post-title"><a href="<?php echo $postUrl ?>" <?php echo $postLinkAttr;?> title="<?php echo $_post->getTitle(); ?>"><?php echo $_post->getTitle(); ?></a></h3>
-				<?php if($show_socialnetworks){ ?>
-				<div class="addthis_toolbox addthis_default_style" data-title="<?php echo $_post->getTitle(); ?>" addthis:url="<?php echo $postUrl ?>">
-					<a class="addthis_button_facebook"></a>
-					<a class="addthis_button_twitter"></a>
-					<a class="addthis_button_google"></a>
-					<a class="addthis_button_email"></a>
-					<a class="addthis_button_pinterest_share"></a>
-					<a class="addthis_button_compact"></a>
-				</div>
-				<?php } ?>
-				<?php } ?>
-
-			<?php if($show_image){ ?>
-			<div class="post-image">
-				<a href="<?php echo $postUrl ?>" <?php echo $postLinkAttr;?> title="<?php echo $_post->getTitle(); ?>">
-					<?php if( $_post->getThumbnailType() == 1 && $_post->getPostThumbnail()!=''){ ?>
-						<?php if($_post->getImageType() == 2 && $_post->getImageVideoId()!=''){ ?>
-						<span class="fa overlay-icon"></span>
-					<?php }else{ ?>
-						<span class="fa overlay-icon"></span>
-					<?php } ?>
-					<?php if($image_width>0){ ?>
-					<img src="<?php echo $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height, 100, $keep_ratio, $keep_frame) ?>" height="<?php echo $image_height ?>" width="<?php echo $image_width ?>" alt="<?php echo $_post->getTitle(); ?>"/>
-					<?php }else{ ?>
-					<img src="<?php echo $helper->getMediaUrl($_post->getPostThumbnail()) ?>" alt="<?php echo $_post->getTitle(); ?>"/>
-					<?php } ?>
-					<?php }else if($_post->getThumbnailType() == 2){ ?>
-					<?php if($_post->getThumbnailVideoType()==1 && $_post->getThumbnailVideoId()!=''){ ?>
-					<iframe width="<?php echo $image_width ?>" height="<?php echo $image_height ?>" src="https://www.youtube.com/embed/<?php echo $_post->getThumbnailVideoId() ?>" frameborder="0" allowfullscreen></iframe>
-					<?php }else if($_post->getThumbnailVideoType()==2 && $_post->getThumbnailVideoId()!=''){ ?>
-					<iframe src="https://player.vimeo.com/video/<?php echo $_post->getThumbnailVideoId() ?>?color=3498DB&title=0&byline=0&portrait=0" width="<?php echo $image_width ?>" height="<?php echo $image_height ?>" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
-					<?php } ?>
-					<?php } ?>
-				</a>
-			</div>
-			<?php } ?>
-
-
-			<div class="post-meta">
-				<?php if($show_author){ ?>
-				<div class="post-author">
-					<?php $author = $helper->getPostAuthor($_post);?>
-					<?php if($author) { ?>
-					<i class="fa fa-user"></i> <a href="<?php echo $helper->getAuthorUrl($author); ?>" title="<?php echo $author->getNickName() ?>"><?php echo $author->getNickName() ?></a>
-					<?php } ?>
-				</div>
-				<?php } ?>
-				<?php if($show_createdtime || $show_updatedtime){ ?>
-				<div class="post-date">
-					<?php if($show_createdtime){ ?>
-					<?php $createdTime = $helper->getFormatDate($_post->getCreationTime(), $dateFormat); ?>
-					<i class="fa fa-clock-o"></i> <span><?php echo $createdTime; ?></span>
-					<?php } ?>
-					<?php if($show_updatedtime){ ?>
-					<?php $updateTime = $helper->getFormatDate($_post->getUpdateTime(), $dateFormat); ?>
-					<i class="fa fa-clock-o"></i> <span><?php echo __('Updated on %1', $updateTime); ?></span>
-					<?php } ?>
-				</div>
-				<?php } ?>
-				<?php if($show_categories){ ?>
-				<div class="post-categories">
-					<?php
-					$categories = $_post->getData('categories');
-					$count = count($categories);
-					?>
-					<i class="fa fa-folder"></i>
-					<?php foreach ($categories as $k => $v) { ?>
-					<a href="<?php echo $helper->getCategoryUrl($v['identifier'])  ?>" title="<?php echo $v['name'] ?>"><?php echo $v['name'] ?></a>
-					<?php if(isset($categories[$k+1])) echo __(', '); ?>
-					<?php } ?>
-				</div>
-				<?php } ?>
-				<?php if($show_hits){ ?>
-				<div class="post-hits"><i class="fa fa-eye"></i> <span><?php echo (int)$_post->getHits(); ?></span></div>
-				<?php } ?>
-				<?php if($show_commentcount){ ?>
-				<div class="post-comment">
-					<i class="fa fa-comments"></i>
-					<a href="<?php echo $postUrl ?>#comments" <?php echo $postLinkAttr;?>><?php echo $_post->getCommentCount(); ?></a>
-				</div>
-				<?php } ?>				
-			</div>
-				
-				
-				<?php if($show_tags){ ?>
-				<?php $tags = $_post->getTag(); ?>
-				<?php if(!empty($tags)){ ?>
-				<div class="post-tag">
-					<span><?php echo __('Tags:'); ?></span>
-					<?php foreach ($tags as $k => $v) { ?>
-					<a href="<?php echo $helper->getTagUrl($v['alias']) ?>"><?php echo trim($v['name']) ?></a>
-					<?php //if(isset($tags[$k+1])) echo __(', '); ?>
-					<?php } ?>
-				</div>
-				<?php } ?>
-				<?php } ?>
-				<?php if($show_shortdescription){ ?>
-				<div class="post-summary">
-					<?php $shortContent = $_post->getShortContent(); ?>
-					<?php echo $helper->subString($shortContent, (int)$shortdescription_count); ?>
-				</div>
-				<?php if($show_readmorelink){ ?>
-					<div class="post-readmore"><a href="<?php echo $postUrl ?>" <?php echo $postLinkAttr;?> title="<?php echo $_post->getTitle(); ?>"><?php echo __('Read more') ?></a></div>
-					<?php } ?>	
-				<?php } ?>
-		</div>
-		</div>
-
-		<?php if($layout == 'grid'){ ?>
-	</div>	
-	<?php if( $lg_column_item == 1 || ($x+1)%$lg_column_item == 0 || $i == $total ) {  ?>
-</div>
-<?php } ?>
-<?php $i++; $x++; ?>
-<?php } ?>
-<?php } ?>
\ No newline at end of file
+<?php
+$collection  = $this->getCollection();
+$helper      = $this->helper("Ves\Blog\Helper\Data");
+$imageHelper = $this->helper("Ves\Blog\Helper\Image");
+
+/** General Settings **/
+$dateFormat         = $helper->getConfig("general_settings/dateformat");
+$twitterUsername    = $helper->getConfig("general_settings/twitter_username");
+$enableNetworks     = $helper->getConfig("general_settings/enable_networks");
+$networks           = array_flip(explode(",", $helper->getConfig("general_settings/networks")));
+$layout             = $this->getConfig("layout_type");
+$show_toolbartop    = $this->getConfig("show_toolbartop");
+$show_toolbarbottom = $this->getConfig("show_toolbarbottom");
+
+$itemsperpage       = (int)$this->getConfig('item_per_page',20);
+$itemsperpage 		= $itemsperpage?$itemsperpage:8;
+$lg_column_item     = (int)$this->getConfig('lg_column_item',6);
+$lg_column_item 	= $lg_column_item?$lg_column_item:4;
+$md_column_item     = (int)$this->getConfig('md_column_item',6);
+$md_column_item 	= $md_column_item?$md_column_item:4;
+$sm_column_item     = (int)$this->getConfig('sm_column_item',6);
+$sm_column_item 	= $sm_column_item?$sm_column_item:2;
+$xs_column_item     = (int)$this->getConfig('xs_column_item',6);
+$xs_column_item 	= $xs_column_item?$xs_column_item:1;
+$lg_column          = 12/$lg_column_item;
+$md_column          = 12/$md_column_item;
+$sm_column          = 12/$sm_column_item;
+$xs_column          = 12/$xs_column_item;
+
+/** POST Settings **/
+$show_image             = $this->getConfig("show_image");
+$image_width            = (int)$this->getConfig("image_width", 800);
+$image_height           = (int)$this->getConfig("image_height");
+$keep_ratio             = $this->getConfig("keep_ratio");
+$keep_frame             = $this->getConfig("keep_frame");
+$show_title             = $this->getConfig("show_title");
+$show_shortdescription  = $this->getConfig("show_shortdescription");
+$shortdescription_count = $this->getConfig("shortdescription_count");
+$show_readmorelink      = $this->getConfig("show_readmorelink");
+$show_categories        = $this->getConfig("show_categories");
+$show_author            = $this->getConfig("show_author");
+$show_commentcount      = $this->getConfig("show_commentcount");
+$disable_comment 		= $helper->getConfig('general_settings/disable_comment');
+if($disable_comment) {
+	$show_commentcount = false;
+}
+$show_updatedtime       = $this->getConfig("show_updatedtime");
+$show_createdtime       = $this->getConfig("show_createdtime");
+$show_hits              = $this->getConfig("show_hits");
+$show_tags              = $this->getConfig("show_tags");
+$show_socialnetworks    = $this->getConfig("show_socialnetworks");
+
+$i = 1;
+$x = 0;
+$total = $collection->count();
+?>
+<?php foreach ($collection as $_post) { ?>
+<?php $postUrl = $helper->getPostUrl($_post); ?>
+<?php $postLinkAttr = $helper->getPostUrlLinkAttr($_post); ?>
+<?php if($layout == 'grid'){ ?>
+<?php if( $lg_column_item == 1 || $x%$lg_column_item == 0){ ?>
+<div class="row">
+	<?php } ?>
+	<div class="col-lg-<?= $lg_column ?> col-md-<?= $md_column ?> col-sm-<?= $sm_column ?> col-xs-<?= $xs_column ?>">
+		<?php } ?>
+		<div class="ves-post post-item">
+		<div class="post-wrapper">
+		<?php if($show_title){ ?>
+					<h3 class="post-title"><a href="<?= $postUrl ?>" <?= $postLinkAttr;?> title="<?= $_post->getTitle(); ?>"><?= $_post->getTitle(); ?></a></h3>
+				<?php if($show_socialnetworks){ ?>
+				<div class="addthis_toolbox addthis_default_style" data-title="<?= $_post->getTitle(); ?>" addthis:url="<?= $postUrl ?>">
+					<a class="addthis_button_facebook"></a>
+					<a class="addthis_button_twitter"></a>
+					<a class="addthis_button_google"></a>
+					<a class="addthis_button_email"></a>
+					<a class="addthis_button_pinterest_share"></a>
+					<a class="addthis_button_compact"></a>
+				</div>
+				<?php } ?>
+				<?php } ?>
+
+			<?php if($show_image){ ?>
+			<div class="post-image">
+				<a href="<?= $postUrl ?>" <?= $postLinkAttr;?> title="<?= $_post->getTitle(); ?>">
+					<?php if( $_post->getThumbnailType() == 1 && $_post->getPostThumbnail()!=''){ ?>
+						<?php if($_post->getImageType() == 2 && $_post->getImageVideoId()!=''){ ?>
+						<span class="fa overlay-icon"></span>
+					<?php }else{ ?>
+						<span class="fa overlay-icon"></span>
+					<?php } ?>
+					<?php if($image_width>0){ ?>
+					<img src="<?= $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height, 100, $keep_ratio, $keep_frame) ?>" height="<?= $image_height ?>" width="<?= $image_width ?>" alt="<?= $_post->getTitle(); ?>"/>
+					<?php }else{ ?>
+					<img src="<?= $helper->getMediaUrl($_post->getPostThumbnail()) ?>" alt="<?= $_post->getTitle(); ?>"/>
+					<?php } ?>
+					<?php }else if($_post->getThumbnailType() == 2){ ?>
+					<?php if($_post->getThumbnailVideoType()==1 && $_post->getThumbnailVideoId()!=''){ ?>
+					<iframe width="<?= $image_width ?>" height="<?= $image_height ?>" src="https://www.youtube.com/embed/<?= $_post->getThumbnailVideoId() ?>" frameborder="0" allowfullscreen></iframe>
+					<?php }else if($_post->getThumbnailVideoType()==2 && $_post->getThumbnailVideoId()!=''){ ?>
+					<iframe src="https://player.vimeo.com/video/<?= $_post->getThumbnailVideoId() ?>?color=3498DB&title=0&byline=0&portrait=0" width="<?= $image_width ?>" height="<?= $image_height ?>" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
+					<?php } ?>
+					<?php } ?>
+				</a>
+			</div>
+			<?php } ?>
+
+
+			<div class="post-meta">
+				<?php if($show_author){ ?>
+				<div class="post-author">
+					<?php $author = $helper->getPostAuthor($_post);?>
+					<?php if($author) { ?>
+					<i class="fa fa-user"></i> <a href="<?= $helper->getAuthorUrl($author); ?>" title="<?= $author->getNickName() ?>"><?= $author->getNickName() ?></a>
+					<?php } ?>
+				</div>
+				<?php } ?>
+				<?php if($show_createdtime || $show_updatedtime){ ?>
+				<div class="post-date">
+					<?php if($show_createdtime){ ?>
+					<?php $createdTime = $helper->getFormatDate($_post->getCreationTime(), $dateFormat); ?>
+					<i class="fa fa-clock-o"></i> <span><?= $createdTime; ?></span>
+					<?php } ?>
+					<?php if($show_updatedtime){ ?>
+					<?php $updateTime = $helper->getFormatDate($_post->getUpdateTime(), $dateFormat); ?>
+					<i class="fa fa-clock-o"></i> <span><?= __('Updated on %1', $updateTime); ?></span>
+					<?php } ?>
+				</div>
+				<?php } ?>
+				<?php if($show_categories){ ?>
+				<div class="post-categories">
+					<?php
+					$categories = $_post->getData('categories');
+					$count = count($categories);
+					?>
+					<i class="fa fa-folder"></i>
+					<?php foreach ($categories as $k => $v) { ?>
+					<a href="<?= $helper->getCategoryUrl($v['identifier'])  ?>" title="<?= $v['name'] ?>"><?= $v['name'] ?></a>
+					<?php if(isset($categories[$k+1])) echo __(', '); ?>
+					<?php } ?>
+				</div>
+				<?php } ?>
+				<?php if($show_hits){ ?>
+				<div class="post-hits"><i class="fa fa-eye"></i> <span><?= (int)$_post->getHits(); ?></span></div>
+				<?php } ?>
+				<?php if($show_commentcount){ ?>
+				<div class="post-comment">
+					<i class="fa fa-comments"></i>
+					<a href="<?= $postUrl ?>#comments" <?= $postLinkAttr;?>><?= $_post->getCommentCount(); ?></a>
+				</div>
+				<?php } ?>
+			</div>
+
+
+				<?php if($show_tags){ ?>
+				<?php $tags = $_post->getTag(); ?>
+				<?php if(!empty($tags)){ ?>
+				<div class="post-tag">
+					<span><?= __('Tags:'); ?></span>
+					<?php foreach ($tags as $k => $v) { ?>
+					<a href="<?= $helper->getTagUrl($v['alias']) ?>"><?= trim($v['name']) ?></a>
+					<?php //if(isset($tags[$k+1])) echo __(', '); ?>
+					<?php } ?>
+				</div>
+				<?php } ?>
+				<?php } ?>
+				<?php if($show_shortdescription){ ?>
+				<div class="post-summary">
+					<?php $shortContent = $_post->getShortContent(); ?>
+					<?= $helper->subString($shortContent, (int)$shortdescription_count); ?>
+				</div>
+				<?php if($show_readmorelink){ ?>
+					<div class="post-readmore"><a href="<?= $postUrl ?>" <?= $postLinkAttr;?> title="<?= $_post->getTitle(); ?>"><?= __('Read more') ?></a></div>
+					<?php } ?>
+				<?php } ?>
+		</div>
+		</div>
+
+		<?php if($layout == 'grid'){ ?>
+	</div>
+	<?php if( $lg_column_item == 1 || ($x+1)%$lg_column_item == 0 || $i == $total ) {  ?>
+</div>
+<?php } ?>
+<?php $i++; $x++; ?>
+<?php } ?>
+<?php } ?>
diff --git a/view/frontend/templates/post/style/style4.phtml b/view/frontend/templates/post/style/style4.phtml
index 61faeba..55475f3 100644
--- a/view/frontend/templates/post/style/style4.phtml
+++ b/view/frontend/templates/post/style/style4.phtml
@@ -1,185 +1,185 @@
-<?php
-$collection  = $this->getCollection();
-$helper      = $this->helper("Ves\Blog\Helper\Data");
-$imageHelper = $this->helper("Ves\Blog\Helper\Image");
-
-/** General Settings **/
-$dateFormat         = $helper->getConfig("general_settings/dateformat");
-$twitterUsername    = $helper->getConfig("general_settings/twitter_username");
-$enableNetworks     = $helper->getConfig("general_settings/enable_networks");
-$networks           = array_flip(explode(",", $helper->getConfig("general_settings/networks")));
-$layout             = $this->getConfig("layout_type");
-$show_toolbartop    = $this->getConfig("show_toolbartop");
-$show_toolbarbottom = $this->getConfig("show_toolbarbottom");
-
-$itemsperpage       = (int)$this->getConfig('item_per_page',20);
-$itemsperpage 		= $itemsperpage?$itemsperpage:8;
-$lg_column_item     = (int)$this->getConfig('lg_column_item',6);
-$lg_column_item 	= $lg_column_item?$lg_column_item:4;
-$md_column_item     = (int)$this->getConfig('md_column_item',6);
-$md_column_item 	= $md_column_item?$md_column_item:4;
-$sm_column_item     = (int)$this->getConfig('sm_column_item',6);
-$sm_column_item 	= $sm_column_item?$sm_column_item:2;
-$xs_column_item     = (int)$this->getConfig('xs_column_item',6);
-$xs_column_item 	= $xs_column_item?$xs_column_item:1;
-$lg_column          = 12/$lg_column_item;
-$md_column          = 12/$md_column_item;
-$sm_column          = 12/$sm_column_item;
-$xs_column          = 12/$xs_column_item;
-
-/** POST Settings **/
-$show_image             = $this->getConfig("show_image");
-$image_width            = (int)$this->getConfig("image_width", 800);
-$image_height           = (int)$this->getConfig("image_height");
-$keep_ratio             = $this->getConfig("keep_ratio");
-$keep_frame             = $this->getConfig("keep_frame");
-$show_title             = $this->getConfig("show_title");
-$show_shortdescription  = $this->getConfig("show_shortdescription");
-$shortdescription_count = $this->getConfig("shortdescription_count");
-$show_readmorelink      = $this->getConfig("show_readmorelink");
-$show_categories        = $this->getConfig("show_categories");
-$show_author            = $this->getConfig("show_author");
-$show_commentcount      = $this->getConfig("show_commentcount");
-$disable_comment 		= $helper->getConfig('general_settings/disable_comment');
-if($disable_comment) {
-	$show_commentcount = false;
-}
-$show_updatedtime       = $this->getConfig("show_updatedtime");
-$show_createdtime       = $this->getConfig("show_createdtime");
-$show_hits              = $this->getConfig("show_hits");
-$show_tags              = $this->getConfig("show_tags");
-$show_socialnetworks    = $this->getConfig("show_socialnetworks");
-
-$i = 1;
-$x = 0;
-$total = $collection->count();
-?>
-<?php foreach ($collection as $_post) { ?>
-<?php $postUrl = $helper->getPostUrl($_post); ?>
-<?php $postLinkAttr = $helper->getPostUrlLinkAttr($_post); ?>
-<?php if($layout == 'grid'){ ?>
-<?php if( $lg_column_item == 1 || $x%$lg_column_item == 0){ ?>
-<div class="row">
-	<?php } ?>
-	<div class="col-lg-<?php echo $lg_column ?> col-md-<?php echo $md_column ?> col-sm-<?php echo $sm_column ?> col-xs-<?php echo $xs_column ?>">
-		<?php } ?>
-		<div class="ves-post post-item">
-		<div class="post-wrapper">
-			<?php if($show_image){ ?>
-				<?php $imageClass = ''; ?>
-				<?php if($_post->getImageType() == 2 && $_post->getImageVideoId()!=''){
-					$imageClass = ' post-video';
-				} ?>
-			<div class="post-image <?php echo $imageClass; ?>">
-				<a href="<?php echo $postUrl ?>" <?php echo $postLinkAttr;?> title="<?php echo $_post->getTitle(); ?>">
-					<?php if( $_post->getThumbnailType() == 1 && $_post->getPostThumbnail()!=''){ ?>
-						<?php if($_post->getImageType() == 2 && $_post->getImageVideoId()!=''){ ?>
-						<span class="fa overlay-icon"></span>
-					<?php }else{ ?>
-						<span class="fa overlay-icon"></span>
-					<?php } ?>
-					<?php if($image_width>0){ ?>
-					<img src="<?php echo $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height, 100, $keep_ratio, $keep_frame) ?>" height="<?php echo $image_height ?>" width="<?php echo $image_width ?>" alt="<?php echo $_post->getTitle(); ?>"/>
-					<?php }else{ ?>
-					<img src="<?php echo $helper->getMediaUrl($_post->getPostThumbnail()) ?>" alt="<?php echo $_post->getTitle(); ?>"/>
-					<?php } ?>
-					<?php }else if($_post->getThumbnailType() == 2){ ?>
-					<?php if($_post->getThumbnailVideoType()==1 && $_post->getThumbnailVideoId()!=''){ ?>
-					<iframe width="<?php echo $image_width ?>" height="<?php echo $image_height ?>" src="https://www.youtube.com/embed/<?php echo $_post->getThumbnailVideoId() ?>" frameborder="0" allowfullscreen></iframe>
-					<?php }else if($_post->getThumbnailVideoType()==2 && $_post->getThumbnailVideoId()!=''){ ?>
-					<iframe src="https://player.vimeo.com/video/<?php echo $_post->getThumbnailVideoId() ?>?color=3498DB&title=0&byline=0&portrait=0" width="<?php echo $image_width ?>" height="<?php echo $image_height ?>" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
-					<?php } ?>
-					<?php } ?>
-				</a>
-			</div>
-			<?php } ?>
-			
-				<?php if($show_title){ ?>
-					<h2 class="post-title"><a href="<?php echo $postUrl ?>" <?php echo $postLinkAttr;?> title="<?php echo $_post->getTitle(); ?>"><?php echo $_post->getTitle(); ?></a></h2>
-				<?php if($show_socialnetworks){ ?>
-				<div class="addthis_toolbox addthis_default_style" data-title="<?php echo $_post->getTitle(); ?>" addthis:url="<?php echo $postUrl ?>">
-					<a class="addthis_button_facebook"></a>
-					<a class="addthis_button_twitter"></a>
-					<a class="addthis_button_google"></a>
-					<a class="addthis_button_email"></a>
-					<a class="addthis_button_pinterest_share"></a>
-					<a class="addthis_button_compact"></a>
-				</div>
-				<?php } ?>
-				<?php } ?>
-				<div class="post-meta">
-				<?php if($show_author){ ?>
-				<div class="post-author">
-					<?php $author = $helper->getPostAuthor($_post);?>
-					<?php if($author) { ?>
-					<i class="fa fa-user"></i> <a href="<?php echo $helper->getAuthorUrl($author); ?>" title="<?php echo $author->getNickName() ?>"><?php echo $author->getNickName() ?></a>
-					<?php } ?>
-				</div>
-				<?php } ?>
-				<?php if($show_createdtime || $show_updatedtime){ ?>
-				<div class="post-date">
-					<?php if($show_createdtime){ ?>
-					<?php $createdTime = $helper->getFormatDate($_post->getCreationTime(), $dateFormat); ?>
-					<i class="fa fa-clock-o"></i> <span><?php echo $createdTime; ?></span>
-					<?php } ?>
-					<?php if($show_updatedtime){ ?>
-					<?php $updateTime = $helper->getFormatDate($_post->getUpdateTime(), $dateFormat); ?>
-					<i class="fa fa-clock-o"></i> <span><?php echo __('Updated on %1', $updateTime); ?></span>
-					<?php } ?>
-				</div>
-				<?php } ?>
-				<?php if($show_categories){ ?>
-				<div class="post-categories">
-					<?php
-					$categories = $_post->getData('categories');
-					$count = count($categories);
-					?>
-					<i class="fa fa-folder"></i>
-					<?php foreach ($categories as $k => $v) { ?>
-					<a href="<?php echo $helper->getCategoryUrl($v['identifier'])  ?>" title="<?php echo $v['name'] ?>"><?php echo $v['name'] ?></a>
-					<?php if(isset($categories[$k+1])) echo __(', '); ?>
-					<?php } ?>
-				</div>
-				<?php } ?>
-				<?php if($show_hits){ ?>
-				<div class="post-hits"><i class="fa fa-eye"></i> <span><?php echo (int)$_post->getHits(); ?></span></div>
-				<?php } ?>
-				<?php if($show_commentcount){ ?>
-				<div class="post-comment">
-					<i class="fa fa-comments"></i>
-					<a href="<?php echo $postUrl ?>#comments" <?php echo $postLinkAttr;?>><?php echo $_post->getCommentCount(); ?></a>
-				</div>
-				
-				<?php } ?>
-			</div>
-				<?php if($show_tags){ ?>
-				<?php $tags = $_post->getTag(); ?>
-				<?php if(!empty($tags)){ ?>
-				<div class="post-tag">
-					<span><?php echo __('Tags:'); ?></span>
-					<?php foreach ($tags as $k => $v) { ?>
-					<a href="<?php echo $helper->getTagUrl($v['alias']) ?>"><?php echo trim($v['name']) ?></a>
-					<?php if(isset($tags[$k+1])) echo __(', '); ?>
-					<?php } ?>
-				</div>
-				<?php } ?>
-				<?php } ?>
-				<?php if($show_shortdescription){ ?>
-				<div class="post-summary">
-					<?php $shortContent = $_post->getShortContent(); ?>
-					<?php echo $helper->subString($shortContent, (int)$shortdescription_count); ?>
-				</div>
-				<?php if($show_readmorelink){ ?>
-					<div class="post-readmore"><a href="<?php echo $postUrl ?>" <?php echo $postLinkAttr;?> title="<?php echo $_post->getTitle(); ?>"><?php echo __('Read more') ?></a></div>
-					<?php } ?>	
-				<?php } ?>
-		</div>
-		</div>
-		<?php if($layout == 'grid'){ ?>
-	</div>	
-	<?php if( $lg_column_item == 1 || ($x+1)%$lg_column_item == 0 || $i == $total ) {  ?>
-</div>
-<?php } ?>
-<?php $i++; $x++; ?>
-<?php } ?>
-<?php } ?>
\ No newline at end of file
+<?php
+$collection  = $this->getCollection();
+$helper      = $this->helper("Ves\Blog\Helper\Data");
+$imageHelper = $this->helper("Ves\Blog\Helper\Image");
+
+/** General Settings **/
+$dateFormat         = $helper->getConfig("general_settings/dateformat");
+$twitterUsername    = $helper->getConfig("general_settings/twitter_username");
+$enableNetworks     = $helper->getConfig("general_settings/enable_networks");
+$networks           = array_flip(explode(",", $helper->getConfig("general_settings/networks")));
+$layout             = $this->getConfig("layout_type");
+$show_toolbartop    = $this->getConfig("show_toolbartop");
+$show_toolbarbottom = $this->getConfig("show_toolbarbottom");
+
+$itemsperpage       = (int)$this->getConfig('item_per_page',20);
+$itemsperpage 		= $itemsperpage?$itemsperpage:8;
+$lg_column_item     = (int)$this->getConfig('lg_column_item',6);
+$lg_column_item 	= $lg_column_item?$lg_column_item:4;
+$md_column_item     = (int)$this->getConfig('md_column_item',6);
+$md_column_item 	= $md_column_item?$md_column_item:4;
+$sm_column_item     = (int)$this->getConfig('sm_column_item',6);
+$sm_column_item 	= $sm_column_item?$sm_column_item:2;
+$xs_column_item     = (int)$this->getConfig('xs_column_item',6);
+$xs_column_item 	= $xs_column_item?$xs_column_item:1;
+$lg_column          = 12/$lg_column_item;
+$md_column          = 12/$md_column_item;
+$sm_column          = 12/$sm_column_item;
+$xs_column          = 12/$xs_column_item;
+
+/** POST Settings **/
+$show_image             = $this->getConfig("show_image");
+$image_width            = (int)$this->getConfig("image_width", 800);
+$image_height           = (int)$this->getConfig("image_height");
+$keep_ratio             = $this->getConfig("keep_ratio");
+$keep_frame             = $this->getConfig("keep_frame");
+$show_title             = $this->getConfig("show_title");
+$show_shortdescription  = $this->getConfig("show_shortdescription");
+$shortdescription_count = $this->getConfig("shortdescription_count");
+$show_readmorelink      = $this->getConfig("show_readmorelink");
+$show_categories        = $this->getConfig("show_categories");
+$show_author            = $this->getConfig("show_author");
+$show_commentcount      = $this->getConfig("show_commentcount");
+$disable_comment 		= $helper->getConfig('general_settings/disable_comment');
+if($disable_comment) {
+	$show_commentcount = false;
+}
+$show_updatedtime       = $this->getConfig("show_updatedtime");
+$show_createdtime       = $this->getConfig("show_createdtime");
+$show_hits              = $this->getConfig("show_hits");
+$show_tags              = $this->getConfig("show_tags");
+$show_socialnetworks    = $this->getConfig("show_socialnetworks");
+
+$i = 1;
+$x = 0;
+$total = $collection->count();
+?>
+<?php foreach ($collection as $_post) { ?>
+<?php $postUrl = $helper->getPostUrl($_post); ?>
+<?php $postLinkAttr = $helper->getPostUrlLinkAttr($_post); ?>
+<?php if($layout == 'grid'){ ?>
+<?php if( $lg_column_item == 1 || $x%$lg_column_item == 0){ ?>
+<div class="row">
+	<?php } ?>
+	<div class="col-lg-<?= $lg_column ?> col-md-<?= $md_column ?> col-sm-<?= $sm_column ?> col-xs-<?= $xs_column ?>">
+		<?php } ?>
+		<div class="ves-post post-item">
+		<div class="post-wrapper">
+			<?php if($show_image){ ?>
+				<?php $imageClass = ''; ?>
+				<?php if($_post->getImageType() == 2 && $_post->getImageVideoId()!=''){
+					$imageClass = ' post-video';
+				} ?>
+			<div class="post-image <?= $imageClass; ?>">
+				<a href="<?= $postUrl ?>" <?= $postLinkAttr;?> title="<?= $_post->getTitle(); ?>">
+					<?php if( $_post->getThumbnailType() == 1 && $_post->getPostThumbnail()!=''){ ?>
+						<?php if($_post->getImageType() == 2 && $_post->getImageVideoId()!=''){ ?>
+						<span class="fa overlay-icon"></span>
+					<?php }else{ ?>
+						<span class="fa overlay-icon"></span>
+					<?php } ?>
+					<?php if($image_width>0){ ?>
+					<img src="<?= $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height, 100, $keep_ratio, $keep_frame) ?>" height="<?= $image_height ?>" width="<?= $image_width ?>" alt="<?= $_post->getTitle(); ?>"/>
+					<?php }else{ ?>
+					<img src="<?= $helper->getMediaUrl($_post->getPostThumbnail()) ?>" alt="<?= $_post->getTitle(); ?>"/>
+					<?php } ?>
+					<?php }else if($_post->getThumbnailType() == 2){ ?>
+					<?php if($_post->getThumbnailVideoType()==1 && $_post->getThumbnailVideoId()!=''){ ?>
+					<iframe width="<?= $image_width ?>" height="<?= $image_height ?>" src="https://www.youtube.com/embed/<?= $_post->getThumbnailVideoId() ?>" frameborder="0" allowfullscreen></iframe>
+					<?php }else if($_post->getThumbnailVideoType()==2 && $_post->getThumbnailVideoId()!=''){ ?>
+					<iframe src="https://player.vimeo.com/video/<?= $_post->getThumbnailVideoId() ?>?color=3498DB&title=0&byline=0&portrait=0" width="<?= $image_width ?>" height="<?= $image_height ?>" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
+					<?php } ?>
+					<?php } ?>
+				</a>
+			</div>
+			<?php } ?>
+
+				<?php if($show_title){ ?>
+					<h2 class="post-title"><a href="<?= $postUrl ?>" <?= $postLinkAttr;?> title="<?= $_post->getTitle(); ?>"><?= $_post->getTitle(); ?></a></h2>
+				<?php if($show_socialnetworks){ ?>
+				<div class="addthis_toolbox addthis_default_style" data-title="<?= $_post->getTitle(); ?>" addthis:url="<?= $postUrl ?>">
+					<a class="addthis_button_facebook"></a>
+					<a class="addthis_button_twitter"></a>
+					<a class="addthis_button_google"></a>
+					<a class="addthis_button_email"></a>
+					<a class="addthis_button_pinterest_share"></a>
+					<a class="addthis_button_compact"></a>
+				</div>
+				<?php } ?>
+				<?php } ?>
+				<div class="post-meta">
+				<?php if($show_author){ ?>
+				<div class="post-author">
+					<?php $author = $helper->getPostAuthor($_post);?>
+					<?php if($author) { ?>
+					<i class="fa fa-user"></i> <a href="<?= $helper->getAuthorUrl($author); ?>" title="<?= $author->getNickName() ?>"><?= $author->getNickName() ?></a>
+					<?php } ?>
+				</div>
+				<?php } ?>
+				<?php if($show_createdtime || $show_updatedtime){ ?>
+				<div class="post-date">
+					<?php if($show_createdtime){ ?>
+					<?php $createdTime = $helper->getFormatDate($_post->getCreationTime(), $dateFormat); ?>
+					<i class="fa fa-clock-o"></i> <span><?= $createdTime; ?></span>
+					<?php } ?>
+					<?php if($show_updatedtime){ ?>
+					<?php $updateTime = $helper->getFormatDate($_post->getUpdateTime(), $dateFormat); ?>
+					<i class="fa fa-clock-o"></i> <span><?= __('Updated on %1', $updateTime); ?></span>
+					<?php } ?>
+				</div>
+				<?php } ?>
+				<?php if($show_categories){ ?>
+				<div class="post-categories">
+					<?php
+					$categories = $_post->getData('categories');
+					$count = count($categories);
+					?>
+					<i class="fa fa-folder"></i>
+					<?php foreach ($categories as $k => $v) { ?>
+					<a href="<?= $helper->getCategoryUrl($v['identifier'])  ?>" title="<?= $v['name'] ?>"><?= $v['name'] ?></a>
+					<?php if(isset($categories[$k+1])) echo __(', '); ?>
+					<?php } ?>
+				</div>
+				<?php } ?>
+				<?php if($show_hits){ ?>
+				<div class="post-hits"><i class="fa fa-eye"></i> <span><?= (int)$_post->getHits(); ?></span></div>
+				<?php } ?>
+				<?php if($show_commentcount){ ?>
+				<div class="post-comment">
+					<i class="fa fa-comments"></i>
+					<a href="<?= $postUrl ?>#comments" <?= $postLinkAttr;?>><?= $_post->getCommentCount(); ?></a>
+				</div>
+
+				<?php } ?>
+			</div>
+				<?php if($show_tags){ ?>
+				<?php $tags = $_post->getTag(); ?>
+				<?php if(!empty($tags)){ ?>
+				<div class="post-tag">
+					<span><?= __('Tags:'); ?></span>
+					<?php foreach ($tags as $k => $v) { ?>
+					<a href="<?= $helper->getTagUrl($v['alias']) ?>"><?= trim($v['name']) ?></a>
+					<?php if(isset($tags[$k+1])) echo __(', '); ?>
+					<?php } ?>
+				</div>
+				<?php } ?>
+				<?php } ?>
+				<?php if($show_shortdescription){ ?>
+				<div class="post-summary">
+					<?php $shortContent = $_post->getShortContent(); ?>
+					<?= $helper->subString($shortContent, (int)$shortdescription_count); ?>
+				</div>
+				<?php if($show_readmorelink){ ?>
+					<div class="post-readmore"><a href="<?= $postUrl ?>" <?= $postLinkAttr;?> title="<?= $_post->getTitle(); ?>"><?= __('Read more') ?></a></div>
+					<?php } ?>
+				<?php } ?>
+		</div>
+		</div>
+		<?php if($layout == 'grid'){ ?>
+	</div>
+	<?php if( $lg_column_item == 1 || ($x+1)%$lg_column_item == 0 || $i == $total ) {  ?>
+</div>
+<?php } ?>
+<?php $i++; $x++; ?>
+<?php } ?>
+<?php } ?>
diff --git a/view/frontend/templates/post/styles/grid1.phtml b/view/frontend/templates/post/styles/grid1.phtml
index b83db40..aa32ee7 100644
--- a/view/frontend/templates/post/styles/grid1.phtml
+++ b/view/frontend/templates/post/styles/grid1.phtml
@@ -1,163 +1,163 @@
-<?php
-$collection  = $this->getCollection();
-$helper      = $this->helper("Ves\Blog\Helper\Data");
-$imageHelper = $this->helper("Ves\Blog\Helper\Image");
-
-/** General Settings **/
-$dateFormat         = $helper->getConfig("general_settings/dateformat");
-$twitterUsername    = $helper->getConfig("general_settings/twitter_username");
-$enableNetworks     = $helper->getConfig("general_settings/enable_networks");
-$networks           = array_flip(explode(",", $helper->getConfig("general_settings/networks")));
-$layout             = $this->getConfig("layout_type");
-$show_toolbartop    = $this->getConfig("show_toolbartop");
-$show_toolbarbottom = $this->getConfig("show_toolbarbottom");
-
-$itemsperpage       = (int)$this->getConfig('item_per_page',20);
-$lg_column_item     = (int)$this->getConfig('lg_column_item',6);
-$md_column_item     = (int)$this->getConfig('md_column_item',6);
-$sm_column_item     = (int)$this->getConfig('sm_column_item',6);
-$xs_column_item     = (int)$this->getConfig('xs_column_item',6);
-$lg_column          = 12/$lg_column_item;
-$md_column          = 12/$md_column_item;
-$sm_column          = 12/$sm_column_item;
-$xs_column          = 12/$xs_column_item;
-
-/** POST Settings **/
-$show_image             = $this->getConfig("show_image");
-$image_width            = (int)$this->getConfig("image_width", 800);
-$image_height           = (int)$this->getConfig("image_height");
-$show_title             = $this->getConfig("show_title");
-$show_shortdescription  = $this->getConfig("show_shortdescription");
-$shortdescription_count = $this->getConfig("shortdescription_count");
-$show_readmorelink      = $this->getConfig("show_readmorelink");
-$show_categories        = $this->getConfig("show_categories");
-$show_author            = $this->getConfig("show_author");
-$show_commentcount      = $this->getConfig("show_commentcount");
-$disable_comment 		= $helper->getConfig('general_settings/disable_comment');
-if($disable_comment) {
-	$show_commentcount = false;
-}
-$show_updatedtime       = $this->getConfig("show_updatedtime");
-$show_createdtime       = $this->getConfig("show_createdtime");
-$show_hits              = $this->getConfig("show_hits");
-$show_tags              = $this->getConfig("show_tags");
-$show_socialnetworks    = $this->getConfig("show_socialnetworks");
-
-$i = 1;
-$x = 0;
-$total = $collection->count();
-?>
-<?php foreach ($collection as $_post) { ?>
-<?php $postUrl = $helper->getPostUrl($_post); ?>
-<?php $postLinkAttr = $helper->getPostUrlLinkAttr($_post); ?>
-<?php if($layout == 'grid'){ ?>
-<?php if( $lg_column_item == 1 || $x%$lg_column_item == 0){ ?>
-<div class="row">
-	<?php } ?>
-	<div class="col-lg-<?php echo $lg_column ?> col-md-<?php echo $md_column ?> col-sm-<?php echo $sm_column ?> col-xs-<?php echo $xs_column ?>">
-		<?php } ?>
-		<div class="ves-post post-item">
-			<?php if($show_image){ ?>
-			<div class="post-image">
-				<a href="<?php echo $postUrl ?>" <?php echo $postLinkAttr;?> title="<?php echo $_post->getTitle(); ?>">
-					<?php if( $_post->getThumbnailType() == 1 && $_post->getPostThumbnail()!=''){ ?>
-					<img src="<?php echo $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height) ?>" height="<?php echo $image_height ?>" width="<?php echo $image_width ?>" alt="<?php echo $_post->getTitle(); ?>"/>
-					<?php }else if($_post->getThumbnailType() == 2){ ?>
-					<?php if($_post->getThumbnailVideoType()==1 && $_post->getThumbnailVideoId()!=''){ ?>
-					<iframe width="<?php echo $image_width ?>" height="<?php echo $image_height ?>" src="https://www.youtube.com/embed/<?php echo $_post->getThumbnailVideoId() ?>" frameborder="0" allowfullscreen></iframe>
-					<?php }else if($_post->getThumbnailVideoType()==2 && $_post->getThumbnailVideoId()!=''){ ?>
-					<iframe src="https://player.vimeo.com/video/<?php echo $_post->getThumbnailVideoId() ?>?color=3498DB&title=0&byline=0&portrait=0" width="<?php echo $image_width ?>" height="<?php echo $image_height ?>" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
-					<?php } ?>
-					<?php } ?>
-				</a>
-
-				<?php if($show_categories){ ?>
-				<div class="post-categories">
-					<?php
-					$categories = $_post->getData('categories');
-					$count = count($categories);
-					?>
-					<?php foreach ($categories as $k => $v) { ?>
-					<a href="<?php echo $helper->getCategoryUrl($v['identifier'])  ?>" title="<?php echo $v['name'] ?>"><?php echo $v['name'] ?></a>
-					<?php } ?>
-				</div>
-				<?php } ?>
-
-			</div>
-			<?php } ?>
-			
-				<?php if($show_title){ ?>
-					<h3 class="post-title"><a href="<?php echo $postUrl ?>" <?php echo $postLinkAttr;?> title="<?php echo $_post->getTitle(); ?>"><?php echo $_post->getTitle(); ?></a></h3>
-				<?php if($show_socialnetworks){ ?>
-				<div class="addthis_toolbox addthis_default_style" data-title="<?php echo $_post->getTitle(); ?>" addthis:url="<?php echo $postUrl ?>">
-					<a class="addthis_button_facebook"></a>
-					<a class="addthis_button_twitter"></a>
-					<a class="addthis_button_google"></a>
-					<a class="addthis_button_email"></a>
-					<a class="addthis_button_pinterest_share"></a>
-					<a class="addthis_button_compact"></a>
-				</div>
-				<?php } ?>
-				<?php } ?>
-				<div class="post-meta">
-				<?php if($show_author){ ?>
-				<div class="post-author">
-					<?php $author = $helper->getPostAuthor($_post);?>
-					<?php if($author) { ?>
-					<i class="fa fa-user"></i> <a href="<?php echo $helper->getAuthorUrl($author); ?>" title="<?php echo $author->getNickName() ?>"><?php echo $author->getNickName() ?></a>
-					<?php } ?>
-				</div>
-				<?php } ?>
-				<?php if($show_createdtime || $show_updatedtime){ ?>
-				<div class="post-date">
-					<?php if($show_createdtime){ ?>
-					<?php $createdTime = $helper->getFormatDate($_post->getCreationTime(), $dateFormat); ?>
-					<span><?php echo ' - ' . $createdTime; ?></span>
-					<?php } ?>
-					<?php if($show_updatedtime){ ?>
-					<?php $updateTime = $helper->getFormatDate($_post->getUpdateTime(), $dateFormat); ?>
-					<span><?php echo __('Updated on %1', $updateTime); ?></span>
-					<?php } ?>
-				</div>
-				<?php } ?>
-				<?php if($show_hits){ ?>
-				<div class="post-hits"><span></span><strong><?php echo ' - ' . (int)$_post->getHits(); ?></strong> <?php echo __("times"); ?></div>
-				<?php } ?>
-				<?php if($show_commentcount){ ?>
-				<div class="post-comment">
-					<a href="<?php echo $postUrl ?>#comments" <?php echo $postLinkAttr;?>><?php echo $_post->getCommentCount(); ?></a>
-				</div>
-				
-			</div>
-				<?php } ?>
-				<?php if($show_tags){ ?>
-				<?php $tags = $_post->getTag(); ?>
-				<?php if(!empty($tags)){ ?>
-				<div class="post-tag">
-					<span><?php echo __('Tags:'); ?></span>
-					<?php foreach ($tags as $k => $v) { ?>
-					<a href="<?php echo $helper->getTagUrl($v['alias']) ?>"><?php echo trim($v['name']) ?></a>
-					<?php if(isset($tags[$k+1])) echo __(', '); ?>
-					<?php } ?>
-				</div>
-				<?php } ?>
-				<?php } ?>
-				<?php if($show_shortdescription){ ?>
-				<div class="post-summary">
-					<?php $shortContent = $_post->getShortContent(); ?>
-					<?php echo $helper->subString($shortContent, (int)$shortdescription_count); ?>
-				</div>
-				<?php if($show_readmorelink){ ?>
-					<div class="post-readmore"><a href="<?php echo $postUrl ?>" <?php echo $postLinkAttr;?> title="<?php echo $_post->getTitle(); ?>"><?php echo __('Read more') ?></a></div>
-					<?php } ?>	
-				<?php } ?>
-		</div>
-
-		<?php if($layout == 'grid'){ ?>
-	</div>	
-	<?php if( $lg_column_item == 1 || ($x+1)%$lg_column_item == 0 || $i == $total ) {  ?>
-</div>
-<?php } ?>
-<?php $i++; $x++; ?>
-<?php } ?>
-<?php } ?>
\ No newline at end of file
+<?php
+$collection  = $this->getCollection();
+$helper      = $this->helper("Ves\Blog\Helper\Data");
+$imageHelper = $this->helper("Ves\Blog\Helper\Image");
+
+/** General Settings **/
+$dateFormat         = $helper->getConfig("general_settings/dateformat");
+$twitterUsername    = $helper->getConfig("general_settings/twitter_username");
+$enableNetworks     = $helper->getConfig("general_settings/enable_networks");
+$networks           = array_flip(explode(",", $helper->getConfig("general_settings/networks")));
+$layout             = $this->getConfig("layout_type");
+$show_toolbartop    = $this->getConfig("show_toolbartop");
+$show_toolbarbottom = $this->getConfig("show_toolbarbottom");
+
+$itemsperpage       = (int)$this->getConfig('item_per_page',20);
+$lg_column_item     = (int)$this->getConfig('lg_column_item',6);
+$md_column_item     = (int)$this->getConfig('md_column_item',6);
+$sm_column_item     = (int)$this->getConfig('sm_column_item',6);
+$xs_column_item     = (int)$this->getConfig('xs_column_item',6);
+$lg_column          = 12/$lg_column_item;
+$md_column          = 12/$md_column_item;
+$sm_column          = 12/$sm_column_item;
+$xs_column          = 12/$xs_column_item;
+
+/** POST Settings **/
+$show_image             = $this->getConfig("show_image");
+$image_width            = (int)$this->getConfig("image_width", 800);
+$image_height           = (int)$this->getConfig("image_height");
+$show_title             = $this->getConfig("show_title");
+$show_shortdescription  = $this->getConfig("show_shortdescription");
+$shortdescription_count = $this->getConfig("shortdescription_count");
+$show_readmorelink      = $this->getConfig("show_readmorelink");
+$show_categories        = $this->getConfig("show_categories");
+$show_author            = $this->getConfig("show_author");
+$show_commentcount      = $this->getConfig("show_commentcount");
+$disable_comment 		= $helper->getConfig('general_settings/disable_comment');
+if($disable_comment) {
+	$show_commentcount = false;
+}
+$show_updatedtime       = $this->getConfig("show_updatedtime");
+$show_createdtime       = $this->getConfig("show_createdtime");
+$show_hits              = $this->getConfig("show_hits");
+$show_tags              = $this->getConfig("show_tags");
+$show_socialnetworks    = $this->getConfig("show_socialnetworks");
+
+$i = 1;
+$x = 0;
+$total = $collection->count();
+?>
+<?php foreach ($collection as $_post) { ?>
+<?php $postUrl = $helper->getPostUrl($_post); ?>
+<?php $postLinkAttr = $helper->getPostUrlLinkAttr($_post); ?>
+<?php if($layout == 'grid'){ ?>
+<?php if( $lg_column_item == 1 || $x%$lg_column_item == 0){ ?>
+<div class="row">
+	<?php } ?>
+	<div class="col-lg-<?= $lg_column ?> col-md-<?= $md_column ?> col-sm-<?= $sm_column ?> col-xs-<?= $xs_column ?>">
+		<?php } ?>
+		<div class="ves-post post-item">
+			<?php if($show_image){ ?>
+			<div class="post-image">
+				<a href="<?= $postUrl ?>" <?= $postLinkAttr;?> title="<?= $_post->getTitle(); ?>">
+					<?php if( $_post->getThumbnailType() == 1 && $_post->getPostThumbnail()!=''){ ?>
+					<img src="<?= $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height) ?>" height="<?= $image_height ?>" width="<?= $image_width ?>" alt="<?= $_post->getTitle(); ?>"/>
+					<?php }else if($_post->getThumbnailType() == 2){ ?>
+					<?php if($_post->getThumbnailVideoType()==1 && $_post->getThumbnailVideoId()!=''){ ?>
+					<iframe width="<?= $image_width ?>" height="<?= $image_height ?>" src="https://www.youtube.com/embed/<?= $_post->getThumbnailVideoId() ?>" frameborder="0" allowfullscreen></iframe>
+					<?php }else if($_post->getThumbnailVideoType()==2 && $_post->getThumbnailVideoId()!=''){ ?>
+					<iframe src="https://player.vimeo.com/video/<?= $_post->getThumbnailVideoId() ?>?color=3498DB&title=0&byline=0&portrait=0" width="<?= $image_width ?>" height="<?= $image_height ?>" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
+					<?php } ?>
+					<?php } ?>
+				</a>
+
+				<?php if($show_categories){ ?>
+				<div class="post-categories">
+					<?php
+					$categories = $_post->getData('categories');
+					$count = count($categories);
+					?>
+					<?php foreach ($categories as $k => $v) { ?>
+					<a href="<?= $helper->getCategoryUrl($v['identifier'])  ?>" title="<?= $v['name'] ?>"><?= $v['name'] ?></a>
+					<?php } ?>
+				</div>
+				<?php } ?>
+
+			</div>
+			<?php } ?>
+
+				<?php if($show_title){ ?>
+					<h3 class="post-title"><a href="<?= $postUrl ?>" <?= $postLinkAttr;?> title="<?= $_post->getTitle(); ?>"><?= $_post->getTitle(); ?></a></h3>
+				<?php if($show_socialnetworks){ ?>
+				<div class="addthis_toolbox addthis_default_style" data-title="<?= $_post->getTitle(); ?>" addthis:url="<?= $postUrl ?>">
+					<a class="addthis_button_facebook"></a>
+					<a class="addthis_button_twitter"></a>
+					<a class="addthis_button_google"></a>
+					<a class="addthis_button_email"></a>
+					<a class="addthis_button_pinterest_share"></a>
+					<a class="addthis_button_compact"></a>
+				</div>
+				<?php } ?>
+				<?php } ?>
+				<div class="post-meta">
+				<?php if($show_author){ ?>
+				<div class="post-author">
+					<?php $author = $helper->getPostAuthor($_post);?>
+					<?php if($author) { ?>
+					<i class="fa fa-user"></i> <a href="<?= $helper->getAuthorUrl($author); ?>" title="<?= $author->getNickName() ?>"><?= $author->getNickName() ?></a>
+					<?php } ?>
+				</div>
+				<?php } ?>
+				<?php if($show_createdtime || $show_updatedtime){ ?>
+				<div class="post-date">
+					<?php if($show_createdtime){ ?>
+					<?php $createdTime = $helper->getFormatDate($_post->getCreationTime(), $dateFormat); ?>
+					<span><?= ' - ' . $createdTime; ?></span>
+					<?php } ?>
+					<?php if($show_updatedtime){ ?>
+					<?php $updateTime = $helper->getFormatDate($_post->getUpdateTime(), $dateFormat); ?>
+					<span><?= __('Updated on %1', $updateTime); ?></span>
+					<?php } ?>
+				</div>
+				<?php } ?>
+				<?php if($show_hits){ ?>
+				<div class="post-hits"><span></span><strong><?= ' - ' . (int)$_post->getHits(); ?></strong> <?= __("times"); ?></div>
+				<?php } ?>
+				<?php if($show_commentcount){ ?>
+				<div class="post-comment">
+					<a href="<?= $postUrl ?>#comments" <?= $postLinkAttr;?>><?= $_post->getCommentCount(); ?></a>
+				</div>
+
+			</div>
+				<?php } ?>
+				<?php if($show_tags){ ?>
+				<?php $tags = $_post->getTag(); ?>
+				<?php if(!empty($tags)){ ?>
+				<div class="post-tag">
+					<span><?= __('Tags:'); ?></span>
+					<?php foreach ($tags as $k => $v) { ?>
+					<a href="<?= $helper->getTagUrl($v['alias']) ?>"><?= trim($v['name']) ?></a>
+					<?php if(isset($tags[$k+1])) echo __(', '); ?>
+					<?php } ?>
+				</div>
+				<?php } ?>
+				<?php } ?>
+				<?php if($show_shortdescription){ ?>
+				<div class="post-summary">
+					<?php $shortContent = $_post->getShortContent(); ?>
+					<?= $helper->subString($shortContent, (int)$shortdescription_count); ?>
+				</div>
+				<?php if($show_readmorelink){ ?>
+					<div class="post-readmore"><a href="<?= $postUrl ?>" <?= $postLinkAttr;?> title="<?= $_post->getTitle(); ?>"><?= __('Read more') ?></a></div>
+					<?php } ?>
+				<?php } ?>
+		</div>
+
+		<?php if($layout == 'grid'){ ?>
+	</div>
+	<?php if( $lg_column_item == 1 || ($x+1)%$lg_column_item == 0 || $i == $total ) {  ?>
+</div>
+<?php } ?>
+<?php $i++; $x++; ?>
+<?php } ?>
+<?php } ?>
diff --git a/view/frontend/templates/post/view.phtml b/view/frontend/templates/post/view.phtml
index 31e3c46..292c794 100644
--- a/view/frontend/templates/post/view.phtml
+++ b/view/frontend/templates/post/view.phtml
@@ -38,15 +38,15 @@ $_post->setData('categories', $_post->getPostCategories());
 	<div class="post-image">
 		<?php if( $_post->getImageType() == 1 && $_post->getImage()!=''){ ?>
 		<?php if($image_width>0 && $_post->getThumbnail()){ ?>
-		<img src="<?php echo $imageHelper->resizeImage($_post->getImage(), $image_width, $image_height) ?>" height="<?php echo $image_height ?>" width="<?php echo $image_width ?>" alt="<?php echo $_post->getTitle(); ?>"/>
+		<img src="<?= $imageHelper->resizeImage($_post->getImage(), $image_width, $image_height) ?>" height="<?= $image_height ?>" width="<?= $image_width ?>" alt="<?= $_post->getTitle(); ?>"/>
 		<?php }else{ ?>
-		<img src="<?php echo $helper->getMediaUrl($_post->getImage()) ?>" alt="<?php echo $_post->getTitle(); ?>"/>
+		<img src="<?= $helper->getMediaUrl($_post->getImage()) ?>" alt="<?= $_post->getTitle(); ?>"/>
 		<?php } ?>
 		<?php }else if($_post->getImageType() == 2){ ?>
 		<?php if($_post->getImageVideoType()==1 && $_post->getImageVideoId()!=''){ ?>
-		<iframe src="https://www.youtube.com/embed/<?php echo $_post->getImageVideoId() ?>" frameborder="0" allowfullscreen height="<?php echo $image_height?$image_height:'500' ?>" width="<?php echo $image_width?$image_width:'100%' ?>"></iframe>
+		<iframe src="https://www.youtube.com/embed/<?= $_post->getImageVideoId() ?>" frameborder="0" allowfullscreen height="<?= $image_height?$image_height:'500' ?>" width="<?= $image_width?$image_width:'100%' ?>"></iframe>
 		<?php }else if($_post->getImageVideoType()==2 && $_post->getImageVideoId()!=''){ ?>
-		<iframe src="https://player.vimeo.com/video/<?php echo $_post->getImageVideoId() ?>?color=3498DB&title=0&byline=0&portrait=0" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen height="<?php echo $image_height?$image_height:'500' ?>" width="<?php echo $image_width?$image_width:'100%' ?>"></iframe>
+		<iframe src="https://player.vimeo.com/video/<?= $_post->getImageVideoId() ?>?color=3498DB&title=0&byline=0&portrait=0" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen height="<?= $image_height?$image_height:'500' ?>" width="<?= $image_width?$image_width:'100%' ?>"></iframe>
 		<?php } ?>
 		<?php } ?>
 	</div>
@@ -55,14 +55,14 @@ $_post->setData('categories', $_post->getPostCategories());
 		<div class="post-meta">
 			<?php if($show_title){ ?>
 			<div class="post-title">
-				<h1><?php echo $_post->getTitle(); ?></h1>
+				<h1><?= $_post->getTitle(); ?></h1>
 			</div>
 			<?php } ?>
 			<?php if($show_author){ ?>
 			<div class="post-author">
 				<?php $author = $helper->getPostAuthor($_post); ?>
 				<?php if($author) { ?>
-				<i class="fa fa-user"></i> <a href="<?php echo $helper->getAuthorUrl($author); ?>" title="<?php echo $author->getNickName() ?>"><?php echo $author->getNickName() ?></a>
+				<i class="fa fa-user"></i> <a href="<?= $helper->getAuthorUrl($author); ?>" title="<?= $author->getNickName() ?>"><?= $author->getNickName() ?></a>
 				<?php } ?>
 			</div>
 			<?php } ?>
@@ -70,11 +70,11 @@ $_post->setData('categories', $_post->getPostCategories());
 			<div class="post-date">
 				<?php if($show_createdtime){ ?>
 				<?php $createdTime = $helper->getFormatDate($_post->getCreationTime(), $dateFormat); ?>
-				<i class="fa fa-clock-o"></i> <span><?php echo $createdTime; ?></span>
+				<i class="fa fa-clock-o"></i> <span><?= $createdTime; ?></span>
 				<?php } ?>
 				<?php if($show_updatedtime){ ?>
 				<?php $updateTime = $helper->getFormatDate($_post->getUpdateTime(), $dateFormat); ?>
-				<i class="fa fa-clock-o"></i> <span><?php echo $createdTime; ?></span>
+				<i class="fa fa-clock-o"></i> <span><?= $createdTime; ?></span>
 				<?php } ?>
 			</div>
 			<?php } ?>
@@ -86,29 +86,29 @@ $_post->setData('categories', $_post->getPostCategories());
 				$count = count($categories);
 				?>
 				<?php foreach ($categories as $k => $v) { ?>
-				<a href="<?php echo $helper->getCategoryUrl($v['identifier'])  ?>" title="<?php echo $v['name'] ?>"><?php echo $v['name'] ?></a>
+				<a href="<?= $helper->getCategoryUrl($v['identifier'])  ?>" title="<?= $v['name'] ?>"><?= $v['name'] ?></a>
 				<?php if(isset($categories[$k+1])) echo __(', '); ?>
 				<?php } ?>
 			</div>
 			<?php } ?>
 			<?php if($show_commentcount){ ?>
 			<div class="post-comment">
-				<i class="fa fa-comments"></i> <a href="<?php echo $postUrl ?>#comments"><?php echo $_post->getCommentCount(); ?></a>
+				<i class="fa fa-comments"></i> <a href="<?= $postUrl ?>#comments"><?= $_post->getCommentCount(); ?></a>
 			</div>
 			<?php } ?>
 			<?php if($show_hits){ ?>
-			<div class="post-hits"><i class="fa fa-eye"></i> <span><?php echo (int)$_post->getHits(); ?></span></div>
+			<div class="post-hits"><i class="fa fa-eye"></i> <span><?= (int)$_post->getHits(); ?></span></div>
 			<?php } ?>
 		</div>
 		<div class="post-content">
-			<?php echo $helper->filter($_post->getContent()) ?>
+			<?= $helper->filter($_post->getContent()) ?>
 		</div>
 	</div>
 </div>
 <?php if($show_likedisklike){ ?>
 <div id="post-like" class="post-like">
-	<a href="#" class="vbtn-like"><?php echo __('Like <span>(%1)</span>', (int)$_post->getLike()); ?></a>
-	<a href="#" class="vbtn-disklike"><?php echo __('Disklike <span>(%1)</span>', (int)$_post->getDisklike()); ?></a>
+	<a href="#" class="vbtn-like"><?= __('Like <span>(%1)</span>', (int)$_post->getLike()); ?></a>
+	<a href="#" class="vbtn-disklike"><?= __('Disklike <span>(%1)</span>', (int)$_post->getDisklike()); ?></a>
 	<div class="post-message"></div>
 	<script type="text/javascript">
 	require(['jquery'], function($){
@@ -121,9 +121,9 @@ $_post->setData('categories', $_post->getPostCategories());
 				}
 				var tmp = '';
 				$.ajax({
-					url: '<?php echo $block->getUrl('vesblog/vote/post') ?>',
+					url: '<?= $block->getUrl('vesblog/vote/post') ?>',
 					type: 'post',
-					data: { like: like, postId: <?php echo $_post->getId() ?> },
+					data: { like: like, postId: <?= $_post->getId() ?> },
 					dataType: 'json',
 					beforeSend: function() {
 						tmp = $(self).find('span').html();
@@ -144,7 +144,7 @@ $_post->setData('categories', $_post->getPostCategories());
 						$('.post-like .post-message').html(result.message);
 						setTimeout(function(){
 							$('.post-like .post-message').html('');
-							$('.post-like .post-message').removeClass('post-success').removeClass('post-error');							
+							$('.post-like .post-message').removeClass('post-success').removeClass('post-error');
 						},2000);
 					}
 				});
@@ -160,10 +160,10 @@ $_post->setData('categories', $_post->getPostCategories());
 	<?php $tags = $_post->getPostTags(); ?>
 	<?php if(!empty($tags)){ ?>
 	<div class="post-tag">
-		<span><?php echo __('Tags:'); ?></span>
+		<span><?= __('Tags:'); ?></span>
 		<?php foreach ($tags as $k => $v) { ?>
 		<?php if(trim($v['name'])!=''){ ?>
-		<a href="<?php echo $helper->getTagUrl($v['alias']) ?>"><?php echo $v['name'] ?></a>
+		<a href="<?= $helper->getTagUrl($v['alias']) ?>"><?= $v['name'] ?></a>
 		<?php } ?>
 		<?php } ?>
 	</div>
@@ -171,7 +171,7 @@ $_post->setData('categories', $_post->getPostCategories());
 	<?php } ?>
 	<?php if($show_socialnetworks && $networks){ ?>
 	<div class="post-social post-bottom">
-		<span class="td-post-share-title"><?php echo __('SHARE'); ?></span>
+		<span class="td-post-share-title"><?= __('SHARE'); ?></span>
 		<!-- Go to www.addthis.com/dashboard to customize your tools -->
 		<div class="addthis_toolbox addthis_default_style addthis_32x32_style">
 			<?php if(isset($networks['facebook'])){ ?>
@@ -197,23 +197,23 @@ $_post->setData('categories', $_post->getPostCategories());
 	<?php } ?>
 </div>
 <?php if($show_socialnetworks && $networks){ ?>
-<script type="text/javascript" src="//s7.addthis.com/js/300/addthis_widget.js#pubid=<?php echo $addthis_pubid; ?>"></script>
+<script type="text/javascript" src="//s7.addthis.com/js/300/addthis_widget.js#pubid=<?= $addthis_pubid; ?>"></script>
 <?php } ?>
 
 <?php if($show_authorprofile && isset($author) && $author){ ?>
 <div id="author-box">
-	<div class="block-title"><h2><strong><?php echo __('Author'); ?></strong></h2></div>
+	<div class="block-title"><h2><strong><?= __('Author'); ?></strong></h2></div>
 	<div class="block-content">
 		<?php if($avatar = $author->getAvatar()){ ?>
 		<div class="author-avatar">
-		<a href="<?php echo $helper->getAuthorUrl($author); ?>" title="<?php echo $author->getNickName() ?>">
-			<img src="<?php echo $imageHelper->resizeImage($avatar, 125, 125) ?>" alt="" height="125" width="125">
+		<a href="<?= $helper->getAuthorUrl($author); ?>" title="<?= $author->getNickName() ?>">
+			<img src="<?= $imageHelper->resizeImage($avatar, 125, 125) ?>" alt="" height="125" width="125">
 		</a>
 		</div>
 		<?php } ?>
-		<h3 style="margin-top: 0;"><?php echo $author->getNickName(); ?></h3>
+		<h3 style="margin-top: 0;"><?= $author->getNickName(); ?></h3>
 		<?php if($bio = $author->getDescription()){ ?>
-		<div class="author-description"><?php echo $helper->filter($bio) ?></div>
+		<div class="author-description"><?= $helper->filter($bio) ?></div>
 		<?php } ?>
 
 		<?php $authorSocials = unserialize($author->getSocialNetworks()); ?>
@@ -221,7 +221,7 @@ $_post->setData('categories', $_post->getPostCategories());
 		<div class="author-social flat-social">
 			<?php foreach ($authorSocials as $k => $v) { ?>
 				<?php if(trim($v)!=''){ ?>
-				<a class="social-<?php echo $k ?>" href="<?php echo $v; ?>"><i class="fa fa-<?php echo $k ?>"></i></a>
+				<a class="social-<?= $k ?>" href="<?= $v; ?>"><i class="fa fa-<?= $k ?>"></i></a>
 				<?php } ?>
 			<?php } ?>
 		</div>
@@ -229,9 +229,9 @@ $_post->setData('categories', $_post->getPostCategories());
 	</div>
 </div>
 <?php } ?>
-<?php echo $this->getChildHtml("posts_related"); ?>
-<?php echo $this->getChildHtml("posts_nextprev"); ?>
-<?php echo $this->getChildHtml("products_related"); ?>
+<?= $this->getChildHtml("posts_related"); ?>
+<?= $this->getChildHtml("posts_nextprev"); ?>
+<?= $this->getChildHtml("products_related"); ?>
 <?php if($_post->getEnableComment()){ ?>
-<?php echo $this->getChildHtml("post_comment"); ?>
-<?php } ?>
\ No newline at end of file
+<?= $this->getChildHtml("post_comment"); ?>
+<?php } ?>
diff --git a/view/frontend/templates/post/view/opengraph.phtml b/view/frontend/templates/post/view/opengraph.phtml
index be57dae..25efc7a 100644
--- a/view/frontend/templates/post/view/opengraph.phtml
+++ b/view/frontend/templates/post/view/opengraph.phtml
@@ -1,18 +1,18 @@
 <?php
 /**
  * Venustheme
- * 
+ *
  * NOTICE OF LICENSE
- * 
+ *
  * This source file is subject to the Venustheme.com license that is
  * available through the world-wide-web at this URL:
  * http://www.venustheme.com/license-agreement.html
- * 
+ *
  * DISCLAIMER
- * 
+ *
  * Do not edit or add to this file if you wish to upgrade this extension to newer
  * version in the future.
- * 
+ *
  * @category   Venustheme
  * @package    Ves_Blog
  * @copyright  Copyright (c) 2016 Venustheme (http://www.venustheme.com/)
@@ -27,10 +27,10 @@
  */
 ?>
 
-<meta property="og:type" content="<?php echo $block->escapeHtml($block->getType()); ?>" />
-<meta property="og:title" content="<?php echo $block->escapeHtml($block->getTitle()); ?>" />
-<meta property="og:description" content="<?php echo $block->escapeHtml($block->getDescription()); ?>" />
-<meta property="og:url" content="<?php echo $block->escapeHtml($block->getPageUrl()); ?>" />
+<meta property="og:type" content="<?= $block->escapeHtml($block->getType()); ?>" />
+<meta property="og:title" content="<?= $block->escapeHtml($block->getTitle()); ?>" />
+<meta property="og:description" content="<?= $block->escapeHtml($block->getDescription()); ?>" />
+<meta property="og:url" content="<?= $block->escapeHtml($block->getPageUrl()); ?>" />
 <?php if ($image = $block->getImage()) { ?>
-<meta property="og:image" content="<?php echo $block->escapeHtml($image); ?>" />
-<?php } ?>
\ No newline at end of file
+<meta property="og:image" content="<?= $block->escapeHtml($image); ?>" />
+<?php } ?>
diff --git a/view/frontend/templates/product/view.phtml b/view/frontend/templates/product/view.phtml
index 76c0483..316b1d9 100644
--- a/view/frontend/templates/product/view.phtml
+++ b/view/frontend/templates/product/view.phtml
@@ -94,7 +94,7 @@ $carousel .= 'data-loop="';
 $carousel .= '"';
 $carousel .= 'data-nav = "';
 	$carousel .= $nav?"true":"false";
-$carousel .= '"';	
+$carousel .= '"';
 $carousel .= 'data-autoplay-pauonhover="';
 $carousel .= $autoplay_hoverpause?"true":"false";
 $carousel .= '"';
@@ -109,11 +109,11 @@ $carousel .= 'data-large-max-items="'.$large_max_items.'"';
 <?php if(!empty($_postCollection)){ ?>
 <div class="block ves-blog post-list postsstyle-style4 postsgrid1 blog-widget related-posts blog-posts">
 	<div class="block-title">
-		<h2><strong><?php echo __('Related Posts'); ?></strong></h2>
+		<h2><strong><?= __('Related Posts'); ?></strong></h2>
 	</div>
 	<div class="block-content blog-grid" <?php if($border_color = $this->getConfig('border_color')){ echo 'style="border-bottom-color: ' . $border_color . '"'; } ?>>
 		<?php if($total>0){ ?>
-		<ul id="<?php echo $blockId ?>" class="owl-carousel owl-theme" <?php echo $carousel; ?>>
+		<ul id="<?= $blockId ?>" class="owl-carousel owl-theme" <?= $carousel; ?>>
 			<?php foreach ($_postCollection as $_columnCollection) { ?>
 			<li class="ves-post">
 				<?php
@@ -128,15 +128,15 @@ $carousel .= 'data-large-max-items="'.$large_max_items.'"';
 					$style = 'style="height:' . $item_height . 'px"';
 				}
 				?>
-				<div class="ves-post post-item" <?php echo $style; ?>>
+				<div class="ves-post post-item" <?= $style; ?>>
 					<div class="post-wrapper">
 						<?php if($show_image){ ?>
 						<?php $imageClass = ''; ?>
 						<?php if($_post->getImageType() == 2 && $_post->getImageVideoId()!=''){
 							$imageClass = ' post-video';
 						} ?>
-						<div class="post-image <?php echo $imageClass; ?>">
-							<a href="<?php echo $postUrl ?>" <?php echo $postLinkAttr;?> title="<?php echo $_post->getTitle(); ?>">
+						<div class="post-image <?= $imageClass; ?>">
+							<a href="<?= $postUrl ?>" <?= $postLinkAttr;?> title="<?= $_post->getTitle(); ?>">
 								<?php if( $_post->getThumbnailType() == 1 && $_post->getPostThumbnail()!=''){ ?>
 								<?php if($_post->getImageType() == 2 && $_post->getImageVideoId()!=''){ ?>
 								<span class="fa overlay-icon"></span>
@@ -144,15 +144,15 @@ $carousel .= 'data-large-max-items="'.$large_max_items.'"';
 								<span class="fa overlay-icon"></span>
 								<?php } ?>
 								<?php if($image_width>0){ ?>
-								<img src="<?php echo $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height) ?>" height="<?php echo $image_height ?>" width="<?php echo $image_width ?>" alt="<?php echo $_post->getTitle(); ?>"/>
+								<img src="<?= $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height) ?>" height="<?= $image_height ?>" width="<?= $image_width ?>" alt="<?= $_post->getTitle(); ?>"/>
 								<?php }else{ ?>
-								<img src="<?php echo $helper->getMediaUrl($_post->getPostThumbnail()) ?>" alt="<?php echo $_post->getTitle(); ?>"/>
+								<img src="<?= $helper->getMediaUrl($_post->getPostThumbnail()) ?>" alt="<?= $_post->getTitle(); ?>"/>
 								<?php } ?>
 								<?php }else if($_post->getThumbnailType() == 2){ ?>
 								<?php if($_post->getThumbnailVideoType()==1 && $_post->getThumbnailVideoId()!=''){ ?>
-								<iframe width="<?php echo $image_width ?>" height="<?php echo $image_height ?>" src="https://www.youtube.com/embed/<?php echo $_post->getThumbnailVideoId() ?>" frameborder="0" allowfullscreen></iframe>
+								<iframe width="<?= $image_width ?>" height="<?= $image_height ?>" src="https://www.youtube.com/embed/<?= $_post->getThumbnailVideoId() ?>" frameborder="0" allowfullscreen></iframe>
 								<?php }else if($_post->getThumbnailVideoType()==2 && $_post->getThumbnailVideoId()!=''){ ?>
-								<iframe src="https://player.vimeo.com/video/<?php echo $_post->getThumbnailVideoId() ?>?color=3498DB&title=0&byline=0&portrait=0" width="<?php echo $image_width ?>" height="<?php echo $image_height ?>" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
+								<iframe src="https://player.vimeo.com/video/<?= $_post->getThumbnailVideoId() ?>?color=3498DB&title=0&byline=0&portrait=0" width="<?= $image_width ?>" height="<?= $image_height ?>" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
 								<?php } ?>
 								<?php } ?>
 							</a>
@@ -161,12 +161,12 @@ $carousel .= 'data-large-max-items="'.$large_max_items.'"';
 
 						<?php if($show_title){ ?>
 						<div class="post-title">
-						<h3><a href="<?php echo $postUrl ?>" <?php echo $postLinkAttr;?> title="<?php echo $_post->getTitle(); ?>"><?php echo $_post->getTitle(); ?></a></h3>
+						<h3><a href="<?= $postUrl ?>" <?= $postLinkAttr;?> title="<?= $_post->getTitle(); ?>"><?= $_post->getTitle(); ?></a></h3>
 						</div>
 						<?php } ?>
 						<?php if($show_socialnetworks){ ?>
 						<div class="post-socials">
-							<div class="addthis_toolbox addthis_default_style" data-title="<?php echo $_post->getTitle(); ?>" addthis:url="<?php echo $postUrl ?>">
+							<div class="addthis_toolbox addthis_default_style" data-title="<?= $_post->getTitle(); ?>" addthis:url="<?= $postUrl ?>">
 								<a class="addthis_button_facebook"></a>
 								<a class="addthis_button_twitter"></a>
 								<a class="addthis_button_google"></a>
@@ -180,7 +180,7 @@ $carousel .= 'data-large-max-items="'.$large_max_items.'"';
 							<?php if($show_author){ ?>
 							<div class="post-author">
 								<?php if($author = $helper->getPostAuthor($_post)){ ?>
-								<i class="fa fa-user"></i> <a href="<?php echo $helper->getAuthorUrl($author); ?>" title="<?php echo $author->getNickName() ?>"><?php echo $author->getNickName() ?></a>
+								<i class="fa fa-user"></i> <a href="<?= $helper->getAuthorUrl($author); ?>" title="<?= $author->getNickName() ?>"><?= $author->getNickName() ?></a>
 								<?php } ?>
 							</div>
 							<?php } ?>
@@ -188,11 +188,11 @@ $carousel .= 'data-large-max-items="'.$large_max_items.'"';
 							<div class="post-date">
 								<?php if($show_createdtime){ ?>
 								<?php $createdTime = $helper->getFormatDate($_post->getCreationTime(), $dateFormat); ?>
-								<i class="fa fa-clock-o"></i> <span><?php echo $createdTime; ?></span>
+								<i class="fa fa-clock-o"></i> <span><?= $createdTime; ?></span>
 								<?php } ?>
 								<?php if($show_updatedtime){ ?>
 								<?php $updateTime = $helper->getFormatDate($_post->getUpdateTime(), $dateFormat); ?>
-								<i class="fa fa-clock-o"></i> <span><?php echo __('Updated on %1', $updateTime); ?></span>
+								<i class="fa fa-clock-o"></i> <span><?= __('Updated on %1', $updateTime); ?></span>
 								<?php } ?>
 							</div>
 							<?php } ?>
@@ -202,19 +202,19 @@ $carousel .= 'data-large-max-items="'.$large_max_items.'"';
 								$categories = $_post->getData('categories');
 								$count = count($categories);
 								?>
-								<i class="fa fa-folder"></i> 
+								<i class="fa fa-folder"></i>
 								<?php foreach ($categories as $k => $v) { ?>
-								<a href="<?php echo $helper->getCategoryUrl($v['identifier'])  ?>" title="<?php echo $v['name'] ?>"><?php echo $v['name'] ?></a>
+								<a href="<?= $helper->getCategoryUrl($v['identifier'])  ?>" title="<?= $v['name'] ?>"><?= $v['name'] ?></a>
 								<?php if(isset($categories[$k+1])) echo __(', '); ?>
 								<?php } ?>
 							</div>
 							<?php } ?>
 							<?php if($show_hits){ ?>
-							<div class="post-hits"><i class="fa fa-eye"></i> <span><?php echo (int)$_post->getHits(); ?></span></div>
+							<div class="post-hits"><i class="fa fa-eye"></i> <span><?= (int)$_post->getHits(); ?></span></div>
 							<?php } ?>
 							<?php if($show_commentcount){ ?>
 							<div class="post-comment">
-								<i class="fa fa-comments"></i> <a href="<?php echo $postUrl ?>#comments" <?php echo $postLinkAttr;?>><?php echo $_post->getCommentCount(); ?></a>
+								<i class="fa fa-comments"></i> <a href="<?= $postUrl ?>#comments" <?= $postLinkAttr;?>><?= $_post->getCommentCount(); ?></a>
 							</div>
 
 							<?php } ?>
@@ -223,9 +223,9 @@ $carousel .= 'data-large-max-items="'.$large_max_items.'"';
 						<?php $tags = $_post->getTag(); ?>
 						<?php if(!empty($tags)){ ?>
 						<div class="post-tag">
-							<span><?php echo __('Tags:'); ?></span>
+							<span><?= __('Tags:'); ?></span>
 							<?php foreach ($tags as $k => $v) { ?>
-							<a href="<?php echo $helper->getTagUrl($v['alias']) ?>"><?php echo trim($v['name']) ?></a>
+							<a href="<?= $helper->getTagUrl($v['alias']) ?>"><?= trim($v['name']) ?></a>
 							<?php if(isset($tags[$k+1])) echo __(', '); ?>
 							<?php } ?>
 						</div>
@@ -234,10 +234,10 @@ $carousel .= 'data-large-max-items="'.$large_max_items.'"';
 						<?php if($show_shortdescription){ ?>
 						<div class="post-summary">
 							<?php $shortContent = $_post->getShortContent(); ?>
-							<?php echo $helper->subString($shortContent, (int)$shortdescription_count); ?>
+							<?= $helper->subString($shortContent, (int)$shortdescription_count); ?>
 						</div>
 						<?php if($show_readmorelink){ ?>
-						<div class="post-readmore"><a href="<?php echo $postUrl ?>" <?php echo $postLinkAttr;?> title="<?php echo $_post->getTitle(); ?>" ><?php echo __('Read more') ?> <i class="fa fa-angle-double-right" aria-hidden="true"></i></a></div>
+						<div class="post-readmore"><a href="<?= $postUrl ?>" <?= $postLinkAttr;?> title="<?= $_post->getTitle(); ?>" ><?= __('Read more') ?> <i class="fa fa-angle-double-right" aria-hidden="true"></i></a></div>
 						<?php } ?>
 						<?php } ?>
 					</div>
@@ -254,7 +254,7 @@ $carousel .= 'data-large-max-items="'.$large_max_items.'"';
 				], function($){
 					jQuery(document).ready(function() {
 						var anchorColor = '';
-						$('#<?php echo $blockId ?> a').hover(function(){
+						$('#<?= $blockId ?> a').hover(function(){
 							anchorColor = '';
 							if($(this).data('hover-color')!=''){
 								$(this).css('color',$(this).data('hover-color'));
@@ -271,4 +271,4 @@ $carousel .= 'data-large-max-items="'.$large_max_items.'"';
 			<?php } ?>
 		</div>
 	</div>
-	<?php } ?>
\ No newline at end of file
+	<?php } ?>
diff --git a/view/frontend/templates/rss/head.phtml b/view/frontend/templates/rss/head.phtml
index c4a3a3a..ffb5aa5 100644
--- a/view/frontend/templates/rss/head.phtml
+++ b/view/frontend/templates/rss/head.phtml
@@ -1,3 +1,3 @@
 <?php if ($block->isRssAllowed() && $block->getLink()): ?>
-<link href="<?php echo $block->getLink() ?>" title="<?php echo __('Blog'); ?>" rel="alternate" type="application/rss+xml" />
+<link href="<?= $block->getLink() ?>" title="<?= __('Blog'); ?>" rel="alternate" type="application/rss+xml" />
 <?php endif; ?>
diff --git a/view/frontend/templates/rss/rss.phtml b/view/frontend/templates/rss/rss.phtml
index 96cbb24..da429fc 100644
--- a/view/frontend/templates/rss/rss.phtml
+++ b/view/frontend/templates/rss/rss.phtml
@@ -1,3 +1,3 @@
 <?php if ($block->isRssAllowed() && $block->getLink()): ?>
-    <a href="<?php echo $block->getLink() ?>" class="action link rss"><span><?php echo $block->getLabel() ?></span></a>
+    <a href="<?= $block->getLink() ?>" class="action link rss"><span><?= $block->getLabel() ?></span></a>
 <?php endif; ?>
diff --git a/view/frontend/templates/search/form.phtml b/view/frontend/templates/search/form.phtml
index 036bda7..8ad63b6 100644
--- a/view/frontend/templates/search/form.phtml
+++ b/view/frontend/templates/search/form.phtml
@@ -3,15 +3,15 @@ $helper = $this->helper("Ves\Blog\Helper\Data");
 $title = $helper->getConfig('sidebar/searchform_title');
 ?>
 <div class="ves-block block blog-searchform">
-	<?php if($title){ ?>
+	<?php if($title) : ?>
 	<div class="block-title">
-		<strong><?php echo __('Search Form'); ?></strong>
+		<strong><?= __('Search Form'); ?></strong>
 	</div>
-	<?php } ?>
+	<?php endif; ?>
 	<div class="block-content">
-		<form method="get" class="search-form" action="<?php echo $helper->getSearchFormUrl(); ?>" data-mage-init='{"validation":{}}'>
-			<input type="text" class="search-field required-entry" placeholder="<?php echo __('Search posts here…'); ?>" value="<?php echo $helper->getSearchKey() ?>" name="s" title="<?php echo __('Search for:'); ?>">
+		<form method="get" class="search-form" action="<?= $block->escapeUrl($helper->getSearchFormUrl()); ?>" data-mage-init='{"validation":{}}'>
+			<input type="text" class="search-field required-entry" placeholder="<?= $block->escapeHtmlAttr(__('Search posts here…')); ?>" value="<?= $block->escapeHtmlAttr($helper->getSearchKey()) ?>" name="s" title="<?= $block->escapeHtmlAttr(__('Search for:')); ?>">
 			<button type="submit" class="search-submit"><i class="fa fa-search"></i></button>
 		</form>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/view/frontend/templates/search/posts.phtml b/view/frontend/templates/search/posts.phtml
index 8f39bf9..33116c1 100644
--- a/view/frontend/templates/search/posts.phtml
+++ b/view/frontend/templates/search/posts.phtml
@@ -51,18 +51,18 @@ $blockId = 'blog-' . $layout . time();
 
 <?php if($collection->count()){ ?>
 <?php $total = count($collection->getItems()); ?>
-<div class="ves-blog post-list postsstyle-<?php echo $postsStyles; ?> block">
+<div class="ves-blog post-list postsstyle-<?= $postsStyles; ?> block">
 	<?php if($show_toolbartop){ ?>
 	<div class="blog-toolbar">
-		<?php echo $block->getChildHtml('toolbar'); ?>
+		<?= $block->getChildHtml('toolbar'); ?>
 	</div>
 	<?php } ?>
-	<div class="blog-<?php echo $layout ?> <?php echo $blockId; ?>  blog-posts">
-		<?php echo $this->getPostsBlock(); ?>
+	<div class="blog-<?= $layout ?> <?= $blockId; ?>  blog-posts">
+		<?= $this->getPostsBlock(); ?>
 	</div>
 	<?php if($show_toolbarbottom){ ?>
 	<div class="blog-toolbar">
-		<?php echo $block->getChildHtml('toolbar'); ?>
+		<?= $block->getChildHtml('toolbar'); ?>
 	</div>
 	<?php } ?>
 </div>
@@ -70,22 +70,22 @@ $blockId = 'blog-' . $layout . time();
 <script>
 	function initBlogMasonryLayout($, Masonry) {
 		var width = $(window).width();
-		var column = <?php echo $lg_column_item ?>;
+		var column = <?= $lg_column_item ?>;
 		if(width<480){
-			column = <?php echo $xs_column_item ?>;
+			column = <?= $xs_column_item ?>;
 			w = w - 20;
 		}
 		if(width>=480){
-			column = <?php echo $sm_column_item ?>;
+			column = <?= $sm_column_item ?>;
 		}
 		if(width>=992){
-			column = <?php echo $md_column_item ?>;
+			column = <?= $md_column_item ?>;
 		}
 		if(width>=1200){
-			column = <?php echo $lg_column_item ?>;
+			column = <?= $lg_column_item ?>;
 		}
-		var w = $('<?php echo $maincontainer_selector ; ?>').width() + 20;
-		$('.<?php echo $blockId; ?>').css({"width":w+"px"});
+		var w = $('<?= $maincontainer_selector ; ?>').width() + 20;
+		$('.<?= $blockId; ?>').css({"width":w+"px"});
 		var masoW = 100/column;
 		$('.blog-masonry .post-item').css({"width":masoW+"%","margin-bottom":"20px"});
 		new Masonry( '.blog-masonry', {
@@ -106,5 +106,5 @@ $blockId = 'blog-' . $layout . time();
 	</script>
 	<?php } ?>
 	<?php }else{ ?>
-	<?php echo __('Sorry, but nothing matched your search criteria. Please try again with some different keywords.'); ?>
-	<?php } ?>
\ No newline at end of file
+	<?= __('Sorry, but nothing matched your search criteria. Please try again with some different keywords.'); ?>
+	<?php } ?>
diff --git a/view/frontend/templates/tag/list.phtml b/view/frontend/templates/tag/list.phtml
index 1fa9036..d062424 100644
--- a/view/frontend/templates/tag/list.phtml
+++ b/view/frontend/templates/tag/list.phtml
@@ -3,14 +3,14 @@ $helper            = $this->helper("Ves\Blog\Helper\Data");
 $tags              = $this->getData('tags');
 $showTagblock      = $helper->getConfig('sidebar/show_tagblock');
 $title             = $helper->getConfig('sidebar/tagblock_title');
-$show_tagcountdown = $helper->getConfig("sidebar/show_tagcountdown"); 
+$show_tagcountdown = $helper->getConfig("sidebar/show_tagcountdown");
 $tag_cloud         = $helper->getConfig("sidebar/tag_cloud");
 ?>
 <?php if(count($tags)>0 && $showTagblock){ ?>
 	<div class="ves-block block blog-tags">
 		<?php if($title){ ?>
 			<div class="block-title">
-				<strong><?php echo $title ?></strong>
+				<strong><?= $title ?></strong>
 			</div>
 			<?php } ?>
 			<div class="block-content blog-widget-content">
@@ -21,14 +21,14 @@ $tag_cloud         = $helper->getConfig("sidebar/tag_cloud");
 						if($tag_cloud) $class = 'class="tag-count-' . $v['count'] . '"';
 						?>
 						<?php if(trim($v['name'])!=''){ ?>
-							<li><a href="<?php echo $helper->getTagUrl($k) ?>" <?php echo $class ?> title="<?php echo $v['name'] ?>"><?php echo $v['name'] ?>
+							<li><a href="<?= $helper->getTagUrl($k) ?>" <?= $class ?> title="<?= $v['name'] ?>"><?= $v['name'] ?>
 								<?php if($show_tagcountdown){ ?>
 									<?php } ?>
 								</a>
-								<span>(<?php echo $v['count'] ?>)</span></li>
+								<span>(<?= $v['count'] ?>)</span></li>
 								<?php } ?>
 								<?php } ?>
 							</ul>
 						</div>
 					</div>
-					<?php } ?>
\ No newline at end of file
+					<?php } ?>
diff --git a/view/frontend/templates/tag/posts.phtml b/view/frontend/templates/tag/posts.phtml
index e68bfa2..33d5c53 100644
--- a/view/frontend/templates/tag/posts.phtml
+++ b/view/frontend/templates/tag/posts.phtml
@@ -51,18 +51,18 @@ $blockId = 'blog-' . $layout . time();
 
 <?php if($collection->count()){ ?>
 <?php $total = count($collection->getItems()); ?>
-<div class="ves-blog post-list postsstyle-<?php echo $postsStyles ?>">
+<div class="ves-blog post-list postsstyle-<?= $postsStyles ?>">
 	<?php if($show_toolbartop){ ?>
 	<div class="blog-toolbar">
-		<?php echo $block->getChildHtml('toolbar'); ?>
+		<?= $block->getChildHtml('toolbar'); ?>
 	</div>
 	<?php } ?>
-	<div class="blog-<?php echo $layout ?> <?php echo $blockId; ?>  blog-posts">
-		<?php echo $this->getPostsBlock(); ?>
+	<div class="blog-<?= $layout ?> <?= $blockId; ?>  blog-posts">
+		<?= $this->getPostsBlock(); ?>
 	</div>
 	<?php if($show_toolbarbottom){ ?>
 	<div class="blog-toolbar">
-		<?php echo $block->getChildHtml('toolbar'); ?>
+		<?= $block->getChildHtml('toolbar'); ?>
 	</div>
 	<?php } ?>
 </div>
@@ -70,22 +70,22 @@ $blockId = 'blog-' . $layout . time();
 <script>
 	function initBlogMasonryLayout($, Masonry) {
 		var width = $(window).width();
-		var column = <?php echo $lg_column_item ?>;
+		var column = <?= $lg_column_item ?>;
 		if(width<480){
-			column = <?php echo $xs_column_item ?>;
+			column = <?= $xs_column_item ?>;
 			w = w - 20;
 		}
 		if(width>=480){
-			column = <?php echo $sm_column_item ?>;
+			column = <?= $sm_column_item ?>;
 		}
 		if(width>=992){
-			column = <?php echo $md_column_item ?>;
+			column = <?= $md_column_item ?>;
 		}
 		if(width>=1200){
-			column = <?php echo $lg_column_item ?>;
+			column = <?= $lg_column_item ?>;
 		}
-		var w = $('<?php echo $maincontainer_selector ; ?>').width() + 20;
-		$('.<?php echo $blockId; ?>').css({"width":w+"px"});
+		var w = $('<?= $maincontainer_selector ; ?>').width() + 20;
+		$('.<?= $blockId; ?>').css({"width":w+"px"});
 		var masoW = 100/column;
 		$('.blog-masonry .post-item').css({"width":masoW+"%","margin-bottom":"20px"});
 		new Masonry( '.blog-masonry', {
@@ -105,4 +105,4 @@ $blockId = 'blog-' . $layout . time();
 	</script>
 	<?php } ?>
 
-	<?php } ?>
\ No newline at end of file
+	<?php } ?>
diff --git a/view/frontend/templates/toolbar.phtml b/view/frontend/templates/toolbar.phtml
index 5f39321..07ac492 100644
--- a/view/frontend/templates/toolbar.phtml
+++ b/view/frontend/templates/toolbar.phtml
@@ -1 +1 @@
- <?php echo $block->getPagerHtml() ?>
\ No newline at end of file
+ <?= $block->getPagerHtml() ?>
diff --git a/view/frontend/templates/widget/latestposts.phtml b/view/frontend/templates/widget/latestposts.phtml
index 6b82919..97a2044 100644
--- a/view/frontend/templates/widget/latestposts.phtml
+++ b/view/frontend/templates/widget/latestposts.phtml
@@ -71,14 +71,14 @@ $list_category = [];
 $list_tag = [];
 $list_auth = [];
 ?>
-<div class="block blog-posts latestposts-filter <?php echo $addition_class ?>">
+<div class="block blog-posts latestposts-filter <?= $addition_class ?>">
     <?php if ($widget_title != '') { ?>
         <div class="block-title">
-            <h2><?php echo $widget_title; ?></h2>
+            <h2><?= $widget_title; ?></h2>
         </div>
     <?php } ?>
     <?php if ($html != '') { ?>
-        <div class="pretext-html"><?php echo $html ?></div>
+        <div class="pretext-html"><?= $html ?></div>
     <?php } ?>
     <!--===============================. Filter button .========================-->
     <?php
@@ -115,22 +115,22 @@ $list_auth = [];
     <div class="filters">
         <?php if (count($list_category) > 0) { ?>
             <div class="filter_categories ui-group">
-                <p class="ui-group__title"><strong><?php echo __('Categories')?></strong></p>
+                <p class="ui-group__title"><strong><?= __('Categories')?></strong></p>
                 <div class="button-group js-radio-button-group" data-filter-group="category">
-                    <button class="button is-selected" data-filter=""><?php echo __('Any')?></button>
+                    <button class="button is-selected" data-filter=""><?= __('Any')?></button>
                     <?php foreach ($list_category as $v) { ?>
-                        <button class="button" data-filter=".<?php echo str_replace(" ", "_", $v); ?>"><?php echo $v; ?></button>
+                        <button class="button" data-filter=".<?= str_replace(" ", "_", $v); ?>"><?= $v; ?></button>
                     <?php } ?>
                 </div>
             </div>
         <?php } ?>
         <?php if (count($list_tag) > 0) { ?>
             <div class="filter_tags ui-group">
-                <p class="ui-group__title"><strong><?php echo __('Tags')?></strong></p>
+                <p class="ui-group__title"><strong><?= __('Tags')?></strong></p>
                 <div class="button-group js-radio-button-group" data-filter-group="tags">
-                    <button class="button is-selected" data-filter=""><?php echo __('Any')?></button>
+                    <button class="button is-selected" data-filter=""><?= __('Any')?></button>
                     <?php foreach ($list_tag as $v) { ?>
-                        <button class="button" data-filter=".<?php echo str_replace(" ", "_", $v); ?>"><?php echo $v; ?></button>
+                        <button class="button" data-filter=".<?= str_replace(" ", "_", $v); ?>"><?= $v; ?></button>
                     <?php } ?>
                 </div>
             </div>
@@ -138,11 +138,11 @@ $list_auth = [];
 
         <?php if (count($list_auth) > 0) { ?>
             <div class="filter_authors ui-group">
-                <p class="ui-group__title"><strong><?php echo __('Author')?></strong></p>
+                <p class="ui-group__title"><strong><?= __('Author')?></strong></p>
                 <div class="button-group js-radio-button-group" data-filter-group="author">
-                    <button class="button is-selected" data-filter=""><?php echo __('Any')?></button>
+                    <button class="button is-selected" data-filter=""><?= __('Any')?></button>
                     <?php foreach ($list_auth as $v) { ?>
-                        <button class="button" data-filter=".<?php echo str_replace(" ", "_", $v); ?>"><?php echo $v; ?></button>
+                        <button class="button" data-filter=".<?= str_replace(" ", "_", $v); ?>"><?= $v; ?></button>
                     <?php } ?>
                 </div>
             </div>
@@ -151,7 +151,7 @@ $list_auth = [];
     <!--===============================. END Filter button .========================-->
     <div class="block-content">
         <?php if ($total > 0) { ?>
-            <ul id="<?php echo $blockId ?>" class="<?php echo $classes ?>" <?php // echo $carousel;?>>
+            <ul id="<?= $blockId ?>" class="<?= $classes ?>" <?php // echo $carousel;?>>
                 <?php
                 foreach ($_postCollection as $_columnCollection) {
                     ?>
@@ -179,17 +179,17 @@ $list_auth = [];
                             }
                             /* ===============================. END Add class filter .======================== */
                             ?>
-                            <div class="post-block <?php echo $class; ?>">
+                            <div class="post-block <?= $class; ?>">
                                 <?php if ($show_image) { ?>
                                     <div class="post-image">
-                                        <a href="<?php echo $postUrl ?>" <?php echo $postLinkAttr;?> title="<?php echo $_post->getTitle(); ?>">
+                                        <a href="<?= $postUrl ?>" <?= $postLinkAttr;?> title="<?= $_post->getTitle(); ?>">
                                             <?php if ($_post->getThumbnailType() == 1 && $_post->getPostThumbnail() != '') { ?>
-                                                <img src="<?php echo $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height) ?>" alt="<?php echo $_post->getTitle(); ?>"/>
+                                                <img src="<?= $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height) ?>" alt="<?= $_post->getTitle(); ?>"/>
                                             <?php } else if ($_post->getThumbnailType() == 2) { ?>
                                                 <?php if ($_post->getThumbnailVideoType() == 1 && $_post->getThumbnailVideoId() != '') { ?>
-                                                    <iframe width="<?php echo $image_width ?>" height="<?php echo $image_height ?>" src="https://www.youtube.com/embed/<?php echo $_post->getThumbnailVideoId() ?>" frameborder="0" allowfullscreen></iframe>
+                                                    <iframe width="<?= $image_width ?>" height="<?= $image_height ?>" src="https://www.youtube.com/embed/<?= $_post->getThumbnailVideoId() ?>" frameborder="0" allowfullscreen></iframe>
                                                 <?php } else if ($_post->getThumbnailVideoType() == 2 && $_post->getThumbnailVideoId() != '') { ?>
-                                                    <iframe src="https://player.vimeo.com/video/<?php echo $_post->getThumbnailVideoId() ?>?color=3498DB&title=0&byline=0&portrait=0" width="<?php echo $image_width ?>" height="<?php echo $image_height ?>" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
+                                                    <iframe src="https://player.vimeo.com/video/<?= $_post->getThumbnailVideoId() ?>?color=3498DB&title=0&byline=0&portrait=0" width="<?= $image_width ?>" height="<?= $image_height ?>" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
                                                 <?php } ?>
                                             <?php } ?>
                                         </a>
@@ -198,47 +198,47 @@ $list_auth = [];
                                 <div class="post-meta">
                                     <?php if ($show_title) { ?>
                                         <div class="post-title">
-                                            <h4><a href="<?php echo $postUrl ?>" <?php echo $postLinkAttr;?> title="<?php echo $_post->getTitle(); ?>"><?php echo $_post->getTitle(); ?></a></h4>
+                                            <h4><a href="<?= $postUrl ?>" <?= $postLinkAttr;?> title="<?= $_post->getTitle(); ?>"><?= $_post->getTitle(); ?></a></h4>
                                         </div>
                                     <?php } ?>
                                     <?php if ($show_author) { ?>
                                         <div class="post-author">
                                             <?php $author = $helper->getPostAuthor($_post); ?>
-                                            <i class="fa fa-user"></i> <a href="<?php echo $helper->getAuthorUrl($author); ?>" title="<?php echo $author->getNickName() ?>"><?php echo $author->getNickName() ?></a>
+                                            <i class="fa fa-user"></i> <a href="<?= $helper->getAuthorUrl($author); ?>" title="<?= $author->getNickName() ?>"><?= $author->getNickName() ?></a>
                                         </div>
                                     <?php } ?>
                                     <?php if ($show_createdtime || $show_updatedtime) { ?>
                                         <div class="post-date">
                                             <?php if ($show_createdtime) { ?>
                                                 <?php $createdTime = $helper->getFormatDate($_post->getCreationTime(), $dateFormat); ?>
-                                                <span><?php echo __('Created on %1', $createdTime); ?></span>
+                                                <span><?= __('Created on %1', $createdTime); ?></span>
                                             <?php } ?>
                                             <?php if ($show_updatedtime) { ?>
                                                 <?php $updateTime = $helper->getFormatDate($_post->getUpdateTime(), $dateFormat); ?>
-                                                <span><?php echo __('Updated on %1', $updateTime); ?></span>
+                                                <span><?= __('Updated on %1', $updateTime); ?></span>
                                             <?php } ?>
                                         </div>
                                     <?php } ?>
                                     <?php if ($show_commentcount) { ?>
                                         <div class="post-comment">
-                                            <?php echo __('%1 comments', $_post->getCommentCount()); ?>
+                                            <?= __('%1 comments', $_post->getCommentCount()); ?>
                                         </div>
                                     <?php } ?>
                                     <?php if ($show_categories) { ?>
                                         <div class="post-categories">
-                                            <?php echo __('Pubslished In: ') ?>
+                                            <?= __('Pubslished In: ') ?>
                                             <?php
                                             $categories = $_post->getData('categories');
                                             $count = count($categories);
                                             ?>
                                             <?php foreach ($categories as $k => $v) { ?>
-                                                <a href="<?php echo $helper->getCategoryUrl($v['identifier']) ?>" title="<?php echo $v['name'] ?>"><?php echo $v['name'] ?></a>
+                                                <a href="<?= $helper->getCategoryUrl($v['identifier']) ?>" title="<?= $v['name'] ?>"><?= $v['name'] ?></a>
                                                 <?php if (isset($categories[$k + 1])) echo __(', '); ?>
                                             <?php } ?>
                                         </div>
                                     <?php } ?>
                                     <?php if ($show_hits) { ?>
-                                        <div class="post-hits"><span><?php echo __("Read"); ?></span> <strong><?php echo (int) $_post->getHits(); ?></strong> <?php echo __("Times"); ?></div>
+                                        <div class="post-hits"><span><?= __("Read"); ?></span> <strong><?= (int) $_post->getHits(); ?></strong> <?= __("Times"); ?></div>
                                     <?php } ?>
                                     <?php if ($show_socialnetwork) { ?>
                                         <div class="post-social">
@@ -257,9 +257,9 @@ $list_auth = [];
                                         <?php $tags = $_post->getTag(); ?>
                                         <?php if (!empty($tags)) { ?>
                                             <div class="post-tag">
-                                                <span><?php echo __('Tags:'); ?></span>
+                                                <span><?= __('Tags:'); ?></span>
                                                 <?php foreach ($tags as $k => $v) { ?>
-                                                    <a href="<?php echo $helper->getTagUrl($v['alias']) ?>"><?php echo $v['name'] ?></a>
+                                                    <a href="<?= $helper->getTagUrl($v['alias']) ?>"><?= $v['name'] ?></a>
                                                     <?php if (isset($tags[$k + 1])) echo __(', '); ?>
                                                 <?php } ?>
                                             </div>
@@ -268,10 +268,10 @@ $list_auth = [];
                                     <?php if ($show_shortdescription) { ?>
                                         <div class="post-readmore">
                                             <?php $shortContent = $_post->getShortContent(); ?>
-                                            <?php echo $helper->subString($shortContent, (int) $shortdescription_count); ?>
+                                            <?= $helper->subString($shortContent, (int) $shortdescription_count); ?>
                                             <?php if ($show_readmorelink) { ?>
-                                                <br><a href="<?php echo $postUrl ?>" <?php echo $postLinkAttr;?> title="<?php echo $_post->getTitle(); ?>"><?php echo __('Read more') ?></a>
-                                            <?php } ?>	
+                                                <br><a href="<?= $postUrl ?>" <?= $postLinkAttr;?> title="<?= $_post->getTitle(); ?>"><?= __('Read more') ?></a>
+                                            <?php } ?>
                                         </div>
                                     <?php } ?>
                                 </div>
@@ -283,7 +283,7 @@ $list_auth = [];
             </ul>
         <?php } ?>
         <?php if ($show_socialnetwork) { ?>
-            <script type="text/javascript" src="//s7.addthis.com/js/300/addthis_widget.js#pubid=<?php echo $addthis_pubid; ?>"></script>
+            <script type="text/javascript" src="//s7.addthis.com/js/300/addthis_widget.js#pubid=<?= $addthis_pubid; ?>"></script>
         <?php } ?>
     </div>
 </div>
@@ -327,4 +327,4 @@ $list_auth = [];
         });
     </script>
 
-<?php } ?>
\ No newline at end of file
+<?php } ?>
diff --git a/view/frontend/templates/widget/posts.phtml b/view/frontend/templates/widget/posts.phtml
index 979d77d..965e2ae 100644
--- a/view/frontend/templates/widget/posts.phtml
+++ b/view/frontend/templates/widget/posts.phtml
@@ -153,18 +153,18 @@ if($layout_type == 'owl_carousel'){
 	$classes = 'plist';
 }
 ?>
-<div class="block blog-posts <?php echo $addition_class ?>">
+<div class="block blog-posts <?= $addition_class ?>">
 	<?php if($widget_title!=''){ ?>
 	<div class="block-title">
-		<h2><?php echo $widget_title; ?></h2>
+		<h2><?= $widget_title; ?></h2>
 	</div>
 	<?php } ?>
 	<?php if($html!=''){ ?>
-	<div class="pretext-html"><?php echo $html ?></div>
+	<div class="pretext-html"><?= $html ?></div>
 	<?php } ?>
 	<div class="block-content">
 		<?php if($total>0){ ?>
-		<ul id="<?php echo $blockId ?>" class="<?php echo $classes ?>" <?php echo $carousel; ?>>
+		<ul id="<?= $blockId ?>" class="<?= $classes ?>" <?= $carousel; ?>>
 			<?php foreach ($_postCollection as $_columnCollection) { ?>
 			<li class="ves-post post-item">
 
@@ -177,17 +177,17 @@ if($layout_type == 'owl_carousel'){
 					$style = 'style="height:' . $item_height . 'px"';
 				}
 				?>
-				<div class="post-block" <?php echo $style; ?>>
+				<div class="post-block" <?= $style; ?>>
 					<?php if($show_image){ ?>
 					<div class="post-image">
-						<a href="<?php echo $postUrl ?>" <?php echo $postLinkAttr;?> title="<?php echo $_post->getTitle(); ?>">
+						<a href="<?= $postUrl ?>" <?= $postLinkAttr;?> title="<?= $_post->getTitle(); ?>">
 							<?php if( $_post->getThumbnailType() == 1 && $_post->getPostThumbnail()!=''){ ?>
-							<img src="<?php echo $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height) ?>" alt="<?php echo $_post->getTitle(); ?>"/>
+							<img src="<?= $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height) ?>" alt="<?= $_post->getTitle(); ?>"/>
 							<?php }else if($_post->getThumbnailType() == 2){ ?>
 							<?php if($_post->getThumbnailVideoType()==1 && $_post->getThumbnailVideoId()!=''){ ?>
-							<iframe width="<?php echo $image_width ?>" height="<?php echo $image_height ?>" src="https://www.youtube.com/embed/<?php echo $_post->getThumbnailVideoId() ?>" frameborder="0" allowfullscreen></iframe>
+							<iframe width="<?= $image_width ?>" height="<?= $image_height ?>" src="https://www.youtube.com/embed/<?= $_post->getThumbnailVideoId() ?>" frameborder="0" allowfullscreen></iframe>
 							<?php }else if($_post->getThumbnailVideoType()==2 && $_post->getThumbnailVideoId()!=''){ ?>
-							<iframe src="https://player.vimeo.com/video/<?php echo $_post->getThumbnailVideoId() ?>?color=3498DB&title=0&byline=0&portrait=0" width="<?php echo $image_width ?>" height="<?php echo $image_height ?>" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
+							<iframe src="https://player.vimeo.com/video/<?= $_post->getThumbnailVideoId() ?>?color=3498DB&title=0&byline=0&portrait=0" width="<?= $image_width ?>" height="<?= $image_height ?>" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
 							<?php } ?>
 							<?php } ?>
 						</a>
@@ -196,47 +196,47 @@ if($layout_type == 'owl_carousel'){
 					<div class="post-meta">
 						<?php if($show_title){ ?>
 						<div class="post-title">
-							<h4><a href="<?php echo $postUrl ?>" <?php echo $postLinkAttr;?> title="<?php echo $_post->getTitle(); ?>"><?php echo $_post->getTitle(); ?></a></h4>
+							<h4><a href="<?= $postUrl ?>" <?= $postLinkAttr;?> title="<?= $_post->getTitle(); ?>"><?= $_post->getTitle(); ?></a></h4>
 						</div>
 						<?php } ?>
 						<?php if($show_author){ ?>
 						<div class="post-author">
 							<?php $author = $helper->getPostAuthor($_post);?>
-							<i class="fa fa-user"></i> <a href="<?php echo $helper->getAuthorUrl($author); ?>" title="<?php echo $author->getNickName() ?>"><?php echo $author->getNickName() ?></a>
+							<i class="fa fa-user"></i> <a href="<?= $helper->getAuthorUrl($author); ?>" title="<?= $author->getNickName() ?>"><?= $author->getNickName() ?></a>
 						</div>
 						<?php } ?>
 						<?php if($show_createdtime || $show_updatedtime){ ?>
 						<div class="post-date">
 							<?php if($show_createdtime){ ?>
 							<?php $createdTime = $helper->getFormatDate($_post->getCreationTime(), $dateFormat); ?>
-							<span><?php echo __('Created on %1', $createdTime); ?></span>
+							<span><?= __('Created on %1', $createdTime); ?></span>
 							<?php } ?>
 							<?php if($show_updatedtime){ ?>
 							<?php $updateTime = $helper->getFormatDate($_post->getUpdateTime(), $dateFormat); ?>
-							<span><?php echo __('Updated on %1', $updateTime); ?></span>
+							<span><?= __('Updated on %1', $updateTime); ?></span>
 							<?php } ?>
 						</div>
 						<?php } ?>
 						<?php if($show_commentcount){ ?>
 						<div class="post-comment">
-							<?php echo __('%1 comments', $_post->getCommentCount()); ?>
+							<?= __('%1 comments', $_post->getCommentCount()); ?>
 						</div>
 						<?php } ?>
 						<?php if($show_categories){ ?>
 						<div class="post-categories">
-							<?php echo __('Pubslished In: ') ?>
+							<?= __('Pubslished In: ') ?>
 							<?php
 							$categories = $_post->getData('categories');
 							$count = count($categories);
 							?>
 							<?php foreach ($categories as $k => $v) { ?>
-							<a href="<?php echo $helper->getCategoryUrl($v['identifier'])  ?>" title="<?php echo $v['name'] ?>"><?php echo $v['name'] ?></a>
+							<a href="<?= $helper->getCategoryUrl($v['identifier'])  ?>" title="<?= $v['name'] ?>"><?= $v['name'] ?></a>
 							<?php if(isset($categories[$k+1])) echo __(', '); ?>
 							<?php } ?>
 						</div>
 						<?php } ?>
 						<?php if($show_hits){ ?>
-						<div class="post-hits"><span><?php echo __("Read");?></span> <strong><?php echo (int)$_post->getHits(); ?></strong> <?php echo __("Times"); ?></div>
+						<div class="post-hits"><span><?= __("Read");?></span> <strong><?= (int)$_post->getHits(); ?></strong> <?= __("Times"); ?></div>
 						<?php } ?>
 						<?php if($show_socialnetwork){ ?>
 						<div class="post-social">
@@ -255,9 +255,9 @@ if($layout_type == 'owl_carousel'){
 						<?php $tags = $_post->getTag(); ?>
 						<?php if(!empty($tags)){ ?>
 						<div class="post-tag">
-							<span><?php echo __('Tags:'); ?></span>
+							<span><?= __('Tags:'); ?></span>
 							<?php foreach ($tags as $k => $v) { ?>
-							<a href="<?php echo $helper->getTagUrl($v['alias']) ?>"><?php echo $v['name'] ?></a>
+							<a href="<?= $helper->getTagUrl($v['alias']) ?>"><?= $v['name'] ?></a>
 							<?php if(isset($tags[$k+1])) echo __(', '); ?>
 							<?php } ?>
 						</div>
@@ -266,10 +266,10 @@ if($layout_type == 'owl_carousel'){
 						<?php if($show_shortdescription){ ?>
 						<div class="post-summary">
 							<?php $shortContent = $_post->getShortContent(); ?>
-							<?php echo $helper->subString($shortContent, (int)$shortdescription_count); ?>
+							<?= $helper->subString($shortContent, (int)$shortdescription_count); ?>
 							<?php if($show_readmorelink){ ?>
-							<a href="<?php echo $postUrl ?>" <?php echo $postLinkAttr;?> title="<?php echo $_post->getTitle(); ?>"><?php echo __('Read more') ?></a>
-							<?php } ?>	
+							<a href="<?= $postUrl ?>" <?= $postLinkAttr;?> title="<?= $_post->getTitle(); ?>"><?= __('Read more') ?></a>
+							<?php } ?>
 						</div>
 						<?php } ?>
 					</div>
@@ -281,7 +281,7 @@ if($layout_type == 'owl_carousel'){
 		</ul>
 		<?php } ?>
 		<?php if($show_socialnetwork){ ?>
-		<script type="text/javascript" src="//s7.addthis.com/js/300/addthis_widget.js#pubid=<?php echo $addthis_pubid; ?>"></script>
+		<script type="text/javascript" src="//s7.addthis.com/js/300/addthis_widget.js#pubid=<?= $addthis_pubid; ?>"></script>
 		<?php } ?>
 		</div>
-	</div>
\ No newline at end of file
+	</div>
diff --git a/view/frontend/templates/widget/style1.phtml b/view/frontend/templates/widget/style1.phtml
index bfc3385..79a902a 100644
--- a/view/frontend/templates/widget/style1.phtml
+++ b/view/frontend/templates/widget/style1.phtml
@@ -161,18 +161,18 @@ if($layout_type == 'owl_carousel'){
 
 
 ?>
-<div class="block ves-blog post-list postsstyle-style4 blog-widget <?php echo $addition_class ?>">
+<div class="block ves-blog post-list postsstyle-style4 blog-widget <?= $addition_class ?>">
 	<?php if($widget_title!=''){ ?>
 	<div class="block-title">
-		<h2><strong><?php echo $widget_title; ?></strong></h2>
+		<h2><strong><?= $widget_title; ?></strong></h2>
 	</div>
 	<?php } ?>
 	<?php if($html!=''){ ?>
-	<div class="pretext-html"><?php echo $html ?></div>
+	<div class="pretext-html"><?= $html ?></div>
 	<?php } ?>
 	<div class="block-content blog-grid">
 		<?php if($total>0){ ?>
-		<ul id="<?php echo $blockId ?>" class="<?php echo $classes ?>" <?php echo $carousel; ?>>
+		<ul id="<?= $blockId ?>" class="<?= $classes ?>" <?= $carousel; ?>>
 			<?php foreach ($_postCollection as $_columnCollection) { ?>
 			<li class="ves-post">
 				<?php $y = 0; ?>
@@ -185,15 +185,15 @@ if($layout_type == 'owl_carousel'){
 					$style = 'style="height:' . $item_height . 'px"';
 				}
 				?>
-				<div class="ves-post post-item <?php if($y==0){ echo "first-items"; }else{ echo "other-items"; } ?>" <?php echo $style; ?>>
+				<div class="ves-post post-item <?php if($y==0){ echo "first-items"; }else{ echo "other-items"; } ?>" <?= $style; ?>>
 					<div class="post-wrapper">
 						<?php if($show_image){ ?>
 						<?php $imageClass = ''; ?>
 						<?php if($_post->getImageType() == 2 && $_post->getImageVideoId()!=''){
 							$imageClass = ' post-video';
 						} ?>
-						<div class="post-image <?php echo $imageClass; ?>">
-							<a href="<?php echo $postUrl ?>" <?php echo $postLinkAttr;?> title="<?php echo $_post->getTitle(); ?>">
+						<div class="post-image <?= $imageClass; ?>">
+							<a href="<?= $postUrl ?>" <?= $postLinkAttr;?> title="<?= $_post->getTitle(); ?>">
 								<?php if( $_post->getThumbnailType() == 1 && $_post->getPostThumbnail()!=''){ ?>
 								<?php if($_post->getImageType() == 2 && $_post->getImageVideoId()!=''){ ?>
 								<span class="fa overlay-icon"></span>
@@ -203,23 +203,23 @@ if($layout_type == 'owl_carousel'){
 								<?php if($image_width>0){ ?>
 								<img
 								<?php if (!$lazyload) { ?>
-								src="<?php echo $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height, 100, $keep_ratio, $keep_frame) ?>"
+								src="<?= $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height, 100, $keep_ratio, $keep_frame) ?>"
 								<?php } ?>
-								height="<?php echo $image_height ?>" width="<?php echo $image_width ?>" alt="<?php echo $_post->getTitle(); ?>"
-								<?php if ($lazyload) { ?>data-src="<?php echo $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height, 100, $keep_ratio, $keep_ratio) ?>" class="lazyOwl"<?php } ?>
+								height="<?= $image_height ?>" width="<?= $image_width ?>" alt="<?= $_post->getTitle(); ?>"
+								<?php if ($lazyload) { ?>data-src="<?= $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height, 100, $keep_ratio, $keep_ratio) ?>" class="lazyOwl"<?php } ?>
 								/>
 								<?php }else{ ?>
 								<img <?php if (!$lazyload) { ?>
-								src="<?php echo $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height, 100, $keep_ratio, $keep_frame) ?>"
+								src="<?= $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height, 100, $keep_ratio, $keep_frame) ?>"
 								<?php } ?>
-								<?php if ($lazyload) { ?>data-src="<?php echo $helper->getMediaUrl($_post->getPostThumbnail()) ?>" alt="<?php echo $_post->getTitle(); ?>"  class="lazyOwl"<?php } ?>
+								<?php if ($lazyload) { ?>data-src="<?= $helper->getMediaUrl($_post->getPostThumbnail()) ?>" alt="<?= $_post->getTitle(); ?>"  class="lazyOwl"<?php } ?>
 								/>
 								<?php } ?>
 								<?php }else if($_post->getThumbnailType() == 2){ ?>
 								<?php if($_post->getThumbnailVideoType()==1 && $_post->getThumbnailVideoId()!=''){ ?>
-								<iframe width="<?php echo $image_width ?>" height="<?php echo $image_height ?>" src="https://www.youtube.com/embed/<?php echo $_post->getThumbnailVideoId() ?>" frameborder="0" allowfullscreen></iframe>
+								<iframe width="<?= $image_width ?>" height="<?= $image_height ?>" src="https://www.youtube.com/embed/<?= $_post->getThumbnailVideoId() ?>" frameborder="0" allowfullscreen></iframe>
 								<?php }else if($_post->getThumbnailVideoType()==2 && $_post->getThumbnailVideoId()!=''){ ?>
-								<iframe src="https://player.vimeo.com/video/<?php echo $_post->getThumbnailVideoId() ?>?color=3498DB&title=0&byline=0&portrait=0" width="<?php echo $image_width ?>" height="<?php echo $image_height ?>" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
+								<iframe src="https://player.vimeo.com/video/<?= $_post->getThumbnailVideoId() ?>?color=3498DB&title=0&byline=0&portrait=0" width="<?= $image_width ?>" height="<?= $image_height ?>" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
 								<?php } ?>
 								<?php } ?>
 							</a>
@@ -227,11 +227,11 @@ if($layout_type == 'owl_carousel'){
 						<?php } ?>
 
 						<?php if($show_title){ ?>
-						<h2 class="post-title"><a href="<?php echo $postUrl ?>" <?php echo $postLinkAttr;?> <?php if($titleColor){ ?>data-hover-color="<?php echo $titleColor ?>"<?php } ?> title="<?php echo $_post->getTitle(); ?>"><?php echo $_post->getTitle(); ?></a></h2>
+						<h2 class="post-title"><a href="<?= $postUrl ?>" <?= $postLinkAttr;?> <?php if($titleColor){ ?>data-hover-color="<?= $titleColor ?>"<?php } ?> title="<?= $_post->getTitle(); ?>"><?= $_post->getTitle(); ?></a></h2>
 						<?php } ?>
 						<?php if($show_socialnetworks){ ?>
 						<div class="post-socials">
-							<div class="addthis_toolbox addthis_default_style" data-title="<?php echo $_post->getTitle(); ?>" addthis:url="<?php echo $postUrl ?>">
+							<div class="addthis_toolbox addthis_default_style" data-title="<?= $_post->getTitle(); ?>" addthis:url="<?= $postUrl ?>">
 								<a class="addthis_button_facebook"></a>
 								<a class="addthis_button_twitter"></a>
 								<a class="addthis_button_google"></a>
@@ -245,18 +245,18 @@ if($layout_type == 'owl_carousel'){
 							<?php if($show_author){ ?>
 							<div class="post-author">
 								<?php $author = $helper->getPostAuthor($_post);?>
-								<i class="fa fa-user"></i> <a href="<?php echo $helper->getAuthorUrl($author); ?>" title="<?php echo $author->getNickName() ?>"><?php echo $author->getNickName() ?></a>
+								<i class="fa fa-user"></i> <a href="<?= $helper->getAuthorUrl($author); ?>" title="<?= $author->getNickName() ?>"><?= $author->getNickName() ?></a>
 							</div>
 							<?php } ?>
 							<?php if($show_createdtime || $show_updatedtime){ ?>
 							<div class="post-date">
 								<?php if($show_createdtime){ ?>
 								<?php $createdTime = $helper->getFormatDate($_post->getCreationTime(), $dateFormat); ?>
-								<i class="fa fa-clock-o"></i> <span><?php echo $createdTime; ?></span>
+								<i class="fa fa-clock-o"></i> <span><?= $createdTime; ?></span>
 								<?php } ?>
 								<?php if($show_updatedtime){ ?>
 								<?php $updateTime = $helper->getFormatDate($_post->getUpdateTime(), $dateFormat); ?>
-								<i class="fa fa-clock-o"></i> <span><?php echo __('Updated on %1', $updateTime); ?></span>
+								<i class="fa fa-clock-o"></i> <span><?= __('Updated on %1', $updateTime); ?></span>
 								<?php } ?>
 							</div>
 							<?php } ?>
@@ -266,19 +266,19 @@ if($layout_type == 'owl_carousel'){
 								$categories = $_post->getData('categories');
 								$count = count($categories);
 								?>
-								<i class="fa fa-folder"></i> 
+								<i class="fa fa-folder"></i>
 								<?php foreach ($categories as $k => $v) { ?>
-								<a href="<?php echo $helper->getCategoryUrl($v['identifier'])  ?>" title="<?php echo $v['name'] ?>"><?php echo $v['name'] ?></a>
+								<a href="<?= $helper->getCategoryUrl($v['identifier'])  ?>" title="<?= $v['name'] ?>"><?= $v['name'] ?></a>
 								<?php if(isset($categories[$k+1])) echo __(', '); ?>
 								<?php } ?>
 							</div>
 							<?php } ?>
 							<?php if($show_hits){ ?>
-							<div class="post-hits"><i class="fa fa-eye"></i> <span><?php echo (int)$_post->getHits(); ?></span></div>
+							<div class="post-hits"><i class="fa fa-eye"></i> <span><?= (int)$_post->getHits(); ?></span></div>
 							<?php } ?>
 							<?php if($show_commentcount){ ?>
 							<div class="post-comment">
-								<i class="fa fa-comments"></i> <a href="<?php echo $postUrl ?>#comments" <?php echo $postLinkAttr;?>><?php echo $_post->getCommentCount(); ?></a>
+								<i class="fa fa-comments"></i> <a href="<?= $postUrl ?>#comments" <?= $postLinkAttr;?>><?= $_post->getCommentCount(); ?></a>
 							</div>
 
 							<?php } ?>
@@ -287,9 +287,9 @@ if($layout_type == 'owl_carousel'){
 						<?php $tags = $_post->getTag(); ?>
 						<?php if(!empty($tags)){ ?>
 						<div class="post-tag">
-							<span><?php echo __('Tags:'); ?></span>
+							<span><?= __('Tags:'); ?></span>
 							<?php foreach ($tags as $k => $v) { ?>
-							<a href="<?php echo $helper->getTagUrl($v['alias']) ?>"><?php echo trim($v['name']) ?></a>
+							<a href="<?= $helper->getTagUrl($v['alias']) ?>"><?= trim($v['name']) ?></a>
 							<?php if(isset($tags[$k+1])) echo __(', '); ?>
 							<?php } ?>
 						</div>
@@ -298,11 +298,11 @@ if($layout_type == 'owl_carousel'){
 						<?php if($show_shortdescription){ ?>
 						<div class="post-summary">
 							<?php $shortContent = $_post->getShortContent(); ?>
-							<?php echo $helper->subString($shortContent, (int)$shortdescription_count); ?>
+							<?= $helper->subString($shortContent, (int)$shortdescription_count); ?>
 						</div>
 						<?php if($show_readmorelink){ ?>
-						<div class="post-readmore"><a href="<?php echo $postUrl ?>" <?php echo $postLinkAttr;?> title="<?php echo $_post->getTitle(); ?>"><?php echo __('Read more') ?> <i class="fa fa-angle-double-right" aria-hidden="true"></i></a></div>
-						<?php } ?>	
+						<div class="post-readmore"><a href="<?= $postUrl ?>" <?= $postLinkAttr;?> title="<?= $_post->getTitle(); ?>"><?= __('Read more') ?> <i class="fa fa-angle-double-right" aria-hidden="true"></i></a></div>
+						<?php } ?>
 						<?php } ?>
 					</div>
 				</div>
@@ -319,7 +319,7 @@ if($layout_type == 'owl_carousel'){
 				], function($){
 					jQuery(document).ready(function() {
 						var anchorColor = '';
-						$('#<?php echo $blockId ?> a').hover(function(){
+						$('#<?= $blockId ?> a').hover(function(){
 							anchorColor = '';
 							if($(this).data('hover-color')!=''){
 								$(this).css('color',$(this).data('hover-color'));
@@ -327,7 +327,7 @@ if($layout_type == 'owl_carousel'){
 						}, function(){
 							$(this).css('color','');
 						})
-						
+
 					});
 				});
 			</script>
@@ -337,4 +337,4 @@ if($layout_type == 'owl_carousel'){
 			<script type="text/javascript" src="//s7.addthis.com/js/300/addthis_widget.js#pubid=ra-56ceab198f4f2e81"></script>
 			<?php } ?>
 		</div>
-	</div>
\ No newline at end of file
+	</div>
diff --git a/view/frontend/templates/widget/style2.phtml b/view/frontend/templates/widget/style2.phtml
index a142276..4e4d6d3 100644
--- a/view/frontend/templates/widget/style2.phtml
+++ b/view/frontend/templates/widget/style2.phtml
@@ -136,18 +136,18 @@ if($layout_type == 'owl_carousel'){
 }
 $show_socialnetworks = $this->getConfig("show_socialnetwork");
 ?>
-<div class="block ves-blog post-list postsstyle-style4 postsgrid1 blog-widget blog-widget-<?php echo $widgetStyle ?> <?php echo $addition_class ?>">
+<div class="block ves-blog post-list postsstyle-style4 postsgrid1 blog-widget blog-widget-<?= $widgetStyle ?> <?= $addition_class ?>">
 	<?php if($widget_title!=''){ ?>
 	<div class="block-title">
-		<h2 <?php if($titleColor!=''){ echo 'style="color: ' . $titleColor . '"'; } ?>><strong><?php echo $widget_title; ?></strong></h2>
+		<h2 <?php if($titleColor!=''){ echo 'style="color: ' . $titleColor . '"'; } ?>><strong><?= $widget_title; ?></strong></h2>
 	</div>
 	<?php } ?>
 	<?php if($html!=''){ ?>
-	<div class="pretext-html"><?php echo $html ?></div>
+	<div class="pretext-html"><?= $html ?></div>
 	<?php } ?>
 	<div class="block-content blog-grid" <?php if($border_color = $this->getConfig('border_color')){ echo 'style="border-bottom-color: ' . $border_color . '"'; } ?>>
 		<?php if($total>0){ ?>
-		<ul id="<?php echo $blockId ?>" class="<?php echo $classes ?>" <?php echo $carousel; ?>>
+		<ul id="<?= $blockId ?>" class="<?= $classes ?>" <?= $carousel; ?>>
 			<?php foreach ($_postCollection as $_columnCollection) { ?>
 			<li class="ves-post">
 				<?php
@@ -198,15 +198,15 @@ $show_socialnetworks = $this->getConfig("show_socialnetwork");
 					$style = 'style="height:' . $item_height . 'px"';
 				}
 				?>
-				<div class="ves-post post-item <?php if($y==0){ echo "first-items"; }else{ echo "other-items"; } ?>" <?php echo $style; ?>>
+				<div class="ves-post post-item <?php if($y==0){ echo "first-items"; }else{ echo "other-items"; } ?>" <?= $style; ?>>
 					<div class="post-wrapper">
 						<?php if($show_image){ ?>
 						<?php $imageClass = ''; ?>
 						<?php if($_post->getImageType() == 2 && $_post->getImageVideoId()!=''){
 							$imageClass = ' post-video';
 						} ?>
-						<div class="post-image <?php echo $imageClass; ?>">
-							<a href="<?php echo $postUrl ?>" <?php echo $postLinkAttr;?> title="<?php echo $_post->getTitle(); ?>">
+						<div class="post-image <?= $imageClass; ?>">
+							<a href="<?= $postUrl ?>" <?= $postLinkAttr;?> title="<?= $_post->getTitle(); ?>">
 								<?php if( $_post->getThumbnailType() == 1 && $_post->getPostThumbnail()!=''){ ?>
 								<?php if($_post->getImageType() == 2 && $_post->getImageVideoId()!=''){ ?>
 								<span class="fa overlay-icon"></span>
@@ -216,23 +216,23 @@ $show_socialnetworks = $this->getConfig("show_socialnetwork");
 								<?php if($image_width>0){ ?>
 								<img
 								<?php if (!$lazyload) { ?>
-								src="<?php echo $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height, 100, $keep_ratio, $keep_frame) ?>"
+								src="<?= $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height, 100, $keep_ratio, $keep_frame) ?>"
 								<?php } ?>
-								height="<?php echo $image_height ?>" width="<?php echo $image_width ?>" alt="<?php echo $_post->getTitle(); ?>"
-								<?php if ($lazyload) { ?>data-src="<?php echo $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height, 100, $keep_ratio, $keep_ratio) ?>" class="lazyOwl"<?php } ?>
+								height="<?= $image_height ?>" width="<?= $image_width ?>" alt="<?= $_post->getTitle(); ?>"
+								<?php if ($lazyload) { ?>data-src="<?= $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height, 100, $keep_ratio, $keep_ratio) ?>" class="lazyOwl"<?php } ?>
 								/>
 								<?php }else{ ?>
 								<img <?php if (!$lazyload) { ?>
-								src="<?php echo $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height, 100, $keep_ratio, $keep_frame) ?>"
+								src="<?= $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height, 100, $keep_ratio, $keep_frame) ?>"
 								<?php } ?>
-								<?php if ($lazyload) { ?>data-src="<?php echo $helper->getMediaUrl($_post->getPostThumbnail()) ?>" alt="<?php echo $_post->getTitle(); ?>"  class="lazyOwl"<?php } ?>
+								<?php if ($lazyload) { ?>data-src="<?= $helper->getMediaUrl($_post->getPostThumbnail()) ?>" alt="<?= $_post->getTitle(); ?>"  class="lazyOwl"<?php } ?>
 								/>
 								<?php } ?>
 								<?php }else if($_post->getThumbnailType() == 2){ ?>
 								<?php if($_post->getThumbnailVideoType()==1 && $_post->getThumbnailVideoId()!=''){ ?>
-								<iframe width="<?php echo $image_width ?>" height="<?php echo $image_height ?>" src="https://www.youtube.com/embed/<?php echo $_post->getThumbnailVideoId() ?>" frameborder="0" allowfullscreen></iframe>
+								<iframe width="<?= $image_width ?>" height="<?= $image_height ?>" src="https://www.youtube.com/embed/<?= $_post->getThumbnailVideoId() ?>" frameborder="0" allowfullscreen></iframe>
 								<?php }else if($_post->getThumbnailVideoType()==2 && $_post->getThumbnailVideoId()!=''){ ?>
-								<iframe src="https://player.vimeo.com/video/<?php echo $_post->getThumbnailVideoId() ?>?color=3498DB&title=0&byline=0&portrait=0" width="<?php echo $image_width ?>" height="<?php echo $image_height ?>" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
+								<iframe src="https://player.vimeo.com/video/<?= $_post->getThumbnailVideoId() ?>?color=3498DB&title=0&byline=0&portrait=0" width="<?= $image_width ?>" height="<?= $image_height ?>" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
 								<?php } ?>
 								<?php } ?>
 							</a>
@@ -240,11 +240,11 @@ $show_socialnetworks = $this->getConfig("show_socialnetwork");
 						<?php } ?>
 
 						<?php if($show_title){ ?>
-						<h2 class="post-title"><a <?php if($titleColor){ ?>data-hover-color="<?php echo $titleColor ?>"<?php } ?> href="<?php echo $postUrl ?>" title="<?php echo $_post->getTitle(); ?>"><?php echo $_post->getTitle(); ?></a></h2>
+						<h2 class="post-title"><a <?php if($titleColor){ ?>data-hover-color="<?= $titleColor ?>"<?php } ?> href="<?= $postUrl ?>" title="<?= $_post->getTitle(); ?>"><?= $_post->getTitle(); ?></a></h2>
 						<?php } ?>
 						<?php if($show_socialnetworks){ ?>
 						<div class="post-socials">
-							<div class="addthis_toolbox addthis_default_style" data-title="<?php echo $_post->getTitle(); ?>" addthis:url="<?php echo $postUrl ?>">
+							<div class="addthis_toolbox addthis_default_style" data-title="<?= $_post->getTitle(); ?>" addthis:url="<?= $postUrl ?>">
 								<a class="addthis_button_facebook"></a>
 								<a class="addthis_button_twitter"></a>
 								<a class="addthis_button_google"></a>
@@ -258,18 +258,18 @@ $show_socialnetworks = $this->getConfig("show_socialnetwork");
 							<?php if($show_author){ ?>
 							<div class="post-author">
 								<?php $author = $helper->getPostAuthor($_post);?>
-								<i class="fa fa-user"></i> <a href="<?php echo $helper->getAuthorUrl($author); ?>" title="<?php echo $author->getNickName() ?>"><?php echo $author->getNickName() ?></a>
+								<i class="fa fa-user"></i> <a href="<?= $helper->getAuthorUrl($author); ?>" title="<?= $author->getNickName() ?>"><?= $author->getNickName() ?></a>
 							</div>
 							<?php } ?>
 							<?php if($show_createdtime || $show_updatedtime){ ?>
 							<div class="post-date">
 								<?php if($show_createdtime){ ?>
 								<?php $createdTime = $helper->getFormatDate($_post->getCreationTime(), $dateFormat); ?>
-								<i class="fa fa-clock-o"></i> <span><?php echo $createdTime; ?></span>
+								<i class="fa fa-clock-o"></i> <span><?= $createdTime; ?></span>
 								<?php } ?>
 								<?php if($show_updatedtime){ ?>
 								<?php $updateTime = $helper->getFormatDate($_post->getUpdateTime(), $dateFormat); ?>
-								<i class="fa fa-clock-o"></i> <span><?php echo __('Updated on %1', $updateTime); ?></span>
+								<i class="fa fa-clock-o"></i> <span><?= __('Updated on %1', $updateTime); ?></span>
 								<?php } ?>
 							</div>
 							<?php } ?>
@@ -279,19 +279,19 @@ $show_socialnetworks = $this->getConfig("show_socialnetwork");
 								$categories = $_post->getData('categories');
 								$count = count($categories);
 								?>
-								<i class="fa fa-folder"></i> 
+								<i class="fa fa-folder"></i>
 								<?php foreach ($categories as $k => $v) { ?>
-								<a href="<?php echo $helper->getCategoryUrl($v['identifier'])  ?>" title="<?php echo $v['name'] ?>"><?php echo $v['name'] ?></a>
+								<a href="<?= $helper->getCategoryUrl($v['identifier'])  ?>" title="<?= $v['name'] ?>"><?= $v['name'] ?></a>
 								<?php if(isset($categories[$k+1])) echo __(', '); ?>
 								<?php } ?>
 							</div>
 							<?php } ?>
 							<?php if($show_hits){ ?>
-							<div class="post-hits"><i class="fa fa-eye"></i> <span><?php echo (int)$_post->getHits(); ?></span></div>
+							<div class="post-hits"><i class="fa fa-eye"></i> <span><?= (int)$_post->getHits(); ?></span></div>
 							<?php } ?>
 							<?php if($show_commentcount){ ?>
 							<div class="post-comment">
-								<i class="fa fa-comments"></i> <a href="<?php echo $postUrl ?>#comments" <?php echo $postLinkAttr;?>><?php echo $_post->getCommentCount(); ?></a>
+								<i class="fa fa-comments"></i> <a href="<?= $postUrl ?>#comments" <?= $postLinkAttr;?>><?= $_post->getCommentCount(); ?></a>
 							</div>
 
 							<?php } ?>
@@ -300,9 +300,9 @@ $show_socialnetworks = $this->getConfig("show_socialnetwork");
 						<?php $tags = $_post->getTag(); ?>
 						<?php if(!empty($tags)){ ?>
 						<div class="post-tag">
-							<span><?php echo __('Tags:'); ?></span>
+							<span><?= __('Tags:'); ?></span>
 							<?php foreach ($tags as $k => $v) { ?>
-							<a href="<?php echo $helper->getTagUrl($v['alias']) ?>"><?php echo trim($v['name']) ?></a>
+							<a href="<?= $helper->getTagUrl($v['alias']) ?>"><?= trim($v['name']) ?></a>
 							<?php if(isset($tags[$k+1])) echo __(', '); ?>
 							<?php } ?>
 						</div>
@@ -311,10 +311,10 @@ $show_socialnetworks = $this->getConfig("show_socialnetwork");
 						<?php if($show_shortdescription){ ?>
 						<div class="post-summary">
 							<?php $shortContent = $_post->getShortContent(); ?>
-							<?php echo $helper->subString($shortContent, (int)$shortdescription_count); ?>
+							<?= $helper->subString($shortContent, (int)$shortdescription_count); ?>
 						</div>
 						<?php if($show_readmorelink){ ?>
-						<div class="post-readmore"><a href="<?php echo $postUrl ?>" <?php echo $postLinkAttr;?> title="<?php echo $_post->getTitle(); ?>" <?php echo $readmoreStyle ?>><?php echo __('Read more') ?> <i class="fa fa-angle-double-right" aria-hidden="true"></i></a></div>
+						<div class="post-readmore"><a href="<?= $postUrl ?>" <?= $postLinkAttr;?> title="<?= $_post->getTitle(); ?>" <?= $readmoreStyle ?>><?= __('Read more') ?> <i class="fa fa-angle-double-right" aria-hidden="true"></i></a></div>
 						<?php } ?>
 						<?php } ?>
 					</div>
@@ -333,7 +333,7 @@ $show_socialnetworks = $this->getConfig("show_socialnetwork");
 					jQuery(document).ready(function() {
 
 						var anchorColor = '';
-						$('#<?php echo $blockId ?> a').hover(function(){
+						$('#<?= $blockId ?> a').hover(function(){
 							anchorColor = '';
 							if($(this).data('hover-color')!=''){
 								$(this).css('color',$(this).data('hover-color'));
@@ -342,7 +342,7 @@ $show_socialnetworks = $this->getConfig("show_socialnetwork");
 							$(this).css('color','');
 						})
 
-					});	
+					});
 				});
 			</script>
 			<?php } ?>
@@ -351,4 +351,4 @@ $show_socialnetworks = $this->getConfig("show_socialnetwork");
 			<script type="text/javascript" src="//s7.addthis.com/js/300/addthis_widget.js#pubid=ra-56ceab198f4f2e81"></script>
 			<?php } ?>
 		</div>
-	</div>
\ No newline at end of file
+	</div>
diff --git a/view/frontend/templates/widget/style3.phtml b/view/frontend/templates/widget/style3.phtml
index ac7cefc..3762094 100644
--- a/view/frontend/templates/widget/style3.phtml
+++ b/view/frontend/templates/widget/style3.phtml
@@ -135,18 +135,18 @@ if($layout_type == 'owl_carousel'){
 	$classes = 'plist';
 }
 ?>
-<div class="block ves-blog post-list postsstyle-style3 postsstyle-style4 postsgrid1 blog-widget blog-widget-<?php echo $widgetStyle ?> <?php echo $addition_class ?>">
+<div class="block ves-blog post-list postsstyle-style3 postsstyle-style4 postsgrid1 blog-widget blog-widget-<?= $widgetStyle ?> <?= $addition_class ?>">
 	<?php if($widget_title!=''){ ?>
 	<div class="block-title">
-		<h2 <?php if($titleColor!=''){ echo 'style="color: ' . $titleColor . '"'; } ?>><strong><?php echo $widget_title; ?></strong></h2>
+		<h2 <?php if($titleColor!=''){ echo 'style="color: ' . $titleColor . '"'; } ?>><strong><?= $widget_title; ?></strong></h2>
 	</div>
 	<?php } ?>
 	<?php if($html!=''){ ?>
-	<div class="pretext-html"><?php echo $html ?></div>
+	<div class="pretext-html"><?= $html ?></div>
 	<?php } ?>
 	<div class="block-content blog-grid" <?php if($border_color = $this->getConfig('border_color')){ echo 'style="border-bottom-color: ' . $border_color . '"'; } ?>>
 		<?php if($total>0){ ?>
-		<ul id="<?php echo $blockId ?>" class="<?php echo $classes ?>" <?php echo $carousel; ?>>
+		<ul id="<?= $blockId ?>" class="<?= $classes ?>" <?= $carousel; ?>>
 			<?php foreach ($_postCollection as $_columnCollection) { ?>
 			<li class="ves-post">
 				<div class="row">
@@ -199,20 +199,20 @@ if($layout_type == 'owl_carousel'){
 						$style = 'style="height:' . $item_height . 'px"';
 					}
 					?>
-					
+
 					<?php if($y==0 || $y==1){ ?>
 					<div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
 						<?php }?>
 
-						<div class="ves-post post-item <?php if($y==0){ echo "first-items"; }else{ echo "other-items"; } ?>" <?php echo $style; ?>>
+						<div class="ves-post post-item <?php if($y==0){ echo "first-items"; }else{ echo "other-items"; } ?>" <?= $style; ?>>
 							<div class="post-wrapper">
 								<?php if($show_image){ ?>
 								<?php $imageClass = ''; ?>
 								<?php if($_post->getImageType() == 2 && $_post->getImageVideoId()!=''){
 									$imageClass = ' post-video';
 								} ?>
-								<div class="post-image <?php echo $imageClass; ?>">
-									<a href="<?php echo $postUrl ?>" <?php echo $postLinkAttr;?> title="<?php echo $_post->getTitle(); ?>">
+								<div class="post-image <?= $imageClass; ?>">
+									<a href="<?= $postUrl ?>" <?= $postLinkAttr;?> title="<?= $_post->getTitle(); ?>">
 										<?php if( $_post->getThumbnailType() == 1 && $_post->getPostThumbnail()!=''){ ?>
 										<?php if($_post->getImageType() == 2 && $_post->getImageVideoId()!=''){ ?>
 										<span class="fa overlay-icon"></span>
@@ -222,23 +222,23 @@ if($layout_type == 'owl_carousel'){
 										<?php if($image_width>0){ ?>
 										<img
 										<?php if (!$lazyload) { ?>
-										src="<?php echo $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height, 100, $keep_ratio, $keep_frame) ?>"
+										src="<?= $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height, 100, $keep_ratio, $keep_frame) ?>"
 										<?php } ?>
-										height="<?php echo $image_height ?>" width="<?php echo $image_width ?>" alt="<?php echo $_post->getTitle(); ?>"
-										<?php if ($lazyload) { ?>data-src="<?php echo $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height, 100, $keep_ratio, $keep_ratio) ?>" class="lazyOwl"<?php } ?>
+										height="<?= $image_height ?>" width="<?= $image_width ?>" alt="<?= $_post->getTitle(); ?>"
+										<?php if ($lazyload) { ?>data-src="<?= $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height, 100, $keep_ratio, $keep_ratio) ?>" class="lazyOwl"<?php } ?>
 										/>
 										<?php }else{ ?>
 										<img <?php if (!$lazyload) { ?>
-										src="<?php echo $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height, 100, $keep_ratio, $keep_frame) ?>"
+										src="<?= $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height, 100, $keep_ratio, $keep_frame) ?>"
 										<?php } ?>
-										<?php if ($lazyload) { ?>data-src="<?php echo $helper->getMediaUrl($_post->getPostThumbnail()) ?>" alt="<?php echo $_post->getTitle(); ?>"  class="lazyOwl"<?php } ?>
+										<?php if ($lazyload) { ?>data-src="<?= $helper->getMediaUrl($_post->getPostThumbnail()) ?>" alt="<?= $_post->getTitle(); ?>"  class="lazyOwl"<?php } ?>
 										/>
 										<?php } ?>
 										<?php }else if($_post->getThumbnailType() == 2){ ?>
 										<?php if($_post->getThumbnailVideoType()==1 && $_post->getThumbnailVideoId()!=''){ ?>
-										<iframe width="<?php echo $image_width ?>" height="<?php echo $image_height ?>" src="https://www.youtube.com/embed/<?php echo $_post->getThumbnailVideoId() ?>" frameborder="0" allowfullscreen></iframe>
+										<iframe width="<?= $image_width ?>" height="<?= $image_height ?>" src="https://www.youtube.com/embed/<?= $_post->getThumbnailVideoId() ?>" frameborder="0" allowfullscreen></iframe>
 										<?php }else if($_post->getThumbnailVideoType()==2 && $_post->getThumbnailVideoId()!=''){ ?>
-										<iframe src="https://player.vimeo.com/video/<?php echo $_post->getThumbnailVideoId() ?>?color=3498DB&title=0&byline=0&portrait=0" width="<?php echo $image_width ?>" height="<?php echo $image_height ?>" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
+										<iframe src="https://player.vimeo.com/video/<?= $_post->getThumbnailVideoId() ?>?color=3498DB&title=0&byline=0&portrait=0" width="<?= $image_width ?>" height="<?= $image_height ?>" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
 										<?php } ?>
 										<?php } ?>
 									</a>
@@ -246,11 +246,11 @@ if($layout_type == 'owl_carousel'){
 								<?php } ?>
 
 								<?php if($show_title){ ?>
-								<h2 class="post-title"><a <?php if($titleColor){ ?>data-hover-color="<?php echo $titleColor ?>"<?php } ?> href="<?php echo $postUrl ?>" <?php echo $postLinkAttr;?> title="<?php echo $_post->getTitle(); ?>"><?php echo $_post->getTitle(); ?></a></h2>
+								<h2 class="post-title"><a <?php if($titleColor){ ?>data-hover-color="<?= $titleColor ?>"<?php } ?> href="<?= $postUrl ?>" <?= $postLinkAttr;?> title="<?= $_post->getTitle(); ?>"><?= $_post->getTitle(); ?></a></h2>
 								<?php } ?>
 								<?php if($show_socialnetworks){ ?>
 								<div class="post-socials">
-									<div class="addthis_toolbox addthis_default_style" data-title="<?php echo $_post->getTitle(); ?>" addthis:url="<?php echo $postUrl ?>">
+									<div class="addthis_toolbox addthis_default_style" data-title="<?= $_post->getTitle(); ?>" addthis:url="<?= $postUrl ?>">
 										<a class="addthis_button_facebook"></a>
 										<a class="addthis_button_twitter"></a>
 										<a class="addthis_button_google"></a>
@@ -264,18 +264,18 @@ if($layout_type == 'owl_carousel'){
 									<?php if($show_author){ ?>
 									<div class="post-author">
 										<?php $author = $helper->getPostAuthor($_post);?>
-										<i class="fa fa-user"></i> <a href="<?php echo $helper->getAuthorUrl($author); ?>" title="<?php echo $author->getNickName() ?>"><?php echo $author->getNickName() ?></a>
+										<i class="fa fa-user"></i> <a href="<?= $helper->getAuthorUrl($author); ?>" title="<?= $author->getNickName() ?>"><?= $author->getNickName() ?></a>
 									</div>
 									<?php } ?>
 									<?php if($show_createdtime || $show_updatedtime){ ?>
 									<div class="post-date">
 										<?php if($show_createdtime){ ?>
 										<?php $createdTime = $helper->getFormatDate($_post->getCreationTime(), $dateFormat); ?>
-										<i class="fa fa-clock-o"></i> <span><?php echo $createdTime; ?></span>
+										<i class="fa fa-clock-o"></i> <span><?= $createdTime; ?></span>
 										<?php } ?>
 										<?php if($show_updatedtime){ ?>
 										<?php $updateTime = $helper->getFormatDate($_post->getUpdateTime(), $dateFormat); ?>
-										<i class="fa fa-clock-o"></i> <span><?php echo __('Updated on %1', $updateTime); ?></span>
+										<i class="fa fa-clock-o"></i> <span><?= __('Updated on %1', $updateTime); ?></span>
 										<?php } ?>
 									</div>
 									<?php } ?>
@@ -285,19 +285,19 @@ if($layout_type == 'owl_carousel'){
 										$categories = $_post->getData('categories');
 										$count = count($categories);
 										?>
-										<i class="fa fa-folder"></i> 
+										<i class="fa fa-folder"></i>
 										<?php foreach ($categories as $k => $v) { ?>
-										<a href="<?php echo $helper->getCategoryUrl($v['identifier'])  ?>" title="<?php echo $v['name'] ?>"><?php echo $v['name'] ?></a>
+										<a href="<?= $helper->getCategoryUrl($v['identifier'])  ?>" title="<?= $v['name'] ?>"><?= $v['name'] ?></a>
 										<?php if(isset($categories[$k+1])) echo __(', '); ?>
 										<?php } ?>
 									</div>
 									<?php } ?>
 									<?php if($show_hits){ ?>
-									<div class="post-hits"><i class="fa fa-eye"></i> <span><?php echo (int)$_post->getHits(); ?></span></div>
+									<div class="post-hits"><i class="fa fa-eye"></i> <span><?= (int)$_post->getHits(); ?></span></div>
 									<?php } ?>
 									<?php if($show_commentcount){ ?>
 									<div class="post-comment">
-										<i class="fa fa-comments"></i> <a href="<?php echo $postUrl ?>#comments" <?php echo $postLinkAttr;?>><?php echo $_post->getCommentCount(); ?></a>
+										<i class="fa fa-comments"></i> <a href="<?= $postUrl ?>#comments" <?= $postLinkAttr;?>><?= $_post->getCommentCount(); ?></a>
 									</div>
 
 									<?php } ?>
@@ -306,9 +306,9 @@ if($layout_type == 'owl_carousel'){
 								<?php $tags = $_post->getTag(); ?>
 								<?php if(!empty($tags)){ ?>
 								<div class="post-tag">
-									<span><?php echo __('Tags:'); ?></span>
+									<span><?= __('Tags:'); ?></span>
 									<?php foreach ($tags as $k => $v) { ?>
-									<a href="<?php echo $helper->getTagUrl($v['alias']) ?>"><?php echo trim($v['name']) ?></a>
+									<a href="<?= $helper->getTagUrl($v['alias']) ?>"><?= trim($v['name']) ?></a>
 									<?php if(isset($tags[$k+1])) echo __(', '); ?>
 									<?php } ?>
 								</div>
@@ -317,10 +317,10 @@ if($layout_type == 'owl_carousel'){
 								<?php if($show_shortdescription){ ?>
 								<div class="post-summary">
 									<?php $shortContent = $_post->getShortContent(); ?>
-									<?php echo $helper->subString($shortContent, (int)$shortdescription_count); ?>
+									<?= $helper->subString($shortContent, (int)$shortdescription_count); ?>
 								</div>
 								<?php if($show_readmorelink){ ?>
-								<div class="post-readmore"><a href="<?php echo $postUrl ?>" <?php echo $postLinkAttr;?> title="<?php echo $_post->getTitle(); ?>" <?php echo $readmoreStyle ?>><?php echo __('Read more') ?> <i class="fa fa-angle-double-right" aria-hidden="true"></i></a></div>
+								<div class="post-readmore"><a href="<?= $postUrl ?>" <?= $postLinkAttr;?> title="<?= $_post->getTitle(); ?>" <?= $readmoreStyle ?>><?= __('Read more') ?> <i class="fa fa-angle-double-right" aria-hidden="true"></i></a></div>
 								<?php } ?>
 								<?php } ?>
 							</div>
@@ -345,7 +345,7 @@ if($layout_type == 'owl_carousel'){
 					jQuery(document).ready(function() {
 
 						var anchorColor = '';
-						$('#<?php echo $blockId ?> a').hover(function(){
+						$('#<?= $blockId ?> a').hover(function(){
 							anchorColor = '';
 							if($(this).data('hover-color')!=''){
 								$(this).css('color',$(this).data('hover-color'));
@@ -353,7 +353,7 @@ if($layout_type == 'owl_carousel'){
 						}, function(){
 							$(this).css('color','');
 						})
-						
+
 					});
 				});
 			</script>
@@ -363,4 +363,4 @@ if($layout_type == 'owl_carousel'){
 			<script type="text/javascript" src="//s7.addthis.com/js/300/addthis_widget.js#pubid=ra-56ceab198f4f2e81"></script>
 			<?php } ?>
 		</div>
-	</div>
\ No newline at end of file
+	</div>
diff --git a/view/frontend/templates/widget/style4.phtml b/view/frontend/templates/widget/style4.phtml
index 45186b7..a353ceb 100644
--- a/view/frontend/templates/widget/style4.phtml
+++ b/view/frontend/templates/widget/style4.phtml
@@ -166,18 +166,18 @@ if($layout_type == 'owl_carousel'){
 	$classes = 'plist';
 }
 ?>
-<div class="block ves-blog post-list postsstyle-style4 postsgrid1 blog-widget blog-widget-<?php echo $widgetStyle ?> <?php echo $addition_class ?>">
+<div class="block ves-blog post-list postsstyle-style4 postsgrid1 blog-widget blog-widget-<?= $widgetStyle ?> <?= $addition_class ?>">
 	<?php if($widget_title!=''){ ?>
 	<div class="block-title">
-		<h2 <?php if($titleColor!=''){ echo 'style="color: ' . $titleColor . '"'; } ?>><strong><?php echo $widget_title; ?></strong></h2>
+		<h2 <?php if($titleColor!=''){ echo 'style="color: ' . $titleColor . '"'; } ?>><strong><?= $widget_title; ?></strong></h2>
 	</div>
 	<?php } ?>
 	<?php if($html!=''){ ?>
-	<div class="pretext-html"><?php echo $html ?></div>
+	<div class="pretext-html"><?= $html ?></div>
 	<?php } ?>
 	<div class="block-content blog-grid" <?php if($border_color = $this->getConfig('border_color')){ echo 'style="border-bottom-color: ' . $border_color . '"'; } ?>>
 		<?php if($total>0){ ?>
-		<ul id="<?php echo $blockId ?>" class="<?php echo $classes ?>" <?php echo $carousel; ?>>
+		<ul id="<?= $blockId ?>" class="<?= $classes ?>" <?= $carousel; ?>>
 			<?php foreach ($_postCollection as $_columnCollection) { ?>
 			<li class="ves-post">
 				<?php
@@ -192,15 +192,15 @@ if($layout_type == 'owl_carousel'){
 					$style = 'style="height:' . $item_height . 'px"';
 				}
 				?>
-				<div class="ves-post post-item other-items" <?php echo $style; ?>>
+				<div class="ves-post post-item other-items" <?= $style; ?>>
 					<div class="post-wrapper">
 						<?php if($show_image){ ?>
 						<?php $imageClass = ''; ?>
 						<?php if($_post->getImageType() == 2 && $_post->getImageVideoId()!=''){
 							$imageClass = ' post-video';
 						} ?>
-						<div class="post-image <?php echo $imageClass; ?>">
-							<a href="<?php echo $postUrl ?>" <?php echo $postLinkAttr;?> title="<?php echo $_post->getTitle(); ?>">
+						<div class="post-image <?= $imageClass; ?>">
+							<a href="<?= $postUrl ?>" <?= $postLinkAttr;?> title="<?= $_post->getTitle(); ?>">
 								<?php if( $_post->getThumbnailType() == 1 && $_post->getPostThumbnail()!=''){ ?>
 								<?php if($_post->getImageType() == 2 && $_post->getImageVideoId()!=''){ ?>
 								<span class="fa overlay-icon"></span>
@@ -210,23 +210,23 @@ if($layout_type == 'owl_carousel'){
 								<?php if($image_width>0){ ?>
 								<img
 								<?php if (!$lazyload) { ?>
-								src="<?php echo $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height, 100, $keep_ratio, $keep_frame) ?>"
+								src="<?= $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height, 100, $keep_ratio, $keep_frame) ?>"
 								<?php } ?>
-								height="<?php echo $image_height ?>" width="<?php echo $image_width ?>" alt="<?php echo $_post->getTitle(); ?>"
-								<?php if ($lazyload) { ?>data-src="<?php echo $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height, 100, $keep_ratio, $keep_ratio) ?>" class="lazyOwl"<?php } ?>
+								height="<?= $image_height ?>" width="<?= $image_width ?>" alt="<?= $_post->getTitle(); ?>"
+								<?php if ($lazyload) { ?>data-src="<?= $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height, 100, $keep_ratio, $keep_ratio) ?>" class="lazyOwl"<?php } ?>
 								/>
 								<?php }else{ ?>
 								<img <?php if (!$lazyload) { ?>
-								src="<?php echo $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height, 100, $keep_ratio, $keep_frame) ?>"
+								src="<?= $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height, 100, $keep_ratio, $keep_frame) ?>"
 								<?php } ?>
-								<?php if ($lazyload) { ?>data-src="<?php echo $helper->getMediaUrl($_post->getPostThumbnail()) ?>" alt="<?php echo $_post->getTitle(); ?>"  class="lazyOwl"<?php } ?>
+								<?php if ($lazyload) { ?>data-src="<?= $helper->getMediaUrl($_post->getPostThumbnail()) ?>" alt="<?= $_post->getTitle(); ?>"  class="lazyOwl"<?php } ?>
 								/>
 								<?php } ?>
 								<?php }else if($_post->getThumbnailType() == 2){ ?>
 								<?php if($_post->getThumbnailVideoType()==1 && $_post->getThumbnailVideoId()!=''){ ?>
-								<iframe width="<?php echo $image_width ?>" height="<?php echo $image_height ?>" src="https://www.youtube.com/embed/<?php echo $_post->getThumbnailVideoId() ?>" frameborder="0" allowfullscreen></iframe>
+								<iframe width="<?= $image_width ?>" height="<?= $image_height ?>" src="https://www.youtube.com/embed/<?= $_post->getThumbnailVideoId() ?>" frameborder="0" allowfullscreen></iframe>
 								<?php }else if($_post->getThumbnailVideoType()==2 && $_post->getThumbnailVideoId()!=''){ ?>
-								<iframe src="https://player.vimeo.com/video/<?php echo $_post->getThumbnailVideoId() ?>?color=3498DB&title=0&byline=0&portrait=0" width="<?php echo $image_width ?>" height="<?php echo $image_height ?>" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
+								<iframe src="https://player.vimeo.com/video/<?= $_post->getThumbnailVideoId() ?>?color=3498DB&title=0&byline=0&portrait=0" width="<?= $image_width ?>" height="<?= $image_height ?>" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
 								<?php } ?>
 								<?php } ?>
 							</a>
@@ -234,11 +234,11 @@ if($layout_type == 'owl_carousel'){
 						<?php } ?>
 
 						<?php if($show_title){ ?>
-						<h2 class="post-title"><a <?php if($titleColor){ ?>data-hover-color="<?php echo $titleColor ?>"<?php } ?> href="<?php echo $postUrl ?>" <?php echo $postLinkAttr;?> title="<?php echo $_post->getTitle(); ?>"><?php echo $_post->getTitle(); ?></a></h2>
+						<h2 class="post-title"><a <?php if($titleColor){ ?>data-hover-color="<?= $titleColor ?>"<?php } ?> href="<?= $postUrl ?>" <?= $postLinkAttr;?> title="<?= $_post->getTitle(); ?>"><?= $_post->getTitle(); ?></a></h2>
 						<?php } ?>
 						<?php if($show_socialnetworks){ ?>
 						<div class="post-socials">
-							<div class="addthis_toolbox addthis_default_style" data-title="<?php echo $_post->getTitle(); ?>" addthis:url="<?php echo $postUrl ?>">
+							<div class="addthis_toolbox addthis_default_style" data-title="<?= $_post->getTitle(); ?>" addthis:url="<?= $postUrl ?>">
 								<a class="addthis_button_facebook"></a>
 								<a class="addthis_button_twitter"></a>
 								<a class="addthis_button_google"></a>
@@ -252,18 +252,18 @@ if($layout_type == 'owl_carousel'){
 							<?php if($show_author){ ?>
 							<div class="post-author">
 								<?php $author = $helper->getPostAuthor($_post);?>
-								<i class="fa fa-user"></i> <a href="<?php echo $helper->getAuthorUrl($author); ?>" title="<?php echo $author->getNickName() ?>"><?php echo $author->getNickName() ?></a>
+								<i class="fa fa-user"></i> <a href="<?= $helper->getAuthorUrl($author); ?>" title="<?= $author->getNickName() ?>"><?= $author->getNickName() ?></a>
 							</div>
 							<?php } ?>
 							<?php if($show_createdtime || $show_updatedtime){ ?>
 							<div class="post-date">
 								<?php if($show_createdtime){ ?>
 								<?php $createdTime = $helper->getFormatDate($_post->getCreationTime(), $dateFormat); ?>
-								<i class="fa fa-clock-o"></i> <span><?php echo $createdTime; ?></span>
+								<i class="fa fa-clock-o"></i> <span><?= $createdTime; ?></span>
 								<?php } ?>
 								<?php if($show_updatedtime){ ?>
 								<?php $updateTime = $helper->getFormatDate($_post->getUpdateTime(), $dateFormat); ?>
-								<i class="fa fa-clock-o"></i> <span><?php echo __('Updated on %1', $updateTime); ?></span>
+								<i class="fa fa-clock-o"></i> <span><?= __('Updated on %1', $updateTime); ?></span>
 								<?php } ?>
 							</div>
 							<?php } ?>
@@ -273,19 +273,19 @@ if($layout_type == 'owl_carousel'){
 								$categories = $_post->getData('categories');
 								$count = count($categories);
 								?>
-								<i class="fa fa-folder"></i> 
+								<i class="fa fa-folder"></i>
 								<?php foreach ($categories as $k => $v) { ?>
-								<a href="<?php echo $helper->getCategoryUrl($v['identifier'])  ?>" title="<?php echo $v['name'] ?>"><?php echo $v['name'] ?></a>
+								<a href="<?= $helper->getCategoryUrl($v['identifier'])  ?>" title="<?= $v['name'] ?>"><?= $v['name'] ?></a>
 								<?php if(isset($categories[$k+1])) echo __(', '); ?>
 								<?php } ?>
 							</div>
 							<?php } ?>
 							<?php if($show_hits){ ?>
-							<div class="post-hits"><i class="fa fa-eye"></i> <span><?php echo (int)$_post->getHits(); ?></span></div>
+							<div class="post-hits"><i class="fa fa-eye"></i> <span><?= (int)$_post->getHits(); ?></span></div>
 							<?php } ?>
 							<?php if($show_commentcount){ ?>
 							<div class="post-comment">
-								<i class="fa fa-comments"></i> <a href="<?php echo $postUrl ?>#comments" <?php echo $postLinkAttr;?>><?php echo $_post->getCommentCount(); ?></a>
+								<i class="fa fa-comments"></i> <a href="<?= $postUrl ?>#comments" <?= $postLinkAttr;?>><?= $_post->getCommentCount(); ?></a>
 							</div>
 
 							<?php } ?>
@@ -294,9 +294,9 @@ if($layout_type == 'owl_carousel'){
 						<?php $tags = $_post->getTag(); ?>
 						<?php if(!empty($tags)){ ?>
 						<div class="post-tag">
-							<span><?php echo __('Tags:'); ?></span>
+							<span><?= __('Tags:'); ?></span>
 							<?php foreach ($tags as $k => $v) { ?>
-							<a href="<?php echo $helper->getTagUrl($v['alias']) ?>"><?php echo trim($v['name']) ?></a>
+							<a href="<?= $helper->getTagUrl($v['alias']) ?>"><?= trim($v['name']) ?></a>
 							<?php if(isset($tags[$k+1])) echo __(', '); ?>
 							<?php } ?>
 						</div>
@@ -305,10 +305,10 @@ if($layout_type == 'owl_carousel'){
 						<?php if($show_shortdescription){ ?>
 						<div class="post-summary">
 							<?php $shortContent = $_post->getShortContent(); ?>
-							<?php echo $helper->subString($shortContent, (int)$shortdescription_count); ?>
+							<?= $helper->subString($shortContent, (int)$shortdescription_count); ?>
 						</div>
 						<?php if($show_readmorelink){ ?>
-						<div class="post-readmore"><a href="<?php echo $postUrl ?>" <?php echo $postLinkAttr;?> title="<?php echo $_post->getTitle(); ?>" <?php echo $readmoreStyle ?>><?php echo __('Read more') ?> <i class="fa fa-angle-double-right" aria-hidden="true"></i></a></div>
+						<div class="post-readmore"><a href="<?= $postUrl ?>" <?= $postLinkAttr;?> title="<?= $_post->getTitle(); ?>" <?= $readmoreStyle ?>><?= __('Read more') ?> <i class="fa fa-angle-double-right" aria-hidden="true"></i></a></div>
 						<?php } ?>
 						<?php } ?>
 					</div>
@@ -327,7 +327,7 @@ if($layout_type == 'owl_carousel'){
 					jQuery(document).ready(function() {
 
 						var anchorColor = '';
-						$('#<?php echo $blockId ?> a').hover(function(){
+						$('#<?= $blockId ?> a').hover(function(){
 							anchorColor = '';
 							if($(this).data('hover-color')!=''){
 								$(this).css('color',$(this).data('hover-color'));
@@ -336,7 +336,7 @@ if($layout_type == 'owl_carousel'){
 							$(this).css('color','');
 						})
 
-						
+
 					});
 				});
 			</script>
@@ -346,4 +346,4 @@ if($layout_type == 'owl_carousel'){
 			<script type="text/javascript" src="//s7.addthis.com/js/300/addthis_widget.js#pubid=ra-56ceab198f4f2e81"></script>
 			<?php } ?>
 		</div>
-	</div>
\ No newline at end of file
+	</div>
diff --git a/view/frontend/templates/widget/style5.phtml b/view/frontend/templates/widget/style5.phtml
index 45186b7..a353ceb 100644
--- a/view/frontend/templates/widget/style5.phtml
+++ b/view/frontend/templates/widget/style5.phtml
@@ -166,18 +166,18 @@ if($layout_type == 'owl_carousel'){
 	$classes = 'plist';
 }
 ?>
-<div class="block ves-blog post-list postsstyle-style4 postsgrid1 blog-widget blog-widget-<?php echo $widgetStyle ?> <?php echo $addition_class ?>">
+<div class="block ves-blog post-list postsstyle-style4 postsgrid1 blog-widget blog-widget-<?= $widgetStyle ?> <?= $addition_class ?>">
 	<?php if($widget_title!=''){ ?>
 	<div class="block-title">
-		<h2 <?php if($titleColor!=''){ echo 'style="color: ' . $titleColor . '"'; } ?>><strong><?php echo $widget_title; ?></strong></h2>
+		<h2 <?php if($titleColor!=''){ echo 'style="color: ' . $titleColor . '"'; } ?>><strong><?= $widget_title; ?></strong></h2>
 	</div>
 	<?php } ?>
 	<?php if($html!=''){ ?>
-	<div class="pretext-html"><?php echo $html ?></div>
+	<div class="pretext-html"><?= $html ?></div>
 	<?php } ?>
 	<div class="block-content blog-grid" <?php if($border_color = $this->getConfig('border_color')){ echo 'style="border-bottom-color: ' . $border_color . '"'; } ?>>
 		<?php if($total>0){ ?>
-		<ul id="<?php echo $blockId ?>" class="<?php echo $classes ?>" <?php echo $carousel; ?>>
+		<ul id="<?= $blockId ?>" class="<?= $classes ?>" <?= $carousel; ?>>
 			<?php foreach ($_postCollection as $_columnCollection) { ?>
 			<li class="ves-post">
 				<?php
@@ -192,15 +192,15 @@ if($layout_type == 'owl_carousel'){
 					$style = 'style="height:' . $item_height . 'px"';
 				}
 				?>
-				<div class="ves-post post-item other-items" <?php echo $style; ?>>
+				<div class="ves-post post-item other-items" <?= $style; ?>>
 					<div class="post-wrapper">
 						<?php if($show_image){ ?>
 						<?php $imageClass = ''; ?>
 						<?php if($_post->getImageType() == 2 && $_post->getImageVideoId()!=''){
 							$imageClass = ' post-video';
 						} ?>
-						<div class="post-image <?php echo $imageClass; ?>">
-							<a href="<?php echo $postUrl ?>" <?php echo $postLinkAttr;?> title="<?php echo $_post->getTitle(); ?>">
+						<div class="post-image <?= $imageClass; ?>">
+							<a href="<?= $postUrl ?>" <?= $postLinkAttr;?> title="<?= $_post->getTitle(); ?>">
 								<?php if( $_post->getThumbnailType() == 1 && $_post->getPostThumbnail()!=''){ ?>
 								<?php if($_post->getImageType() == 2 && $_post->getImageVideoId()!=''){ ?>
 								<span class="fa overlay-icon"></span>
@@ -210,23 +210,23 @@ if($layout_type == 'owl_carousel'){
 								<?php if($image_width>0){ ?>
 								<img
 								<?php if (!$lazyload) { ?>
-								src="<?php echo $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height, 100, $keep_ratio, $keep_frame) ?>"
+								src="<?= $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height, 100, $keep_ratio, $keep_frame) ?>"
 								<?php } ?>
-								height="<?php echo $image_height ?>" width="<?php echo $image_width ?>" alt="<?php echo $_post->getTitle(); ?>"
-								<?php if ($lazyload) { ?>data-src="<?php echo $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height, 100, $keep_ratio, $keep_ratio) ?>" class="lazyOwl"<?php } ?>
+								height="<?= $image_height ?>" width="<?= $image_width ?>" alt="<?= $_post->getTitle(); ?>"
+								<?php if ($lazyload) { ?>data-src="<?= $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height, 100, $keep_ratio, $keep_ratio) ?>" class="lazyOwl"<?php } ?>
 								/>
 								<?php }else{ ?>
 								<img <?php if (!$lazyload) { ?>
-								src="<?php echo $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height, 100, $keep_ratio, $keep_frame) ?>"
+								src="<?= $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height, 100, $keep_ratio, $keep_frame) ?>"
 								<?php } ?>
-								<?php if ($lazyload) { ?>data-src="<?php echo $helper->getMediaUrl($_post->getPostThumbnail()) ?>" alt="<?php echo $_post->getTitle(); ?>"  class="lazyOwl"<?php } ?>
+								<?php if ($lazyload) { ?>data-src="<?= $helper->getMediaUrl($_post->getPostThumbnail()) ?>" alt="<?= $_post->getTitle(); ?>"  class="lazyOwl"<?php } ?>
 								/>
 								<?php } ?>
 								<?php }else if($_post->getThumbnailType() == 2){ ?>
 								<?php if($_post->getThumbnailVideoType()==1 && $_post->getThumbnailVideoId()!=''){ ?>
-								<iframe width="<?php echo $image_width ?>" height="<?php echo $image_height ?>" src="https://www.youtube.com/embed/<?php echo $_post->getThumbnailVideoId() ?>" frameborder="0" allowfullscreen></iframe>
+								<iframe width="<?= $image_width ?>" height="<?= $image_height ?>" src="https://www.youtube.com/embed/<?= $_post->getThumbnailVideoId() ?>" frameborder="0" allowfullscreen></iframe>
 								<?php }else if($_post->getThumbnailVideoType()==2 && $_post->getThumbnailVideoId()!=''){ ?>
-								<iframe src="https://player.vimeo.com/video/<?php echo $_post->getThumbnailVideoId() ?>?color=3498DB&title=0&byline=0&portrait=0" width="<?php echo $image_width ?>" height="<?php echo $image_height ?>" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
+								<iframe src="https://player.vimeo.com/video/<?= $_post->getThumbnailVideoId() ?>?color=3498DB&title=0&byline=0&portrait=0" width="<?= $image_width ?>" height="<?= $image_height ?>" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
 								<?php } ?>
 								<?php } ?>
 							</a>
@@ -234,11 +234,11 @@ if($layout_type == 'owl_carousel'){
 						<?php } ?>
 
 						<?php if($show_title){ ?>
-						<h2 class="post-title"><a <?php if($titleColor){ ?>data-hover-color="<?php echo $titleColor ?>"<?php } ?> href="<?php echo $postUrl ?>" <?php echo $postLinkAttr;?> title="<?php echo $_post->getTitle(); ?>"><?php echo $_post->getTitle(); ?></a></h2>
+						<h2 class="post-title"><a <?php if($titleColor){ ?>data-hover-color="<?= $titleColor ?>"<?php } ?> href="<?= $postUrl ?>" <?= $postLinkAttr;?> title="<?= $_post->getTitle(); ?>"><?= $_post->getTitle(); ?></a></h2>
 						<?php } ?>
 						<?php if($show_socialnetworks){ ?>
 						<div class="post-socials">
-							<div class="addthis_toolbox addthis_default_style" data-title="<?php echo $_post->getTitle(); ?>" addthis:url="<?php echo $postUrl ?>">
+							<div class="addthis_toolbox addthis_default_style" data-title="<?= $_post->getTitle(); ?>" addthis:url="<?= $postUrl ?>">
 								<a class="addthis_button_facebook"></a>
 								<a class="addthis_button_twitter"></a>
 								<a class="addthis_button_google"></a>
@@ -252,18 +252,18 @@ if($layout_type == 'owl_carousel'){
 							<?php if($show_author){ ?>
 							<div class="post-author">
 								<?php $author = $helper->getPostAuthor($_post);?>
-								<i class="fa fa-user"></i> <a href="<?php echo $helper->getAuthorUrl($author); ?>" title="<?php echo $author->getNickName() ?>"><?php echo $author->getNickName() ?></a>
+								<i class="fa fa-user"></i> <a href="<?= $helper->getAuthorUrl($author); ?>" title="<?= $author->getNickName() ?>"><?= $author->getNickName() ?></a>
 							</div>
 							<?php } ?>
 							<?php if($show_createdtime || $show_updatedtime){ ?>
 							<div class="post-date">
 								<?php if($show_createdtime){ ?>
 								<?php $createdTime = $helper->getFormatDate($_post->getCreationTime(), $dateFormat); ?>
-								<i class="fa fa-clock-o"></i> <span><?php echo $createdTime; ?></span>
+								<i class="fa fa-clock-o"></i> <span><?= $createdTime; ?></span>
 								<?php } ?>
 								<?php if($show_updatedtime){ ?>
 								<?php $updateTime = $helper->getFormatDate($_post->getUpdateTime(), $dateFormat); ?>
-								<i class="fa fa-clock-o"></i> <span><?php echo __('Updated on %1', $updateTime); ?></span>
+								<i class="fa fa-clock-o"></i> <span><?= __('Updated on %1', $updateTime); ?></span>
 								<?php } ?>
 							</div>
 							<?php } ?>
@@ -273,19 +273,19 @@ if($layout_type == 'owl_carousel'){
 								$categories = $_post->getData('categories');
 								$count = count($categories);
 								?>
-								<i class="fa fa-folder"></i> 
+								<i class="fa fa-folder"></i>
 								<?php foreach ($categories as $k => $v) { ?>
-								<a href="<?php echo $helper->getCategoryUrl($v['identifier'])  ?>" title="<?php echo $v['name'] ?>"><?php echo $v['name'] ?></a>
+								<a href="<?= $helper->getCategoryUrl($v['identifier'])  ?>" title="<?= $v['name'] ?>"><?= $v['name'] ?></a>
 								<?php if(isset($categories[$k+1])) echo __(', '); ?>
 								<?php } ?>
 							</div>
 							<?php } ?>
 							<?php if($show_hits){ ?>
-							<div class="post-hits"><i class="fa fa-eye"></i> <span><?php echo (int)$_post->getHits(); ?></span></div>
+							<div class="post-hits"><i class="fa fa-eye"></i> <span><?= (int)$_post->getHits(); ?></span></div>
 							<?php } ?>
 							<?php if($show_commentcount){ ?>
 							<div class="post-comment">
-								<i class="fa fa-comments"></i> <a href="<?php echo $postUrl ?>#comments" <?php echo $postLinkAttr;?>><?php echo $_post->getCommentCount(); ?></a>
+								<i class="fa fa-comments"></i> <a href="<?= $postUrl ?>#comments" <?= $postLinkAttr;?>><?= $_post->getCommentCount(); ?></a>
 							</div>
 
 							<?php } ?>
@@ -294,9 +294,9 @@ if($layout_type == 'owl_carousel'){
 						<?php $tags = $_post->getTag(); ?>
 						<?php if(!empty($tags)){ ?>
 						<div class="post-tag">
-							<span><?php echo __('Tags:'); ?></span>
+							<span><?= __('Tags:'); ?></span>
 							<?php foreach ($tags as $k => $v) { ?>
-							<a href="<?php echo $helper->getTagUrl($v['alias']) ?>"><?php echo trim($v['name']) ?></a>
+							<a href="<?= $helper->getTagUrl($v['alias']) ?>"><?= trim($v['name']) ?></a>
 							<?php if(isset($tags[$k+1])) echo __(', '); ?>
 							<?php } ?>
 						</div>
@@ -305,10 +305,10 @@ if($layout_type == 'owl_carousel'){
 						<?php if($show_shortdescription){ ?>
 						<div class="post-summary">
 							<?php $shortContent = $_post->getShortContent(); ?>
-							<?php echo $helper->subString($shortContent, (int)$shortdescription_count); ?>
+							<?= $helper->subString($shortContent, (int)$shortdescription_count); ?>
 						</div>
 						<?php if($show_readmorelink){ ?>
-						<div class="post-readmore"><a href="<?php echo $postUrl ?>" <?php echo $postLinkAttr;?> title="<?php echo $_post->getTitle(); ?>" <?php echo $readmoreStyle ?>><?php echo __('Read more') ?> <i class="fa fa-angle-double-right" aria-hidden="true"></i></a></div>
+						<div class="post-readmore"><a href="<?= $postUrl ?>" <?= $postLinkAttr;?> title="<?= $_post->getTitle(); ?>" <?= $readmoreStyle ?>><?= __('Read more') ?> <i class="fa fa-angle-double-right" aria-hidden="true"></i></a></div>
 						<?php } ?>
 						<?php } ?>
 					</div>
@@ -327,7 +327,7 @@ if($layout_type == 'owl_carousel'){
 					jQuery(document).ready(function() {
 
 						var anchorColor = '';
-						$('#<?php echo $blockId ?> a').hover(function(){
+						$('#<?= $blockId ?> a').hover(function(){
 							anchorColor = '';
 							if($(this).data('hover-color')!=''){
 								$(this).css('color',$(this).data('hover-color'));
@@ -336,7 +336,7 @@ if($layout_type == 'owl_carousel'){
 							$(this).css('color','');
 						})
 
-						
+
 					});
 				});
 			</script>
@@ -346,4 +346,4 @@ if($layout_type == 'owl_carousel'){
 			<script type="text/javascript" src="//s7.addthis.com/js/300/addthis_widget.js#pubid=ra-56ceab198f4f2e81"></script>
 			<?php } ?>
 		</div>
-	</div>
\ No newline at end of file
+	</div>
diff --git a/view/frontend/templates/widget/tab.phtml b/view/frontend/templates/widget/tab.phtml
index e70a468..aed480d 100644
--- a/view/frontend/templates/widget/tab.phtml
+++ b/view/frontend/templates/widget/tab.phtml
@@ -1,427 +1,427 @@
-<?php
-$helper      = $this->helper("Ves\Blog\Helper\Data");
-$imageHelper = $this->helper("Ves\Blog\Helper\Image");
-
-
-/** General Settings **/
-$dateFormat      = $helper->getConfig("general_settings/dateformat");
-$twitterUsername = $helper->getConfig("general_settings/twitter_username");
-$enableNetworks  = $helper->getConfig("general_settings/enable_networks");
-$networks        = array_flip(explode(",", $helper->getConfig("general_settings/networks")));
-$widget_title    = $this->getConfig("widget_title");
-$addition_class  = $this->getConfig("addition_class");
-$layout_type     = $this->getConfig("layout_type");
-$widgetStyle     = $this->getConfig('widget_style');
-$titleColor      = $this->getConfig('title_color');
-$get_categories  = $this->getConfig('tab');
-$get_categories  = explode(",", $get_categories);
-$apply			 = $this->getConfig('apply');
-/** Owl Carousel Settings **/
-$item_height           = (int)$this->getConfig("item_height");
-$number_item_percolumn = $this->getConfig("number_item_percolumn");
-$large_max_items       = $this->getConfig("large_max_items");
-$large_items           = $this->getConfig("large_items");
-$portrait_items        = $this->getConfig("portrait_items");
-$tablet_items          = $this->getConfig("tablet_items");
-$tablet_small_items    = $this->getConfig("tablet_small_items");
-$mobile_items          = $this->getConfig("mobile_items");
-$rtl                   = $this->getConfig("rtl");
-$autoplay              = $this->getConfig("autoplay");
-$autoplay_timeout      = $this->getConfig("autoplay_timeout");
-$autoplay_hoverpause   = $this->getConfig("autoplay_hoverpause");
-$dots                  = $this->getConfig("dots");
-$nav                   = $this->getConfig("nav");
-$nav_prev              = str_replace("'", '"', $this->getConfig("nav_prev"));
-$nav_next              = str_replace("'", '"', $this->getConfig("nav_next"));
-$loop                  = $this->getConfig("loop");
-$mousedrag             = $this->getConfig("mousedrag");
-$touchdrag             = $this->getConfig("touchdrag");
-$pulldrag              = $this->getConfig("pulldrag");
-
-$html = '';
-
-$cmsblock = $this->getConfig('cmsblock');
-$pretext_html = $this->getConfig('pretext_html');
-if($cmsblock === 'pretext_html' && $pretext_html){
-	$html = base64_decode($pretext_html);
-}elseif($cmsblock!=''){
-	$html = $this->getCmsBlockModel()->load($cmsblock)->getContent();
-}
-$html = $helper->filter($html);
-
-$blockId = 'block' . time().rand();
-$classes = '';
-$carousel = '';
-if($layout_type == 'owl_carousel'){
-	$classes = 'owl-carousel owl-theme';
-	$carousel .= 'data-items="'.$this->getConfig("column", 3).'"';
-	$carousel .= 'data-mousedrag="';
-		$carousel .= $this->getConfig("mousedrag")?"true":"false";
-	$carousel .= '"';
-	$carousel .= 'data-pulldrag="';
-		$carousel .= $this->getConfig("pulldrag")?"true":"false";
-	$carousel .='"';
-	$carousel .= 'data-freedrag="';
-		$carousel .= $this->getConfig("freedrag")?"true":"false";
-	$carousel .='"';
-	$carousel .= 'data-stagepadding="';
-		$carousel .= (int)$this->getConfig("stagepadding");
-	$carousel .= '"';
-	$carousel .= 'data-lazyload="';
-		$carousel .= $this->getConfig("lazyload")?"true":"false";
-	$carousel .= '"';
-	$carousel .= 'data-rtl="';
-		$carousel .= $this->getConfig("rtl")?"true":"false";
-	$carousel .= '"';
-	$carousel .= 'data-center="';
-		$carousel .= $this->getConfig("center")?"true":"false";
-	$carousel .='"';
-	$carousel .= 'data-margin="';
-		$carousel .= (int)$this->getConfig("margin");
-	$carousel .='"';
-	$carousel .= 'data-autoplay="';
-		$carousel .= $this->getConfig("autoplay")?"true":"false";
-	$carousel .= '"';
-	$carousel .= 'data-autoplay-timeout="';
-		$carousel .= $this->getConfig("autoplay_timeout", 3000);
-	$carousel .= '"';
-	$carousel .= 'data-dots="';
-		$carousel .= $this->getConfig("dots")?"true":"false";
-	$carousel .= '"';
-	$carousel .= 'data-loop="';
-		$carousel .= $this->getConfig("loop")?"true":"false";
-	$carousel .= '"';
-	$carousel .= 'data-nav = "';
-		$carousel .= $this->getConfig("nav")?"true":"false";
-	$carousel .= '"';
-	if($nav_prev){
-		$carousel .='data-nav-text-owlpre="' . str_replace('"', "'", $nav_prev) . '"';
-	}
-	if($nav_next){
-    	$carousel .='data-nav-text-owlnext="' . str_replace('"', "'", $nav_next) . '"';
-	}
-	$carousel .= 'data-autoplay-pauonhover="';
-	$carousel .= $this->getConfig("autoplay_hoverpause")?"true":"false";
-	$carousel .= '"';
-	$carousel .= 'data-mobile-items="'.$mobile_items.'"';
-	$carousel .= 'data-tablet-small-items="'.$tablet_small_items.'"';
-	$carousel .= 'data-tablet-items="'.$tablet_small_items.'"';
-	$carousel .= 'data-portrait-items="'.$portrait_items.'"';
-	$carousel .= 'data-large-items="'.$large_items.'"';
-	$carousel .= 'data-large-max-items="'.$large_max_items.'"';
-}else{
-	$classes = 'plist';
-}
-$d=0;
-$c=0;
-$active = '';
-$type = explode(',',$this->getConfig('types'));
-
-?>
-<?php
-$y = 0;
-/** Post Settings **/
-$show_image             = $this->getConfig("show_image");
-$image_width            = (int)$this->getConfig("image_width", 800);
-$image_height           = (int)$this->getConfig("image_height");
-$show_title             = $this->getConfig("show_title");
-$show_shortdescription  = $this->getConfig("show_shortdescription");
-$shortdescription_count = $this->getConfig("shortdescription_count");
-$show_readmorelink      = $this->getConfig("show_readmorelink");
-$readmoreBgColor		= $this->getConfig("rebg_color");
-$readmoreColor			= $this->getConfig("re_color");
-$readmoreStyle = '';
-if($readmoreBgColor) $readmoreStyle .= 'background: ' . $readmoreBgColor . ';';
-if($readmoreColor) $readmoreStyle .= 'color: ' . $readmoreColor . ';';
-if($readmoreStyle!='') $readmoreStyle = 'style="' . $readmoreStyle .'"';
-$show_categories        = $this->getConfig("show_categories");
-$show_author            = $this->getConfig("show_author");
-$show_commentcount      = $this->getConfig("show_commentcount");
-$disable_comment 		= $helper->getConfig('general_settings/disable_comment');
-if($disable_comment) {
-	$show_commentcount = false;
-}
-$show_updatedtime       = $this->getConfig("show_updatedtime");
-$show_createdtime       = $this->getConfig("show_createdtime");
-$show_hits              = $this->getConfig("show_hits");
-$show_tags              = $this->getConfig("show_tags");
-$show_socialnetworks    = $this->getConfig("show_socialnetwork");
-$item_height            = (int)$this->getConfig("item_height");
-$catCollestion 			= $this->getCategoryCollection();
-$args = array();
-foreach ($catCollestion as $_cat) { 
-	if(in_array($_cat->getCategoryId(),$get_categories) ){
-		$args[] =$_cat->getCategoryId();
-	}
-}
-foreach ($type as $_type) { 
-	if(in_array($_type,$get_categories) ){
-		$args[] =$_type;
-	}
-}
-?>
-<div class="block ves-blog post-list postsstyle-style4 postsgrid1 blog-widget blog-widget-<?php echo $widgetStyle ?>">
-	<?php if($widget_title!=''){ ?>
-	<div class="block-title">
-		<h2 <?php if($titleColor!=''){ echo 'style="color: ' . $titleColor . '"'; } ?>><strong><?php echo $widget_title; ?></strong></h2>
-	</div>
-	<?php } ?>
-	<?php if($html!=''){ ?>
-	<div class="pretext-html"><?php echo $html ?></div>
-	<?php } ?>
-	<div class="block-content blog-grid" <?php if($border_color = $this->getConfig('border_color')){ echo 'style="border-bottom-color: ' . $border_color . '"'; } ?>>
-		<?php if($catCollestion->count()){ ?>
-		<ul class="nav nav-tabs" id="nav-<?php echo $blockId ?>" role="tablist">
-		<?php foreach ($catCollestion as $_cat) {
-			if(in_array($_cat->getCategoryId(),$get_categories) ){
-				$c++; 
-				if($c == 1) { $active = 'active'; } else { $active = '';} ?>
-				<li class = "<?php echo $active; ?>" role="presentation"><a href="#tab<?php echo $_cat->getCategoryId() . '-' . $blockId ?>" aria-controls="<?php echo $_cat->getName(); ?>" role="tab" data-toggle="tab"><?php echo $_cat->getName(); ?></a></li>
-			
-		<?php }
-		} ?>
-		<?php foreach ($type as $key => $_type) {
-			if(in_array($_type,$get_categories) ){
-				$c++; 
-				if($c == 1) { $active = 'active'; } else { $active = '';} ?>
-				<li class = "<?php echo $active; ?>" role="presentation"><a href="#tab<?php echo $_type . '-' . $blockId ?>" aria-controls="<?php echo $_type; ?>" role="tab" data-toggle="tab"><?php echo ucwords($_type); ?></a></li>
-		<?php }
-			} ?>
-		</ul>
-
-		<div class="tab-content">
-
-		<?php  foreach ($args as $key => $arg) { 
-			if(in_array($arg,$get_categories) ){
-				$d++;
-				if($d == 1) { $active = 'active in'; } else { $active = '';}  ?>
-				<div id="tab<?php echo $arg . '-' . $blockId ?>" class="tab-pane fade <?php echo $active; ?>">
-				<?php
-					if(is_numeric($arg)) {
-						$collection  = $this->getPostCollection($arg);
-					} else {
-						$collection  = $this->getBlogTypeCollection($arg);
-					}
-					$i = 1;
-					$x = 0;
-					$total = $collection->count();
-					if($total%$number_item_percolumn == 0){
-						$column = $total/$number_item_percolumn;
-					}else{
-						$column = floor($total/$number_item_percolumn)+1;
-					}
-					$_postCollection = [];
-					$i = $x = 0;
-					foreach ($collection as $_post) {
-						if($i<$column){
-							$i++;
-						}else{
-							$i = 1;
-							$x++;
-						}
-						$_postCollection[$i][$x] = $_post;
-					}
-				?>
-				<ul id="<?php echo $blockId ?>" class="<?php echo $classes ?>" <?php echo $carousel; ?>>
-					<?php foreach ($_postCollection as $_columnCollection) { ?>
-					<li class="ves-post">
-						<?php
-						$y = 0;
-						$show_categories        = $this->getConfig("show_categories");
-						$show_author            = $this->getConfig("show_author");
-						$show_commentcount      = $this->getConfig("show_commentcount");
-						$show_hits              = $this->getConfig("show_hits");
-						$show_tags              = $this->getConfig("show_tags");
-						$show_socialnetworks    = $this->getConfig("show_socialnetwork");
-						$item_height            = (int)$this->getConfig("item_height");
-						$show_image             = $this->getConfig("show_image");
-						$image_width            = (int)$this->getConfig("image_width", 800);
-						$image_height           = (int)$this->getConfig("image_height");
-						$show_shortdescription  = $this->getConfig("show_shortdescription");
-						$show_readmorelink      = $this->getConfig("show_readmorelink");
-						?>
-						<?php foreach ($_columnCollection as $_post){ ?>
-						<?php $postUrl = $helper->getPostUrl($_post); ?>
-						<?php $postLinkAttr = $helper->getPostUrlLinkAttr($_post); ?>
-						<?php
-						if($y==1){
-							if($apply == 'all') {
-								$item_height = 0;
-								$image_width = 110;
-								$image_height = 75;
-								$show_socialnetworks = $show_tags = $show_shortdescription = $show_categories = $show_author = $show_hits = $show_readmorelink = false;
-							}
-						}
-						?>
-						<?php
-						$style = '';
-						if($layout_type=='owl_carousel' && $item_height>0){
-							$style = 'style="height:' . $item_height . 'px"';
-						}
-						?>
-						<div class="ves-post post-item <?php if($y==0){ echo "first-items"; }else{ echo "other-items"; } ?>" <?php echo $style; ?>>
-							<div class="post-wrapper">
-								<?php if($show_image){ ?>
-								<?php $imageClass = ''; ?>
-								<?php if($_post->getImageType() == 2 && $_post->getImageVideoId()!=''){
-									$imageClass = ' post-video';
-								} ?>
-								<div class="post-image <?php echo $imageClass; ?>">
-									<a href="<?php echo $postUrl ?>" <?php echo $postLinkAttr;?> title="<?php echo $_post->getTitle(); ?>">
-										<?php if( $_post->getThumbnailType() == 1 && $_post->getPostThumbnail()!=''){ ?>
-										<?php if($_post->getImageType() == 2 && $_post->getImageVideoId()!=''){ ?>
-										<span class="fa overlay-icon"></span>
-										<?php }else{ ?>
-										<span class="fa overlay-icon"></span>
-										<?php } ?>
-										<?php if($image_width>0){ ?>
-										<img src="<?php echo $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height) ?>" height="<?php echo $image_height ?>" width="<?php echo $image_width ?>" alt="<?php echo $_post->getTitle(); ?>"/>
-										<?php }else{ ?>
-										<img src="<?php echo $helper->getMediaUrl($_post->getPostThumbnail()) ?>" alt="<?php echo $_post->getTitle(); ?>"/>
-										<?php } ?>
-										<?php }else if($_post->getThumbnailType() == 2){ ?>
-										<?php if($_post->getThumbnailVideoType()==1 && $_post->getThumbnailVideoId()!=''){ ?>
-										<iframe width="<?php echo $image_width ?>" height="<?php echo $image_height ?>" src="https://www.youtube.com/embed/<?php echo $_post->getThumbnailVideoId() ?>" frameborder="0" allowfullscreen></iframe>
-										<?php }else if($_post->getThumbnailVideoType()==2 && $_post->getThumbnailVideoId()!=''){ ?>
-										<iframe src="https://player.vimeo.com/video/<?php echo $_post->getThumbnailVideoId() ?>?color=3498DB&title=0&byline=0&portrait=0" width="<?php echo $image_width ?>" height="<?php echo $image_height ?>" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
-										<?php } ?>
-										<?php } ?>
-									</a>
-								</div>
-								<?php } ?>
-
-								<?php if($show_title){ ?>
-								<h2 class="post-title"><a <?php if($titleColor){ ?>data-hover-color="<?php echo $titleColor ?>"<?php } ?> href="<?php echo $postUrl ?>" <?php echo $postLinkAttr;?> title="<?php echo $_post->getTitle(); ?>"><?php echo $_post->getTitle(); ?></a></h2>
-								<?php } ?>
-								<?php if($show_socialnetworks){ ?>
-								<div class="post-socials">
-									<div class="addthis_toolbox addthis_default_style" data-title="<?php echo $_post->getTitle(); ?>" addthis:url="<?php echo $postUrl ?>">
-										<a class="addthis_button_facebook"></a>
-										<a class="addthis_button_twitter"></a>
-										<a class="addthis_button_google"></a>
-										<a class="addthis_button_email"></a>
-										<a class="addthis_button_pinterest_share"></a>
-										<a class="addthis_button_compact"></a>
-									</div>
-								</div>
-								<?php } ?>
-								<div class="post-meta">
-									<?php if($show_author){ ?>
-									<div class="post-author">
-										<?php $author = $helper->getPostAuthor($_post);?>
-										<i class="fa fa-user"></i> <a href="<?php echo $helper->getAuthorUrl($author); ?>" title="<?php echo $author->getNickName() ?>"><?php echo $author->getNickName() ?></a>
-									</div>
-									<?php } ?>
-									<?php if($show_createdtime || $show_updatedtime){ ?>
-									<div class="post-date">
-										<?php if($show_createdtime){ ?>
-										<?php $createdTime = $helper->getFormatDate($_post->getCreationTime(), $dateFormat); ?>
-										<i class="fa fa-clock-o"></i> <span><?php echo $createdTime; ?></span>
-										<?php } ?>
-										<?php if($show_updatedtime){ ?>
-										<?php $updateTime = $helper->getFormatDate($_post->getUpdateTime(), $dateFormat); ?>
-										<i class="fa fa-clock-o"></i> <span><?php echo __('Updated on %1', $updateTime); ?></span>
-										<?php } ?>
-									</div>
-									<?php } ?>
-									<?php if($show_categories){ ?>
-									<div class="post-categories">
-										<?php
-										$categories = $_post->getData('categories');
-										$count = count($categories);
-										?>
-										<i class="fa fa-folder"></i> 
-										<?php foreach ($categories as $k => $v) { ?>
-										<a href="<?php echo $helper->getCategoryUrl($v['identifier'])  ?>" title="<?php echo $v['name'] ?>"><?php echo $v['name'] ?></a>
-										<?php if(isset($categories[$k+1])) echo __(', '); ?>
-										<?php } ?>
-									</div>
-									<?php } ?>
-									<?php if($show_hits){ ?>
-									<div class="post-hits"><i class="fa fa-eye"></i> <span><?php echo (int)$_post->getHits(); ?></span></div>
-									<?php } ?>
-									<?php if($show_commentcount){ ?>
-									<div class="post-comment">
-										<i class="fa fa-comments"></i> <a href="<?php echo $postUrl ?>#comments" <?php echo $postLinkAttr;?>><?php echo $_post->getCommentCount(); ?></a>
-									</div>
-
-									<?php } ?>
-								</div>
-								<?php if($show_tags){ ?>
-								<?php $tags = $_post->getTag(); ?>
-								<?php if(!empty($tags)){ ?>
-								<div class="post-tag">
-									<span><?php echo __('Tags:'); ?></span>
-									<?php foreach ($tags as $k => $v) { ?>
-									<a href="<?php echo $helper->getTagUrl($v['alias']) ?>"><?php echo trim($v['name']) ?></a>
-									<?php if(isset($tags[$k+1])) echo __(', '); ?>
-									<?php } ?>
-								</div>
-								<?php } ?>
-								<?php } ?>
-								<?php if($show_shortdescription){ ?>
-								<div class="post-summary">
-									<?php $shortContent = $_post->getShortContent(); ?>
-									<?php echo $helper->subString($shortContent, (int)$shortdescription_count); ?>
-								</div>
-								<?php if($show_readmorelink){ ?>
-								<div class="post-readmore"><a href="<?php echo $postUrl ?>" <?php echo $postLinkAttr;?> title="<?php echo $_post->getTitle(); ?>" <?php echo $readmoreStyle ?>><?php echo __('Read more') ?> <i class="fa fa-angle-double-right" aria-hidden="true"></i></a></div>
-								<?php } ?>
-								<?php } ?>
-							</div>
-						</div>
-						<?php $y++; ?>
-						<?php } ?>
-					</li>
-					<?php } ?>
-				</ul>
-
-			</div>
-			
-		<?php }
-		} ?>
-		<?php } // Category Collection ?>
-
-		<?php  if($layout_type =='owl_carousel'){ ?>
-		<script>
-			require([
-				'jquery',
-				'Ves_All/lib/bootstrap/js/bootstrap.min',
-				], function($){ 
-					jQuery(document).ready(function() {
-						var tab = $('#nav-<?php echo $blockId ?>');
-						var tabParent = tab.parents('.blog-widget');
-						tabParent.find('ul.owl-carousel').each(function(){
-							jQuery(this).addClass('abc').css({'width':tabParent.width() + 'px'});
-						});
-						$('#nav-<?php echo $blockId ?> a:first').tab('show');
-						var anchorColor = '';
-						$('#<?php echo $blockId ?> a').hover(function(){
-							anchorColor = '';
-							if($(this).data('hover-color')!=''){
-								$(this).css('color',$(this).data('hover-color'));
-							}
-						}, function(){
-							$(this).css('color','');
-						})
-					});
-				});
-			</script>
-			<?php }else { ?>
-			<script>	
-				require([
-				'jquery',
-				'Ves_All/lib/bootstrap/js/bootstrap.min'
-				], function(){
-
-				});
-			</script>	
-			<?php } ?>
-
-			<?php if($show_socialnetworks){ ?>
-			<script type="text/javascript" src="//s7.addthis.com/js/300/addthis_widget.js#pubid=ra-56ceab198f4f2e81"></script>
-			<?php } ?>
-			</div>
-
-		</div>
-	</div>
\ No newline at end of file
+<?php
+$helper      = $this->helper("Ves\Blog\Helper\Data");
+$imageHelper = $this->helper("Ves\Blog\Helper\Image");
+
+
+/** General Settings **/
+$dateFormat      = $helper->getConfig("general_settings/dateformat");
+$twitterUsername = $helper->getConfig("general_settings/twitter_username");
+$enableNetworks  = $helper->getConfig("general_settings/enable_networks");
+$networks        = array_flip(explode(",", $helper->getConfig("general_settings/networks")));
+$widget_title    = $this->getConfig("widget_title");
+$addition_class  = $this->getConfig("addition_class");
+$layout_type     = $this->getConfig("layout_type");
+$widgetStyle     = $this->getConfig('widget_style');
+$titleColor      = $this->getConfig('title_color');
+$get_categories  = $this->getConfig('tab');
+$get_categories  = explode(",", $get_categories);
+$apply			 = $this->getConfig('apply');
+/** Owl Carousel Settings **/
+$item_height           = (int)$this->getConfig("item_height");
+$number_item_percolumn = $this->getConfig("number_item_percolumn");
+$large_max_items       = $this->getConfig("large_max_items");
+$large_items           = $this->getConfig("large_items");
+$portrait_items        = $this->getConfig("portrait_items");
+$tablet_items          = $this->getConfig("tablet_items");
+$tablet_small_items    = $this->getConfig("tablet_small_items");
+$mobile_items          = $this->getConfig("mobile_items");
+$rtl                   = $this->getConfig("rtl");
+$autoplay              = $this->getConfig("autoplay");
+$autoplay_timeout      = $this->getConfig("autoplay_timeout");
+$autoplay_hoverpause   = $this->getConfig("autoplay_hoverpause");
+$dots                  = $this->getConfig("dots");
+$nav                   = $this->getConfig("nav");
+$nav_prev              = str_replace("'", '"', $this->getConfig("nav_prev"));
+$nav_next              = str_replace("'", '"', $this->getConfig("nav_next"));
+$loop                  = $this->getConfig("loop");
+$mousedrag             = $this->getConfig("mousedrag");
+$touchdrag             = $this->getConfig("touchdrag");
+$pulldrag              = $this->getConfig("pulldrag");
+
+$html = '';
+
+$cmsblock = $this->getConfig('cmsblock');
+$pretext_html = $this->getConfig('pretext_html');
+if($cmsblock === 'pretext_html' && $pretext_html){
+	$html = base64_decode($pretext_html);
+}elseif($cmsblock!=''){
+	$html = $this->getCmsBlockModel()->load($cmsblock)->getContent();
+}
+$html = $helper->filter($html);
+
+$blockId = 'block' . time().rand();
+$classes = '';
+$carousel = '';
+if($layout_type == 'owl_carousel'){
+	$classes = 'owl-carousel owl-theme';
+	$carousel .= 'data-items="'.$this->getConfig("column", 3).'"';
+	$carousel .= 'data-mousedrag="';
+		$carousel .= $this->getConfig("mousedrag")?"true":"false";
+	$carousel .= '"';
+	$carousel .= 'data-pulldrag="';
+		$carousel .= $this->getConfig("pulldrag")?"true":"false";
+	$carousel .='"';
+	$carousel .= 'data-freedrag="';
+		$carousel .= $this->getConfig("freedrag")?"true":"false";
+	$carousel .='"';
+	$carousel .= 'data-stagepadding="';
+		$carousel .= (int)$this->getConfig("stagepadding");
+	$carousel .= '"';
+	$carousel .= 'data-lazyload="';
+		$carousel .= $this->getConfig("lazyload")?"true":"false";
+	$carousel .= '"';
+	$carousel .= 'data-rtl="';
+		$carousel .= $this->getConfig("rtl")?"true":"false";
+	$carousel .= '"';
+	$carousel .= 'data-center="';
+		$carousel .= $this->getConfig("center")?"true":"false";
+	$carousel .='"';
+	$carousel .= 'data-margin="';
+		$carousel .= (int)$this->getConfig("margin");
+	$carousel .='"';
+	$carousel .= 'data-autoplay="';
+		$carousel .= $this->getConfig("autoplay")?"true":"false";
+	$carousel .= '"';
+	$carousel .= 'data-autoplay-timeout="';
+		$carousel .= $this->getConfig("autoplay_timeout", 3000);
+	$carousel .= '"';
+	$carousel .= 'data-dots="';
+		$carousel .= $this->getConfig("dots")?"true":"false";
+	$carousel .= '"';
+	$carousel .= 'data-loop="';
+		$carousel .= $this->getConfig("loop")?"true":"false";
+	$carousel .= '"';
+	$carousel .= 'data-nav = "';
+		$carousel .= $this->getConfig("nav")?"true":"false";
+	$carousel .= '"';
+	if($nav_prev){
+		$carousel .='data-nav-text-owlpre="' . str_replace('"', "'", $nav_prev) . '"';
+	}
+	if($nav_next){
+    	$carousel .='data-nav-text-owlnext="' . str_replace('"', "'", $nav_next) . '"';
+	}
+	$carousel .= 'data-autoplay-pauonhover="';
+	$carousel .= $this->getConfig("autoplay_hoverpause")?"true":"false";
+	$carousel .= '"';
+	$carousel .= 'data-mobile-items="'.$mobile_items.'"';
+	$carousel .= 'data-tablet-small-items="'.$tablet_small_items.'"';
+	$carousel .= 'data-tablet-items="'.$tablet_small_items.'"';
+	$carousel .= 'data-portrait-items="'.$portrait_items.'"';
+	$carousel .= 'data-large-items="'.$large_items.'"';
+	$carousel .= 'data-large-max-items="'.$large_max_items.'"';
+}else{
+	$classes = 'plist';
+}
+$d=0;
+$c=0;
+$active = '';
+$type = explode(',',$this->getConfig('types'));
+
+?>
+<?php
+$y = 0;
+/** Post Settings **/
+$show_image             = $this->getConfig("show_image");
+$image_width            = (int)$this->getConfig("image_width", 800);
+$image_height           = (int)$this->getConfig("image_height");
+$show_title             = $this->getConfig("show_title");
+$show_shortdescription  = $this->getConfig("show_shortdescription");
+$shortdescription_count = $this->getConfig("shortdescription_count");
+$show_readmorelink      = $this->getConfig("show_readmorelink");
+$readmoreBgColor		= $this->getConfig("rebg_color");
+$readmoreColor			= $this->getConfig("re_color");
+$readmoreStyle = '';
+if($readmoreBgColor) $readmoreStyle .= 'background: ' . $readmoreBgColor . ';';
+if($readmoreColor) $readmoreStyle .= 'color: ' . $readmoreColor . ';';
+if($readmoreStyle!='') $readmoreStyle = 'style="' . $readmoreStyle .'"';
+$show_categories        = $this->getConfig("show_categories");
+$show_author            = $this->getConfig("show_author");
+$show_commentcount      = $this->getConfig("show_commentcount");
+$disable_comment 		= $helper->getConfig('general_settings/disable_comment');
+if($disable_comment) {
+	$show_commentcount = false;
+}
+$show_updatedtime       = $this->getConfig("show_updatedtime");
+$show_createdtime       = $this->getConfig("show_createdtime");
+$show_hits              = $this->getConfig("show_hits");
+$show_tags              = $this->getConfig("show_tags");
+$show_socialnetworks    = $this->getConfig("show_socialnetwork");
+$item_height            = (int)$this->getConfig("item_height");
+$catCollestion 			= $this->getCategoryCollection();
+$args = array();
+foreach ($catCollestion as $_cat) {
+	if(in_array($_cat->getCategoryId(),$get_categories) ){
+		$args[] =$_cat->getCategoryId();
+	}
+}
+foreach ($type as $_type) {
+	if(in_array($_type,$get_categories) ){
+		$args[] =$_type;
+	}
+}
+?>
+<div class="block ves-blog post-list postsstyle-style4 postsgrid1 blog-widget blog-widget-<?= $widgetStyle ?>">
+	<?php if($widget_title!=''){ ?>
+	<div class="block-title">
+		<h2 <?php if($titleColor!=''){ echo 'style="color: ' . $titleColor . '"'; } ?>><strong><?= $widget_title; ?></strong></h2>
+	</div>
+	<?php } ?>
+	<?php if($html!=''){ ?>
+	<div class="pretext-html"><?= $html ?></div>
+	<?php } ?>
+	<div class="block-content blog-grid" <?php if($border_color = $this->getConfig('border_color')){ echo 'style="border-bottom-color: ' . $border_color . '"'; } ?>>
+		<?php if($catCollestion->count()){ ?>
+		<ul class="nav nav-tabs" id="nav-<?= $blockId ?>" role="tablist">
+		<?php foreach ($catCollestion as $_cat) {
+			if(in_array($_cat->getCategoryId(),$get_categories) ){
+				$c++;
+				if($c == 1) { $active = 'active'; } else { $active = '';} ?>
+				<li class = "<?= $active; ?>" role="presentation"><a href="#tab<?= $_cat->getCategoryId() . '-' . $blockId ?>" aria-controls="<?= $_cat->getName(); ?>" role="tab" data-toggle="tab"><?= $_cat->getName(); ?></a></li>
+
+		<?php }
+		} ?>
+		<?php foreach ($type as $key => $_type) {
+			if(in_array($_type,$get_categories) ){
+				$c++;
+				if($c == 1) { $active = 'active'; } else { $active = '';} ?>
+				<li class = "<?= $active; ?>" role="presentation"><a href="#tab<?= $_type . '-' . $blockId ?>" aria-controls="<?= $_type; ?>" role="tab" data-toggle="tab"><?= ucwords($_type); ?></a></li>
+		<?php }
+			} ?>
+		</ul>
+
+		<div class="tab-content">
+
+		<?php  foreach ($args as $key => $arg) {
+			if(in_array($arg,$get_categories) ){
+				$d++;
+				if($d == 1) { $active = 'active in'; } else { $active = '';}  ?>
+				<div id="tab<?= $arg . '-' . $blockId ?>" class="tab-pane fade <?= $active; ?>">
+				<?php
+					if(is_numeric($arg)) {
+						$collection  = $this->getPostCollection($arg);
+					} else {
+						$collection  = $this->getBlogTypeCollection($arg);
+					}
+					$i = 1;
+					$x = 0;
+					$total = $collection->count();
+					if($total%$number_item_percolumn == 0){
+						$column = $total/$number_item_percolumn;
+					}else{
+						$column = floor($total/$number_item_percolumn)+1;
+					}
+					$_postCollection = [];
+					$i = $x = 0;
+					foreach ($collection as $_post) {
+						if($i<$column){
+							$i++;
+						}else{
+							$i = 1;
+							$x++;
+						}
+						$_postCollection[$i][$x] = $_post;
+					}
+				?>
+				<ul id="<?= $blockId ?>" class="<?= $classes ?>" <?= $carousel; ?>>
+					<?php foreach ($_postCollection as $_columnCollection) { ?>
+					<li class="ves-post">
+						<?php
+						$y = 0;
+						$show_categories        = $this->getConfig("show_categories");
+						$show_author            = $this->getConfig("show_author");
+						$show_commentcount      = $this->getConfig("show_commentcount");
+						$show_hits              = $this->getConfig("show_hits");
+						$show_tags              = $this->getConfig("show_tags");
+						$show_socialnetworks    = $this->getConfig("show_socialnetwork");
+						$item_height            = (int)$this->getConfig("item_height");
+						$show_image             = $this->getConfig("show_image");
+						$image_width            = (int)$this->getConfig("image_width", 800);
+						$image_height           = (int)$this->getConfig("image_height");
+						$show_shortdescription  = $this->getConfig("show_shortdescription");
+						$show_readmorelink      = $this->getConfig("show_readmorelink");
+						?>
+						<?php foreach ($_columnCollection as $_post){ ?>
+						<?php $postUrl = $helper->getPostUrl($_post); ?>
+						<?php $postLinkAttr = $helper->getPostUrlLinkAttr($_post); ?>
+						<?php
+						if($y==1){
+							if($apply == 'all') {
+								$item_height = 0;
+								$image_width = 110;
+								$image_height = 75;
+								$show_socialnetworks = $show_tags = $show_shortdescription = $show_categories = $show_author = $show_hits = $show_readmorelink = false;
+							}
+						}
+						?>
+						<?php
+						$style = '';
+						if($layout_type=='owl_carousel' && $item_height>0){
+							$style = 'style="height:' . $item_height . 'px"';
+						}
+						?>
+						<div class="ves-post post-item <?php if($y==0){ echo "first-items"; }else{ echo "other-items"; } ?>" <?= $style; ?>>
+							<div class="post-wrapper">
+								<?php if($show_image){ ?>
+								<?php $imageClass = ''; ?>
+								<?php if($_post->getImageType() == 2 && $_post->getImageVideoId()!=''){
+									$imageClass = ' post-video';
+								} ?>
+								<div class="post-image <?= $imageClass; ?>">
+									<a href="<?= $postUrl ?>" <?= $postLinkAttr;?> title="<?= $_post->getTitle(); ?>">
+										<?php if( $_post->getThumbnailType() == 1 && $_post->getPostThumbnail()!=''){ ?>
+										<?php if($_post->getImageType() == 2 && $_post->getImageVideoId()!=''){ ?>
+										<span class="fa overlay-icon"></span>
+										<?php }else{ ?>
+										<span class="fa overlay-icon"></span>
+										<?php } ?>
+										<?php if($image_width>0){ ?>
+										<img src="<?= $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height) ?>" height="<?= $image_height ?>" width="<?= $image_width ?>" alt="<?= $_post->getTitle(); ?>"/>
+										<?php }else{ ?>
+										<img src="<?= $helper->getMediaUrl($_post->getPostThumbnail()) ?>" alt="<?= $_post->getTitle(); ?>"/>
+										<?php } ?>
+										<?php }else if($_post->getThumbnailType() == 2){ ?>
+										<?php if($_post->getThumbnailVideoType()==1 && $_post->getThumbnailVideoId()!=''){ ?>
+										<iframe width="<?= $image_width ?>" height="<?= $image_height ?>" src="https://www.youtube.com/embed/<?= $_post->getThumbnailVideoId() ?>" frameborder="0" allowfullscreen></iframe>
+										<?php }else if($_post->getThumbnailVideoType()==2 && $_post->getThumbnailVideoId()!=''){ ?>
+										<iframe src="https://player.vimeo.com/video/<?= $_post->getThumbnailVideoId() ?>?color=3498DB&title=0&byline=0&portrait=0" width="<?= $image_width ?>" height="<?= $image_height ?>" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
+										<?php } ?>
+										<?php } ?>
+									</a>
+								</div>
+								<?php } ?>
+
+								<?php if($show_title){ ?>
+								<h2 class="post-title"><a <?php if($titleColor){ ?>data-hover-color="<?= $titleColor ?>"<?php } ?> href="<?= $postUrl ?>" <?= $postLinkAttr;?> title="<?= $_post->getTitle(); ?>"><?= $_post->getTitle(); ?></a></h2>
+								<?php } ?>
+								<?php if($show_socialnetworks){ ?>
+								<div class="post-socials">
+									<div class="addthis_toolbox addthis_default_style" data-title="<?= $_post->getTitle(); ?>" addthis:url="<?= $postUrl ?>">
+										<a class="addthis_button_facebook"></a>
+										<a class="addthis_button_twitter"></a>
+										<a class="addthis_button_google"></a>
+										<a class="addthis_button_email"></a>
+										<a class="addthis_button_pinterest_share"></a>
+										<a class="addthis_button_compact"></a>
+									</div>
+								</div>
+								<?php } ?>
+								<div class="post-meta">
+									<?php if($show_author){ ?>
+									<div class="post-author">
+										<?php $author = $helper->getPostAuthor($_post);?>
+										<i class="fa fa-user"></i> <a href="<?= $helper->getAuthorUrl($author); ?>" title="<?= $author->getNickName() ?>"><?= $author->getNickName() ?></a>
+									</div>
+									<?php } ?>
+									<?php if($show_createdtime || $show_updatedtime){ ?>
+									<div class="post-date">
+										<?php if($show_createdtime){ ?>
+										<?php $createdTime = $helper->getFormatDate($_post->getCreationTime(), $dateFormat); ?>
+										<i class="fa fa-clock-o"></i> <span><?= $createdTime; ?></span>
+										<?php } ?>
+										<?php if($show_updatedtime){ ?>
+										<?php $updateTime = $helper->getFormatDate($_post->getUpdateTime(), $dateFormat); ?>
+										<i class="fa fa-clock-o"></i> <span><?= __('Updated on %1', $updateTime); ?></span>
+										<?php } ?>
+									</div>
+									<?php } ?>
+									<?php if($show_categories){ ?>
+									<div class="post-categories">
+										<?php
+										$categories = $_post->getData('categories');
+										$count = count($categories);
+										?>
+										<i class="fa fa-folder"></i>
+										<?php foreach ($categories as $k => $v) { ?>
+										<a href="<?= $helper->getCategoryUrl($v['identifier'])  ?>" title="<?= $v['name'] ?>"><?= $v['name'] ?></a>
+										<?php if(isset($categories[$k+1])) echo __(', '); ?>
+										<?php } ?>
+									</div>
+									<?php } ?>
+									<?php if($show_hits){ ?>
+									<div class="post-hits"><i class="fa fa-eye"></i> <span><?= (int)$_post->getHits(); ?></span></div>
+									<?php } ?>
+									<?php if($show_commentcount){ ?>
+									<div class="post-comment">
+										<i class="fa fa-comments"></i> <a href="<?= $postUrl ?>#comments" <?= $postLinkAttr;?>><?= $_post->getCommentCount(); ?></a>
+									</div>
+
+									<?php } ?>
+								</div>
+								<?php if($show_tags){ ?>
+								<?php $tags = $_post->getTag(); ?>
+								<?php if(!empty($tags)){ ?>
+								<div class="post-tag">
+									<span><?= __('Tags:'); ?></span>
+									<?php foreach ($tags as $k => $v) { ?>
+									<a href="<?= $helper->getTagUrl($v['alias']) ?>"><?= trim($v['name']) ?></a>
+									<?php if(isset($tags[$k+1])) echo __(', '); ?>
+									<?php } ?>
+								</div>
+								<?php } ?>
+								<?php } ?>
+								<?php if($show_shortdescription){ ?>
+								<div class="post-summary">
+									<?php $shortContent = $_post->getShortContent(); ?>
+									<?= $helper->subString($shortContent, (int)$shortdescription_count); ?>
+								</div>
+								<?php if($show_readmorelink){ ?>
+								<div class="post-readmore"><a href="<?= $postUrl ?>" <?= $postLinkAttr;?> title="<?= $_post->getTitle(); ?>" <?= $readmoreStyle ?>><?= __('Read more') ?> <i class="fa fa-angle-double-right" aria-hidden="true"></i></a></div>
+								<?php } ?>
+								<?php } ?>
+							</div>
+						</div>
+						<?php $y++; ?>
+						<?php } ?>
+					</li>
+					<?php } ?>
+				</ul>
+
+			</div>
+
+		<?php }
+		} ?>
+		<?php } // Category Collection ?>
+
+		<?php  if($layout_type =='owl_carousel'){ ?>
+		<script>
+			require([
+				'jquery',
+				'Ves_All/lib/bootstrap/js/bootstrap.min',
+				], function($){
+					jQuery(document).ready(function() {
+						var tab = $('#nav-<?= $blockId ?>');
+						var tabParent = tab.parents('.blog-widget');
+						tabParent.find('ul.owl-carousel').each(function(){
+							jQuery(this).addClass('abc').css({'width':tabParent.width() + 'px'});
+						});
+						$('#nav-<?= $blockId ?> a:first').tab('show');
+						var anchorColor = '';
+						$('#<?= $blockId ?> a').hover(function(){
+							anchorColor = '';
+							if($(this).data('hover-color')!=''){
+								$(this).css('color',$(this).data('hover-color'));
+							}
+						}, function(){
+							$(this).css('color','');
+						})
+					});
+				});
+			</script>
+			<?php }else { ?>
+			<script>
+				require([
+				'jquery',
+				'Ves_All/lib/bootstrap/js/bootstrap.min'
+				], function(){
+
+				});
+			</script>
+			<?php } ?>
+
+			<?php if($show_socialnetworks){ ?>
+			<script type="text/javascript" src="//s7.addthis.com/js/300/addthis_widget.js#pubid=ra-56ceab198f4f2e81"></script>
+			<?php } ?>
+			</div>
+
+		</div>
+	</div>
diff --git a/view/frontend/templates/widget/timeline.phtml b/view/frontend/templates/widget/timeline.phtml
index cca49ec..59dccac 100644
--- a/view/frontend/templates/widget/timeline.phtml
+++ b/view/frontend/templates/widget/timeline.phtml
@@ -1,360 +1,360 @@
-<?php
-$collection  = $this->getCollection();
-$helper      = $this->helper("Ves\Blog\Helper\Data");
-$imageHelper = $this->helper("Ves\Blog\Helper\Image");
-
-
-/** General Settings **/
-$dateFormat      = $helper->getConfig("general_settings/dateformat");
-$twitterUsername = $helper->getConfig("general_settings/twitter_username");
-$enableNetworks  = $helper->getConfig("general_settings/enable_networks");
-$networks        = array_flip(explode(",", $helper->getConfig("general_settings/networks")));
-$widget_title    = $this->getConfig("widget_title");
-$addition_class  = $this->getConfig("addition_class");
-$layout_type     = $this->getConfig("layout_type");
-$widgetStyle     = $this->getConfig('widget_style');
-$titleColor      = $this->getConfig('title_color');
-
-/** Post Settings **/
-$show_image             = $this->getConfig("show_image");
-$image_width            = (int)$this->getConfig("image_width", 800);
-$image_height           = (int)$this->getConfig("image_height");
-$show_title             = $this->getConfig("show_title");
-$show_shortdescription  = $this->getConfig("show_shortdescription");
-$shortdescription_count = $this->getConfig("shortdescription_count");
-$show_readmorelink      = $this->getConfig("show_readmorelink");
-$readmoreBgColor		= $this->getConfig("rebg_color");
-$readmoreColor			= $this->getConfig("re_color");
-$readmoreStyle = '';
-if($readmoreBgColor) $readmoreStyle .= 'background: ' . $readmoreBgColor . ';';
-if($readmoreColor) $readmoreStyle .= 'color: ' . $readmoreColor . ';';
-if($readmoreStyle!='') $readmoreStyle = 'style="' . $readmoreStyle .'"';
-$show_categories        = $this->getConfig("show_categories");
-$show_author            = $this->getConfig("show_author");
-$show_commentcount      = $this->getConfig("show_commentcount");
-$disable_comment 		= $helper->getConfig('general_settings/disable_comment');
-if($disable_comment) {
-	$show_commentcount = false;
-}
-$show_updatedtime       = $this->getConfig("show_updatedtime");
-$show_createdtime       = $this->getConfig("show_createdtime");
-$show_hits              = $this->getConfig("show_hits");
-$show_tags              = $this->getConfig("show_tags");
-$show_socialnetworks    = $this->getConfig("show_socialnetwork");
-$item_height            = (int)$this->getConfig("item_height");
-
-
-/** Owl Carousel Settings **/
-$item_height           = (int)$this->getConfig("item_height");
-$number_item_percolumn = $this->getConfig("number_item_percolumn");
-$large_max_items       = $this->getConfig("large_max_items");
-$large_items           = $this->getConfig("large_items");
-$portrait_items        = $this->getConfig("portrait_items");
-$tablet_items          = $this->getConfig("tablet_items");
-$tablet_small_items    = $this->getConfig("tablet_small_items");
-$mobile_items          = $this->getConfig("mobile_items");
-$rtl                   = $this->getConfig("rtl");
-$autoplay              = $this->getConfig("autoplay");
-$autoplay_timeout      = $this->getConfig("autoplay_timeout");
-$autoplay_hoverpause   = $this->getConfig("autoplay_hoverpause");
-$dots                  = $this->getConfig("dots");
-$nav                   = $this->getConfig("nav");
-$nav_prev              = str_replace("'", '"', $this->getConfig("nav_prev"));
-$nav_next              = str_replace("'", '"', $this->getConfig("nav_next"));
-$loop                  = $this->getConfig("loop");
-$mousedrag             = $this->getConfig("mousedrag");
-$touchdrag             = $this->getConfig("touchdrag");
-$pulldrag              = $this->getConfig("pulldrag");
-
-$html = '';
-
-$cmsblock = $this->getConfig('cmsblock');
-$pretext_html = $this->getConfig('pretext_html');
-if($cmsblock === 'pretext_html' && $pretext_html){
-	$html = base64_decode($pretext_html);
-}elseif($cmsblock!=''){
-	$html = $this->getCmsBlockModel()->load($cmsblock)->getContent();
-}
-$html = $helper->filter($html);
-
-$i = 1;
-$x = 0;
-$total = $collection->count();
-
-if($total%$number_item_percolumn == 0){
-	$column = $total/$number_item_percolumn;
-}else{
-	$column = floor($total/$number_item_percolumn)+1;
-}
-
-$_postCollection = [];
-$i = $x = 0;
-foreach ($collection as $_post) {
-	if($i<$column){
-		$i++;
-	}else{
-		$i = 1;
-		$x++;
-	}
-	$_postCollection[$i][$x] = $_post;
-}
-
-$blockId = 'block' . time().rand();
-$classes = '';
-$carousel = '';
-if($layout_type == 'owl_carousel'){
-	$classes = 'owl-carousel owl-theme';
-	$carousel .= 'data-items="'.$this->getConfig("column", 3).'"';
-	$carousel .= 'data-mousedrag="';
-		$carousel .= $this->getConfig("mousedrag")?"true":"false";
-	$carousel .= '"';
-	$carousel .= 'data-pulldrag="';
-		$carousel .= $this->getConfig("pulldrag")?"true":"false";
-	$carousel .='"';
-	$carousel .= 'data-freedrag="';
-		$carousel .= $this->getConfig("freedrag")?"true":"false";
-	$carousel .='"';
-	$carousel .= 'data-stagepadding="';
-		$carousel .= (int)$this->getConfig("stagepadding");
-	$carousel .= '"';
-	$carousel .= 'data-lazyload="';
-		$carousel .= $this->getConfig("lazyload")?"true":"false";
-	$carousel .= '"';
-	$carousel .= 'data-rtl="';
-		$carousel .= $this->getConfig("rtl")?"true":"false";
-	$carousel .= '"';
-	$carousel .= 'data-center="';
-		$carousel .= $this->getConfig("center")?"true":"false";
-	$carousel .='"';
-	$carousel .= 'data-margin="';
-		$carousel .= (int)$this->getConfig("margin");
-	$carousel .='"';
-	$carousel .= 'data-autoplay="';
-		$carousel .= $this->getConfig("autoplay")?"true":"false";
-	$carousel .= '"';
-	$carousel .= 'data-autoplay-timeout="';
-		$carousel .= $this->getConfig("autoplay_timeout", 3000);
-	$carousel .= '"';
-	$carousel .= 'data-dots="';
-		$carousel .= $this->getConfig("dots")?"true":"false";
-	$carousel .= '"';
-	$carousel .= 'data-loop="';
-		$carousel .= $this->getConfig("loop")?"true":"false";
-	$carousel .= '"';
-	$carousel .= 'data-nav = "';
-		$carousel .= $this->getConfig("nav")?"true":"false";
-	$carousel .= '"';
-	if($nav_prev){
-		$carousel .='data-nav-text-owlpre="' . str_replace('"', "'", $nav_prev) . '"';
-	}
-	if($nav_next){
-    	$carousel .='data-nav-text-owlnext="' . str_replace('"', "'", $nav_next) . '"';
-	}
-	$carousel .= 'data-autoplay-pauonhover="';
-	$carousel .= $this->getConfig("autoplay_hoverpause")?"true":"false";
-	$carousel .= '"';
-	$carousel .= 'data-mobile-items="'.$mobile_items.'"';
-	$carousel .= 'data-tablet-small-items="'.$tablet_small_items.'"';
-	$carousel .= 'data-tablet-items="'.$tablet_small_items.'"';
-	$carousel .= 'data-portrait-items="'.$portrait_items.'"';
-	$carousel .= 'data-large-items="'.$large_items.'"';
-	$carousel .= 'data-large-max-items="'.$large_max_items.'"';
-}else{
-	$classes = 'plist';
-}
-
-?>
-<div class="block ves-blog post-list postsstyle-style4 postsgrid1 blog-widget blog-widget-<?php echo $widgetStyle ?>">
-	<?php if($widget_title!=''){ ?>
-	<div class="block-title">
-		<h2 <?php if($titleColor!=''){ echo 'style="color: ' . $titleColor . '"'; } ?>><strong><?php echo $widget_title; ?></strong></h2>
-	</div>
-	<?php } ?>
-	<?php if($html!=''){ ?>
-	<div class="pretext-html"><?php echo $html ?></div>
-	<?php } ?>
-	<div class="block-content blog-grid" <?php if($border_color = $this->getConfig('border_color')){ echo 'style="border-bottom-color: ' . $border_color . '"'; } ?>>
-		<?php if($total>0){ ?>
-		<ul id="<?php echo $blockId ?>" class="<?php echo $classes ?> ves-timeline-ulist" <?php echo $carousel; ?>>
-			<?php $c=0; foreach ($_postCollection as $_columnCollection) { $c++; ?>
-			<li class="ves-post ves-timeline-list-item">
-				<?php
-				$y = 0;
-				?>
-				<?php foreach ($_columnCollection as $_post){ ?>
-				<?php $postUrl = $helper->getPostUrl($_post); ?>
-				<?php $postLinkAttr = $helper->getPostUrlLinkAttr($_post); ?>
-				<?php
-				$style = '';
-				if($layout_type=='owl_carousel' && $item_height>0){
-					$style = 'style="height:' . $item_height . 'px"';
-				}
-				?>
-				<?php if($c%2 == 1) { $a = 1; $b=2; ?>
-				<div class="ves-timeline-col<?php echo $a; ?>">
-					<?php if($show_createdtime || $show_updatedtime){ ?>
-					<div class="post-date">
-						<?php if($show_createdtime){ ?>
-						<?php $createdTime = $helper->getFormatDate($_post->getCreationTime(), $dateFormat); ?>
-						<i class="fa fa-clock-o"></i> <span><?php echo $createdTime; ?></span>
-						<?php } ?>
-						<?php if($show_updatedtime){ ?>
-						<?php $updateTime = $helper->getFormatDate($_post->getUpdateTime(), $dateFormat); ?>
-						<i class="fa fa-clock-o"></i> <span><?php echo __('Updated on %1', $updateTime); ?></span>
-						<?php } ?>
-					</div>
-					<?php } ?>
-				</div>
-				<?php }else { $b=1; } ?>
-				<div class="ves-timeline-col<?php echo $b; ?>">
-					<div class="ves-post post-item other-items" <?php echo $style; ?>>
-						<div class="post-wrapper">
-							<?php if($show_image){ ?>
-							<?php $imageClass = ''; ?>
-							<?php if($_post->getImageType() == 2 && $_post->getImageVideoId()!=''){
-								$imageClass = ' post-video';
-							} ?>
-							<div class="post-image <?php echo $imageClass; ?>">
-								<a href="<?php echo $postUrl ?>" <?php echo $postLinkAttr;?> title="<?php echo $_post->getTitle(); ?>">
-									<?php if( $_post->getThumbnailType() == 1 && $_post->getPostThumbnail()!=''){ ?>
-									<?php if($_post->getImageType() == 2 && $_post->getImageVideoId()!=''){ ?>
-									<span class="fa overlay-icon"></span>
-									<?php }else{ ?>
-									<span class="fa overlay-icon"></span>
-									<?php } ?>
-									<?php if($image_width>0){ ?>
-									<img src="<?php echo $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height) ?>" height="<?php echo $image_height ?>" width="<?php echo $image_width ?>" alt="<?php echo $_post->getTitle(); ?>"/>
-									<?php }else{ ?>
-									<img src="<?php echo $helper->getMediaUrl($_post->getThumbnail()) ?>" alt="<?php echo $_post->getTitle(); ?>"/>
-									<?php } ?>
-									<?php }else if($_post->getThumbnailType() == 2){ ?>
-									<?php if($_post->getThumbnailVideoType()==1 && $_post->getThumbnailVideoId()!=''){ ?>
-									<iframe width="<?php echo $image_width ?>" height="<?php echo $image_height ?>" src="https://www.youtube.com/embed/<?php echo $_post->getThumbnailVideoId() ?>" frameborder="0" allowfullscreen></iframe>
-									<?php }else if($_post->getThumbnailVideoType()==2 && $_post->getThumbnailVideoId()!=''){ ?>
-									<iframe src="https://player.vimeo.com/video/<?php echo $_post->getThumbnailVideoId() ?>?color=3498DB&title=0&byline=0&portrait=0" width="<?php echo $image_width ?>" height="<?php echo $image_height ?>" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
-									<?php } ?>
-									<?php } ?>
-								</a>
-							</div>
-							<?php } ?>
-
-							<?php if($show_title){ ?>
-							<h2 class="post-title"><a <?php if($titleColor){ ?>data-hover-color="<?php echo $titleColor ?>"<?php } ?> href="<?php echo $postUrl ?>" <?php echo $postLinkAttr;?> title="<?php echo $_post->getTitle(); ?>"><?php echo $_post->getTitle(); ?></a></h2>
-							<?php } ?>
-							<?php if($show_socialnetworks){ ?>
-							<div class="post-socials">
-								<div class="addthis_toolbox addthis_default_style" data-title="<?php echo $_post->getTitle(); ?>" addthis:url="<?php echo $postUrl ?>">
-									<a class="addthis_button_facebook"></a>
-									<a class="addthis_button_twitter"></a>
-									<a class="addthis_button_google"></a>
-									<a class="addthis_button_email"></a>
-									<a class="addthis_button_pinterest_share"></a>
-									<a class="addthis_button_compact"></a>
-								</div>
-							</div>
-							<?php } ?>
-							<div class="post-meta">
-								<?php if($show_author){ ?>
-								<div class="post-author">
-									<?php $author = $helper->getPostAuthor($_post);?>
-									<i class="fa fa-user"></i> <a href="<?php echo $helper->getAuthorUrl($author); ?>" title="<?php echo $author->getNickName() ?>"><?php echo $author->getNickName() ?></a>
-								</div>
-								<?php } ?>
-								
-								<?php if($show_categories){ ?>
-								<div class="post-categories">
-									<?php
-									$categories = $_post->getData('categories');
-									$count = count($categories);
-									?>
-									<i class="fa fa-folder"></i> 
-									<?php foreach ($categories as $k => $v) { ?>
-									<a href="<?php echo $helper->getCategoryUrl($v['identifier'])  ?>" title="<?php echo $v['name'] ?>"><?php echo $v['name'] ?></a>
-									<?php if(isset($categories[$k+1])) echo __(', '); ?>
-									<?php } ?>
-								</div>
-								<?php } ?>
-								<?php if($show_hits){ ?>
-								<div class="post-hits"><i class="fa fa-eye"></i> <span><?php echo (int)$_post->getHits(); ?></span></div>
-								<?php } ?>
-								<?php if($show_commentcount){ ?>
-								<div class="post-comment">
-									<i class="fa fa-comments"></i> <a href="<?php echo $postUrl ?>#comments" <?php echo $postLinkAttr;?>><?php echo $_post->getCommentCount(); ?></a>
-								</div>
-
-								<?php } ?>
-							</div>
-							<?php if($show_tags){ ?>
-							<?php $tags = $_post->getTag(); ?>
-							<?php if(!empty($tags)){ ?>
-							<div class="post-tag">
-								<span><?php echo __('Tags:'); ?></span>
-								<?php foreach ($tags as $k => $v) { ?>
-								<a href="<?php echo $helper->getTagUrl($v['alias']) ?>"><?php echo trim($v['name']) ?></a>
-								<?php if(isset($tags[$k+1])) echo __(', '); ?>
-								<?php } ?>
-							</div>
-							<?php } ?>
-							<?php } ?>
-							<?php if($show_shortdescription){ ?>
-							<div class="post-summary">
-								<?php $shortContent = $_post->getShortContent(); ?>
-								<?php echo $helper->subString($shortContent, (int)$shortdescription_count); ?>
-							</div>
-							<?php if($show_readmorelink){ ?>
-							<div class="post-readmore"><a href="<?php echo $postUrl ?>" <?php echo $postLinkAttr;?> title="<?php echo $_post->getTitle(); ?>" <?php echo $readmoreStyle ?>><?php echo __('Read more') ?> <i class="fa fa-angle-double-right" aria-hidden="true"></i></a></div>
-							<?php } ?>
-							<?php } ?>
-						</div>
-					</div>
-				</div>
-				<?php if($c%2 == 0) { $a = 2;  ?>
-				<div class="ves-timeline-col<?php echo $a; ?>">
-					<?php if($show_createdtime || $show_updatedtime){ ?>
-					<div class="post-date">
-						<?php if($show_createdtime){ ?>
-						<?php $createdTime = $helper->getFormatDate($_post->getCreationTime(), $dateFormat); ?>
-						<i class="fa fa-clock-o"></i> <span><?php echo $createdTime; ?></span>
-						<?php } ?>
-						<?php if($show_updatedtime){ ?>
-						<?php $updateTime = $helper->getFormatDate($_post->getUpdateTime(), $dateFormat); ?>
-						<i class="fa fa-clock-o"></i> <span><?php echo __('Updated on %1', $updateTime); ?></span>
-						<?php } ?>
-					</div>
-					<?php } ?>
-				</div>
-				<?php } ?>	
-				<?php $y++; ?>
-				<?php } ?>
-			</li>
-			<?php } ?>
-		</ul>
-		<?php } ?>
-		<?php if($layout_type =='owl_carousel'){ ?>
-		<script>
-			require([
-				'jquery'
-				], function($){
-					jQuery(document).ready(function() {
-
-						var anchorColor = '';
-						$('#<?php echo $blockId ?> a').hover(function(){
-							anchorColor = '';
-							if($(this).data('hover-color')!=''){
-								$(this).css('color',$(this).data('hover-color'));
-							}
-						}, function(){
-							$(this).css('color','');
-						})
-
-						
-					});
-				});
-			</script>
-			<?php } ?>
-
-			<?php if($show_socialnetworks){ ?>
-			<script type="text/javascript" src="//s7.addthis.com/js/300/addthis_widget.js#pubid=ra-56ceab198f4f2e81"></script>
-			<?php } ?>
-		</div>
-	</div>
\ No newline at end of file
+<?php
+$collection  = $this->getCollection();
+$helper      = $this->helper("Ves\Blog\Helper\Data");
+$imageHelper = $this->helper("Ves\Blog\Helper\Image");
+
+
+/** General Settings **/
+$dateFormat      = $helper->getConfig("general_settings/dateformat");
+$twitterUsername = $helper->getConfig("general_settings/twitter_username");
+$enableNetworks  = $helper->getConfig("general_settings/enable_networks");
+$networks        = array_flip(explode(",", $helper->getConfig("general_settings/networks")));
+$widget_title    = $this->getConfig("widget_title");
+$addition_class  = $this->getConfig("addition_class");
+$layout_type     = $this->getConfig("layout_type");
+$widgetStyle     = $this->getConfig('widget_style');
+$titleColor      = $this->getConfig('title_color');
+
+/** Post Settings **/
+$show_image             = $this->getConfig("show_image");
+$image_width            = (int)$this->getConfig("image_width", 800);
+$image_height           = (int)$this->getConfig("image_height");
+$show_title             = $this->getConfig("show_title");
+$show_shortdescription  = $this->getConfig("show_shortdescription");
+$shortdescription_count = $this->getConfig("shortdescription_count");
+$show_readmorelink      = $this->getConfig("show_readmorelink");
+$readmoreBgColor		= $this->getConfig("rebg_color");
+$readmoreColor			= $this->getConfig("re_color");
+$readmoreStyle = '';
+if($readmoreBgColor) $readmoreStyle .= 'background: ' . $readmoreBgColor . ';';
+if($readmoreColor) $readmoreStyle .= 'color: ' . $readmoreColor . ';';
+if($readmoreStyle!='') $readmoreStyle = 'style="' . $readmoreStyle .'"';
+$show_categories        = $this->getConfig("show_categories");
+$show_author            = $this->getConfig("show_author");
+$show_commentcount      = $this->getConfig("show_commentcount");
+$disable_comment 		= $helper->getConfig('general_settings/disable_comment');
+if($disable_comment) {
+	$show_commentcount = false;
+}
+$show_updatedtime       = $this->getConfig("show_updatedtime");
+$show_createdtime       = $this->getConfig("show_createdtime");
+$show_hits              = $this->getConfig("show_hits");
+$show_tags              = $this->getConfig("show_tags");
+$show_socialnetworks    = $this->getConfig("show_socialnetwork");
+$item_height            = (int)$this->getConfig("item_height");
+
+
+/** Owl Carousel Settings **/
+$item_height           = (int)$this->getConfig("item_height");
+$number_item_percolumn = $this->getConfig("number_item_percolumn");
+$large_max_items       = $this->getConfig("large_max_items");
+$large_items           = $this->getConfig("large_items");
+$portrait_items        = $this->getConfig("portrait_items");
+$tablet_items          = $this->getConfig("tablet_items");
+$tablet_small_items    = $this->getConfig("tablet_small_items");
+$mobile_items          = $this->getConfig("mobile_items");
+$rtl                   = $this->getConfig("rtl");
+$autoplay              = $this->getConfig("autoplay");
+$autoplay_timeout      = $this->getConfig("autoplay_timeout");
+$autoplay_hoverpause   = $this->getConfig("autoplay_hoverpause");
+$dots                  = $this->getConfig("dots");
+$nav                   = $this->getConfig("nav");
+$nav_prev              = str_replace("'", '"', $this->getConfig("nav_prev"));
+$nav_next              = str_replace("'", '"', $this->getConfig("nav_next"));
+$loop                  = $this->getConfig("loop");
+$mousedrag             = $this->getConfig("mousedrag");
+$touchdrag             = $this->getConfig("touchdrag");
+$pulldrag              = $this->getConfig("pulldrag");
+
+$html = '';
+
+$cmsblock = $this->getConfig('cmsblock');
+$pretext_html = $this->getConfig('pretext_html');
+if($cmsblock === 'pretext_html' && $pretext_html){
+	$html = base64_decode($pretext_html);
+}elseif($cmsblock!=''){
+	$html = $this->getCmsBlockModel()->load($cmsblock)->getContent();
+}
+$html = $helper->filter($html);
+
+$i = 1;
+$x = 0;
+$total = $collection->count();
+
+if($total%$number_item_percolumn == 0){
+	$column = $total/$number_item_percolumn;
+}else{
+	$column = floor($total/$number_item_percolumn)+1;
+}
+
+$_postCollection = [];
+$i = $x = 0;
+foreach ($collection as $_post) {
+	if($i<$column){
+		$i++;
+	}else{
+		$i = 1;
+		$x++;
+	}
+	$_postCollection[$i][$x] = $_post;
+}
+
+$blockId = 'block' . time().rand();
+$classes = '';
+$carousel = '';
+if($layout_type == 'owl_carousel'){
+	$classes = 'owl-carousel owl-theme';
+	$carousel .= 'data-items="'.$this->getConfig("column", 3).'"';
+	$carousel .= 'data-mousedrag="';
+		$carousel .= $this->getConfig("mousedrag")?"true":"false";
+	$carousel .= '"';
+	$carousel .= 'data-pulldrag="';
+		$carousel .= $this->getConfig("pulldrag")?"true":"false";
+	$carousel .='"';
+	$carousel .= 'data-freedrag="';
+		$carousel .= $this->getConfig("freedrag")?"true":"false";
+	$carousel .='"';
+	$carousel .= 'data-stagepadding="';
+		$carousel .= (int)$this->getConfig("stagepadding");
+	$carousel .= '"';
+	$carousel .= 'data-lazyload="';
+		$carousel .= $this->getConfig("lazyload")?"true":"false";
+	$carousel .= '"';
+	$carousel .= 'data-rtl="';
+		$carousel .= $this->getConfig("rtl")?"true":"false";
+	$carousel .= '"';
+	$carousel .= 'data-center="';
+		$carousel .= $this->getConfig("center")?"true":"false";
+	$carousel .='"';
+	$carousel .= 'data-margin="';
+		$carousel .= (int)$this->getConfig("margin");
+	$carousel .='"';
+	$carousel .= 'data-autoplay="';
+		$carousel .= $this->getConfig("autoplay")?"true":"false";
+	$carousel .= '"';
+	$carousel .= 'data-autoplay-timeout="';
+		$carousel .= $this->getConfig("autoplay_timeout", 3000);
+	$carousel .= '"';
+	$carousel .= 'data-dots="';
+		$carousel .= $this->getConfig("dots")?"true":"false";
+	$carousel .= '"';
+	$carousel .= 'data-loop="';
+		$carousel .= $this->getConfig("loop")?"true":"false";
+	$carousel .= '"';
+	$carousel .= 'data-nav = "';
+		$carousel .= $this->getConfig("nav")?"true":"false";
+	$carousel .= '"';
+	if($nav_prev){
+		$carousel .='data-nav-text-owlpre="' . str_replace('"', "'", $nav_prev) . '"';
+	}
+	if($nav_next){
+    	$carousel .='data-nav-text-owlnext="' . str_replace('"', "'", $nav_next) . '"';
+	}
+	$carousel .= 'data-autoplay-pauonhover="';
+	$carousel .= $this->getConfig("autoplay_hoverpause")?"true":"false";
+	$carousel .= '"';
+	$carousel .= 'data-mobile-items="'.$mobile_items.'"';
+	$carousel .= 'data-tablet-small-items="'.$tablet_small_items.'"';
+	$carousel .= 'data-tablet-items="'.$tablet_small_items.'"';
+	$carousel .= 'data-portrait-items="'.$portrait_items.'"';
+	$carousel .= 'data-large-items="'.$large_items.'"';
+	$carousel .= 'data-large-max-items="'.$large_max_items.'"';
+}else{
+	$classes = 'plist';
+}
+
+?>
+<div class="block ves-blog post-list postsstyle-style4 postsgrid1 blog-widget blog-widget-<?= $widgetStyle ?>">
+	<?php if($widget_title!=''){ ?>
+	<div class="block-title">
+		<h2 <?php if($titleColor!=''){ echo 'style="color: ' . $titleColor . '"'; } ?>><strong><?= $widget_title; ?></strong></h2>
+	</div>
+	<?php } ?>
+	<?php if($html!=''){ ?>
+	<div class="pretext-html"><?= $html ?></div>
+	<?php } ?>
+	<div class="block-content blog-grid" <?php if($border_color = $this->getConfig('border_color')){ echo 'style="border-bottom-color: ' . $border_color . '"'; } ?>>
+		<?php if($total>0){ ?>
+		<ul id="<?= $blockId ?>" class="<?= $classes ?> ves-timeline-ulist" <?= $carousel; ?>>
+			<?php $c=0; foreach ($_postCollection as $_columnCollection) { $c++; ?>
+			<li class="ves-post ves-timeline-list-item">
+				<?php
+				$y = 0;
+				?>
+				<?php foreach ($_columnCollection as $_post){ ?>
+				<?php $postUrl = $helper->getPostUrl($_post); ?>
+				<?php $postLinkAttr = $helper->getPostUrlLinkAttr($_post); ?>
+				<?php
+				$style = '';
+				if($layout_type=='owl_carousel' && $item_height>0){
+					$style = 'style="height:' . $item_height . 'px"';
+				}
+				?>
+				<?php if($c%2 == 1) { $a = 1; $b=2; ?>
+				<div class="ves-timeline-col<?= $a; ?>">
+					<?php if($show_createdtime || $show_updatedtime){ ?>
+					<div class="post-date">
+						<?php if($show_createdtime){ ?>
+						<?php $createdTime = $helper->getFormatDate($_post->getCreationTime(), $dateFormat); ?>
+						<i class="fa fa-clock-o"></i> <span><?= $createdTime; ?></span>
+						<?php } ?>
+						<?php if($show_updatedtime){ ?>
+						<?php $updateTime = $helper->getFormatDate($_post->getUpdateTime(), $dateFormat); ?>
+						<i class="fa fa-clock-o"></i> <span><?= __('Updated on %1', $updateTime); ?></span>
+						<?php } ?>
+					</div>
+					<?php } ?>
+				</div>
+				<?php }else { $b=1; } ?>
+				<div class="ves-timeline-col<?= $b; ?>">
+					<div class="ves-post post-item other-items" <?= $style; ?>>
+						<div class="post-wrapper">
+							<?php if($show_image){ ?>
+							<?php $imageClass = ''; ?>
+							<?php if($_post->getImageType() == 2 && $_post->getImageVideoId()!=''){
+								$imageClass = ' post-video';
+							} ?>
+							<div class="post-image <?= $imageClass; ?>">
+								<a href="<?= $postUrl ?>" <?= $postLinkAttr;?> title="<?= $_post->getTitle(); ?>">
+									<?php if( $_post->getThumbnailType() == 1 && $_post->getPostThumbnail()!=''){ ?>
+									<?php if($_post->getImageType() == 2 && $_post->getImageVideoId()!=''){ ?>
+									<span class="fa overlay-icon"></span>
+									<?php }else{ ?>
+									<span class="fa overlay-icon"></span>
+									<?php } ?>
+									<?php if($image_width>0){ ?>
+									<img src="<?= $imageHelper->resizeImage($_post->getPostThumbnail(), $image_width, $image_height) ?>" height="<?= $image_height ?>" width="<?= $image_width ?>" alt="<?= $_post->getTitle(); ?>"/>
+									<?php }else{ ?>
+									<img src="<?= $helper->getMediaUrl($_post->getThumbnail()) ?>" alt="<?= $_post->getTitle(); ?>"/>
+									<?php } ?>
+									<?php }else if($_post->getThumbnailType() == 2){ ?>
+									<?php if($_post->getThumbnailVideoType()==1 && $_post->getThumbnailVideoId()!=''){ ?>
+									<iframe width="<?= $image_width ?>" height="<?= $image_height ?>" src="https://www.youtube.com/embed/<?= $_post->getThumbnailVideoId() ?>" frameborder="0" allowfullscreen></iframe>
+									<?php }else if($_post->getThumbnailVideoType()==2 && $_post->getThumbnailVideoId()!=''){ ?>
+									<iframe src="https://player.vimeo.com/video/<?= $_post->getThumbnailVideoId() ?>?color=3498DB&title=0&byline=0&portrait=0" width="<?= $image_width ?>" height="<?= $image_height ?>" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
+									<?php } ?>
+									<?php } ?>
+								</a>
+							</div>
+							<?php } ?>
+
+							<?php if($show_title){ ?>
+							<h2 class="post-title"><a <?php if($titleColor){ ?>data-hover-color="<?= $titleColor ?>"<?php } ?> href="<?= $postUrl ?>" <?= $postLinkAttr;?> title="<?= $_post->getTitle(); ?>"><?= $_post->getTitle(); ?></a></h2>
+							<?php } ?>
+							<?php if($show_socialnetworks){ ?>
+							<div class="post-socials">
+								<div class="addthis_toolbox addthis_default_style" data-title="<?= $_post->getTitle(); ?>" addthis:url="<?= $postUrl ?>">
+									<a class="addthis_button_facebook"></a>
+									<a class="addthis_button_twitter"></a>
+									<a class="addthis_button_google"></a>
+									<a class="addthis_button_email"></a>
+									<a class="addthis_button_pinterest_share"></a>
+									<a class="addthis_button_compact"></a>
+								</div>
+							</div>
+							<?php } ?>
+							<div class="post-meta">
+								<?php if($show_author){ ?>
+								<div class="post-author">
+									<?php $author = $helper->getPostAuthor($_post);?>
+									<i class="fa fa-user"></i> <a href="<?= $helper->getAuthorUrl($author); ?>" title="<?= $author->getNickName() ?>"><?= $author->getNickName() ?></a>
+								</div>
+								<?php } ?>
+
+								<?php if($show_categories){ ?>
+								<div class="post-categories">
+									<?php
+									$categories = $_post->getData('categories');
+									$count = count($categories);
+									?>
+									<i class="fa fa-folder"></i>
+									<?php foreach ($categories as $k => $v) { ?>
+									<a href="<?= $helper->getCategoryUrl($v['identifier'])  ?>" title="<?= $v['name'] ?>"><?= $v['name'] ?></a>
+									<?php if(isset($categories[$k+1])) echo __(', '); ?>
+									<?php } ?>
+								</div>
+								<?php } ?>
+								<?php if($show_hits){ ?>
+								<div class="post-hits"><i class="fa fa-eye"></i> <span><?= (int)$_post->getHits(); ?></span></div>
+								<?php } ?>
+								<?php if($show_commentcount){ ?>
+								<div class="post-comment">
+									<i class="fa fa-comments"></i> <a href="<?= $postUrl ?>#comments" <?= $postLinkAttr;?>><?= $_post->getCommentCount(); ?></a>
+								</div>
+
+								<?php } ?>
+							</div>
+							<?php if($show_tags){ ?>
+							<?php $tags = $_post->getTag(); ?>
+							<?php if(!empty($tags)){ ?>
+							<div class="post-tag">
+								<span><?= __('Tags:'); ?></span>
+								<?php foreach ($tags as $k => $v) { ?>
+								<a href="<?= $helper->getTagUrl($v['alias']) ?>"><?= trim($v['name']) ?></a>
+								<?php if(isset($tags[$k+1])) echo __(', '); ?>
+								<?php } ?>
+							</div>
+							<?php } ?>
+							<?php } ?>
+							<?php if($show_shortdescription){ ?>
+							<div class="post-summary">
+								<?php $shortContent = $_post->getShortContent(); ?>
+								<?= $helper->subString($shortContent, (int)$shortdescription_count); ?>
+							</div>
+							<?php if($show_readmorelink){ ?>
+							<div class="post-readmore"><a href="<?= $postUrl ?>" <?= $postLinkAttr;?> title="<?= $_post->getTitle(); ?>" <?= $readmoreStyle ?>><?= __('Read more') ?> <i class="fa fa-angle-double-right" aria-hidden="true"></i></a></div>
+							<?php } ?>
+							<?php } ?>
+						</div>
+					</div>
+				</div>
+				<?php if($c%2 == 0) { $a = 2;  ?>
+				<div class="ves-timeline-col<?= $a; ?>">
+					<?php if($show_createdtime || $show_updatedtime){ ?>
+					<div class="post-date">
+						<?php if($show_createdtime){ ?>
+						<?php $createdTime = $helper->getFormatDate($_post->getCreationTime(), $dateFormat); ?>
+						<i class="fa fa-clock-o"></i> <span><?= $createdTime; ?></span>
+						<?php } ?>
+						<?php if($show_updatedtime){ ?>
+						<?php $updateTime = $helper->getFormatDate($_post->getUpdateTime(), $dateFormat); ?>
+						<i class="fa fa-clock-o"></i> <span><?= __('Updated on %1', $updateTime); ?></span>
+						<?php } ?>
+					</div>
+					<?php } ?>
+				</div>
+				<?php } ?>
+				<?php $y++; ?>
+				<?php } ?>
+			</li>
+			<?php } ?>
+		</ul>
+		<?php } ?>
+		<?php if($layout_type =='owl_carousel'){ ?>
+		<script>
+			require([
+				'jquery'
+				], function($){
+					jQuery(document).ready(function() {
+
+						var anchorColor = '';
+						$('#<?= $blockId ?> a').hover(function(){
+							anchorColor = '';
+							if($(this).data('hover-color')!=''){
+								$(this).css('color',$(this).data('hover-color'));
+							}
+						}, function(){
+							$(this).css('color','');
+						})
+
+
+					});
+				});
+			</script>
+			<?php } ?>
+
+			<?php if($show_socialnetworks){ ?>
+			<script type="text/javascript" src="//s7.addthis.com/js/300/addthis_widget.js#pubid=ra-56ceab198f4f2e81"></script>
+			<?php } ?>
+		</div>
+	</div>