diff --git a/layouts/v7/modules/Calendar/AddActivityType.tpl b/layouts/v7/modules/Calendar/AddActivityType.tpl
index ab6d08fd19078c43ee25882f9eeef51b0fc3d822..474be3f21975c049ced88bab8bdb38bd11186964 100644
--- a/layouts/v7/modules/Calendar/AddActivityType.tpl
+++ b/layouts/v7/modules/Calendar/AddActivityType.tpl
@@ -8,7 +8,7 @@
  ************************************************************************************}
 {* modules/Calendar/views/ActivityTypeViews.php *}
 {strip}
-<div class="modal-dialog modelContainer">
+<div class="modal-dialog modelContainer modal-content">
     {assign var=HEADER_TITLE value={vtranslate('LBL_ADD_CALENDAR_VIEW', $MODULE)}}
     {include file="ModalHeader.tpl"|vtemplate_path:$MODULE TITLE=$HEADER_TITLE}
     <div class="modal-body">
diff --git a/layouts/v7/modules/Calendar/AddUserCalendar.tpl b/layouts/v7/modules/Calendar/AddUserCalendar.tpl
index 27c18c27a2cd1f691d30b29dc0d67112daa0fb91..9c30c15e31789af4362d6f1a4b91a532c452c9ac 100644
--- a/layouts/v7/modules/Calendar/AddUserCalendar.tpl
+++ b/layouts/v7/modules/Calendar/AddUserCalendar.tpl
@@ -10,7 +10,7 @@
 {strip}
 {assign var=SHARED_USER_INFO value= Zend_Json::encode($SHAREDUSERS_INFO)}
 {assign var=CURRENT_USER_ID value= $CURRENTUSER_MODEL->getId()}
-<div class="modal-dialog modelContainer">
+<div class="modal-dialog modelContainer modal-content">
     {assign var=HEADER_TITLE value={vtranslate('LBL_EDITING_CALENDAR_VIEW', $MODULE)}}
     {include file="ModalHeader.tpl"|vtemplate_path:$MODULE TITLE=$HEADER_TITLE}
     <div class="modal-body">
diff --git a/layouts/v7/modules/Calendar/EditActivityType.tpl b/layouts/v7/modules/Calendar/EditActivityType.tpl
index b9a1fd5da87daa12c03bb8deed8eee9b79dc3f49..c7c6443f22a5b01f98d6befd8eaaadc76f97b53b 100644
--- a/layouts/v7/modules/Calendar/EditActivityType.tpl
+++ b/layouts/v7/modules/Calendar/EditActivityType.tpl
@@ -8,7 +8,7 @@
  ************************************************************************************}
 {* modules/Calendar/views/ActivityTypeViews.php *}
 {strip}
-<div class="modal-dialog modelContainer">
+<div class="modal-dialog modelContainer modal-content">
     {assign var=HEADER_TITLE value={vtranslate('LBL_EDITING_CALENDAR_VIEW', $MODULE)}}
     {include file="ModalHeader.tpl"|vtemplate_path:$MODULE TITLE=$HEADER_TITLE}
     <div class="modal-body">
diff --git a/layouts/v7/modules/Calendar/EditUserCalendar.tpl b/layouts/v7/modules/Calendar/EditUserCalendar.tpl
index 76a5df79d69aa0ab8fc364fa461f35d8dfd3be16..3b081e2794407ecd51c9394a16d781aa84d8fa29 100644
--- a/layouts/v7/modules/Calendar/EditUserCalendar.tpl
+++ b/layouts/v7/modules/Calendar/EditUserCalendar.tpl
@@ -10,7 +10,7 @@
 {strip}
 {assign var=SHARED_USER_INFO value= Zend_Json::encode($SHAREDUSERS_INFO)}
 {assign var=CURRENT_USER_ID value= $CURRENTUSER_MODEL->getId()}
-<div class="modal-dialog modelContainer">
+<div class="modal-dialog modelContainer modal-content">
     {assign var=HEADER_TITLE value={vtranslate('LBL_EDITING_CALENDAR_VIEW', $MODULE)}}
     {include file="ModalHeader.tpl"|vtemplate_path:$MODULE TITLE=$HEADER_TITLE}
     <div class="modal-body">
diff --git a/layouts/v7/modules/Calendar/QuickCreate.tpl b/layouts/v7/modules/Calendar/QuickCreate.tpl
index 5d8abed257f86b36dcd5d2fcbf1141cf0720c22b..824a7b713ecb071e030ad7c33d41e88a9aa4ced0 100644
--- a/layouts/v7/modules/Calendar/QuickCreate.tpl
+++ b/layouts/v7/modules/Calendar/QuickCreate.tpl
@@ -144,7 +144,7 @@
 						{if $MODULE eq 'Events'}
 							{assign var="EDIT_VIEW_URL" value=$CALENDAR_MODULE_MODEL->getCreateEventRecordUrl()}
 						{/if}
-						<button class="btn" id="goToFullForm" data-edit-view-url="{$EDIT_VIEW_URL}" type="button"><strong>{vtranslate('LBL_GO_TO_FULL_FORM', $MODULE)}</strong></button>
+						<button class="btn btn-default" id="goToFullForm" data-edit-view-url="{$EDIT_VIEW_URL}" type="button"><strong>{vtranslate('LBL_GO_TO_FULL_FORM', $MODULE)}</strong></button>
 						<button {if $BUTTON_ID neq null} id="{$BUTTON_ID}" {/if} class="btn btn-success" type="submit" name="saveButton"><strong>{$BUTTON_LABEL}</strong></button>
 						<a href="#" class="cancelLink" type="reset" data-dismiss="modal">{vtranslate('LBL_CANCEL', $MODULE)}</a>
 					</center>
diff --git a/layouts/v7/modules/Calendar/QuickCreateFollowup.tpl b/layouts/v7/modules/Calendar/QuickCreateFollowup.tpl
index 6668be4b952707b4c844428306ba3813876408e6..721a1bb6173d1af368c83694abd195fe4752e5c1 100644
--- a/layouts/v7/modules/Calendar/QuickCreateFollowup.tpl
+++ b/layouts/v7/modules/Calendar/QuickCreateFollowup.tpl
@@ -8,7 +8,7 @@
  ************************************************************************************}
 {* modules/Calendar/views/QuickCreateFollowupAjax.php *}
 {strip}
-<div class="modal-dialog modelContainer">
+<div class="modal-dialog modelContainer modal-content">
 	{assign var=HEADER_TITLE value={vtranslate('LBL_CREATE_FOLLOWUP_EVENT', "Events")}}
 	{include file="ModalHeader.tpl"|vtemplate_path:$MODULE TITLE=$HEADER_TITLE}
 	<form class="form-horizontal followupCreateView" id="followupQuickCreate" name="followupQuickCreate" method="post" action="index.php">
diff --git a/layouts/v7/modules/Calendar/RecurringDeleteView.tpl b/layouts/v7/modules/Calendar/RecurringDeleteView.tpl
index af9c10d134a8b065401a5b06fd941fbe4501ad9c..d65a4fc3fbac9aefa74ac26d70fc34beb2ab7c0e 100644
--- a/layouts/v7/modules/Calendar/RecurringDeleteView.tpl
+++ b/layouts/v7/modules/Calendar/RecurringDeleteView.tpl
@@ -11,7 +11,7 @@
 {strip}
 <!--Confirmation modal for updating Recurring Events-->
 {assign var=MODULE value="Calendar"}
-<div class="modal-dialog modelContainer" style='min-width:350px;'>
+<div class="modal-dialog modelContainer modal-content" style='min-width:350px;'>
     {assign var=HEADER_TITLE value={vtranslate('LBL_DELETE_RECURRING_EVENT', $MODULE)}}
     {include file="ModalHeader.tpl"|vtemplate_path:$MODULE TITLE=$HEADER_TITLE}
     <div class="modal-body">
@@ -20,7 +20,7 @@
             <div class="row" style="padding: 1%;">
                 <span class="col-sm-12">
                     <span class="col-sm-4">
-                        <button class="btn onlyThisEvent" style="width : 150px"><strong>{vtranslate('LBL_ONLY_THIS_EVENT', $MODULE)}</strong></button>
+                        <button class="btn btn-default onlyThisEvent" style="width : 150px">{vtranslate('LBL_ONLY_THIS_EVENT', $MODULE)}</button>
                     </span>
                     <span class="col-sm-8">{vtranslate('LBL_ONLY_THIS_EVENT_DELETE_INFO', $MODULE)}</span>
                 </span>
@@ -28,7 +28,7 @@
             <div class="row" style="padding: 1%;">
                 <span class="col-sm-12">
                     <span class="col-sm-4">
-                        <button class="btn futureEvents" style="width : 150px"><strong>{vtranslate('LBL_FUTURE_EVENTS', $MODULE)}</strong></button>
+                        <button class="btn btn-default futureEvents" style="width : 150px">{vtranslate('LBL_FUTURE_EVENTS', $MODULE)}</button>
                     </span>
                     <span class="col-sm-8">{vtranslate('LBL_FUTURE_EVENTS_DELETE_INFO', $MODULE)}</span>
                 </span>
@@ -36,7 +36,7 @@
             <div class="row" style="padding: 1%;">
                 <span class="col-sm-12">
                     <span class="col-sm-4">
-                        <button class="btn allEvents" style="width : 150px"><strong>{vtranslate('LBL_ALL_EVENTS', $MODULE)}</strong></button>
+                        <button class="btn btn-default allEvents" style="width : 150px">{vtranslate('LBL_ALL_EVENTS', $MODULE)}</button>
                     </span>
                     <span class="col-sm-8">{vtranslate('LBL_ALL_EVENTS_DELETE_INFO', $MODULE)}</span>
                 </span>
diff --git a/layouts/v7/modules/Events/partials/EditViewContents.tpl b/layouts/v7/modules/Events/partials/EditViewContents.tpl
index c514ea42fb8f49bcba069d8bb18ce1d205263dd3..5430b9643a127db2ce1114ed0559e0d07670135f 100644
--- a/layouts/v7/modules/Events/partials/EditViewContents.tpl
+++ b/layouts/v7/modules/Events/partials/EditViewContents.tpl
@@ -36,7 +36,7 @@
 			<input type="hidden" name="recurringEditMode" value="" />
 			<!--Confirmation modal for updating Recurring Events-->
 			{assign var=MODULE value="Calendar"}
-			<div class="modal-dialog modelContainer recurringEventsUpdation hide" style='min-width:350px;'>
+			<div class="modal-dialog modelContainer recurringEventsUpdation modal-content hide" style='min-width:350px;'>
 				{assign var=HEADER_TITLE value={vtranslate('LBL_EDIT_RECURRING_EVENT', $MODULE)}}
 				{include file="ModalHeader.tpl"|vtemplate_path:$MODULE TITLE=$HEADER_TITLE}
 				<div class="modal-body">
@@ -45,7 +45,7 @@
 						<div class="row" style="padding: 1%;">
 							<span class="col-sm-12">
 								<span class="col-sm-4">
-									<button class="btn onlyThisEvent" style="width : 150px"><strong>{vtranslate('LBL_ONLY_THIS_EVENT', $MODULE)}</strong></button>
+									<button class="btn btn-default onlyThisEvent" style="width : 150px">{vtranslate('LBL_ONLY_THIS_EVENT', $MODULE)}</button>
 								</span>
 								<span class="col-sm-8">{vtranslate('LBL_ONLY_THIS_EVENT_EDIT_INFO', $MODULE)}</span>
 							</span>
@@ -53,7 +53,7 @@
 						<div class="row" style="padding: 1%;">
 							<span class="col-sm-12">
 								<span class="col-sm-4">
-									<button class="btn futureEvents" style="width : 150px"><strong>{vtranslate('LBL_FUTURE_EVENTS', $MODULE)}</strong></button>
+									<button class="btn btn-default futureEvents" style="width : 150px">{vtranslate('LBL_FUTURE_EVENTS', $MODULE)}</button>
 								</span>
 								<span class="col-sm-8">{vtranslate('LBL_FUTURE_EVENTS_EDIT_INFO', $MODULE)}</span>
 							</span>
@@ -61,7 +61,7 @@
 						<div class="row" style="padding: 1%;">
 							<span class="col-sm-12">
 								<span class="col-sm-4">
-									<button class="btn allEvents" style="width : 150px"><strong>{vtranslate('LBL_ALL_EVENTS', $MODULE)}</strong></button>
+									<button class="btn btn-default allEvents" style="width : 150px">{vtranslate('LBL_ALL_EVENTS', $MODULE)}</button>
 								</span>
 								<span class="col-sm-8">{vtranslate('LBL_ALL_EVENTS_EDIT_INFO', $MODULE)}</span>
 							</span>
diff --git a/layouts/v7/modules/PriceBooks/ListPriceUpdate.tpl b/layouts/v7/modules/PriceBooks/ListPriceUpdate.tpl
index e2bea6fcae44083ebdd3b55136e85821667dcf81..9801ff379cdda441e8c2654023badc0e80c51ef1 100644
--- a/layouts/v7/modules/PriceBooks/ListPriceUpdate.tpl
+++ b/layouts/v7/modules/PriceBooks/ListPriceUpdate.tpl
@@ -10,24 +10,25 @@
 
 {* START YOUR IMPLEMENTATION FROM BELOW. Use {debug} for information *}
 {strip}
-    <div class="modal-dialog modelContainer modal-md" id="listPriceUpdateContainer">
+    <div class="modal-dialog modelContainer modal-content modal-md" id="listPriceUpdateContainer">
         {assign var=HEADER_TITLE value={vtranslate('LBL_EDIT_LIST_PRICE', $MODULE)}}
         {include file="ModalHeader.tpl"|vtemplate_path:$MODULE TITLE=$HEADER_TITLE}
-        <div class="modal-body">
-            <form class="form-horizontal" id="listPriceUpdate" method="post" action="index.php">
+		<form class="form-horizontal" id="listPriceUpdate" method="post" action="index.php">
+			<div class="modal-body">
                 <input type="hidden" name="module" value="{$MODULE}" />
                 <input type="hidden" name="action" value="RelationAjax" />
                 <input type="hidden" name="src_record" value="{$PRICEBOOK_ID}" />
                 <input type="hidden" name="relid" value="{$REL_ID}" />
                 <div class="form-group">
-                    <label class="col-sm-4 control-label">{vtranslate('LBL_EDIT_LIST_PRICE',$MODULE)} &nbsp <span class="redColor">*</span> &nbsp; </label>
+                    <label class="col-sm-4 control-label">{vtranslate('LBL_EDIT_LIST_PRICE',$MODULE)} <span class="redColor">*</span>&nbsp;</label>
                     <div class="controls col-sm-4">
                         <input type="text" name="currentPrice" value="{$CURRENT_PRICE}" data-rule-required="true" class="inputElement" data-rule-currency="true"
                                data-decimal-separator='{$USER_MODEL->get('currency_decimal_separator')}' data-group-separator='{$USER_MODEL->get('currency_grouping_separator')}' />
                     </div>
                 </div>
-                {include file="ModalFooter.tpl"|vtemplate_path:$MODULE}
-            </form>
+			</div>
+			{include file="ModalFooter.tpl"|vtemplate_path:$MODULE}
+		</form>
         </div>
     </div>
 {/strip}
\ No newline at end of file
diff --git a/layouts/v7/modules/PriceBooks/RelatedList.tpl b/layouts/v7/modules/PriceBooks/RelatedList.tpl
index 9bc4472033031ad5e440f4cfefa896eb3055d850..ccd5375e7a4cc72a28471c4cb34994c84782d916 100644
--- a/layouts/v7/modules/PriceBooks/RelatedList.tpl
+++ b/layouts/v7/modules/PriceBooks/RelatedList.tpl
@@ -8,170 +8,134 @@
 ************************************************************************************}
 {* modules/PriceBooks/views/Detail.php *}
 
-{* START YOUR IMPLEMENTATION FROM BELOW. Use {debug} for information *}
-{*<!--
-/*********************************************************************************
-** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-* ("License"); You may not use this file except in compliance with the License
-* The Original Code is: vtiger CRM Open Source
-* The Initial Developer of the Original Code is vtiger.
-* Portions created by vtiger are Copyright (C) vtiger.
-* All Rights Reserved.
-*
-********************************************************************************/
--->*}
 {strip}
-    {if $RELATED_MODULE->get('name') neq 'Products' && $RELATED_MODULE->get('name') neq 'Services'}
-        {include file='RelatedList.tpl'|vtemplate_path:'Vtiger'}
-    {else}
-        <div class="relatedContainer">
-            <input type="hidden" name="currentPageNum" value="{$PAGING->getCurrentPage()}" />
-            <input type="hidden" name="relatedModuleName" class="relatedModuleName" value="{$RELATED_MODULE->get('name')}" />
-            <input type="hidden" value="{$ORDER_BY}" id="orderBy">
-            <input type="hidden" value="{$SORT_ORDER}" id="sortOrder">
-            <input type="hidden" value="{$RELATED_ENTIRES_COUNT}" id="noOfEntries">
-            <input type='hidden' value="{$PAGING->getPageLimit()}" id='pageLimit'>
-            <input type='hidden' value="{$TOTAL_ENTRIES}" id='totalCount'>
-            <input type='hidden' value="{$TAB_LABEL}" id='tab_label' name='tab_label'>
+	{if $RELATED_MODULE->get('name') neq 'Products' && $RELATED_MODULE->get('name') neq 'Services'}
+		{include file='RelatedList.tpl'|vtemplate_path:'Vtiger'}
+	{else}
+		<div class="relatedContainer">
+			<input type="hidden" name="currentPageNum" value="{$PAGING->getCurrentPage()}" />
+			<input type="hidden" name="relatedModuleName" class="relatedModuleName" value="{$RELATED_MODULE->get('name')}" />
+			<input type="hidden" value="{$ORDER_BY}" id="orderBy">
+			<input type="hidden" value="{$SORT_ORDER}" id="sortOrder">
+			<input type="hidden" value="{$RELATED_ENTIRES_COUNT}" id="noOfEntries">
+			<input type='hidden' value="{$PAGING->getPageLimit()}" id='pageLimit'>
+			<input type='hidden' value="{$TOTAL_ENTRIES}" id='totalCount'>
+			<input type='hidden' value="{$TAB_LABEL}" id='tab_label' name='tab_label'>
 
-            <div class="relatedHeader">
-                <div class="btn-toolbar row">
-                    <div class="col-lg-6 col-md-6 col-sm-6 btn-toolbar">
-                        {foreach item=RELATED_LINK from=$RELATED_LIST_LINKS['LISTVIEWBASIC']}
-                            <div class="btn-group">
-                                {assign var=IS_SELECT_BUTTON value={$RELATED_LINK->get('_selectRelation')}}
-                                <button type="button" class="btn
-                                {if $IS_SELECT_BUTTON eq true} selectRelation {/if} "
-                                {if $IS_SELECT_BUTTON eq true} data-moduleName={$RELATED_LINK->get('_module')->get('name')} {/if}
-                                {if $RELATED_LINK->isPageLoadLink()}onclick="window.location.href='{$RELATED_LINK->getUrl()}'"{/if}
-                                >{if $IS_SELECT_BUTTON eq false}<i class="icon-plus"></i>{/if}&nbsp;<strong>{$RELATED_LINK->getLabel()}</strong></button>
-                            </div>
-                        {/foreach}
-                        &nbsp;
-                    </div>
-                    {assign var=CLASS_VIEW_ACTION value='relatedViewActions'}
-                    {assign var=CLASS_VIEW_PAGING_INPUT value='relatedViewPagingInput'}
-                    {assign var=CLASS_VIEW_PAGING_INPUT_SUBMIT value='relatedViewPagingInputSubmit'}
-                    {assign var=CLASS_VIEW_BASIC_ACTION value='relatedViewBasicAction'}
-                    {assign var=PAGING_MODEL value=$PAGING}
-                    {assign var=RECORD_COUNT value=$RELATED_RECORDS|@count}
-                    {assign var=PAGE_NUMBER value=$PAGING->get('page')}
-                    {include file="Pagination.tpl"|vtemplate_path:$MODULE SHOWPAGEJUMP=true}
-                </div>
-            </div>
-            <div class="relatedContents col-lg-12 col-md-12 col-sm-12 table-container">
-                <div class="bottomscroll-div">
-                    {assign var=WIDTHTYPE value=$USER_MODEL->get('rowheight')}
-                    <table id="listview-table"  class="table listview-table">
-                        <thead>
-                            <tr class="listViewHeaders">
-                                <th style="min-width:100px">
-                                </th>
-                                {foreach item=HEADER_FIELD from=$RELATED_HEADERS}
-                                    <th nowrap {if $HEADER_FIELD@last} {/if}>
-                                        <a href="javascript:void(0);" class="listViewContentHeaderValues" data-nextsortorderval="{if $COLUMN_NAME eq $HEADER_FIELD->get('name')}{$NEXT_SORT_ORDER}{else}ASC{/if}" data-fieldname="{$HEADER_FIELD->get('name')}">{vtranslate($HEADER_FIELD->get('label'), $RELATED_MODULE->get('name'))}
-                                            {if $COLUMN_NAME eq $HEADER_FIELD->get('column')}
-                                                <i class="fa fa-sort {$FASORT_IMAGE}"></i>
-                                            {else}
-                                                <i class="fa fa-sort customsort"></i>
-                                            {/if}
-                                            &nbsp;{if $COLUMN_NAME eq $HEADER_FIELD->get('name')}<img class="{$SORT_IMAGE}">{/if}&nbsp;
-                                        </a>
-                                        {if $COLUMN_NAME eq $HEADER_FIELD->get('column')}
-                                            <a href="#" class="removeSorting"><i class="fa fa-remove"></i></a>
-                                        {/if}
-                                    </th>
-                                {/foreach}
-                            </tr>
-                            <tr class="searchRow">
-                                <th class="inline-search-btn">
-                                    <button class="btn btn-success btn-sm" data-trigger="relatedListSearch">{vtranslate("LBL_SEARCH",$MODULE)}</button>
-                                </th>
-                                {foreach item=HEADER_FIELD from=$RELATED_HEADERS}
-                                    <th>
-                                        {if $HEADER_FIELD->get('column') eq 'time_start' or $HEADER_FIELD->get('column') eq 'time_end' or $HEADER_FIELD->getFieldDataType() eq 'reference'}
-                                        {else}    
-                                            {assign var=FIELD_UI_TYPE_MODEL value=$HEADER_FIELD->getUITypeModel()}
-                                            {include file=vtemplate_path($FIELD_UI_TYPE_MODEL->getListSearchTemplateName(),$RELATED_MODULE_NAME)
-                                            FIELD_MODEL= $HEADER_FIELD SEARCH_INFO=$SEARCH_DETAILS[$HEADER_FIELD->getName()] USER_MODEL=$USER_MODEL}
-                                            <input type="hidden" class="operatorValue" value="{$SEARCH_DETAILS[$HEADER_FIELD->getName()]['comparator']}">
-                                        {/if}
-                                    </th>
-                                {/foreach}
-                            </tr>
-                        </thead>
-                        {foreach item=RELATED_RECORD from=$RELATED_RECORDS}
-                            {assign var=BASE_CURRENCY_DETAILS value=$RELATED_RECORD->getBaseCurrencyDetails()}
-                            <tr class="listViewEntries" data-id='{$RELATED_RECORD->getId()}' data-recordUrl='{$RELATED_RECORD->getDetailViewUrl()}'>
-                                <td style="width:100px">
-                                    <span class="actionImages">
-                                        {if (!empty($RELATED_HEADERS['listprice']) || !empty($RELATED_HEADERS['unit_price']))}
-                                            {if !empty($RELATED_HEADERS['listprice'])}
-                                                {assign var="LISTPRICE" value=$RELATED_RECORD->get('listprice')}
-                                            {/if}
-                                        {/if}
-                                        <a href="javascript:void(0);" data-url="index.php?module=PriceBooks&view=ListPriceUpdate&record={$PARENT_RECORD->getId()}&relid={$RELATED_RECORD->getId()}&currentPrice={$LISTPRICE}"
-                                                       class="editListPrice cursorPointer" data-related-recordid='{$RELATED_RECORD->getId()}' data-list-price={$LISTPRICE}><i title="{vtranslate('LBL_EDIT', $MODULE)}" class="fa fa-pencil"></i></a> &nbsp;&nbsp;
-                                        <a class="relationDelete"><i title="{vtranslate('LBL_UNLINK', $MODULE)}" class="vicon-linkopen"></i></a>
-                                    </span>
-                                </td>
-                                {foreach item=HEADER_FIELD from=$RELATED_HEADERS}
-                                    {assign var=RELATED_HEADERNAME value=$HEADER_FIELD->get('name')}
-                                    <td nowrap class="{$WIDTHTYPE}">
-                                        {if $HEADER_FIELD->get('name') == 'listprice'}
-                                            {assign var="LISTPRICE" value=$RELATED_RECORD->get($HEADER_FIELD->get('name'))}
-                                            {CurrencyField::appendCurrencySymbol($LISTPRICE, $PARENT_RECORD_CURRENCY_SYMBOL)}
-                                        {else if $HEADER_FIELD->isNameField() eq true or $HEADER_FIELD->get('uitype') eq '4'}
-                                            <a href="{$RELATED_RECORD->getDetailViewUrl()}">{$RELATED_RECORD->getDisplayValue($RELATED_HEADERNAME)}</a>
-                                        {elseif $HEADER_FIELD->get('uitype') eq '71' or $HEADER_FIELD->get('uitype') eq '72'}
-                                            {assign var=CURRENCY_SYMBOL value=Vtiger_RelationListView_Model::getCurrencySymbol($RELATED_RECORD->get('id'), $HEADER_FIELD)}
-                                            {assign var=CURRENCY_VALUE value=CurrencyField::convertToUserFormat($RELATED_RECORD->get($RELATED_HEADERNAME))}
-                                            {if $HEADER_FIELD->get('uitype') eq '72'}
-                                                {assign var=CURRENCY_VALUE value=CurrencyField::convertToUserFormat($RELATED_RECORD->get($RELATED_HEADERNAME), null, true)}
-                                            {/if}
-                                            {CurrencyField::appendCurrencySymbol($CURRENCY_VALUE, $CURRENCY_SYMBOL)}
-                                        {else}
-                                            {$RELATED_RECORD->getDisplayValue($RELATED_HEADERNAME)}
-                                        {/if}
-                                        {if $HEADER_FIELD@last}
-                                        </td>
-                                    {/if}
-                                    </td>
-                                {/foreach}
-                            </tr>
-                        {/foreach}
-                    </table>
-                </div>
-            </div>
-            <script type="text/javascript">
-                var related_uimeta = (function() {
-                    var fieldInfo  = {$RELATED_FIELDS_INFO};
-                    return {
-                        field: {
-                            get: function(name, property) {
-                                if(name && property === undefined) {
-                                    return fieldInfo[name];
-                                }
-                                if(name && property) {
-                                    return fieldInfo[name][property]
-                                }
-                            },
-                            isMandatory : function(name){
-                                if(fieldInfo[name]) {
-                                    return fieldInfo[name].mandatory;
-                                }
-                                return false;
-                            },
-                            getType : function(name){
-                                if(fieldInfo[name]) {
-                                    return fieldInfo[name].type
-                                }
-                                return false;
-                            }
-                        },
-                    };
-                })();
-            </script>
-        </div>
-    {/if}
+			{include file="partials/RelatedListHeader.tpl"|vtemplate_path:$RELATED_MODULE_NAME}
+			<div class="relatedContents col-lg-12 col-md-12 col-sm-12 table-container">
+				<div class="bottomscroll-div">
+					{assign var=WIDTHTYPE value=$USER_MODEL->get('rowheight')}
+					<table id="listview-table" class="table listview-table">
+						<thead>
+							<tr class="listViewHeaders">
+								<th style="min-width:100px">
+								</th>
+								{foreach item=HEADER_FIELD from=$RELATED_HEADERS}
+									<th nowrap {if $HEADER_FIELD@last} {/if}>
+										<a href="javascript:void(0);" class="listViewContentHeaderValues" data-nextsortorderval="{if $COLUMN_NAME eq $HEADER_FIELD->get('name')}{$NEXT_SORT_ORDER}{else}ASC{/if}" data-fieldname="{$HEADER_FIELD->get('name')}">{vtranslate($HEADER_FIELD->get('label'), $RELATED_MODULE->get('name'))}
+											{if $COLUMN_NAME eq $HEADER_FIELD->get('column')}
+												<i class="fa fa-sort {$FASORT_IMAGE}"></i>
+											{else}
+												<i class="fa fa-sort customsort"></i>
+											{/if}
+											&nbsp;{if $COLUMN_NAME eq $HEADER_FIELD->get('name')}<img class="{$SORT_IMAGE}">{/if}&nbsp;
+										</a>
+										{if $COLUMN_NAME eq $HEADER_FIELD->get('column')}
+											<a href="#" class="removeSorting"><i class="fa fa-remove"></i></a>
+										{/if}
+									</th>
+								{/foreach}
+							</tr>
+							<tr class="searchRow">
+								<th class="inline-search-btn">
+									<button class="btn btn-success btn-sm" data-trigger="relatedListSearch">{vtranslate("LBL_SEARCH",$MODULE)}</button>
+								</th>
+								{foreach item=HEADER_FIELD from=$RELATED_HEADERS}
+									<th>
+										{if $HEADER_FIELD->get('column') eq 'time_start' or $HEADER_FIELD->get('column') eq 'time_end' or $HEADER_FIELD->getFieldDataType() eq 'reference'}
+										{else}
+											{assign var=FIELD_UI_TYPE_MODEL value=$HEADER_FIELD->getUITypeModel()}
+											{include file=vtemplate_path($FIELD_UI_TYPE_MODEL->getListSearchTemplateName(),$RELATED_MODULE_NAME)
+											FIELD_MODEL= $HEADER_FIELD SEARCH_INFO=$SEARCH_DETAILS[$HEADER_FIELD->getName()] USER_MODEL=$USER_MODEL}
+											<input type="hidden" class="operatorValue" value="{$SEARCH_DETAILS[$HEADER_FIELD->getName()]['comparator']}">
+										{/if}
+									</th>
+								{/foreach}
+							</tr>
+						</thead>
+						{foreach item=RELATED_RECORD from=$RELATED_RECORDS}
+							{assign var=BASE_CURRENCY_DETAILS value=$RELATED_RECORD->getBaseCurrencyDetails()}
+							<tr class="listViewEntries" data-id='{$RELATED_RECORD->getId()}' data-recordUrl='{$RELATED_RECORD->getDetailViewUrl()}'>
+								<td style="width:100px">
+									<span class="actionImages">
+										{if (!empty($RELATED_HEADERS['listprice']) || !empty($RELATED_HEADERS['unit_price']))}
+											{if !empty($RELATED_HEADERS['listprice'])}
+												{assign var="LISTPRICE" value=$RELATED_RECORD->get('listprice')}
+											{/if}
+										{/if}
+										<a href="javascript:void(0);" data-url="index.php?module=PriceBooks&view=ListPriceUpdate&record={$PARENT_RECORD->getId()}&relid={$RELATED_RECORD->getId()}&currentPrice={$LISTPRICE}"
+											class="editListPrice cursorPointer" data-related-recordid='{$RELATED_RECORD->getId()}' data-list-price={$LISTPRICE}><i title="{vtranslate('LBL_EDIT', $MODULE)}" class="fa fa-pencil"></i></a> &nbsp;&nbsp;
+										<a class="relationDelete"><i title="{vtranslate('LBL_UNLINK', $MODULE)}" class="vicon-linkopen"></i></a>
+									</span>
+								</td>
+								{foreach item=HEADER_FIELD from=$RELATED_HEADERS}
+									{assign var=RELATED_HEADERNAME value=$HEADER_FIELD->get('name')}
+									<td nowrap class="{$WIDTHTYPE}">
+										{if $HEADER_FIELD->get('name') == 'listprice'}
+											{assign var="LISTPRICE" value=$RELATED_RECORD->get($HEADER_FIELD->get('name'))}
+											{CurrencyField::appendCurrencySymbol($LISTPRICE, $PARENT_RECORD_CURRENCY_SYMBOL)}
+										{else if $HEADER_FIELD->isNameField() eq true or $HEADER_FIELD->get('uitype') eq '4'}
+											<a href="{$RELATED_RECORD->getDetailViewUrl()}">{$RELATED_RECORD->getDisplayValue($RELATED_HEADERNAME)}</a>
+										{elseif $HEADER_FIELD->get('uitype') eq '71' or $HEADER_FIELD->get('uitype') eq '72'}
+											{assign var=CURRENCY_SYMBOL value=Vtiger_RelationListView_Model::getCurrencySymbol($RELATED_RECORD->get('id'), $HEADER_FIELD)}
+											{assign var=CURRENCY_VALUE value=CurrencyField::convertToUserFormat($RELATED_RECORD->get($RELATED_HEADERNAME))}
+											{if $HEADER_FIELD->get('uitype') eq '72'}
+												{assign var=CURRENCY_VALUE value=CurrencyField::convertToUserFormat($RELATED_RECORD->get($RELATED_HEADERNAME), null, true)}
+											{/if}
+											{CurrencyField::appendCurrencySymbol($CURRENCY_VALUE, $CURRENCY_SYMBOL)}
+										{else}
+											{$RELATED_RECORD->getDisplayValue($RELATED_HEADERNAME)}
+										{/if}
+										{if $HEADER_FIELD@last}
+											</td>
+										{/if}
+									</td>
+								{/foreach}
+							</tr>
+						{/foreach}
+					</table>
+				</div>
+			</div>
+			<script type="text/javascript">
+				var related_uimeta = (function() {
+					var fieldInfo = {$RELATED_FIELDS_INFO};
+					return {
+						field: {
+							get: function(name, property) {
+								if(name && property === undefined) {
+									return fieldInfo[name];
+								}
+								if(name && property) {
+									return fieldInfo[name][property]
+								}
+							},
+							isMandatory : function(name){
+								if(fieldInfo[name]) {
+									return fieldInfo[name].mandatory;
+								}
+								return false;
+							},
+							getType : function(name){
+								if(fieldInfo[name]) {
+									return fieldInfo[name].type
+								}
+								return false;
+							}
+						},
+					};
+				})();
+			</script>
+		</div>
+	{/if}
 {/strip}
diff --git a/layouts/v7/modules/Products/BundleCostView.tpl b/layouts/v7/modules/Products/BundleCostView.tpl
index c298ecb990f9e100932833f0b605931dc03594e7..e8ded67c5553ed19ca58a1e027f2a3d595b6bf5b 100644
--- a/layouts/v7/modules/Products/BundleCostView.tpl
+++ b/layouts/v7/modules/Products/BundleCostView.tpl
@@ -15,7 +15,7 @@
     </label>
     {assign var=PRODUCT_ACTUAL_PRICE value="{CurrencyField::convertToUserFormat((float)$PARENT_RECORD->get('unit_price'), '', true, true)}"}
     &nbsp;&nbsp;
-    <button type="button" id ="updatePrice" class="btn btn-sm btn-dark"
+    <button type="button" id ="updatePrice" class="btn btn-sm btn-dark btn-default"
             {if $SUB_PRODUCTS_TOTAL_COST eq $PRODUCT_ACTUAL_PRICE && $USER_MODEL->get('currency_id') eq $PARENT_RECORD->get('currency_id')}
                 disabled
             {/if}>
diff --git a/layouts/v7/modules/Settings/ExtensionStore/ExtensionModules.tpl b/layouts/v7/modules/Settings/ExtensionStore/ExtensionModules.tpl
index 66709240c1e3b0ef361679dfab4aa64ab242a712..092879628db49a1a51915a6fcdc6ff1721f9917e 100644
--- a/layouts/v7/modules/Settings/ExtensionStore/ExtensionModules.tpl
+++ b/layouts/v7/modules/Settings/ExtensionStore/ExtensionModules.tpl
@@ -61,7 +61,7 @@
 								<div class="col-sm-7 col-xs-7">
 									<div class="pull-right">
 										{if $EXTENSION->isVtigerCompatible()}
-											<button class="btn btn-sm installExtension addButton" style="margin-right:5px;">{vtranslate('LBL_MORE_DETAILS', $QUALIFIED_MODULE)}</button>
+											<button class="btn btn-sm btn-default installExtension addButton" style="margin-right:5px;">{vtranslate('LBL_MORE_DETAILS', $QUALIFIED_MODULE)}</button>
 											{if $EXTENSION->isAlreadyExists()}
 												{if ($EXTENSION->isUpgradable())}
 													<button class="oneclickInstallFree btn btn-success btn-sm margin0px {if $IS_AUTH}authenticated {else} loginRequired{/if}">
diff --git a/layouts/v7/modules/Settings/Leads/MappingDetail.tpl b/layouts/v7/modules/Settings/Leads/MappingDetail.tpl
index f522667bbc6b712d3569caff2a2c6162df86b303..cd77d9de93923da4be013e9a3c247911639b1a2b 100644
--- a/layouts/v7/modules/Settings/Leads/MappingDetail.tpl
+++ b/layouts/v7/modules/Settings/Leads/MappingDetail.tpl
@@ -15,7 +15,7 @@
                 <span class="col-sm-12">
                     <span class="pull-right">
                         {foreach item=LINK_MODEL from=$MODULE_MODEL->getDetailViewLinks()}
-                            <button type="button" class="btn btn-default" onclick={$LINK_MODEL->getUrl()}><strong>{vtranslate($LINK_MODEL->getLabel(), $QUALIFIED_MODULE)}</strong></button>
+                            <button type="button" class="btn btn-default" onclick={$LINK_MODEL->getUrl()}>{vtranslate($LINK_MODEL->getLabel(), $QUALIFIED_MODULE)}</button>
                         {/foreach}
                     </span>
                 </span>
diff --git a/layouts/v7/modules/Vtiger/AddDashBoardTabForm.tpl b/layouts/v7/modules/Vtiger/AddDashBoardTabForm.tpl
index 46920355f8547b23a196c3f9d1cf4ad23388e723..fff5cf4f78066413c60b36a512f5177e3af4a861 100644
--- a/layouts/v7/modules/Vtiger/AddDashBoardTabForm.tpl
+++ b/layouts/v7/modules/Vtiger/AddDashBoardTabForm.tpl
@@ -14,8 +14,8 @@
                 <input type="hidden" name="module" value="{$MODULE}"/>
                 <input type="hidden" name="action" value="DashBoardTab"/>
                 <input type="hidden" name="mode" value="addTab"/>
-                <div class="modal-body  clearfix">
-                    <div class="col-lg-3">
+                <div class="modal-body clearfix">
+                    <div class="col-lg-5">
                         <label class="control-label pull-right marginTop5px">
                             {vtranslate('LBL_TAB_NAME',$MODULE)}&nbsp;<span class="redColor">*</span>
                         </label>
diff --git a/layouts/v7/modules/Vtiger/QuickCreate.tpl b/layouts/v7/modules/Vtiger/QuickCreate.tpl
index cbff7264b3c24057177b7b20c1fb55d7e4fbf368..cae856119138bd8d0ea6b73455631dfe36be0ab8 100644
--- a/layouts/v7/modules/Vtiger/QuickCreate.tpl
+++ b/layouts/v7/modules/Vtiger/QuickCreate.tpl
@@ -109,7 +109,7 @@
                             {assign var=BUTTON_LABEL value={vtranslate('LBL_SAVE', $MODULE)}}
                         {/if}
                         {assign var="EDIT_VIEW_URL" value=$MODULE_MODEL->getCreateRecordUrl()}
-                        <button class="btn" id="goToFullForm" data-edit-view-url="{$EDIT_VIEW_URL}" type="button"><strong>{vtranslate('LBL_GO_TO_FULL_FORM', $MODULE)}</strong></button>
+                        <button class="btn btn-default" id="goToFullForm" data-edit-view-url="{$EDIT_VIEW_URL}" type="button"><strong>{vtranslate('LBL_GO_TO_FULL_FORM', $MODULE)}</strong></button>
                         <button {if $BUTTON_ID neq null} id="{$BUTTON_ID}" {/if} class="btn btn-success" type="submit" name="saveButton"><strong>{$BUTTON_LABEL}</strong></button>
                         <a href="#" class="cancelLink" type="reset" data-dismiss="modal">{vtranslate('LBL_CANCEL', $MODULE)}</a>
                     </center>
diff --git a/layouts/v7/modules/Vtiger/dashboards/DashBoardHeader.tpl b/layouts/v7/modules/Vtiger/dashboards/DashBoardHeader.tpl
index 11737f390cd775c3b9c26c13df9c7dbf04c2dd17..acb399727682e0debaa7ab289635a267f9e55797 100644
--- a/layouts/v7/modules/Vtiger/dashboards/DashBoardHeader.tpl
+++ b/layouts/v7/modules/Vtiger/dashboards/DashBoardHeader.tpl
@@ -50,7 +50,7 @@
 
 				</ul>
 			{else if $MODULE_PERMISSION}
-				<button class='btn addButton dropdown-toggle' disabled="disabled" data-toggle='dropdown'>
+				<button class='btn btn-default addButton dropdown-toggle' disabled="disabled" data-toggle='dropdown'>
 					<strong>{vtranslate('LBL_ADD_WIDGET')}</strong> &nbsp;&nbsp;
 					<i class="caret"></i>
 				</button>
diff --git a/layouts/v7/modules/Vtiger/partials/RelatedListHeader.tpl b/layouts/v7/modules/Vtiger/partials/RelatedListHeader.tpl
index 601b670aa0436261582d6e07a1f09377536e2fb5..f31d656475edd26e0b60ff41164088db4533ce74 100644
--- a/layouts/v7/modules/Vtiger/partials/RelatedListHeader.tpl
+++ b/layouts/v7/modules/Vtiger/partials/RelatedListHeader.tpl
@@ -1,52 +1,60 @@
+{*+**********************************************************************************
+* The contents of this file are subject to the vtiger CRM Public License Version 1.1
+* ("License"); You may not use this file except in compliance with the License
+* The Original Code is: vtiger CRM Open Source
+* The Initial Developer of the Original Code is vtiger.
+* Portions created by vtiger are Copyright (C) vtiger.
+* All Rights Reserved.
+*************************************************************************************}
+
 {strip}
-<div class="relatedHeader">
-    <div class="btn-toolbar row">
-        <div class="col-lg-6 col-md-6 col-sm-6 btn-toolbar">
-            {foreach item=RELATED_LINK from=$RELATED_LIST_LINKS['LISTVIEWBASIC']}
-                <div class="btn-group">
-                    {assign var=DROPDOWNS value=$RELATED_LINK->get('linkdropdowns')}
-                    {if count($DROPDOWNS) gt 0}
-                        <div class="btn-group">
-                            <a class="btn dropdown-toggle" href="javascript:void(0)" class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown" data-delay="200" data-close-others="false" style="width:20px;height:18px;">
-                                <img title="{$RELATED_LINK->getLabel()}" alt="{$RELATED_LINK->getLabel()}" src="{vimage_path("{$RELATED_LINK->getIcon()}")}">
-                            </a>
-                            <ul class="dropdown-menu">
-                                {foreach item=DROPDOWN from=$DROPDOWNS}
-                                    <li><a id="{$RELATED_MODULE_NAME}_relatedlistView_add_{Vtiger_Util_Helper::replaceSpaceWithUnderScores($DROPDOWN['label'])}" class="{$RELATED_LINK->get('linkclass')}" href='javascript:void(0)' data-documentType="{$DROPDOWN['type']}" data-url="{$DROPDOWN['url']}" data-name="{$RELATED_MODULE_NAME}" data-firsttime="{$DROPDOWN['firsttime']}"><i class="icon-plus"></i>&nbsp;{vtranslate($DROPDOWN['label'], $RELATED_MODULE_NAME)}</a></li>
-                                {/foreach}
-                            </ul>
-                        </div>
-                    {else}
-                        {assign var=IS_SELECT_BUTTON value={$RELATED_LINK->get('_selectRelation')}}
-                        {* setting button module attribute to Events or Calendar based on link label *}
-                        {assign var=LINK_LABEL value={$RELATED_LINK->get('linklabel')}}
-                        {if $RELATED_LINK->get('_linklabel') === '_add_event'}
-                            {assign var=RELATED_MODULE_NAME value='Events'}
-                        {elseif $RELATED_LINK->get('_linklabel') === '_add_task'}
-                            {assign var=RELATED_MODULE_NAME value='Calendar'}
-                        {/if}
-						{if $IS_SELECT_BUTTON || $IS_CREATE_PERMITTED}
-							<button type="button" module="{$RELATED_MODULE_NAME}"  class="btn addButton btn-default
-								{if $IS_SELECT_BUTTON eq true} selectRelation {/if} "
-								{if $IS_SELECT_BUTTON eq true} data-moduleName={$RELATED_LINK->get('_module')->get('name')} {/if}
-								{if ($RELATED_LINK->isPageLoadLink())}
-								{if $RELATION_FIELD} data-name="{$RELATION_FIELD->getName()}" {/if}
-								data-url="{$RELATED_LINK->getUrl()}{if $SELECTED_MENU_CATEGORY}&app={$SELECTED_MENU_CATEGORY}{/if}"
-								{/if}
-							{if $IS_SELECT_BUTTON neq true}name="addButton"{/if}>{if $IS_SELECT_BUTTON eq false}<i class="fa fa-plus"></i>&nbsp;{/if}&nbsp;{$RELATED_LINK->getLabel()}</button>
+	<div class="relatedHeader">
+		<div class="btn-toolbar row">
+			<div class="col-lg-6 col-md-6 col-sm-6 btn-toolbar">
+				 {foreach item=RELATED_LINK from=$RELATED_LIST_LINKS['LISTVIEWBASIC']}
+					<div class="btn-group">
+						{assign var=DROPDOWNS value=$RELATED_LINK->get('linkdropdowns')}
+						{if count($DROPDOWNS) gt 0}
+							<a class="btn dropdown-toggle" href="javascript:void(0)" class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown" data-delay="200" data-close-others="false" style="width:20px;height:18px;">
+								<img title="{$RELATED_LINK->getLabel()}" alt="{$RELATED_LINK->getLabel()}" src="{vimage_path("{$RELATED_LINK->getIcon()}")}">
+							</a>
+							<ul class="dropdown-menu">
+								{foreach item=DROPDOWN from=$DROPDOWNS}
+									<li><a id="{$RELATED_MODULE_NAME}_relatedlistView_add_{Vtiger_Util_Helper::replaceSpaceWithUnderScores($DROPDOWN['label'])}" class="{$RELATED_LINK->get('linkclass')}" href='javascript:void(0)' data-documentType="{$DROPDOWN['type']}" data-url="{$DROPDOWN['url']}" data-name="{$RELATED_MODULE_NAME}" data-firsttime="{$DROPDOWN['firsttime']}"><i class="icon-plus"></i>&nbsp;{vtranslate($DROPDOWN['label'], $RELATED_MODULE_NAME)}</a></li>
+								{/foreach}
+							</ul>
+						{else}
+							{assign var=IS_SELECT_BUTTON value={$RELATED_LINK->get('_selectRelation')}}
+							{* setting button module attribute to Events or Calendar based on link label *}
+							{assign var=LINK_LABEL value={$RELATED_LINK->get('linklabel')}}
+							{if $RELATED_LINK->get('_linklabel') === '_add_event'}
+								{assign var=RELATED_MODULE_NAME value='Events'}
+							{elseif $RELATED_LINK->get('_linklabel') === '_add_task'}
+								{assign var=RELATED_MODULE_NAME value='Calendar'}
+							{/if}
+							{if $IS_SELECT_BUTTON || $IS_CREATE_PERMITTED}
+								<button type="button" module="{$RELATED_MODULE_NAME}" class="btn btn-default
+									{if $IS_SELECT_BUTTON eq true} selectRelation{else} addButton" name="addButton{/if}"
+									{if $IS_SELECT_BUTTON eq true} data-moduleName="{$RELATED_LINK->get('_module')->get('name')}" {/if}
+									{if ($RELATED_LINK->isPageLoadLink())}
+										{if $RELATION_FIELD} data-name="{$RELATION_FIELD->getName()}" {/if}
+										data-url="{$RELATED_LINK->getUrl()}{if $SELECTED_MENU_CATEGORY}&app={$SELECTED_MENU_CATEGORY}{/if}"
+									{/if}
+									>{if $IS_SELECT_BUTTON eq false}<i class="fa fa-plus"></i>&nbsp;{/if}&nbsp;{$RELATED_LINK->getLabel()}</button>
+							{/if}
 						{/if}
-                    {/if}
-                </div>
-            {/foreach}&nbsp;
-        </div>
-        {assign var=CLASS_VIEW_ACTION value='relatedViewActions'}
-        {assign var=CLASS_VIEW_PAGING_INPUT value='relatedViewPagingInput'}
-        {assign var=CLASS_VIEW_PAGING_INPUT_SUBMIT value='relatedViewPagingInputSubmit'}
-        {assign var=CLASS_VIEW_BASIC_ACTION value='relatedViewBasicAction'}
-        {assign var=PAGING_MODEL value=$PAGING}
-        {assign var=RECORD_COUNT value=$RELATED_RECORDS|@count}
-        {assign var=PAGE_NUMBER value=$PAGING->get('page')}
-        {include file="Pagination.tpl"|vtemplate_path:$MODULE SHOWPAGEJUMP=true}
-    </div>
-</div>
+					</div>
+				{/foreach}
+				&nbsp;
+			</div>
+			{assign var=CLASS_VIEW_ACTION value='relatedViewActions'}
+			{assign var=CLASS_VIEW_PAGING_INPUT value='relatedViewPagingInput'}
+			{assign var=CLASS_VIEW_PAGING_INPUT_SUBMIT value='relatedViewPagingInputSubmit'}
+			{assign var=CLASS_VIEW_BASIC_ACTION value='relatedViewBasicAction'}
+			{assign var=PAGING_MODEL value=$PAGING}
+			{assign var=RECORD_COUNT value=$RELATED_RECORDS|@count}
+			{assign var=PAGE_NUMBER value=$PAGING->get('page')}
+			{include file="Pagination.tpl"|vtemplate_path:$MODULE SHOWPAGEJUMP=true}
+		</div>
+	</div>
 {/strip}
\ No newline at end of file
diff --git a/packages/vtiger/optional/Webforms.zip b/packages/vtiger/optional/Webforms.zip
index 1dcfae20be63ad8376af5ce2c4a9e25195f90d9d..94d6b2532695916a7c86aa694ddf3332c31d01d5 100644
Binary files a/packages/vtiger/optional/Webforms.zip and b/packages/vtiger/optional/Webforms.zip differ
diff --git a/pkg/vtiger/modules/Webforms/layouts/v7/modules/Settings/Webforms/ShowForm.tpl b/pkg/vtiger/modules/Webforms/layouts/v7/modules/Settings/Webforms/ShowForm.tpl
index 7a7e48fd22389404aff2b657d5c5c836adbc4373..dd1e90a4b36e7bff707f6b36a5088874eec9c08f 100644
--- a/pkg/vtiger/modules/Webforms/layouts/v7/modules/Settings/Webforms/ShowForm.tpl
+++ b/pkg/vtiger/modules/Webforms/layouts/v7/modules/Settings/Webforms/ShowForm.tpl
@@ -9,7 +9,7 @@
 *
 ********************************************************************************/
 -->*}
-<div class="modal-dialog modelContainer">  
+<div class="modal-dialog modelContainer modal-content">  
     {assign var=HEADER_TITLE value={vtranslate('SINGLE_'|cat:$MODULE, $QUALIFIED_MODULE)}|cat:" - "|cat:{$RECORD_MODEL->get('name')}}
     {include file="ModalHeader.tpl"|vtemplate_path:$MODULE TITLE=$HEADER_TITLE}