diff --git a/.github/workflows/build-dev-artifacts.yml b/.github/workflows/build-dev-artifacts.yml
index 3165840e..ff9e81db 100755
--- a/.github/workflows/build-dev-artifacts.yml
+++ b/.github/workflows/build-dev-artifacts.yml
@@ -26,7 +26,8 @@ jobs:
       - name: Create zip
         run: |
           npm ci
-          npm run build 
+          npm run build
+          npm version patch --no-git-tag-version
           CURRENT_VERSION=$(node -p -e "require('./package.json').version")
           COMMIT_HASH=$(git rev-parse --short HEAD)
           DEV_VERSION="${CURRENT_VERSION}-dev.${COMMIT_HASH}"
diff --git a/css/feedzy-rss-feed-import.css b/css/feedzy-rss-feed-import.css
index d2c83da1..75daee62 100644
--- a/css/feedzy-rss-feed-import.css
+++ b/css/feedzy-rss-feed-import.css
@@ -8,7 +8,7 @@
  * Author: Themeisle
  */
 
-#feedzy_import_feeds{
+#feedzy_import_feeds {
 	background: transparent;
 	border: 0;
 	box-shadow: none;
@@ -18,49 +18,62 @@
 	padding-right: 12px;
 	box-sizing: border-box;
 }
-#feedzy_import_feeds > .postbox-header{
+
+#feedzy_import_feeds>.postbox-header {
 	display: none;
 }
-.post-type-feedzy_imports:not(.edit-php) .page-title-action, .post-type-feedzy_imports:not(.edit-php) .wp-heading-inline {
+
+.post-type-feedzy_imports:not(.edit-php) .page-title-action,
+.post-type-feedzy_imports:not(.edit-php) .wp-heading-inline {
 	display: none !important;
 }
-.post-type-feedzy_imports:not(.edit-php) #wpcontent{
+
+.post-type-feedzy_imports:not(.edit-php) #wpcontent {
 	padding-left: 0;
 }
-.post-type-feedzy_imports:not(.edit-php) #post-body-content{
+
+.post-type-feedzy_imports:not(.edit-php) #post-body-content {
 	display: none;
 }
-.post-type-feedzy_imports:not(.edit-php) .wrap{
+
+.post-type-feedzy_imports:not(.edit-php) .wrap {
 	margin-top: 0;
 	margin-right: 0;
 }
-.post-type-feedzy_imports:not(.edit-php) .wrap > .wp-heading-inline,
-.post-type-feedzy_imports:not(.edit-php) .wrap > .wp-header-end{
+
+.post-type-feedzy_imports:not(.edit-php) .wrap>.wp-heading-inline,
+.post-type-feedzy_imports:not(.edit-php) .wrap>.wp-header-end {
 	display: none;
 }
-.post-type-feedzy_imports:not(.edit-php) #poststuff{
+
+.post-type-feedzy_imports:not(.edit-php) #poststuff {
 	padding-top: 0;
 }
-.post-type-feedzy_imports:not(.edit-php) #poststuff .inside{
+
+.post-type-feedzy_imports:not(.edit-php) #poststuff .inside {
 	margin-top: 0;
 	padding-left: 0;
 	padding-right: 0;
 }
-.post-type-feedzy_imports:not(.edit-php) #poststuff #post-body.columns-2{
+
+.post-type-feedzy_imports:not(.edit-php) #poststuff #post-body.columns-2 {
 	margin-right: 0;
 }
-.post-type-feedzy_imports:not(.edit-php) #post-body.columns-2 #postbox-container-1{
+
+.post-type-feedzy_imports:not(.edit-php) #post-body.columns-2 #postbox-container-1 {
 	width: 100%;
 	float: none;
 }
+
 .feedzy_page_feedzy-settings #wpcontent,
 .feedzy_page_feedzy-support #wpcontent,
-.feedzy_page_feedzy-integration #wpcontent{
+.feedzy_page_feedzy-integration #wpcontent {
 	padding-left: 0;
 }
+
 .feedzy_page_feedzy-settings .feedzy-header,
 .feedzy_page_feedzy-support .feedzy-header,
-.feedzy_page_feedzy-integration .feedzy-header{
+.feedzy_page_feedzy-integration .feedzy-header {
 	margin-bottom: 40px;
 }
 
@@ -68,7 +81,7 @@
 	color: #ff0000;
 }
 
-tr.feedzy-import-status-row > td {
+tr.feedzy-import-status-row>td {
 	margin: 0;
 	padding: 0
 }
@@ -140,47 +153,60 @@ td.feedzy-has-popup {
 .feedzy-onboarding-modal {
 	max-width: 350px;
 }
+
 .feedzy-onboarding-modal .components-modal__header {
 	text-align: center;
 }
+
 .feedzy-onboarding-modal .components-modal__header h1 {
 	width: 100%;
 }
+
 .feedzy-onboarding-modal .feedzy-onboarding-modal-content {
 	text-align: center;
 	margin: 10px 0 15px;
 }
+
 .feedzy-onboarding-modal .feedzy-onboarding-modal-action {
 	text-align: center;
 	margin: 10px 0;
 }
+
 .feedzy-onboarding-modal .feedzy-onboarding-modal-action .components-button {
 	padding: 2px 20px;
 	font-size: 14px;
 	margin-right: 10px;
 }
+
 .components-modal__screen-overlay {
 	background-color: rgba(0, 0, 0, 0.5);
 }
+
 .react-joyride__tooltip {
 	font-size: 13px !important;
 }
-.react-joyride__tooltip > div {
+
+.react-joyride__tooltip>div {
 	text-align: left !important;
 }
-.react-joyride__tooltip div:nth-of-type( 2) {
+
+.react-joyride__tooltip div:nth-of-type(2) {
 	margin-top: 5px !important;
 }
+
 .react-joyride__tooltip button {
 	text-decoration: underline;
 }
+
 .react-joyride__beacon span:first-child {
 	background-color: #4268CF !important;
 }
+
 .react-joyride__beacon span:last-child {
 	background-color: rgba(66, 104, 207, 0.4) !important;
 	border: 2px solid #4268CF !important;
 }
+
 .react-joyride__tooltip button[data-action="primary"] {
 	background: #4268cf !important;
 	border-color: #006a95 #00648c #00648c !important;
@@ -193,20 +219,25 @@ td.feedzy-has-popup {
 	line-height: 28px !important;
 	font-size: 14px !important;
 }
+
 .react-joyride__tooltip button[data-action="back"] {
 	color: #23282d !important;
 	font-size: 14px !important;
 }
+
 .react-notification-root .notification-container-bottom-left {
 	bottom: 40px;
 }
+
 .react-notification-root .notification-container-mobile-bottom {
 	bottom: 60px;
 }
+
 .feedzy-onboarding-modal-action .components-button.is-primary,
 .feedzy-onboarding-modal-action .components-button.is-primary:hover:not(:disabled) {
 	background: #4268cf;
 }
+
 .feedzy-onboarding-modal-action .components-button.is-secondary,
 .feedzy-onboarding-modal-action .components-button.is-secondary:hover:not(:disabled),
 .feedzy-onboarding-modal-action .components-button.is-tertiary:hover:not(:disabled) {
@@ -279,6 +310,11 @@ i.mce-i-feedzy-icon {
 	text-align: center;
 }
 
+/* NOTE: It will also exclude the Black Friday notice. */
+.notice:not(.fz-notice):not(.themeisle-sale) {
+	display: none;
+}
+
 @media screen and (max-width: 782px) {
 	tr.feedzy-import-status-row table {
 		width: 100%;
diff --git a/css/settings.css b/css/settings.css
index 10d681fe..7dbdfcda 100644
--- a/css/settings.css
+++ b/css/settings.css
@@ -270,8 +270,10 @@
 	border-bottom: 0;
 }
 .fz-form-wrap .form-label{
-	display: block;
+	display: flex;
 	margin-bottom: 8px;
+	align-items: center;
+	gap: 10px;
 }
 
 .fz-form-wrap .form-control {
@@ -558,11 +560,40 @@ fieldset[disabled] .form-control {
 }
 .fz-form-wrap .chosen-container .chosen-results li{
 	padding: 8px;
-	font-weight: 500;
+	font-weight: 600;
 	font-size: 16px;
 	line-height: 19px;
 	color: #050505;
 }
+.fz-form-wrap .chosen-container .chosen-results li.group-result{
+	font-weight: normal;
+	text-transform: uppercase;
+	color: #000000bd;
+	pointer-events: none;
+}
+.fz-form-wrap .chosen-container .chosen-results li.feedzy-pro-terms{
+	pointer-events: none;
+	font-weight: 500;
+}
+.fz-form-wrap .chosen-container .chosen-results li.feedzy-separator{
+	font-size: 0;
+	padding: 0;
+	border-bottom: 1px solid #757575;
+	height: 0;
+}
+.fz-form-wrap .chosen-container .chosen-results li.feedzy-pro-term{
+	display: flex;
+	align-items: center;
+	gap: 10px;
+	color: #757575;
+	pointer-events: none;
+}
+.fz-form-wrap .chosen-container .chosen-results li.feedzy-pro-term .pro-label{
+	background: #80a2ff;
+	padding-left: 7px;
+	padding-right: 7px;
+	border-radius: 5px;
+}
 .fz-form-wrap .chosen-container .chosen-results li:hover,
 .fz-form-wrap .chosen-container .chosen-results li.result-selected{
 	background: #F2F2F2;
@@ -1864,10 +1895,12 @@ span.error-message .components-external-link .components-visually-hidden{
 	border-radius: 8px;
 }
 .popover-action-list ul{
+	display: flex;
+	flex-direction: column;
+	gap: 14px;
 	margin: 0;
 }
 .popover-action-list ul li{
-	padding-bottom: 13px;
 	margin-bottom: 0;
 	font-size: 16px;
 	font-weight: 400;
@@ -2179,6 +2212,7 @@ li.draggable-item .components-panel__body-toggle.components-button{
 }
 .popover-action-list ul li.fz-action-disabled {
 	cursor: not-allowed !important;
+    color: #757575;
 }
 
 .fz-action-panel .fz-chat-cpt-action .fz-notice-wrap,
@@ -2559,6 +2593,32 @@ li.draggable-item .components-panel__body-toggle.components-button{
 	border-bottom: 0;
     padding: 24px 0 0;
 }
+.fz-fallback-images {
+	display: flex;
+	flex-wrap: wrap;
+	gap: 1em;
+	margin: 1em 0 1em;
+}
+.feedzy-wrap .fz-spacing{
+	margin: 1em 0 1em;
+}
+.fz-radio-label {
+    font-weight: 600;
+    color: #333;
+    margin-bottom: 4px;
+}
+.fz-radio-description {
+    color: #666;
+    font-size: 13px;
+    line-height: 1.4;
+    display: block;
+}
+.fz-radio-title {
+	font-size: 16px;
+	font-weight: 600;
+	color: #050505;
+}
+
 @-webkit-keyframes spin { 
     100% { -webkit-transform: rotate(360deg); } 
 }
@@ -2573,4 +2633,44 @@ li.draggable-item .components-panel__body-toggle.components-button{
 	.support-box-list > ul{
 		grid-template-columns: repeat(2, 1fr);
 	}
+}
+
+.fz-license-badge {
+	padding: 2px 8px;
+	font-size: 10px;
+	text-transform: uppercase;
+	border-radius: 5px;
+	letter-spacing: 0.5px;
+	color: #ffffff;
+	background: linear-gradient(135deg, #4268CF 0%, #3458BC 100%);
+}
+
+.feedzy-helper-notice {
+	margin: 15px 0;
+    padding: 16px;
+    background: #e8f4fd;
+    border-left: 4px solid #2271b1;
+	font-size: 14px;
+}
+
+.feedzy-helper-notice p {
+	font-size: 14px;
+}
+
+.feedzy-helper-notice__title {
+    color: #0073aa;
+    font-weight: 600;
+    font-size: 16px;
+    margin-bottom: 8px;
+}
+
+button.feedzy-action-button {
+	padding: 0;
+	font-size: 16px;
+	font-weight: 400;
+	background: none;
+	border: none;
+	width: 100%;
+	cursor: pointer;
+	height: unset;
 }
\ No newline at end of file
diff --git a/includes/abstract/feedzy-rss-feeds-admin-abstract.php b/includes/abstract/feedzy-rss-feeds-admin-abstract.php
index 65ff80f1..0027ae1e 100644
--- a/includes/abstract/feedzy-rss-feeds-admin-abstract.php
+++ b/includes/abstract/feedzy-rss-feeds-admin-abstract.php
@@ -620,6 +620,8 @@ public function get_short_code_attributes( $atts ) {
 				'default'               => '',
 				// thumbs pixel size.
 				'size'                  => '',
+				// default aspect ratio for the image.
+				'aspectRatio'           => '1',
 				// only display item if title contains specific keywords (Use comma(,) and plus(+) keyword).
 				'keywords_title'        => '',
 				// only display item if title OR content contains specific keywords (Use comma(,) and plus(+) keyword).
@@ -1404,44 +1406,54 @@ private function get_feed_item_filter( $sc, $sizes, $item, $feed_url, $index, $i
 				$item_link = $item->get_feed()->get_permalink();
 			}
 		}
-		$new_link = apply_filters( 'feedzy_item_url_filter', $item_link, $sc, $item );
+		$new_link      = apply_filters( 'feedzy_item_url_filter', $item_link, $sc, $item );
+		$amp_running   = function_exists( 'amp_is_request' ) && amp_is_request();
+		$content_thumb = '';
 
-		// Fetch image thumbnail.
+		$thumbnail_to_use = '';
 		if ( 'yes' === $sc['thumb'] || 'auto' === $sc['thumb'] ) {
-			$the_thumbnail = $this->feedzy_retrieve_image( $item, $sc );
-			$content_thumb = '';
+			// Fetch image thumbnail.
+			$thumbnail_to_use = $this->feedzy_retrieve_image( $item, $sc );
+			$thumbnail_to_use = $this->feedzy_image_encode( $thumbnail_to_use );
+
+			if ( empty( $thumbnail_to_use ) && 'yes' === $sc['thumb'] ) {
+				$thumbnail_to_use = $sc['default'];
+			}
+		} else {
+			$thumbnail_to_use = $sc['default'];
+		}
+		
+		if ( ! empty( $thumbnail_to_use ) && is_string( $thumbnail_to_use ) ) {
+			$img_style = '';
+
+			if ( isset( $sizes['height'] ) && is_numeric( $sizes['height'] ) ) {
+				$img_style .= 'height:' . $sizes['height'] . 'px;';
+			}
+
+			if ( isset( $sc['aspectRatio'] ) && '1' !== $sc['aspectRatio'] ) {
+				$img_style .= 'aspect-ratio:' . $sc['aspectRatio'] . '; object-fit: fill;';
+			}
+			
 			if (
-				is_string( $the_thumbnail ) && ! empty( $the_thumbnail ) &&
+				isset( $sizes['width'] ) && is_numeric( $sizes['width'] ) && 
 				(
-					'yes' === $sc['thumb'] ||
+					$sizes['width'] !== $sizes['height'] || // Note: Custom modification via filters.
 					(
-						'auto' === $sc['thumb'] &&
-						! strpos( $the_thumbnail, 'img/feedzy.svg' )
+						isset( $sc['aspectRatio'] ) &&
+						(
+							( 'auto' === $sc['aspectRatio'] && $amp_running ) || // Note: AMP compatibility. Auto without `height` breaks the layout.
+							'1' === $sc['aspectRatio'] // Note: Backward compatiblity.
+						)
 					)
 				)
 			) {
-				$the_thumbnail  = $this->feedzy_image_encode( $the_thumbnail );
-				$content_thumb .= '<span class="fetched" style="background-image:  url(\'' . $the_thumbnail . '\');" title="' . esc_attr( $item->get_title() ) . '"></span>';
-				if ( ! isset( $sc['amp'] ) || 'no' !== $sc['amp'] ) {
-					$content_thumb .= '<amp-img width="' . $sizes['width'] . '" height="' . $sizes['height'] . '" src="' . $the_thumbnail . '">';
-				}
+				$img_style .= 'width:' . $sizes['width'] . 'px;';
 			}
 
-			if ( empty( $the_thumbnail ) && 'yes' === $sc['thumb'] ) {
-				$content_thumb .= '<span class="default" style="background-image:url(' . $sc['default'] . ');" title="' . esc_attr( $item->get_title() ) . '"></span>';
-				if ( ! isset( $sc['amp'] ) || 'no' !== $sc['amp'] ) {
-					$content_thumb .= '<amp-img width="' . $sizes['width'] . '" height="' . $sizes['height'] . '" src="' . $sc['default'] . '">';
-				}
-			}
-			$content_thumb = apply_filters( 'feedzy_thumb_output', $content_thumb, $feed_url, $sizes, $item );
-		} else {
-			$content_thumb  = '';
-			$content_thumb .= '<span class="default" style="width:' . $sizes['width'] . 'px; height:' . $sizes['height'] . 'px; background-image:url(' . $sc['default'] . ');" title="' . $item->get_title() . '"></span>';
-			if ( ! isset( $sc['amp'] ) || 'no' !== $sc['amp'] ) {
-				$content_thumb .= '<amp-img width="' . $sizes['width'] . '" height="' . $sizes['height'] . '" src="' . $sc['default'] . '">';
-			}
-			$content_thumb = apply_filters( 'feedzy_thumb_output', $content_thumb, $feed_url, $sizes, $item );
+			$content_thumb .= '<img decoding="async" src="' . $thumbnail_to_use . '" title="' . esc_attr( $item->get_title() ) . '" style="' . $img_style . '">';
+			$content_thumb  = apply_filters( 'feedzy_thumb_output', $content_thumb, $feed_url, $sizes, $item );
 		}
+
 		$content_title = html_entity_decode( $item->get_title(), ENT_QUOTES, 'UTF-8' );
 		if ( is_numeric( $sc['title'] ) ) {
 			$length = intval( $sc['title'] );
@@ -1593,11 +1605,22 @@ private function get_feed_item_filter( $sc, $sizes, $item, $feed_url, $index, $i
 		if ( empty( $item_content ) ) {
 			$item_content = esc_html__( 'Post Content', 'feedzy-rss-feeds' );
 		}
+
+		$img_style = '';
+		if ( isset( $sizes['height'] ) ) {
+			$img_style = 'height:' . $sizes['height'] . 'px;';
+			if ( isset( $sc['aspectRatio'] ) && '1' !== $sc['aspectRatio'] ) {  
+				$img_style .= 'aspect-ratio:' . $sc['aspectRatio'] . ';';
+			} elseif ( isset( $sizes['width'] ) ) {
+				$img_style .= 'width:' . $sizes['width'] . 'px;';
+			}
+		}
+
 		$item_array = array(
 			'feed_url'              => $item->get_feed()->subscribe_url(),
 			'item_unique_hash'      => wp_hash( $item->get_permalink() ),
 			'item_img_class'        => 'rss_image',
-			'item_img_style'        => 'width:' . $sizes['width'] . 'px; height:' . $sizes['height'] . 'px;',
+			'item_img_style'        => $img_style,
 			'item_url'              => $new_link,
 			'item_url_target'       => $sc['target'],
 			'item_url_follow'       => isset( $sc['follow'] ) && 'yes' === $sc['follow'] ? 'nofollow' : '',
diff --git a/includes/admin/feedzy-rss-feeds-actions.php b/includes/admin/feedzy-rss-feeds-actions.php
index ffd130ec..e7bb7815 100644
--- a/includes/admin/feedzy-rss-feeds-actions.php
+++ b/includes/admin/feedzy-rss-feeds-actions.php
@@ -493,13 +493,25 @@ private function chat_gpt_rewrite() {
 			$content        = wp_strip_all_tags( $content );
 			$content        = substr( $content, 0, apply_filters( 'feedzy_chat_gpt_content_limit', 3000 ) );
 			$prompt_content = $this->current_job->data->ChatGPT;
-			$ai_provider    = 'openai';
+
+			$additional_data = array(
+				'ai_provider' => 'openai',
+			);
+
 			if ( isset( $this->current_job->data ) && isset( $this->current_job->data->aiProvider ) ) {
-				$ai_provider = $this->current_job->data->aiProvider;
+				$additional_data['ai_provider'] = $this->current_job->data->aiProvider;
 			}
+
+			if (
+				'openai' === $additional_data['ai_provider'] &&
+				isset( $this->current_job->data ) && isset( $this->current_job->data->aiModel )
+			) {
+				$additional_data['ai_model'] = $this->current_job->data->aiModel;
+			}
+
 			$content         = str_replace( array( '{content}' ), array( $content ), $prompt_content );
 			$openai          = new \Feedzy_Rss_Feeds_Pro_Openai();
-			$rewrite_content = $openai->call_api( $this->settings, $content, '', array( 'ai_provider' => $ai_provider ) );
+			$rewrite_content = $openai->call_api( $this->settings, $content, '', $additional_data );
 			// Replace prompt content string for specific cases.
 			$rewrite_content = str_replace( explode( '{content}', $prompt_content ), '', trim( $rewrite_content, '"' ) );
 			return $rewrite_content;
diff --git a/includes/admin/feedzy-rss-feeds-admin.php b/includes/admin/feedzy-rss-feeds-admin.php
index dcf45580..d6be8d7b 100644
--- a/includes/admin/feedzy-rss-feeds-admin.php
+++ b/includes/admin/feedzy-rss-feeds-admin.php
@@ -128,6 +128,34 @@ public function enqueue_styles() {
 		}
 		wp_register_style( $this->plugin_name, FEEDZY_ABSURL . 'css/feedzy-rss-feeds.css', array(), $this->version, 'all' );
 	}
+	
+	/**
+	 * Helper function to enqueue the license script with localization
+	 *
+	 * @access  public
+	 * @return  void
+	 */
+	private function enqueue_license_script() {
+		wp_enqueue_script( 
+			$this->plugin_name . '_license', 
+			FEEDZY_ABSURL . 'js/feedzy-license.js', 
+			array( 'jquery' ), 
+			$this->version, 
+			true 
+		);
+
+		wp_localize_script(
+			$this->plugin_name . '_license',
+			'feedzyLicense',
+			array(
+				'l10n' => array(
+					'licenseKey' => __( 'License Key', 'feedzy-rss-feeds' ),
+					'checkBtn'   => __( 'Check License', 'feedzy-rss-feeds' ),
+					'errorMsg'   => __( 'An error occurred while checking the license. Please try again.', 'feedzy-rss-feeds' ),
+				),
+			)
+		);
+	}
 
 	/**
 	 * Register the stylesheets for the admin area.
@@ -206,6 +234,8 @@ public function enqueue_styles_admin() {
 					),
 				)
 			);
+
+			$this->enqueue_license_script();
 		}
 
 		$upsell_screens = array( 'feedzy-rss_page_feedzy-settings', 'feedzy-rss_page_feedzy-admin-menu-pro-upsell' );
@@ -214,16 +244,39 @@ public function enqueue_styles_admin() {
 			$asset_file = include FEEDZY_ABSPATH . '/build/action-popup/index.asset.php';
 			wp_enqueue_script( $this->plugin_name . '_action_popup', FEEDZY_ABSURL . 'build/action-popup/index.js', array_merge( $asset_file['dependencies'], array( 'wp-editor', 'wp-api' ) ), $asset_file['version'], true );
 
+			$openai_model         = '';
+			$open_router_model    = '';
+			$integration_settings = get_option( 'feedzy-rss-feeds-settings', array() );
+
+			$all_open_ai_models        = apply_filters( 'feedzy_openai_models', array() );
+			$deprecated_open_ai_models = apply_filters( 'feedzy_openai_deprecated_models', array() );
+			$active_open_ai_models     = array_values( array_diff( $all_open_ai_models, $deprecated_open_ai_models ) );
+
+			if ( ! empty( $integration_settings['openai_api_model'] ) ) {
+				$openai_model = $integration_settings['openai_api_model'];
+			}
+
+			if ( ! empty( $integration_settings['openrouter_api_model'] ) ) {
+				$open_router_model = $integration_settings['openrouter_api_model'];
+			}
+
 			wp_localize_script(
 				$this->plugin_name . '_action_popup',
 				'feedzyData',
 				array(
-					'isPro'            => feedzy_is_pro(),
-					'isBusinessPlan'   => apply_filters( 'feedzy_is_license_of_type', false, 'business' ),
-					'isAgencyPlan'     => apply_filters( 'feedzy_is_license_of_type', false, 'agency' ),
-					'apiLicenseStatus' => $this->api_license_status(),
-					'isHighPrivileges' => current_user_can( 'manage_options' ),
-					'languageList'     => $this->get_lang_list(),
+					'isPro'                  => feedzy_is_pro(),
+					'isBusinessPlan'         => apply_filters( 'feedzy_is_license_of_type', false, 'business' ),
+					'isAgencyPlan'           => apply_filters( 'feedzy_is_license_of_type', false, 'agency' ),
+					'apiLicenseStatus'       => $this->api_license_status(),
+					'isHighPrivileges'       => current_user_can( 'manage_options' ),
+					'languageList'           => $this->get_lang_list(),
+					'integrationSettings'    => get_option( 'feedzy-rss-feeds-settings' ),
+					'integrations'           => array(
+						'openAIModel'     => $openai_model,
+						'openRouterModel' => $open_router_model,
+					),
+					'activeOpenAIModels'     => $active_open_ai_models,
+					'deprecatedOpenAIModels' => $deprecated_open_ai_models,
 				)
 			);
 
@@ -278,8 +331,15 @@ public function enqueue_styles_admin() {
 		}
 
 		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		if ( 'feedzy_page_feedzy-support' === $screen->base && ( ( isset( $_GET['tab'] ) && 'improve' === $_GET['tab'] ) || ( 'edit' !== $screen->base && 'feedzy_imports' === $screen->post_type ) ) ) {
-
+		$tab = isset( $_GET['tab'] ) ? sanitize_text_field( wp_unslash( $_GET['tab'] ) ) : '';
+
+		if ( 'feedzy_page_feedzy-support' === $screen->base &&
+			(
+				( 'improve' === $tab )
+				|| ( 'edit' !== $screen->base && 'feedzy_imports' === $screen->post_type )
+				|| ( 'license' === $tab )
+			) 
+		) {
 			$asset_file = include FEEDZY_ABSPATH . '/build/feedback/index.asset.php';
 			wp_enqueue_script( $this->plugin_name . '_feedback', FEEDZY_ABSURL . 'build/feedback/index.js', array_merge( $asset_file['dependencies'], array( 'wp-editor', 'wp-api', 'lodash' ) ), $asset_file['version'], true );
 			wp_enqueue_style( 'wp-block-editor' );
@@ -293,6 +353,8 @@ public function enqueue_styles_admin() {
 				)
 			);
 
+			$this->enqueue_license_script();
+
 			wp_set_script_translations( $this->plugin_name . '_feedback', 'feedzy-rss-feeds' );
 		}
 
@@ -426,7 +488,7 @@ function closeModal(e) {
 			</script>
 			<div id="feedzy-add-new-import" class="wp-core-ui feedzy-modal" style="display:none;">
 				<div class="modal-content">
-					<button type="button" class="notice-dismiss close-modal">
+					<button type="button" class="notice-dismiss fz-notice close-modal">
 						<span class="screen-reader-text"><?php esc_html_e( 'Dismiss this dialog', 'feedzy-rss-feeds' ); ?></span>
 					</button>
 					<div class="modal-header">
@@ -456,7 +518,7 @@ class="button button-primary button-large"><?php esc_html_e( 'Upgrade to PRO', '
 		?>
 			<div id="feedzy-renew-edit" class="wp-core-ui feedzy-modal" style="display:none;">
 				<div class="modal-content">
-					<button type="button" class="notice-dismiss close-modal">
+					<button type="button" class="notice-dismiss fz-notice close-modal">
 						<span class="screen-reader-text"><?php esc_html_e( 'Dismiss this dialog', 'feedzy-rss-feeds' ); ?></span>
 					</button>
 					<div class="modal-header">
@@ -481,7 +543,7 @@ class="button button-secondary button-large"><?php esc_html_e( 'Activate License
 			</div>
 			<div id="feedzy-clone-modal" class="wp-core-ui feedzy-modal" style="display:none;">
 				<div class="modal-content">
-					<button type="button" class="notice-dismiss close-modal">
+					<button type="button" class="notice-dismiss fz-notice close-modal">
 						<span class="screen-reader-text"><?php esc_html_e( 'Dismiss this dialog', 'feedzy-rss-feeds' ); ?></span>
 					</button>
 					<div class="modal-header">
@@ -923,6 +985,7 @@ public function feedzy_filter_plugin_row_meta( $links, $file ) {
 	 *
 	 * @since   3.0.12
 	 * @access  public
+	 * @return  void
 	 */
 	public function feedzy_menu_pages() {
 		$capability = feedzy_current_user_can();
@@ -932,6 +995,17 @@ public function feedzy_menu_pages() {
 		$svg_base64_icon = 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB3aWR0aD0iNzdweCIgaGVpZ2h0PSI3N3B4IiB2aWV3Qm94PSIwIDAgNzcgNzciIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+CiAgICA8IS0tIEdlbmVyYXRvcjogU2tldGNoIDUyLjYgKDY3NDkxKSAtIGh0dHA6Ly93d3cuYm9oZW1pYW5jb2RpbmcuY29tL3NrZXRjaCAtLT4KICAgIDx0aXRsZT5Db21iaW5lZC1TaGFwZTwvdGl0bGU+CiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4KICAgIDxnIGlkPSJQcm9kdWN0LVBhZ2UiIHN0cm9rZT0ibm9uZSIgc3Ryb2tlLXdpZHRoPSIxIiBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPgogICAgICAgIDxnIGlkPSJXb3JkUHJlc3MtcGx1Z2lucyIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLTE5Ni4wMDAwMDAsIC05NTcuMDAwMDAwKSIgZmlsbD0iIzQyNjhDRiI+CiAgICAgICAgICAgIDxwYXRoIGQ9Ik0yMzQuNSwxMDM0IEMyMTMuMjM3MDM3LDEwMzQgMTk2LDEwMTYuNzYyOTYgMTk2LDk5NS41IEMxOTYsOTc0LjIzNzAzNyAyMTMuMjM3MDM3LDk1NyAyMzQuNSw5NTcgQzI1NS43NjI5NjMsOTU3IDI3Myw5NzQuMjM3MDM3IDI3Myw5OTUuNSBDMjczLDEwMTYuNzYyOTYgMjU1Ljc2Mjk2MywxMDM0IDIzNC41LDEwMzQgWiBNMjM4LjM4OTA4NywxMDAzLjYxMDkxIEMyMzYuMjQxMjU2LDEwMDEuNDYzMDggMjMyLjc1ODg1MSwxMDAxLjQ2Mjk3IDIzMC42MTA5NDMsMTAwMy42MTA4OCBDMjI4LjQ2MzAzNSwxMDA1Ljc1ODc5IDIyOC40NjMwMjEsMTAwOS4yNDEyIDIzMC42MTA5MTMsMTAxMS4zODkwOSBDMjMyLjc1ODgwNCwxMDEzLjUzNjk4IDIzNi4yNDExNDksMTAxMy41MzcwMyAyMzguMzg5MDU3LDEwMTEuMzg5MTIgQzI0MC41MzY5NjUsMTAwOS4yNDEyMSAyNDAuNTM2OTc5LDEwMDUuNzU4OCAyMzguMzg5MDg3LDEwMDMuNjEwOTEgWiBNMjUxLjE5OTE5Niw5OTYuNTI0MjY5IEMyNDEuNzE2MDEsOTg4LjAxMzQwOSAyMjcuMjk0MTQzLDk4OC4wMDQzMDcgMjE3LjgwMDg1OSw5OTYuNTI0MjE0IEMyMTcuMjQwNDk2LDk5Ny4wMjcwNzkgMjE3LjIyMjEwOCw5OTcuODk5Nzc3IDIxNy43NTQ0OCw5OTguNDMyMTUgTDIyMC41NTE4NzksMTAwMS4yMjk1NSBDMjIxLjA0MTU5NCwxMDAxLjcxOTI2IDIyMS44Mjk5NjcsMTAwMS43NTIyNiAyMjIuMzUwNDA4LDEwMDEuMjk1MzcgQzIyOS4yODI0MDEsOTk1LjIxMTE3IDIzOS43MDI4MSw5OTUuMTk4MjA5IDI0Ni42NDk1NDYsMTAwMS4yOTU0MSBDMjQ3LjE3MDA0NywxMDAxLjc1MjI1IDI0Ny45NTg0MiwxMDAxLjcxOTI1IDI0OC40NDgwNzUsMTAwMS4yMjk1OSBMMjUxLjI0NTQ2NSw5OTguNDMyMjA1IEMyNTEuNzc3OTUyLDk5Ny44OTk4MzQgMjUxLjc1OTU2MSw5OTcuMDI3MTM2IDI1MS4xOTkxOTYsOTk2LjUyNDI2OSBaIE0yNTkuNTE3NDgxLDk4OC4wNjI4MTggQzI0NS43NTQ2NjIsOTc1LjI1MzkxIDIyNC4zMTI1MzEsOTc1LjE5MTM3NCAyMTAuNDgyNDY0LDk4OC4wNjI4NzMgQzIwOS45NTA5Niw5ODguNTU3NTU3IDIwOS45NDA4NDUsOTg5LjM5NjY4OSAyMTAuNDU0MjIyLDk4OS45MTAwNjYgTDIxMy4xODU0ODksOTkyLjY0MTMzMyBDMjEzLjY3NTU2OSw5OTMuMTMxNDEzIDIxNC40NjI4MjQsOTkzLjE0MTkyNCAyMTQuOTcyNjIyLDk5Mi42NzIzNTUgQzIyNi4yODEwMjksOTgyLjI1NDc4NiAyNDMuNzIwODA0LDk4Mi4yNTY0MTUgMjU5LjUxNzQ4MSw5ODguMDYyODE4IFoiIGlkPSJDb21iaW5lZC1TaGFwZSI+PC9wYXRoPgogICAgICAgIDwvZz4KICAgIDwvZz4KPC9zdmc+';
 		add_menu_page( __( 'Feedzy', 'feedzy-rss-feeds' ), __( 'Feedzy', 'feedzy-rss-feeds' ), apply_filters( 'feedzy_admin_menu_capability', 'publish_posts' ), 'feedzy-admin-menu', '', $svg_base64_icon, 98.7666 );
 
+		add_submenu_page(
+			'feedzy-admin-menu',
+			__( 'Dashboard', 'feedzy-rss-feeds' ),
+			__( 'Dashboard', 'feedzy-rss-feeds' ),
+			'manage_options',
+			'feedzy-support',
+			array(
+				$this,
+				'render_support',
+			)
+		);
 		add_submenu_page(
 			'feedzy-admin-menu',
 			__( 'Settings', 'feedzy-rss-feeds' ),
@@ -954,17 +1028,6 @@ public function feedzy_menu_pages() {
 				'feedzy_integration_page',
 			)
 		);
-		add_submenu_page(
-			'feedzy-admin-menu',
-			__( 'Support', 'feedzy-rss-feeds' ),
-			__( 'Support', 'feedzy-rss-feeds' ) . '<span class="dashicons dashicons-editor-help more-features-icon" style="width: 17px; height: 17px; margin-left: 4px; color: #ffca54; font-size: 17px; vertical-align: -3px;"></span>',
-			'manage_options',
-			'feedzy-support',
-			array(
-				$this,
-				'render_support',
-			)
-		);
 
 		if ( ! feedzy_is_pro() && get_option( 'feedzy_fresh_install', false ) ) {
 			$hook = add_submenu_page(
@@ -981,37 +1044,55 @@ public function feedzy_menu_pages() {
 			add_action( "load-$hook", array( $this, 'feedzy_load_setup_wizard_page' ) );
 			add_action( 'adminmenu', array( $this, 'feedzy_hide_wizard_menu' ) );
 		}
-		if ( ! defined( 'REVIVE_NETWORK_VERSION' ) ) {
-			$rss_to_social = __( 'RSS to Social', 'feedzy-rss-feeds' ) . '<span id="feedzy-rn-menu" class="dashicons dashicons-external" style="font-size:initial;"></span>';
-			add_action(
-				'admin_footer',
-				function () {
-					?>
-					<script type="text/javascript">
-						jQuery(document).ready(function ($) {
-							$('#feedzy-rn-menu').parent().attr('target', '_blank');
-						});
-					</script>
-					<?php
-				}
-			);
+	}
 
-			global $submenu;
-			if ( isset( $submenu['feedzy-admin-menu'] ) ) {
+	/**
+	 * Handle the RSS to Social menu item.
+	 *
+	 * @access  public
+	 * @return  void
+	 */
+	public function rss_to_social_menu() {
+		$capability = feedzy_current_user_can();
+		if ( ! $capability ) {
+			return;
+		}
 
-				array_splice(
-					$submenu['feedzy-admin-menu'],
-					4,
-					0,
-					array(
-						array(
-							$rss_to_social,
-							'manage_options',
-							tsdk_utmify( 'https://revive.social/plugins/revive-network', 'feedzy-menu' ),
-						),
-					)
-				);
+		if ( defined( 'REVIVE_NETWORK_VERSION' ) && ! feedzy_is_pro() ) {
+			return;
+		}
+
+		$rss_to_social = __( 'RSS to Social', 'feedzy-rss-feeds' ) . '<span id="feedzy-rn-menu" class="dashicons dashicons-external" style="font-size:initial;"></span>';
+		add_action(
+			'admin_footer',
+			function () {
+				?>
+				<script type="text/javascript">
+					jQuery(document).ready(function ($) {
+						$('#feedzy-rn-menu').parent().attr('target', '_blank');
+					});
+				</script>
+				<?php
+			}
+		);
+
+		global $submenu;
+		if ( isset( $submenu['feedzy-admin-menu'] ) ) {
+			if ( isset( $submenu['feedzy-admin-menu'][0] ) ) {
+				unset( $submenu['feedzy-admin-menu'][0] );
 			}
+			array_splice(
+				$submenu['feedzy-admin-menu'],
+				5,
+				0,
+				array(
+					array(
+						$rss_to_social,
+						'manage_options',
+						tsdk_utmify( 'https://revive.social/plugins/revive-network', 'feedzy-menu' ),
+					),
+				)
+			);
 		}
 	}
 
@@ -1441,7 +1522,7 @@ public function get_source_validity_error( $message = '', $post = '', $css_class
 
 		if ( $invalid ) {
 			if ( empty( $css_class ) ) {
-				$css_class = 'notice notice-error notice-alt feedzy-error-critical';
+				$css_class = 'notice notice-error notice-alt fz-notice feedzy-error-critical';
 			}
 			$message .= '<div class="' . $css_class . '"><p style="color: inherit"><i class="dashicons dashicons-warning"></i>' . $text . ': <ol style="color: inherit">';
 			foreach ( $invalid as $url ) {
@@ -1605,7 +1686,20 @@ public function feedzy_dismiss_wizard( $redirect_to_dashboard = true ) {
 		update_option( 'feedzy_fresh_install', $status );
 		delete_option( 'feedzy_wizard_data' );
 		if ( false !== $redirect_to_dashboard ) {
-			wp_safe_redirect( remove_query_arg( array( 'action', 'status' ) ) );
+
+			$cleaned_url = remove_query_arg( array( 'page', 'action', 'status' ) );
+			$parsed_url  = wp_parse_url( $cleaned_url );
+
+			// Default to dashboard if no page is set.
+			if (
+				isset( $parsed_url['path'] ) && 
+				strpos( $parsed_url['path'], '/wp-admin/admin.php' ) !== false && 
+				empty( $parsed_url['query'] )
+			) {
+				$cleaned_url = add_query_arg( 'page', 'feedzy-support', $cleaned_url );
+			}
+		
+			wp_safe_redirect( $cleaned_url );
 			exit;
 		}
 		return true;
@@ -1809,7 +1903,12 @@ private function setup_wizard_subscribe_process() {
 			$segment  = 1;
 			$response = array(
 				'status'      => 1,
-				'redirect_to' => add_query_arg( 'post_type', 'feedzy_imports', admin_url( 'edit.php' ) ),
+				'redirect_to' => add_query_arg(
+					array(
+						'page' => 'feedzy-support',
+					),
+					admin_url( 'admin.php' )
+				),
 				'message'     => __( 'Redirecting to Feedzy dashboard', 'feedzy-rss-feeds' ),
 			);
 
@@ -1834,30 +1933,48 @@ private function setup_wizard_subscribe_process() {
 			} else {
 				$response = array(
 					'status'      => 1,
-					'redirect_to' => add_query_arg( 'post_type', 'feedzy_imports', admin_url( 'edit.php' ) ),
+					'redirect_to' => add_query_arg(
+						array(
+							'page' => 'feedzy-support',
+						),
+						admin_url( 'admin.php' )
+					),
 					'message'     => __( 'Redirecting to Feedzy dashboard', 'feedzy-rss-feeds' ),
 				);
 			}
 		} elseif ( 'page_builder' === $integrate_with ) {
-			$post_edit_link = get_edit_post_link( $page_id, 'db' );
-			// Get elementor edit page link.
-			if ( defined( 'ELEMENTOR_PATH' ) && class_exists( 'Elementor\Widget_Base' ) ) {
-				$segment        = 3;
-				$post_edit_link = add_query_arg(
-					array(
-						'post'   => $page_id,
-						'action' => 'elementor',
+			if ( empty( $page_id ) ) {
+				$response = array(
+					'status'      => 1,
+					'redirect_to' => add_query_arg(
+						array(
+							'page' => 'feedzy-support',
+						),
+						admin_url( 'admin.php' )
 					),
-					admin_url( 'post.php' )
+					'message'     => __( 'Redirecting to Feedzy dashboard', 'feedzy-rss-feeds' ),
 				);
 			} else {
-				$segment = 4;
+				$post_edit_link = get_edit_post_link( $page_id, 'db' );
+				// Get elementor edit page link.
+				if ( defined( 'ELEMENTOR_PATH' ) && class_exists( 'Elementor\Widget_Base' ) ) {
+					$segment        = 3;
+					$post_edit_link = add_query_arg(
+						array(
+							'post'   => $page_id,
+							'action' => 'elementor',
+						),
+						admin_url( 'post.php' )
+					);
+				} else {
+					$segment = 4;
+				}
+				$response = array(
+					'status'      => 1,
+					'redirect_to' => $post_edit_link,
+					'message'     => __( 'Redirecting to draft page', 'feedzy-rss-feeds' ),
+				);
 			}
-			$response = array(
-				'status'      => 1,
-				'redirect_to' => $post_edit_link,
-				'message'     => __( 'Redirecting to draft page', 'feedzy-rss-feeds' ),
-			);
 		}
 		if ( $with_subscribe && is_email( $email ) ) {
 			update_option( 'feedzy_rss_feeds_logger_flag', 'yes' );
@@ -2215,7 +2332,7 @@ public function add_banner_anchor() {
 		add_action(
 			'admin_notices',
 			function () {
-				echo '<div id="tsdk_banner" class="notice feedzy-banner-dashboard"></div>';
+				echo '<div id="tsdk_banner" class="notice fz-notice feedzy-banner-dashboard"></div>';
 			},
 			999
 		);
@@ -2513,4 +2630,133 @@ public function add_black_friday_data( $configs ) {
 
 		return $configs;
 	}
+
+	/**
+	 * Validate the feed URL and check if it's a valid RSS/Atom feed.
+	 *
+	 * @return void
+	 */
+	public function validate_feed() {
+		try {
+			if (
+				! isset( $_POST['nonce'] ) ||
+				! wp_verify_nonce( sanitize_text_field( wp_unslash( $_POST['nonce'] ) ), FEEDZY_BASEFILE )
+			) {
+				wp_send_json_error( array( 'message' => __( 'Security check failed.', 'feedzy-rss-feeds' ) ) );
+			}
+
+			$feed_urls = isset( $_POST['feed_url'] ) ? sanitize_text_field( wp_unslash( $_POST['feed_url'] ) ) : '';
+
+			if ( empty( $feed_urls ) ) {
+				wp_send_json_error( array( 'message' => __( 'Feed URL cannot be empty.', 'feedzy-rss-feeds' ) ) );
+			}
+
+			$urls = array_map( 'trim', explode( ',', $feed_urls ) );
+			$urls = array_filter( $urls );
+
+			if ( empty( $urls ) ) {
+				wp_send_json_error( array( 'message' => __( 'No valid URLs provided.', 'feedzy-rss-feeds' ) ) );
+			}
+
+			$results = array();
+
+			foreach ( $urls as $feed_url ) {
+				$feed_url = esc_url_raw( $feed_url );
+
+				if ( ! filter_var( $feed_url, FILTER_VALIDATE_URL ) ) {
+					$results[] = array(
+						'url'     => $feed_url,
+						'status'  => 'error',
+						'message' => __( 'Invalid URL format', 'feedzy-rss-feeds' ),
+					);
+					continue;
+				}
+
+				$feed = $this->fetch_feed( array( $feed_url ), '1_mins', array() );
+
+				if ( is_wp_error( $feed ) ) {
+					$results[] = array(
+						'url'     => $feed_url,
+						'status'  => 'error',
+						'message' => __( 'Error fetching feed: ', 'feedzy-rss-feeds' ) . $feed->get_error_message(),
+					);
+					continue;
+				}
+
+				if (
+					! is_object( $feed ) ||
+					! method_exists( $feed, 'get_item_quantity' )
+				) {
+					$results[] = array(
+						'url'     => $feed_url,
+						'status'  => 'error',
+						'message' => __( 'Invalid feed object returned', 'feedzy-rss-feeds' ),
+					);
+					continue;
+				}
+
+				try {
+					$items = $feed->get_item_quantity();
+					$title = $feed->get_title();
+					$error = $feed->error();
+
+					if ( is_array( $error ) && ! empty( $error ) ) {
+						$results[] = array(
+							'url'     => $feed_url,
+							'status'  => 'error',
+							'message' => __( 'Error fetching feed: ', 'feedzy-rss-feeds' ) . implode( ', ', $error ),
+						);
+						continue;
+					}
+
+					if ( 0 === $items ) {
+						$results[] = array(
+							'url'     => $feed_url,
+							'status'  => 'warning',
+							'message' => __( 'Feed is empty', 'feedzy-rss-feeds' ),
+						);
+						continue;
+					}
+
+					$results[] = array(
+						'url'     => $feed_url,
+						'status'  => 'success',
+						'message' => $title . sprintf(
+						/* translators: %d is the number of items found in the feed */
+							_n(
+								'%d item found',
+								'%d items found',
+								$items,
+								'feedzy-rss-feeds'
+							),
+							$items 
+						),
+						'items'   => $items,
+						'title'   => $title,
+					);
+
+				} catch ( Throwable $e ) {
+					$results[] = array(
+						'url'     => $feed_url,
+						'status'  => 'error',
+						/* translators: %s is the error message */
+						'message' => sprintf( __( 'Error reading feed: %s', 'feedzy-rss-feeds' ), $e->getMessage() ),
+					);
+				}
+			}
+
+			wp_send_json_success(
+				array(
+					'results' => $results,
+				)
+			);
+		} catch ( Throwable $e ) {
+			wp_send_json_error(
+				array(
+					/* translators: %s is the error message */
+					'message' => sprintf( __( 'An error occurred: %s', 'feedzy-rss-feeds' ), $e->getMessage() ),
+				)
+			);
+		}
+	}
 }
diff --git a/includes/admin/feedzy-rss-feeds-import.php b/includes/admin/feedzy-rss-feeds-import.php
index a0c0c4d7..0584dc5c 100644
--- a/includes/admin/feedzy-rss-feeds-import.php
+++ b/includes/admin/feedzy-rss-feeds-import.php
@@ -24,6 +24,7 @@
  * Class Feedzy_Rss_Feeds_Import
  */
 class Feedzy_Rss_Feeds_Import {
+
 	/**
 	 * The ID of this plugin.
 	 *
@@ -121,11 +122,22 @@ public function upsell_content( $content, $area, $location ) {
 	 * @access      public
 	 */
 	public function enqueue_styles() {
-		wp_enqueue_style( $this->plugin_name, FEEDZY_ABSURL . 'css/feedzy-rss-feed-import.css', array(), $this->version, 'all' );
-		wp_register_style( $this->plugin_name . '_chosen', FEEDZY_ABSURL . 'includes/views/css/chosen.css', array(), $this->version, 'all' );
-		wp_register_script( $this->plugin_name . '_chosen_script', FEEDZY_ABSURL . 'includes/views/js/chosen.js', array( 'jquery' ), $this->version, true );
+		$screen = get_current_screen();
+
+		if (
+			'feedzy_imports' === $screen->post_type ||
+			'feedzy_categories' === $screen->post_type ||
+			'feedzy_page_feedzy-integration' === $screen->id ||
+			'feedzy_page_feedzy-settings' === $screen->id ||
+			'feedzy_page_feedzy-support' === $screen->id ||
+			'feedzy_page_feedzy-setup-wizard' === $screen->id
+		) {
+			wp_enqueue_style( $this->plugin_name, FEEDZY_ABSURL . 'css/feedzy-rss-feed-import.css', array(), $this->version, 'all' );
+			wp_register_style( $this->plugin_name . '_chosen', FEEDZY_ABSURL . 'includes/views/css/chosen.css', array(), $this->version, 'all' );
+			wp_register_script( $this->plugin_name . '_chosen_script', FEEDZY_ABSURL . 'includes/views/js/chosen.js', array( 'jquery' ), $this->version, true );
+		}
 
-		if ( get_current_screen()->post_type === 'feedzy_imports' ) {
+		if ( 'feedzy_imports' === $screen->post_type ) {
 			if ( ! did_action( 'wp_enqueue_media' ) ) {
 				wp_enqueue_media();
 			}
@@ -151,13 +163,14 @@ public function enqueue_styles() {
 				array(
 					'ajax' => array(
 						'security' => wp_create_nonce( FEEDZY_BASEFILE ),
+						'url'      => admin_url( 'admin-ajax.php' ),
 					),
 					'i10n' => array(
 						'importing'           => __( 'Importing', 'feedzy-rss-feeds' ) . '...',
 						'run_now'             => __( 'Run Now', 'feedzy-rss-feeds' ),
 						'dry_run_loading'     => '<p class="hide-when-loaded">' . __( 'Processing the source and loading the items that will be imported when it runs', 'feedzy-rss-feeds' ) . '...</p>'
-											. '<p><b>' . __( 'Please note that if some of these items have already have been imported in previous runs with the same filters, they may be shown here but will not be imported again.', 'feedzy-rss-feeds' ) . '</b></p>'
-											. '<p class="loading-img hide-when-loaded"><img src="' . includes_url( 'images/wpspin-2x.gif' ) . '"></p><div></div>',
+							. '<p><b>' . __( 'Please note that if some of these items have already have been imported in previous runs with the same filters, they may be shown here but will not be imported again.', 'feedzy-rss-feeds' ) . '</b></p>'
+							. '<p class="loading-img hide-when-loaded"><img src="' . includes_url( 'images/wpspin-2x.gif' ) . '"></p><div></div>',
 						'dry_run_title'       => __( 'Importable Items', 'feedzy-rss-feeds' ),
 						'delete_post_message' => __( 'Would you also like to delete all the imported posts for this import job?', 'feedzy-rss-feeds' ),
 						'media_iframe_title'  => __( 'Select image', 'feedzy-rss-feeds' ),
@@ -176,6 +189,11 @@ public function enqueue_styles() {
 							feedzy_is_pro() ? 'dashicons-upload' : 'dashicons-lock',
 							esc_html__( 'Upload Import', 'feedzy-rss-feeds' )
 						),
+						'is_pro'              => feedzy_is_pro(),
+						'validation_messages' => array(
+							'invalid_feed_url'          => __( 'Invalid feed URL.', 'feedzy-rss-feeds' ),
+							'error_validating_feed_url' => __( 'Error validating feed URL.', 'feedzy-rss-feeds' ),
+						),
 					),
 				)
 			);
@@ -185,11 +203,11 @@ public function enqueue_styles() {
 	/**
 	 * Add attributes to $item_array.
 	 *
-	 * @param array  $item_array The item attributes array.
-	 * @param object $item The feed item.
-	 * @param array  $sc The shortcode attributes array.
-	 * @param int    $index The item number.
-	 * @param int    $item_index The real index of this item in the feed.
+	 * @param array          $item_array The item attributes array.
+	 * @param SimplePie\Item $item The feed item.
+	 * @param array          $sc The shortcode attributes array.
+	 * @param int            $index The item number.
+	 * @param int            $item_index The real index of this item in the feed.
 	 * @return mixed
 	 * @since 1.0.0
 	 * @access public
@@ -204,17 +222,84 @@ public function add_data_to_item( $item_array, $item, $sc = null, $index = null,
 		$item_array['item']       = $item;
 		$item_array['item_index'] = $item_index;
 
+		$item_array = $this->handle_youtube_content( $item_array, $item, $sc );
+
+		return $item_array;
+	}
+
+	/**
+	 * Fetches additional information for each item.
+	 *
+	 * @param array<string, string > $item_array The item attributes array.
+	 * @param SimplePie\Item         $item The feed item.
+	 * @param array<string, mixed>   $sc The shortcode attributes array. This will be empty through the block editor.
+	 * 
+	 * @return array<string, string>
+	 */
+	private function handle_youtube_content( $item_array, $item, $sc ) {
+		$url = '';
+		if ( array_key_exists( 'item_url', $item_array ) ) {
+			$url = $item_array['item_url'];
+		} elseif ( $item ) {
+			$url = $item->get_permalink();
+		}
+
+		if ( empty( $url ) ) {
+			return $item_array;
+		}
+
+		$host = wp_parse_url( $url, PHP_URL_HOST );
+
+		// Remove all dots in the hostname so that shortforms such as youtu.be can also be resolved.
+		$host = str_replace( array( '.', 'www' ), '', $host );
+		
+		if ( ! in_array( $host, array( 'youtubecom', 'youtube' ), true ) ) {
+			// Not a YouTube link, return the item array as is.
+			return $item_array;
+		}
+
+		$tags = $item->get_item_tags( \SimplePie\SimplePie::NAMESPACE_MEDIARSS, 'group' );
+		$desc = '';
+		if ( $tags ) {
+			$desc_tag = $tags[0]['child'][ \SimplePie\SimplePie::NAMESPACE_MEDIARSS ]['description'];
+			if ( $desc_tag ) {
+				$desc = $desc_tag[0]['data'];
+			}
+		}
+
+		if ( ! empty( $desc ) ) {
+			if ( empty( $item_array['item_content'] ) ) {
+				$item_array['item_content'] = $desc;
+			}
+
+			if (
+				( empty( $sc ) || 'yes' === $sc['summary'] ) &&
+				empty( $item_array['item_description'] )
+			) {
+				if (
+					is_numeric( $sc['summarylength'] ) &&
+					strlen( $desc ) > $sc['summarylength']
+				) {
+					$desc = preg_replace( '/\s+?(\S+)?$/', '', substr( $desc, 0, $sc['summarylength'] ) ) . ' [&hellip;]';
+				}
+				$item_array['item_description'] = $desc;
+			}
+		}
+
+		$embed_video_shortcode      = '[embed]' . $url . '[/embed]';
+		$should_overwrite           = str_contains( $item_array['item_content'], 'Post Content' );
+		$item_array['item_content'] = ( $should_overwrite ? '' : $item_array['item_content'] ) . $embed_video_shortcode;
+		
 		return $item_array;
 	}
 
 	/**
 	 * Retrieve the categories.
 	 *
-	 * @param string $dumb The initial categories (only a placeholder argument for the filter).
-	 * @param object $item The feed item.
+	 * @param string         $dumb The initial categories (only a placeholder argument for the filter).
+	 * @param SimplePie\Item $item The feed item.
 	 *
 	 * @return string
-	 * @since   ?
 	 * @access  public
 	 */
 	public function retrieve_categories( $dumb, $item ) {
@@ -222,11 +307,7 @@ public function retrieve_categories( $dumb, $item ) {
 		$categories = $item->get_categories();
 		if ( $categories ) {
 			foreach ( $categories as $category ) {
-				if ( is_string( $category ) ) {
-					$cats[] = $category;
-				} else {
-					$cats[] = $category->get_label();
-				}
+				$cats[] = $category->get_label();
 			}
 		}
 
@@ -384,6 +465,9 @@ public function feedzy_import_feed_options() {
 		$mark_duplicate_tag       = get_post_meta( $post->ID, 'mark_duplicate_tag', true );
 		$import_post_author       = get_post_meta( $post->ID, 'import_post_author', true );
 		$filter_conditions        = get_post_meta( $post->ID, 'filter_conditions', true );
+		$import_remove_html       = get_post_meta( $post->ID, 'import_remove_html', true );
+		$import_remove_html       = 'yes' === $import_remove_html ? 'checked' : '';
+		$import_order             = get_post_meta( $post->ID, 'import_order', true );
 
 		if ( empty( $filter_conditions ) ) {
 			$filter_conditions = apply_filters(
@@ -420,10 +504,23 @@ public function feedzy_import_feed_options() {
 			$import_content = '[[{"value":"%5B%7B%22id%22%3A%22%22%2C%22tag%22%3A%22item_content%22%2C%22data%22%3A%7B%7D%7D%5D"}]]';
 		}
 
-		if ( feedzy_is_pro() && empty( $import_post_term ) ) {
+		if ( feedzy_is_pro() && empty( $import_post_term ) && 'post-new.php' === $pagenow ) {
 			$import_post_term = '[#auto_categories]';
 		}
 
+		if ( feedzy_is_pro() ) {
+			$custom_terms = array(
+				'[#item_categories]' => __( 'Item Categories', 'feedzy-rss-feeds' ),
+				'[#auto_categories]' => __( 'Auto Categories by keyword', 'feedzy-rss-feeds' ),
+			);
+		} elseif ( ! feedzy_is_pro() ) {
+			$custom_terms = array(
+				'[#item_categories]' => __( 'Item Categories', 'feedzy-rss-feeds' ) . sprintf( '<span class="pro-label">%s</span>', __( 'PRO', 'feedzy-rss-feeds' ) ),
+				'[#auto_categories]' => __( 'Auto Categories by keyword', 'feedzy-rss-feeds' ) . sprintf( '<span class="pro-label">%s</span>', __( 'PRO', 'feedzy-rss-feeds' ) ),
+			);
+		}
+		$custom_post_term = wp_json_encode( $custom_terms );
+
 		$import_link_author_admin  = get_post_meta( $post->ID, 'import_link_author_admin', true );
 		$import_link_author_public = get_post_meta( $post->ID, 'import_link_author_public', true );
 
@@ -445,27 +542,13 @@ public function feedzy_import_feed_options() {
 		if ( empty( $import_feed_limit ) ) {
 			$import_feed_limit = 10;
 		}
-		$import_feed_delete_days = intval( get_post_meta( $post->ID, 'import_feed_delete_days', true ) );
-		if ( empty( $import_feed_delete_days ) ) {
-			$import_feed_delete_days = ! empty( $this->free_settings['general']['feedzy-delete-days'] ) ? (int) $this->free_settings['general']['feedzy-delete-days'] : 0;
-		}
-
-		$import_feed_delete_media = get_post_meta( $post->ID, 'import_feed_delete_media', true );
-		if ( empty( $import_feed_delete_media ) ) {
-			$import_feed_delete_media = ! empty( $this->free_settings['general']['feedzy-delete-media'] ) ? 'yes' : 'no';
-		}
-		$import_feed_delete_media = 'yes' === $import_feed_delete_media ? 'checked' : '';
 
-		$default_thumbnail_id = 0;
+		$default_thumbnail_id   = 0;
+		$inherited_thumbnail_id = ! empty( $this->free_settings['general']['default-thumbnail-id'] ) ? (int) $this->free_settings['general']['default-thumbnail-id'] : 0;
 		if ( feedzy_is_pro() ) {
 			$default_thumbnail_id = get_post_meta( $post->ID, 'default_thumbnail_id', true );
-			if (
-				empty( $default_thumbnail_id ) &&
-				'0' !== $default_thumbnail_id // Can use the fallback image from Global Settings.
-			) {
-				$default_thumbnail_id = ! empty( $this->free_settings['general']['default-thumbnail-id'] ) ? (int) $this->free_settings['general']['default-thumbnail-id'] : 0;
-			}
 		}
+
 		$import_schedule = array(
 			'fz_cron_schedule' => ! empty( $this->free_settings['general']['fz_cron_schedule'] ) ? $this->free_settings['general']['fz_cron_schedule'] : '',
 		);
@@ -495,7 +578,8 @@ public function feedzy_import_feed_options() {
 	 * 
 	 * @return int The range. Capped if the user is not PRO.
 	 */
-	public function items_limit( $range, $post ) { // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundAfterLastUsed
+	public function items_limit( $range, $post ) {
+	 // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundAfterLastUsed
 		if ( ! feedzy_is_pro() ) {
 			$range = range( 10, 10, 10 );
 		}
@@ -594,15 +678,15 @@ public function save_feedzy_import_feed_meta( $post_id, $post ) {
 			$data_meta['import_auto_translation'] = isset( $data_meta['import_auto_translation'] ) ? $data_meta['import_auto_translation'] : 'no';
 			// Check feeds external image URL checkbox checked OR not.
 			$data_meta['import_use_external_image'] = isset( $data_meta['import_use_external_image'] ) ? $data_meta['import_use_external_image'] : 'no';
+			// Check feeds remove html checkbox checked OR not.
+			$data_meta['import_remove_html'] = isset( $data_meta['import_remove_html'] ) ? $data_meta['import_remove_html'] : 'no';
+			$data_meta['import_post_term']   = isset( $data_meta['import_post_term'] ) ? $data_meta['import_post_term'] : '';
 
 			// If it is filter_conditions we want to escape it.
 			if ( isset( $data_meta['filter_conditions'] ) ) {
 				$data_meta['filter_conditions'] = wp_slash( $data_meta['filter_conditions'] );
 			}
 
-			// Check feeds remove attached media checkbox checked OR not.
-			$data_meta['import_feed_delete_media'] = isset( $data_meta['import_feed_delete_media'] ) ? $data_meta['import_feed_delete_media'] : 'no';
-
 			// $data_meta['feedzy_post_author'] should be the author username. We convert it to the author ID.
 			if ( ! empty( $data_meta['import_post_author'] ) ) {
 				$author = get_user_by( 'login', $data_meta['import_post_author'] );
@@ -786,7 +870,7 @@ public function manage_feedzy_import_columns( $column, $post_id ) {
 							$src = sprintf( '%s: %s%s%s', __( 'Feed Group', 'feedzy-rss-feeds' ), '<a href="' . admin_url( 'edit.php?post_type=feedzy_categories' ) . '" target="_blank">', $src, '</a>' );
 						}
 					} elseif ( empty( $src ) ) {
-							$src = __( 'No Source Configured', 'feedzy-rss-feeds' );
+						$src = __( 'No Source Configured', 'feedzy-rss-feeds' );
 					} else {
 						$src = sprintf( '%s: %s%s%s', __( 'Feed Group', 'feedzy-rss-feeds' ), '<a href="' . admin_url( 'edit.php?post_type=feedzy_categories' ) . '" target="_blank">', $src, '</a>' );
 					}
@@ -834,7 +918,7 @@ public function manage_feedzy_import_columns( $column, $post_id ) {
 				}
 
 				$msg .= $this->get_last_run_details( $post_id );
-				echo( $msg ); //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+				echo ( $msg ); //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 
 				if ( 'publish' === $post->post_status ) {
 					printf( '<p><input type="button" class="button button-primary feedzy-run-now" data-id="%d" value="%s"></p>', esc_attr( $post_id ), esc_attr__( 'Run Now', 'feedzy-rss-feeds' ) );
@@ -1279,7 +1363,7 @@ private function run_now() {
 			array(
 				'msg'            => $msg,
 				'import_success' => 0 < $count,
-			) 
+			)
 		);
 	}
 
@@ -1478,6 +1562,8 @@ private function run_job( $job, $max ) {
 		$mark_duplicate_tag       = get_post_meta( $job->ID, 'mark_duplicate_tag', true );
 		$mark_duplicate_tag       = feedzy_is_pro() && ! empty( $mark_duplicate_tag ) ? preg_replace( '/[\[\]#]/', '', $mark_duplicate_tag ) : '';
 		$max                      = $import_feed_limit;
+		$import_remove_html       = get_post_meta( $job->ID, 'import_remove_html', true );
+		$import_order             = get_post_meta( $job->ID, 'import_order', true );
 
 		if ( empty( $filter_conditions ) ) {
 			$filter_conditions = apply_filters(
@@ -1552,6 +1638,7 @@ private function run_job( $job, $max ) {
 				'multiple_meta' => 'no',
 				'refresh'       => '55_mins',
 				'filters'       => $filter_conditions,
+				'sort'          => $import_order,
 			),
 			$job
 		);
@@ -1792,6 +1879,10 @@ function ( $attr, $key ) {
 				$post_title           = str_replace( '[#title_feedzy_rewrite]', $title_feedzy_rewrite, $post_title );
 			}
 
+			if ( is_string( $post_title ) ) {
+				$post_title = wp_strip_all_tags( $post_title );
+			}
+			
 			$image_html = '';
 			if ( ! empty( $item['item_img_path'] ) ) {
 				$image_html = '<img src="' . $item['item_img_path'] . '" title="' . $item['item_title'] . '" />';
@@ -1951,6 +2042,11 @@ function ( $attr, $key ) {
 
 			$post_author = ! empty( $import_post_author ) ? $import_post_author : $job->post_author;
 
+			// strip all HTML tag when remove html option is enabled.
+			if ( 'yes' === $import_remove_html ) {
+				$post_content = wp_strip_all_tags( $post_content );
+			}
+
 			$new_post = apply_filters(
 				'feedzy_insert_post_args',
 				array(
@@ -2111,7 +2207,7 @@ function ( $term ) {
 					'translation_lang' => $import_translation_lang,
 					'language_code'    => $language_code,
 					'item'             => $item,
-				) 
+				)
 			);
 
 			if ( ! empty( $import_featured_img ) && 'attachment' !== $import_post_type ) {
@@ -2311,7 +2407,7 @@ public function get_job_feed( $options, $import_content = null, $raw_feed_also =
 			$feed = $admin->fetch_feed( $feed_url, isset( $options['refresh'] ) ? $options['refresh'] : '12_hours', $options );
 
 			$feed->force_feed( true );
-			$feed->enable_order_by_date( false );
+			$feed->enable_order_by_date( isset( $options['sort'] ) && ! empty( $options['sort'] ) );
 
 			if ( is_string( $feed ) ) {
 				return array();
@@ -2607,16 +2703,16 @@ public function admin_notices() {
 		}
 
 		if ( defined( 'DISABLE_WP_CRON' ) && DISABLE_WP_CRON ) {
-			echo wp_kses_post( '<div class="notice notice-error feedzy-error-critical is-dismissible"><p>' . __( 'WP Cron is disabled. Your feeds would not get updated. Please contact your hosting provider or system administrator', 'feedzy-rss-feeds' ) . '</p></div>' );
+			echo wp_kses_post( '<div class="notice notice-error fz-notice feedzy-error-critical is-dismissible"><p>' . __( 'WP Cron is disabled. Your feeds would not get updated. Please contact your hosting provider or system administrator', 'feedzy-rss-feeds' ) . '</p></div>' );
 		}
 
 		if ( false === Feedzy_Rss_Feeds_Util_Scheduler::is_scheduled( 'feedzy_cron' ) ) {
-			echo wp_kses_post( '<div class="notice notice-error"><p>' . __( 'Unable to register cron job. Your feeds might not get updated', 'feedzy-rss-feeds' ) . '</p></div>' );
+			echo wp_kses_post( '<div class="notice notice-error fz-notice"><p>' . __( 'Unable to register cron job. Your feeds might not get updated', 'feedzy-rss-feeds' ) . '</p></div>' );
 		}
 
 		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
 		if ( ! empty( $_GET['imported'] ) ) {
-			echo wp_kses_post( '<div class="notice notice-success is-dismissible"><p>' . __( 'Successfully imported.', 'feedzy-rss-feeds' ) . '</p></div>' );
+			echo wp_kses_post( '<div class="notice notice-success fz-notice is-dismissible"><p>' . __( 'Successfully imported.', 'feedzy-rss-feeds' ) . '</p></div>' );
 		}
 	}
 
@@ -3299,7 +3395,7 @@ public function fetch_custom_fields() {
 		}
 
 		// phpcs:ignore
-		$query_result = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT($wpdb->postmeta.meta_key) FROM $wpdb->posts LEFT JOIN $wpdb->postmeta ON $wpdb->posts.ID = $wpdb->postmeta.post_id WHERE $wpdb->posts.post_type = '%s' AND $wpdb->postmeta.meta_key != '' AND $wpdb->postmeta.meta_key NOT RegExp '(^[_0-9].+$)' AND $wpdb->postmeta.meta_key NOT RegExp '(^[_feedzy].+$)' AND $wpdb->postmeta.meta_key NOT RegExp '(^[0-9]+$)'$like LIMIT 0, 9999", $post_type ), ARRAY_A );
+		$query_result = $wpdb->get_results($wpdb->prepare("SELECT DISTINCT($wpdb->postmeta.meta_key) FROM $wpdb->posts LEFT JOIN $wpdb->postmeta ON $wpdb->posts.ID = $wpdb->postmeta.post_id WHERE $wpdb->posts.post_type = '%s' AND $wpdb->postmeta.meta_key != '' AND $wpdb->postmeta.meta_key NOT RegExp '(^[_0-9].+$)' AND $wpdb->postmeta.meta_key NOT RegExp '(^[_feedzy].+$)' AND $wpdb->postmeta.meta_key NOT RegExp '(^[0-9]+$)'$like LIMIT 0, 9999", $post_type), ARRAY_A);
 
 		$acf_fields = array();
 		if ( function_exists( 'acf_get_field_groups' ) ) {
@@ -3458,9 +3554,9 @@ public function feedzy_import_clone_success_notice() {
 		// Display success notice if clone succeed.
 		if ( isset( $_GET['saved'] ) && 'fz_duplicate_import_job_created' === $_GET['saved'] ) { // phpcs:ignore WordPress.Security.NonceVerification
 			?>
-<div class="notice notice-success is-dismissible">
-	<p><?php esc_html_e( 'Duplicate import job created', 'feedzy-rss-feeds' ); ?></p>
-</div>
+			<div class="notice notice-success fz-notice is-dismissible">
+				<p><?php esc_html_e( 'Duplicate import job created', 'feedzy-rss-feeds' ); ?></p>
+			</div>
 			<?php
 		}
 	}
@@ -3589,22 +3685,36 @@ public function load_edit_screen() {
 	public function add_import_export_section() {
 		if ( ! feedzy_is_pro() ) :
 			?>
-		<div id="fz_import_export_upsell" class="hidden" style="max-width:450px">
-			<div class="modal-content">
-				<span class="notice-dismiss close-modal">
-					<span class="screen-reader-text"><?php esc_html_e( 'Dismiss this dialog', 'feedzy-rss-feeds' ); ?></span>
-				</span>
-				<div class="modal-header">
-					<h2><span class="dashicons dashicons-lock"></span> <?php esc_html_e( 'Upload/Export is a PRO feature', 'feedzy-rss-feeds' ); ?></h2>
-				</div>
-				<div class="modal-body">
-					<p><?php esc_html_e( 'We\'re sorry, upload/export of import configuration is not available on your plan. Please upgrade to the Pro plan to unlock all these features.', 'feedzy-rss-feeds' ); ?></p>
-				</div>
-				<div class="modal-footer">
-					<div class="button-container"><a href="<?php echo esc_url( tsdk_translate_link( tsdk_utmify( FEEDZY_UPSELL_LINK, 'importExport' ) ) ); ?>" target="_blank" rel="noopener " class="button button-primary button-large"><?php esc_html_e( 'Upgrade to PRO', 'feedzy-rss-feeds' ); ?><span aria-hidden="true" class="dashicons dashicons-external"></span></a></div>
+			<div id="fz_import_export_upsell" class="hidden" style="max-width:450px">
+				<div class="modal-content">
+					<span class="notice-dismiss fz-notice close-modal">
+						<span class="screen-reader-text"><?php esc_html_e( 'Dismiss this dialog', 'feedzy-rss-feeds' ); ?></span>
+					</span>
+					<div class="modal-header">
+						<h2>
+							<span class="dashicons dashicons-lock"></span>
+							<?php esc_html_e( 'Upload/Export is a PRO feature', 'feedzy-rss-feeds' ); ?>
+						</h2>
+					</div>
+					<div class="modal-body">
+						<p>
+							<?php esc_html_e( 'We\'re sorry, upload/export of import configuration is not available on your plan. Please upgrade to the Pro plan to unlock all these features.', 'feedzy-rss-feeds' ); ?>
+						</p>
+					</div>
+					<div class="modal-footer">
+						<div class="button-container">
+							<a
+								href="<?php echo esc_url( tsdk_translate_link( tsdk_utmify( FEEDZY_UPSELL_LINK, 'importExport' ) ) ); ?>"
+								target="_blank" rel="noopener "
+								class="button button-primary button-large"
+							>
+								<?php esc_html_e( 'Upgrade to PRO', 'feedzy-rss-feeds' ); ?>
+								<span aria-hidden="true" class="dashicons dashicons-external"></span>
+							</a>
+						</div>
+					</div>
 				</div>
 			</div>
-		</div>
 		<?php endif; ?>
 		<script type="template/text" id="fz_import_field_section">
 			<div class="fz-import-field hidden">
diff --git a/includes/feedzy-rss-feeds-limited-offers.php b/includes/feedzy-rss-feeds-limited-offers.php
index 74a55aa3..4e0279ce 100644
--- a/includes/feedzy-rss-feeds-limited-offers.php
+++ b/includes/feedzy-rss-feeds-limited-offers.php
@@ -209,8 +209,8 @@ public function render_notice() {
 				display: none;
 			}
 		</style>
-		<div class="themeisle-sale notice notice-info is-dismissible">
-			<div class="notice-dismiss"></div>
+		<div class="themeisle-sale notice notice-info is-dismissible fz-notice">
+			<div class="notice-dismiss fz-notice"></div>
 			<svg width="24px" height="24px" viewBox="0 0 77 77" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 				<!-- Generator: Sketch 52.6 (67491) - http://www.bohemiancoding.com/sketch -->
 				<title>Combined Shape</title>
diff --git a/includes/feedzy-rss-feeds.php b/includes/feedzy-rss-feeds.php
index 47fa150e..3d7ff76a 100644
--- a/includes/feedzy-rss-feeds.php
+++ b/includes/feedzy-rss-feeds.php
@@ -176,7 +176,8 @@ private function define_admin_hooks() {
 		self::$instance->loader->add_action( 'feedzy_post_http_teardown', self::$instance->admin, 'post_http_teardown', 10, 1 );
 		self::$instance->loader->add_action( 'admin_init', self::$instance->admin, 'admin_init', 10, 1 );
 		self::$instance->loader->add_action( 'manage_feedzy_categories_posts_custom_column', self::$instance->admin, 'manage_feedzy_category_columns', 10, 2 );
-		self::$instance->loader->add_action( 'admin_menu', self::$instance->admin, 'feedzy_menu_pages' );
+		self::$instance->loader->add_action( 'admin_menu', self::$instance->admin, 'feedzy_menu_pages', 8 );
+		self::$instance->loader->add_action( 'admin_menu', self::$instance->admin, 'rss_to_social_menu', 20 );
 		self::$instance->loader->add_action( 'wp_ajax_get_tinymce_form', self::$instance->admin, 'get_tinymce_form' );
 		self::$instance->loader->add_action( 'wp_enqueue_scripts', self::$instance->admin, 'enqueue_styles' );
 		self::$instance->loader->add_action( 'admin_enqueue_scripts', self::$instance->admin, 'enqueue_styles_admin', 99 );
@@ -202,6 +203,7 @@ private function define_admin_hooks() {
 		self::$instance->loader->add_filter( 'admin_footer', self::$instance->admin, 'handle_upgrade_submenu' );
 		self::$instance->loader->add_action( 'current_screen', self::$instance->admin, 'handle_legacy' );
 		self::$instance->loader->add_action( 'init', self::$instance->admin, 'register_settings' );
+		self::$instance->loader->add_action( 'wp_ajax_feedzy_validate_feed', self::$instance->admin, 'validate_feed' );
 
 		// do not load this with the loader as this will need a corresponding remove_filter also.
 		add_filter( 'update_post_metadata', array( self::$instance->admin, 'validate_category_feeds' ), 10, 5 );
diff --git a/includes/gutenberg/feedzy-rss-feeds-gutenberg-block.php b/includes/gutenberg/feedzy-rss-feeds-gutenberg-block.php
index 8752e324..9f475aa2 100644
--- a/includes/gutenberg/feedzy-rss-feeds-gutenberg-block.php
+++ b/includes/gutenberg/feedzy-rss-feeds-gutenberg-block.php
@@ -75,6 +75,8 @@ public function feedzy_gutenberg_scripts() {
 				'imagepath'             => esc_url( FEEDZY_ABSURL . 'img/' ),
 				'isPro'                 => feedzy_is_pro(),
 				'upsellLinkBlockEditor' => esc_url( tsdk_translate_link( tsdk_utmify( FEEDZY_UPSELL_LINK, 'keywordsfilter', 'blockeditor' ) ) ),
+				'nonce'                 => wp_create_nonce( FEEDZY_BASEFILE ),
+				'url'                   => admin_url( 'admin-ajax.php' ),
 			)
 		);
 
@@ -171,6 +173,10 @@ public function feedzy_register_block_type() {
 						'type'    => 'number',
 						'default' => 150,
 					),
+					'aspectRatio'     => array(
+						'type'    => 'string',
+						'default' => '1',
+					),
 					'price'           => array(
 						'type'    => 'boolean',
 						'default' => true,
diff --git a/includes/gutenberg/feedzy-rss-feeds-loop-block.php b/includes/gutenberg/feedzy-rss-feeds-loop-block.php
index 4e63baf5..93a582c7 100644
--- a/includes/gutenberg/feedzy-rss-feeds-loop-block.php
+++ b/includes/gutenberg/feedzy-rss-feeds-loop-block.php
@@ -73,6 +73,8 @@ public function register_block() {
 			array(
 				'imagepath'    => esc_url( FEEDZY_ABSURL . 'img/' ),
 				'defaultImage' => esc_url( FEEDZY_ABSURL . 'img/feedzy.svg' ),
+				'url'          => admin_url( 'admin-ajax.php' ),
+				'nonce'        => wp_create_nonce( FEEDZY_BASEFILE ),
 				'isPro'        => feedzy_is_pro(),
 			)
 		);
diff --git a/includes/layouts/feedzy-license.php b/includes/layouts/feedzy-license.php
new file mode 100644
index 00000000..58b12522
--- /dev/null
+++ b/includes/layouts/feedzy-license.php
@@ -0,0 +1,3 @@
+<div class="fz-form-wrap"> 
+	<?php do_action( 'feedzy_dashboard_license_content' ); ?>
+</div>
\ No newline at end of file
diff --git a/includes/layouts/feedzy-support.php b/includes/layouts/feedzy-support.php
index e7e97574..f338ae9e 100644
--- a/includes/layouts/feedzy-support.php
+++ b/includes/layouts/feedzy-support.php
@@ -27,10 +27,30 @@ class="<?php echo 'docs' === $active_tab ? 'active' : ''; ?>"><?php esc_html_e(
 									class="<?php echo 'feedzy-pro' === $active_tab ? 'active' : ''; ?>"><?php esc_html_e( 'Free vs Pro', 'feedzy-rss-feeds' ); ?></a>
 							</li>
 						<?php endif; ?>
+						<?php if ( defined( 'FEEDZY_PRO_VERSION' ) && has_action( 'feedzy_dashboard_license_content' ) ) : ?>
+							<li>
+								<a href="<?php echo esc_url( admin_url( 'admin.php?page=feedzy-support&tab=license' ) ); ?>"
+									class="<?php echo 'license' === $active_tab ? 'active' : ''; ?>"><?php esc_html_e( 'License', 'feedzy-rss-feeds' ); ?></a>
+							</li>
+						<?php endif; ?>
 						<li>
 							<a href="<?php echo esc_url( admin_url( 'admin.php?page=feedzy-support&tab=improve' ) ); ?>"
 								class="<?php echo 'improve' === $active_tab ? 'active' : ''; ?>"><?php esc_html_e( 'Help us improve!', 'feedzy-rss-feeds' ); ?></a>
 						</li>
+						<li>
+							<a href="<?php echo esc_url( admin_url( 'admin.php?page=feedzy-settings' ) ); ?>"
+								class="<?php echo 'settings' === $active_tab ? 'active' : ''; ?>">
+								<?php esc_html_e( 'Settings', 'feedzy-rss-feeds' ); ?>
+								<span class="dashicons dashicons-external"></span>
+							</a>
+						</li>
+						<li>
+							<a href="<?php echo esc_url( admin_url( 'admin.php?page=feedzy-integration' ) ); ?>"
+								class="<?php echo 'integration' === $active_tab ? 'active' : ''; ?>">
+								<?php esc_html_e( 'Integration', 'feedzy-rss-feeds' ); ?>
+								<span class="dashicons dashicons-external"></span>
+							</a>
+						</li>
 						<?php $support_tab_heading = apply_filters( 'feedzy_support_tab_heading', '', $active_tab ); ?>
 						<?php if ( ! empty( $support_tab_heading ) ) : ?>
 							<li>
@@ -54,6 +74,9 @@ class="<?php echo 'improve' === $active_tab ? 'active' : ''; ?>"><?php esc_html_
 					case 'improve':
 						load_template( FEEDZY_ABSPATH . '/includes/layouts/feedzy-improve.php' );
 						break;
+					case 'license':
+						load_template( FEEDZY_ABSPATH . '/includes/layouts/feedzy-license.php' );
+						break;
 					default:
 						$template = apply_filters( 'feedzy_support_tab_content', '', $active_tab );
 						if ( ! empty( $template ) ) {
@@ -98,4 +121,4 @@ class="<?php echo 'improve' === $active_tab ? 'active' : ''; ?>"><?php esc_html_
 			</div>
 		<?php endif; ?>
 	</div>
-</div>
+</div>
\ No newline at end of file
diff --git a/includes/layouts/header.php b/includes/layouts/header.php
index b2f0e8b4..ea53b34a 100644
--- a/includes/layouts/header.php
+++ b/includes/layouts/header.php
@@ -10,7 +10,7 @@
 // phpcs:disable WordPress.Security.NonceVerification
 $page_title = __( 'Settings', 'feedzy-rss-feeds' );
 if ( isset( $_GET['page'] ) && 'feedzy-support' === $_GET['page'] ) {
-	$page_title = __( 'Support', 'feedzy-rss-feeds' );
+	$page_title = __( 'Dashboard', 'feedzy-rss-feeds' );
 } elseif ( isset( $_GET['page'] ) && 'feedzy-integration' === $_GET['page'] ) {
 	$page_title = __( 'Integration', 'feedzy-rss-feeds' );
 }
diff --git a/includes/layouts/settings.php b/includes/layouts/settings.php
index 53f092f3..e37386af 100644
--- a/includes/layouts/settings.php
+++ b/includes/layouts/settings.php
@@ -110,8 +110,8 @@ class="<?php echo $_tab === $active_tab ? esc_attr( 'active' ) : ''; ?>"><?php e
 								<?php do_action( 'feedzy_general_setting_before' ); ?>	
 								<div class="form-block">
 									<div class="fz-form-group">
-										<label for="feed-post-default-thumbnail" class="form-label"><?php echo esc_html_e( 'Fallback image for imported posts', 'feedzy-rss-feeds' ); ?></label>
-										<div class="help-text pb-8"><?php esc_html_e( 'Select an image to be the fallback featured image(Feed2Post).', 'feedzy-rss-feeds' ); ?></div>
+										<label for="feed-post-default-thumbnail" class="form-label"><?php echo esc_html_e( 'Fallback Featured Image Settings', 'feedzy-rss-feeds' ); ?></label>
+										<div class="help-text pb-8"><?php esc_html_e( 'Choose a default image to display when RSS feeds don\'t include images.', 'feedzy-rss-feeds' ); ?></div>
 										<?php
 										$btn_label = esc_html__( 'Choose image', 'feedzy-rss-feeds' );
 										if ( $default_thumbnail_id ) :
@@ -129,13 +129,13 @@ class="<?php echo $_tab === $active_tab ? esc_attr( 'active' ) : ''; ?>"><?php e
 										<div class="help-text">
 											<?php
 											echo wp_kses(
-												__( 'This image will be used for the <strong>imported posts</strong> if an image is not available in the source XML Feed.', 'feedzy-rss-feeds' ),
+												__( '<strong>How it works:</strong> When importing posts from RSS feeds, some items may not include images. This fallback image ensures all your <strong>imported posts</strong> have visual content by automatically applying this image as the featured image when needed.', 'feedzy-rss-feeds' ),
 												array(
 													'strong' => true,
 												)
 											);
 											?>
-											</div>
+										</div>
 									</div>
 								</div>
 								<div class="form-block">
@@ -261,6 +261,22 @@ class="btn btn-outline-primary<?php echo 0 === $index ? ' disabled' : ''; ?>" <?
 						case 'headers':
 							?>
 							<div class="fz-form-wrap">
+								<div class="feedzy-helper-notice">
+									<h5 class="feedzy-helper-notice__title">
+										<?php esc_html_e( 'Headers Configuration', 'feedzy-rss-feeds' ); ?>
+									</h5>
+									<p>
+										<?php 
+											esc_html_e(
+												'Use this section to add custom HTTP headers (e.g., User-Agent). This can help bypass feed access restrictions, simulate browser requests, or resolve issues where feeds return incomplete or blocked content.',
+												'feedzy-rss-feeds' 
+											);
+										?>
+										<a href="<?php echo esc_url( $help_btn_url ); ?>" target="_blank">
+											<?php esc_html_e( 'Learn more about headers here.', 'feedzy-rss-feeds' ); ?>
+										</a>
+									</p>
+								</div>
 								<div class="form-block">
 									<div class="fz-form-group">
 										<label class="form-label"><?php esc_html_e( 'User Agent', 'feedzy-rss-feeds' ); ?></label>
@@ -279,6 +295,17 @@ class="form-control"
 						case 'proxy':
 							?>
 							<div class="fz-form-wrap">
+								<div class="feedzy-helper-notice">
+									<h5 class="feedzy-helper-notice__title">
+										<?php esc_html_e( 'Proxy Configuration', 'feedzy-rss-feeds' ); ?>
+									</h5>
+									<p>
+										<?php esc_html_e( 'Use a proxy to bypass firewalls, geographic restrictions, or IP blocks from feed sources. This ensures you can reliably access restricted RSS feeds.', 'feedzy-rss-feeds' ); ?>
+										<a href="<?php echo esc_url( $help_btn_url ); ?>" target="_blank" >
+											<?php esc_html_e( 'View proxy setup guide', 'feedzy-rss-feeds' ); ?>
+										</a>
+									</p>
+								</div>
 								<div class="form-block pb-0">
 									<div class="fz-form-row">
 										<div class="fz-form-col-6">
@@ -359,8 +386,10 @@ class="form-control"
 			</div>
 		</div>
 
-		<div class="cta pt-30">
-			<a href="<?php echo esc_url( $help_btn_url ); ?>" class="btn btn-ghost" target="_blank"><?php esc_html_e( 'Need help?', 'feedzy-rss-feeds' ); ?></a>
-		</div>
+		<?php if ( 'proxy' !== $active_tab && 'headers' !== $active_tab ) : ?>
+			<div class="cta pt-30">
+				<a href="<?php echo esc_url( $help_btn_url ); ?>" class="btn btn-ghost" target="_blank"><?php esc_html_e( 'Need help?', 'feedzy-rss-feeds' ); ?></a>
+			</div>
+		<?php endif; ?>
 	</div>
 </div>
diff --git a/includes/layouts/setup-wizard.php b/includes/layouts/setup-wizard.php
index 7a6a5f4d..d729e9ea 100644
--- a/includes/layouts/setup-wizard.php
+++ b/includes/layouts/setup-wizard.php
@@ -5,13 +5,13 @@
  * @package Feedzy_Rss_Feeds
  */
 
-$dashboard_url = add_query_arg(
+// Note: It will be redirect to dashboard by `feedzy_dismiss_wizard` action.
+$skip_onboarding_url_callback = add_query_arg(
 	array(
-		'post_type' => 'feedzy_imports',
-		'action'    => 'feedzy_dismiss_wizard',
-		'status'    => 0,
+		'action' => 'feedzy_dismiss_wizard',
+		'status' => 0,
 	),
-	admin_url( 'edit.php' )
+	admin_url( 'admin.php' )
 );
 // phpcs:ignore WordPress.Security.NonceVerification
 $integrate_with     = ! empty( $_GET['integrate-with'] ) ? sanitize_text_field( wp_unslash( $_GET['integrate-with'] ) ) : '';
@@ -34,7 +34,7 @@
 				</div>
 			</div>
 			<div class="back-btn">
-				<a href="<?php echo esc_url( $dashboard_url ); ?>" class="btn-link"><span class="dashicons dashicons-arrow-left-alt"></span> <?php esc_html_e( 'Go to dashboard', 'feedzy-rss-feeds' ); ?></a>
+				<a href="<?php echo esc_url( $skip_onboarding_url_callback ); ?>" class="btn-link"><span class="dashicons dashicons-arrow-left-alt"></span> <?php esc_html_e( 'Go to dashboard', 'feedzy-rss-feeds' ); ?></a>
 			</div>
 		</div>
 	</div>
@@ -239,7 +239,7 @@ class="pro-label free-label"><?php esc_html_e( 'Free', 'feedzy-rss-feeds' ); ?><
 														<div class="fz-shortcode-preview">
 															<h4 class="h4 pb-8"><?php esc_html_e( 'Basic Shortcode', 'feedzy-rss-feeds' ); ?></h4>
 															<div class="fz-code-box">
-																<input type="text" redonly value='[feedzy-rss feeds={{feed_source}}]' id="basic_shortcode">
+																<input type="text" readonly value='[feedzy-rss feeds={{feed_source}} max="6" meta="author, date" columns="3" summary="yes" summarylength="160" thumb="yes" target="_blank"]' id="basic_shortcode">
 																<button type="button" class="fz-copy-code-btn" data-clipboard-target="#basic_shortcode"><?php esc_html_e( 'click to copy', 'feedzy-rss-feeds' ); ?> <img src="<?php echo esc_url( FEEDZY_ABSURL . 'img/copy.svg' ); ?>" alt="">
 																</button>
 															</div>
diff --git a/includes/util/feedzy-rss-feeds-conditions.php b/includes/util/feedzy-rss-feeds-conditions.php
index 559773a9..f632e379 100644
--- a/includes/util/feedzy-rss-feeds-conditions.php
+++ b/includes/util/feedzy-rss-feeds-conditions.php
@@ -299,6 +299,9 @@ public function evaluate_conditions( $default_value, $attrs, $item, $feed_url, $
 					$image    = $admin->feedzy_retrieve_image( $item, $attrs );
 					$value    = $image;
 					break;
+				case 'link':
+					$value = $item->get_link();
+					break;
 				default:
 					$value = '';
 					break;
diff --git a/includes/views/amazon-product-advertising-view.php b/includes/views/amazon-product-advertising-view.php
index 98f85422..984e4673 100644
--- a/includes/views/amazon-product-advertising-view.php
+++ b/includes/views/amazon-product-advertising-view.php
@@ -1,10 +1,13 @@
+<?php
+$content = ! apply_filters( 'feedzy_is_license_of_type', false, 'business' ) ? __( 'Your current plan does not include support for this feature.', 'feedzy-rss-feeds' ) . ' ' : __( 'You are using Feedzy Lite.', 'feedzy-rss-feeds' ) . ' ';
+?>
+
 <div class="fz-form-wrap">
 	<div class="form-block">
 		<div class="upgrade-alert mb-24">
 			<?php
 				$upgrade_url = tsdk_translate_link( tsdk_utmify( FEEDZY_UPSELL_LINK, 'amazonproductadvertising' ) );
 
-				$content  = __( 'You are using Feedzy Lite.', 'feedzy-rss-feeds' ) . ' ';
 				$content .= wp_sprintf(
 					// translators: %1$s: opening anchor tag, %2$s: closing anchor tag.
 					__( 'Unlock more powerful features, by %1$s upgrading to Feedzy Pro %2$s', 'feedzy-rss-feeds' ),
diff --git a/includes/views/css/import-metabox-edit.css b/includes/views/css/import-metabox-edit.css
index 159d480a..81eb04f3 100644
--- a/includes/views/css/import-metabox-edit.css
+++ b/includes/views/css/import-metabox-edit.css
@@ -202,3 +202,33 @@ span.feedzy-spinner {
 .fz-import-field.hidden {
 	display: none;
 }
+
+.feedzy-wrap .fz-validation-message {
+    margin: 10px 0;
+    padding: 12px 15px;
+    border-radius: 4px;
+    font-size: 14px;
+    position: relative;
+    z-index: 10;
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    gap: 8px;
+    border: 1px solid #5555559c;
+}
+
+.feedzy-wrap .fz-validation-message button {
+	margin-left: auto;
+}
+
+.fz-validation-message .fz-success {
+    color: #155724;
+}
+
+.fz-validation-message .fz-error {
+    color: #721c24;
+}
+
+.fz-validation-message  .fz-warning {
+    color: #856404;
+}
\ No newline at end of file
diff --git a/includes/views/import-metabox-edit.php b/includes/views/import-metabox-edit.php
index cdc04160..8328a63b 100644
--- a/includes/views/import-metabox-edit.php
+++ b/includes/views/import-metabox-edit.php
@@ -42,25 +42,29 @@
 							<div class="fz-input-group-left">
 								<div class="fz-group">
 									<div class="fz-input-icon">
-										<input type="text" id="feedzy-import-source" title="<?php esc_attr_e( 'Make sure you validate the feed by using the validate button on the right', 'feedzy-rss-feeds' ); ?>"
-											placeholder="<?php esc_attr_e( 'Paste your feed URL and click the plus icon to add it in the list', 'feedzy-rss-feeds' ); ?>"
-											class="form-control" />
-										<div class="fz-input-group-append">
-											<button class="fz-plus-btn add-outside-tags" disabled>
-												<span class="dashicons dashicons-plus-alt2"></span>
-											</button>
+										<div class="fz-feed-validator-wrapper">
+											<input type="text" 
+												id="feedzy-import-source" 
+												title="<?php esc_attr_e( 'Make sure you validate the feed by using the validate button on the right', 'feedzy-rss-feeds' ); ?>"
+												placeholder="<?php esc_attr_e( 'Paste your feed URL and click the plus icon to add it in the list', 'feedzy-rss-feeds' ); ?>"
+												class="form-control" />
+											<div class="fz-input-group-append">
+												<button class="btn btn-flate btn-icon add-outside-tags" 
+												type="button"
+												id="feedzy-validate-feed" 
+												role="button"
+												title="<?php esc_attr_e( 'Validate Feed', 'feedzy-rss-feeds' ); ?>">
+													<i class="dashicons dashicons-plus-alt2" aria-hidden="true"></i>
+												</button>
+											</div>
 										</div>
 									</div>
-									<div class="cta">
-										<a class="btn btn-flate btn-icon" id="feedzy-validate-feed" target="_blank" data-href-base="https://validator.w3.org/feed/check.cgi?url="
-											href="#" title="<?php esc_attr_e( 'Validate Feed', 'feedzy-rss-feeds' ); ?>"><i
-												title="<?php esc_attr_e( 'Validate Feed', 'feedzy-rss-feeds' ); ?>"
-												class="dashicons dashicons-external"></i></a>
-									</div>
 								</div>
 								<div class="help-text">
 									<?php esc_html_e( 'You can add multiple sources at once, by separating them with commas. Make sure to use the validate button. Invalid feeds may not import anything.', 'feedzy-rss-feeds' ); ?>
 								</div>
+								<div class="fz-validation-summary">
+								</div>
 							</div>
 							<div class="fz-input-group-right">
 									<div class="dropdown">
@@ -160,7 +164,7 @@ class="dashicons dashicons-arrow-down-alt2"></span>
 										<label class="form-label"><?php esc_html_e( 'The post type you want to use for the generated post.', 'feedzy-rss-feeds' ); ?></label>
 										<div class="mx-320">
 											<select id="feedzy_post_type" class="form-control feedzy-chosen" name="feedzy_meta_data[import_post_type]"
-												data-tax="<?php echo esc_attr( $import_post_term ); ?>">
+												data-tax="<?php echo esc_attr( $import_post_term ); ?>" data-custom-tag="<?php echo esc_attr( isset( $custom_post_term ) ? $custom_post_term : '' ); ?>">
 												<?php
 												foreach ( $post_types as $_post_type ) {
 													?>
@@ -181,57 +185,44 @@ class="dashicons dashicons-arrow-down-alt2"></span>
 								</div>
 								<div class="fz-right">
 									<div class="fz-form-group">
-										<label class="form-label"><?php esc_html_e( 'Assigns the post to a Category', 'feedzy-rss-feeds' ); ?></label>
 										<div class="mx-320">
 											<select id="feedzy_post_terms" multiple class="form-control feedzy-chosen<?php echo feedzy_is_pro() ? ' fz-chosen-custom-tag' : ''; ?>"
 												name="feedzy_meta_data[import_post_term][]">
 											</select>
 										</div>
 										<div class="help-text pt-8">
-											<?php esc_html_e( 'The imported post will be assigned to a selected taxonomy. Leave it blank if you don\'t need a taxonomy.', 'feedzy-rss-feeds' ); ?>
+											<?php esc_html_e( 'If you don\'t select at least one taxonomy, posts will be assigned to Uncategorized by default.', 'feedzy-rss-feeds' ); ?>
 										</div>
 									</div>
-									<?php if ( ! feedzy_is_pro() ) : ?>
-										<div class="upgrade-alert">
+									<?php if ( feedzy_is_pro() ) : ?>
+										<div class="help-text pt-8">
 											<?php
 												echo wp_kses_post(
 													sprintf(
-														// translators: %1$s: opening anchor tag, %2$s: closing anchor tag.
-														__( 'Add more advanced tags, like item categories and custom field, by %1$s upgrading to Feedzy Pro %2$s', 'feedzy-rss-feeds' ),
-														'<a href="' . esc_url( tsdk_translate_link( tsdk_utmify( FEEDZY_UPSELL_LINK, 'moreadvanced' ) ) ) . '" target="_blank">',
+														// translators: %1$s: magic tag, %2$s: opening anchor tag, %3$s: closing anchor tag.
+														__( 'Auto-create categories from source: %1$s %2$s Learn More %3$s', 'feedzy-rss-feeds' ),
+														'<strong>[#item_categories]</strong>',
+														'<a href="' . esc_url( 'https://docs.themeisle.com/article/1154-how-to-use-feed-to-post-feature-in-feedzy#dynamic-post-taxonomy' ) . '" target="_blank">',
 														'</a>'
 													)
 												);
 											?>
 										</div>
-									<?php endif; ?>
-									<div class="help-text pt-8">
-										<?php
-											echo wp_kses_post(
-												sprintf(
-													// translators: %1$s: magic tag, %2$s: opening anchor tag, %3$s: closing anchor tag.
-													__( 'You can automatically create categories with a magic tag %1$s or use custom tag parsing %2$s Read More %3$s .', 'feedzy-rss-feeds' ),
-													'<strong>[#item_categories]</strong>',
-													'<a href="' . esc_url( 'https://docs.themeisle.com/article/1154-how-to-use-feed-to-post-feature-in-feedzy#dynamic-post-taxonomy' ) . '" target="_blank">',
-													'</a>'
-												)
-											);
-											?>
-									</div>
-									<div class="help-text pt-8">
-										<?php
-											// phpcs:ignore WordPress.WP.I18n.MissingTranslatorsComment
-											echo wp_kses_post(
-												sprintf(
-													// translators: %1$s: magic tag, %2$s: opening anchor tag, %3$s: closing anchor tag.
-													__( 'You can automatically assign categories with a magic tag %1$s by the keywords used in title. Configure it %2$s here%3$s .', 'feedzy-rss-feeds' ),
-													'<strong>[#auto_categories]</strong>',
-													'<a href="' . esc_url( get_admin_url( null, 'admin.php?page=feedzy-settings' ) ) . '" target="_blank">',
-													'</a>'
-												)
-											);
+										<div class="help-text pt-8">
+											<?php
+												// phpcs:ignore WordPress.WP.I18n.MissingTranslatorsComment
+												echo wp_kses_post(
+													sprintf(
+														// translators: %1$s: magic tag, %2$s: opening anchor tag, %3$s: closing anchor tag.
+														__( 'Auto-assign by title keywords: %1$s %2$s Configure %3$s', 'feedzy-rss-feeds' ),
+														'<strong>[#auto_categories]</strong>',
+														'<a href="' . esc_url( get_admin_url( null, 'admin.php?page=feedzy-settings' ) ) . '" target="_blank">',
+														'</a>'
+													)
+												);
 											?>
-									</div>
+										</div>
+									<?php endif; ?>
 								</div>
 							</div>
 
@@ -632,149 +623,45 @@ class="fz-switch-toggle" type="checkbox" value="yes"
 					<div class="feedzy-accordion__icon"><span class="dashicons dashicons-arrow-down-alt2"></span></div>
 				</button>
 			</div>
-			<div class="feedzy-accordion-item__content border-top">
-				<div class="fz-form-wrap">
-
-					<div class="form-block form-block-two-column no-border">
-						<div class="fz-left">
-							<h4 class="h4"><?php esc_html_e( 'Remove Duplicates', 'feedzy-rss-feeds' ); ?></h4>
-						</div>
-						<div class="fz-right">
-							<div class="fz-form-group">
-								<div class="fz-form-switch">
-									<input id="remove-duplicates" name="feedzy_meta_data[import_remove_duplicates]"
-											class="fz-switch-toggle" type="checkbox" value="yes"
-										<?php echo esc_attr( $import_remove_duplicates ); ?>>
-									<label class="feedzy-inline form-label" for="remove-duplicates"><?php esc_html_e( 'Remove Duplicate Items', 'feedzy-rss-feeds' ); ?></label>
-								</div>
-							</div>
-							<div class="help-text">
-								<?php echo wp_sprintf( esc_html__( 'To understand how duplicates will be removed, check out our', 'feedzy-rss-feeds' ) ); ?>
-								<a href="<?php echo esc_url( 'https://docs.themeisle.com/article/638-how-to-eliminate-duplicate-feed-item' ); ?>" target="_blank"><?php esc_html_e( 'Documentation.', 'feedzy-rss-feeds' ); ?></a>
-							</div>
-						</div>
-					</div>
-					<div class="form-block form-block-two-column <?php echo esc_attr( apply_filters( 'feedzy_upsell_class', '' ) ); ?>">
-						<?php echo wp_kses_post( apply_filters( 'feedzy_upsell_content', '', 'remove-duplicates', 'import' ) ); ?>
-						<div class="fz-left">
-							<h4 class="h4"><?php esc_html_e( 'Duplication Key', 'feedzy-rss-feeds' ); ?> <?php echo ! feedzy_is_pro() ? ' <span class="pro-label">PRO</span>' : ''; ?></h4>
-						</div>
-						<div class="fz-right">
-							<div class="fz-form-group">
-								<label class="form-label"><?php esc_html_e( 'Set a custom duplication key to identify unique feed items', 'feedzy-rss-feeds' ); ?></label>
-								<input type="text" id="feedzy_mark_duplicate" name="feedzy_meta_data[mark_duplicate_tag]" class="form-control" value="<?php echo esc_attr( $mark_duplicate_tag ); ?>"<?php disabled( true, 'checked' !== $import_remove_duplicates ); ?> />
-								<div class="help-text pt-8">
-									<?php esc_html_e( 'Define a custom duplication key for identifying unique feed items when importing content. By default, items are considered unique based on their title and URL. Enter one or multiple magic tags.', 'feedzy-rss-feeds' ); ?>
-								</div>
-							</div>
-						</div>
-					</div>
-
-					<div class="form-block form-block-two-column <?php echo esc_attr( apply_filters( 'feedzy_upsell_class', '' ) ); ?>">
-						<?php echo wp_kses_post( apply_filters( 'feedzy_upsell_content', '', 'auto-delete', 'import' ) ); ?>
-						<div class="fz-left">
-							<h4 class="h4"><?php esc_html_e( 'Auto-Delete', 'feedzy-rss-feeds' ); ?> <?php echo ! feedzy_is_pro() ? ' <span class="pro-label">PRO</span>' : ''; ?></h4>
-						</div>
-						<div class="fz-right">
-							<div class="fz-form-group">
-								<label class="form-label"><?php esc_html_e( 'Delete the posts created for this import after a number of days', 'feedzy-rss-feeds' ); ?></label>
-								<input type="number" min="0" max="9999" id="feedzy_delete_days" name="feedzy_meta_data[import_feed_delete_days]" class="form-control" value="<?php echo esc_attr( (int) $import_feed_delete_days ); ?>" />
-								<div class="help-text pt-8">
-									<?php esc_html_e( 'Helpful if you want to remove stale or old items automatically. Choose 0, and the imported items will not be automatically deleted.', 'feedzy-rss-feeds' ); ?>
-								</div>
-							</div>
-						</div>
-					</div>
+			<div class="feedzy-accordion-item__content">
+				<div class="fz-tabs-menu">
+					<ul>
+						<li>
+							<a href="javascript:;" data-id="fz-general-settings"><?php esc_html_e( 'General', 'feedzy-rss-feeds' ); ?></a>
+						</li>
+						<li>
+							<a href="javascript:;" data-id="fz-advanced-settings"><?php esc_html_e( 'Advanced', 'feedzy-rss-feeds' ); ?></a>
+						</li>
+					</ul>
+				</div>
+				<div class="fz-tabs-content">
+					<div class="fz-tab-content" id="fz-general-settings">
+						<div class="fz-form-wrap">
+							<div class="form-block form-block-two-column <?php echo ! feedzy_is_pro() && ! feedzy_is_legacyv5() ? esc_attr( apply_filters( 'feedzy_upsell_class', '' ) ) : ''; ?>">
 
-					<div class="form-block form-block-two-column no-border <?php echo esc_attr( apply_filters( 'feedzy_upsell_class', '' ) ); ?>">
-						<?php echo wp_kses_post( apply_filters( 'feedzy_upsell_content', '', 'delete-featured-image', 'import' ) ); ?>
-						<div class="fz-left"><h4 class="h4"><?php esc_html_e( 'Delete image', 'feedzy-rss-feeds' ); ?><?php echo ! feedzy_is_pro() ? ' <span class="pro-label">PRO</span>' : ''; ?></h4>
-						</div>
-						<div class="fz-right">
-							<div class="fz-form-group">
-								<div class="fz-form-switch">
-									<input id="delete-attached-media" name="feedzy_meta_data[import_feed_delete_media]"
-									class="fz-switch-toggle" type="checkbox" value="yes"
-									<?php echo esc_attr( $import_feed_delete_media ); ?>>
-									<label class="feedzy-inline form-label" for="delete-attached-media"><?php esc_html_e( 'Delete attached featured image', 'feedzy-rss-feeds' ); ?></label>
-								</div>
-								<div class="help-text">
-									<?php echo wp_sprintf( esc_html__( 'Helpful if you want to delete attached featured image when posts are automatically deleted.', 'feedzy-rss-feeds' ) ); ?>
+								<?php echo ! feedzy_is_pro() && ! feedzy_is_legacyv5() ? wp_kses_post( apply_filters( 'feedzy_upsell_content', '', 'item-count', 'import' ) ) : ''; ?>
+								<div class="fz-left">
+									<h4 class="h4"><?php esc_html_e( 'Items', 'feedzy-rss-feeds' ); ?><?php echo ! feedzy_is_pro() && ! feedzy_is_legacyv5() ? ' <span class="pro-label">PRO</span>' : ''; ?></h4>
 								</div>
-							</div>
-						</div>
-					</div>
-
-					<div class="form-block form-block-two-column <?php echo esc_attr( apply_filters( 'feedzy_upsell_class', '' ) ); ?>">
-						<?php echo wp_kses_post( apply_filters( 'feedzy_upsell_content', '', 'fallback-image', 'import' ) ); ?>
-						<div class="fz-left">
-							<h4 class="h4"><?php esc_html_e( 'Fallback Image', 'feedzy-rss-feeds' ); ?> <?php echo ! feedzy_is_pro() ? ' <span class="pro-label">PRO</span>' : ''; ?></h4>
-						</div>
-						<div class="fz-right">
-							<div class="fz-form-group">
-								<label class="form-label"><?php esc_html_e( 'Select an image to be the fallback featured image.', 'feedzy-rss-feeds' ); ?></label>
-								<?php
-								$btn_label            = esc_html__( 'Choose image', 'feedzy-rss-feeds' );
-								$default_thumbnail_id = ! empty( $default_thumbnail_id ) ? explode( ',', (string) $default_thumbnail_id ) : array();
-								if ( ! empty( $default_thumbnail_id ) ) :
-									$btn_label = esc_html__( 'Replace image', 'feedzy-rss-feeds' );
-									?>
-									<div class="fz-form-group mb-20 feedzy-media-preview">
-										<?php
-										if ( count( $default_thumbnail_id ) > 1 ) {
-											?>
-											<a href="javascript:;" class="btn btn-outline-primary feedzy-images-selected">
-												<?php
-												// translators: %d select images count.
-												echo esc_html( sprintf( __( '(%d) images selected', 'feedzy-rss-feeds' ), count( $default_thumbnail_id ) ) );
-												?>
-											</a>
-											<?php
-										} else {
-											echo wp_get_attachment_image( reset( $default_thumbnail_id ), 'thumbnail' );
-										}
-										?>
+								<div class="fz-right">
+									<div class="fz-form-group">
+										<label class="form-label"><?php esc_html_e( 'Number of items to import', 'feedzy-rss-feeds' ); ?></label>
+										<input type="number" min="0" max="9999" id="feedzy_item_limit" name="feedzy_meta_data[import_feed_limit<?php echo ! feedzy_is_pro() && ! feedzy_is_legacyv5() ? 'locked' : ''; ?>]" class="form-control" value="<?php echo esc_attr( (int) $import_feed_limit ); ?>" />
+										<div class="help-text pt-8">
+											<?php echo wp_kses_post( sprintf( __( 'Set the number of feed items to import per run.', 'feedzy-rss-feeds' ), '<b>', '</b>' ) ); ?>
+										</div>
 									</div>
-								<?php endif; ?>
-								<div class="fz-cta-group pb-8">
-									<a href="javascript:;" class="feedzy-open-media btn btn-outline-primary"><?php echo esc_html( $btn_label ); ?></a>
-									<a href="javascript:;" class="feedzy-remove-media btn btn-outline-primary <?php echo ! empty( $default_thumbnail_id ) ? esc_attr( 'is-show' ) : ''; ?>"><?php esc_html_e( 'Remove', 'feedzy-rss-feeds' ); ?></a>
-									<input type="hidden" name="feedzy_meta_data[default_thumbnail_id]" id="feed-post-default-thumbnail" value="<?php echo esc_attr( implode( ',', $default_thumbnail_id ) ); ?>">
-								</div>
-								<div class="help-text pt-8">
-									<?php esc_html_e( 'Helpful for setting a fallback image for feed items without an image. If multiple fallback images are selected, one of them will be randomly assigned to each post without an image during the import process.', 'feedzy-rss-feeds' ); ?>
 								</div>
 							</div>
-						</div>
-					</div>
-
-					<div class="form-block form-block-two-column no-border  <?php echo ! feedzy_is_pro() && ! feedzy_is_legacyv5() ? esc_attr( apply_filters( 'feedzy_upsell_class', '' ) ) : ''; ?>">
 
-						<?php echo ! feedzy_is_pro() && ! feedzy_is_legacyv5() ? wp_kses_post( apply_filters( 'feedzy_upsell_content', '', 'item-count', 'import' ) ) : ''; ?>
-						<div class="fz-left">
-							<h4 class="h4"><?php esc_html_e( 'Items Count', 'feedzy-rss-feeds' ); ?><?php echo ! feedzy_is_pro() && ! feedzy_is_legacyv5() ? ' <span class="pro-label">PRO</span>' : ''; ?></h4>
-						</div>
-						<div class="fz-right">
-							<div class="fz-form-group">
-								<label class="form-label"><?php esc_html_e( 'How many feed items to import from the source?', 'feedzy-rss-feeds' ); ?></label>
-								<input type="number" min="0" max="9999" id="feedzy_item_limit" name="feedzy_meta_data[import_feed_limit<?php echo ! feedzy_is_pro() && ! feedzy_is_legacyv5() ? 'locked' : ''; ?>]" class="form-control" value="<?php echo esc_attr( (int) $import_feed_limit ); ?>" />
-								<div class="help-text pt-8">
-									<?php echo wp_kses_post( sprintf( __( 'If you choose a high number, please check that your configuration can support it or your imports may fail.', 'feedzy-rss-feeds' ), '<b>', '</b>' ) ); ?>
+							<div class="form-block form-block-two-column <?php echo esc_attr( apply_filters( 'feedzy_upsell_class', '' ) ); ?>">
+								<?php echo wp_kses_post( apply_filters( 'feedzy_upsell_content', '', 'schedule-import-job', 'import' ) ); ?>
+								<div class="fz-left">
+									<h4 class="h4"><?php esc_html_e( 'Schedule', 'feedzy-rss-feeds' ); ?> <?php echo ! feedzy_is_pro() ? ' <span class="pro-label">PRO</span>' : ''; ?></h4>
 								</div>
-							</div>
-						</div>
-					</div>
-
-					<div class="form-block form-block-two-column <?php echo esc_attr( apply_filters( 'feedzy_upsell_class', '' ) ); ?>">
-						<?php echo wp_kses_post( apply_filters( 'feedzy_upsell_content', '', 'schedule-import-job', 'import' ) ); ?>
-						<div class="fz-left">
-							<h4 class="h4"><?php esc_html_e( 'Schedule Import', 'feedzy-rss-feeds' ); ?> <?php echo ! feedzy_is_pro() ? ' <span class="pro-label">PRO</span>' : ''; ?></h4>
-						</div>
-						<div class="fz-right">
-							<div class="fz-form-row">
-
-								<div class="fz-form-col-6">
+								<div class="fz-right">
 									<div class="fz-form-group">
+										<label class="form-label"><?php esc_html_e( 'Import schedule', 'feedzy-rss-feeds' ); ?></label>
 										<select id="fz-event-schedule" class="form-control fz-select-control" name="feedzy_meta_data[fz_cron_schedule]"<?php disabled( true, ! feedzy_is_pro() ); ?>>
 											<?php
 											$save_schedule = ! empty( $import_schedule['fz_cron_schedule'] ) ? $import_schedule['fz_cron_schedule'] : '';
@@ -798,54 +685,308 @@ class="fz-switch-toggle" type="checkbox" value="yes"
 												</option>
 											<?php endforeach; ?>
 										</select>
-										<div class="help-text pt-8"><?php esc_html_e( 'How often Feedzy will run the import.', 'feedzy-rss-feeds' ); ?></div>
+										<div class="help-text pt-8"><?php esc_html_e( 'Choose how often Feedzy should import new items from your feeds.', 'feedzy-rss-feeds' ); ?></div>
+									</div>
+								</div>
+							</div>
+
+							<div class="form-block form-block-two-column <?php echo esc_attr( apply_filters( 'feedzy_upsell_class', '' ) ); ?>">
+								<?php echo wp_kses_post( apply_filters( 'feedzy_upsell_content', '', 'fallback-image', 'import' ) ); ?>
+								<div class="fz-left">
+									<h4 class="h4">
+										<?php esc_html_e( 'Fallback Image', 'feedzy-rss-feeds' ); ?> <?php echo ! feedzy_is_pro() ? ' <span class="pro-label">PRO</span>' : ''; ?>
+									</h4>
+								</div>
+								<div class="fz-right">
+									<div class="fz-form-group">
+										<div class="form-label">
+											<?php esc_html_e( 'Which fallback featured image should be used for this feed?', 'feedzy-rss-feeds' ); ?>
+										</div>
+										
+										<?php 
+										$fallback_option = ! empty( $default_thumbnail_id ) ? 'custom' : 'general';
+										?>
+										
+										<div class="fz-spacing">
+											<input
+												type="radio"
+												id="use-general-fallback"
+												name="feedzy_meta_data[fallback_image_option]"
+												value="general"
+												<?php checked( $fallback_option, 'general' ); ?>
+											>
+											<label for="use-general-fallback" class="fz-radio-label">
+												<strong class="fz-radio-title">
+													<?php esc_html_e( 'Use general setting', 'feedzy-rss-feeds' ); ?>
+												</strong>
+												<br>
+												<span class="fz-radio-description">
+													<?php esc_html_e( 'Updates automatically when the general fallback image changes.', 'feedzy-rss-feeds' ); ?>
+												</span>
+											</label>
+										</div>
+
+										<div
+											id="general-fallback-preview"
+											class="fz-spacing"
+											style="<?php echo 'general' === $fallback_option ? '' : 'display: none;'; ?>"
+										>
+											<?php if ( ! empty( $inherited_thumbnail_id ) ) : ?>
+												<div class="fz-form-group">
+													<?php 
+													$image = wp_get_attachment_image( $inherited_thumbnail_id, 'thumbnail' );
+													if ( $image ) {
+														echo wp_kses_post( $image );
+													} else {
+														echo '<div class="help-text">' . esc_html__( 'General fallback image not found (may have been deleted)', 'feedzy-rss-feeds' ) . '</div>';
+													}
+													?>
+												</div>
+											<?php else : ?>
+												<div class="fz-form-group mb-20">
+													<div class="help-text">
+														<?php 
+														echo wp_kses_post(
+															__( 'No general fallback image set. ', 'feedzy-rss-feeds' )
+														);
+														?>
+													</div>
+												</div>
+											<?php endif; ?>
+											
+											<div class="help-text pt-8">
+												<?php 
+												echo wp_kses_post( 
+													sprintf(
+														/* translators: %s is replaced with a link to the Feedzy Settings page */
+														__( 'You can update the general fallback image in %s.', 'feedzy-rss-feeds' ),
+														'<a href="' . esc_url( admin_url( 'admin.php?page=feedzy-settings' ) ) . '" target="_blank">' . esc_html__( 'Feedzy Settings', 'feedzy-rss-feeds' ) . '</a>'
+													) 
+												); 
+												?>
+											</div>
+										</div>
+										
+										<div class="fz-spacing">
+											<input
+												type="radio"
+												id="use-custom-fallback"
+												name="feedzy_meta_data[fallback_image_option]"
+												value="custom"
+												<?php checked( $fallback_option, 'custom' ); ?>
+											>
+											<label for="use-custom-fallback" class="fz-radio-label">
+												<strong class="fz-radio-title">
+													<?php esc_html_e( 'Add custom fallback image', 'feedzy-rss-feeds' ); ?>
+												</strong>
+												<br>
+												<span class="fz-radio-description small">
+													<?php esc_html_e( 'Use a specific image just for this feed.', 'feedzy-rss-feeds' ); ?>
+												</span>
+											</label>
+										</div>
+
+										<div
+											id="custom-fallback-section"
+											style="<?php echo 'custom' === $fallback_option ? '' : 'display: none;'; ?>"
+										>
+											<?php
+											$btn_label                    = esc_html__( 'Choose image', 'feedzy-rss-feeds' );
+											$saved_fallback_thumbnail_ids = is_string( $default_thumbnail_id ) ? explode( ',', $default_thumbnail_id ) : array();
+											$valid_thumbnail_ids          = array_filter( $saved_fallback_thumbnail_ids, 'is_numeric' );
+											$valid_thumbnail_ids          = array_filter(
+												$valid_thumbnail_ids,
+												function ( $id ) {
+													return wp_attachment_is_image( intval( $id ) );
+												} 
+											);
+										
+											if ( ! empty( $valid_thumbnail_ids ) ) :
+												$btn_label = esc_html__( 'Replace image', 'feedzy-rss-feeds' );
+												?>
+												<div class="fz-form-group feedzy-media-preview ">
+													<div class="fz-fallback-images">
+														<?php
+														foreach ( $valid_thumbnail_ids as $thumbnail_id ) {
+															echo wp_get_attachment_image( $thumbnail_id, 'thumbnail' );
+														}
+														?>
+													</div>
+												</div>
+											<?php endif; ?>
+
+											<div class="fz-cta-group pb-8">
+												<a 
+													href="javascript:;"
+													class="feedzy-open-media btn btn-outline-primary"
+												>
+													<?php 
+													echo esc_html( $btn_label );
+													?>
+												</a>
+												<a
+													href="javascript:;"
+													class="feedzy-remove-media btn btn-outline-primary <?php echo ! empty( $valid_thumbnail_ids ) ? esc_attr( 'is-show' ) : ''; ?>"
+												>
+													<?php esc_html_e( 'Remove', 'feedzy-rss-feeds' ); ?>
+												</a>
+												<input 
+													type="hidden" 
+													name="feedzy_meta_data[default_thumbnail_id]" 
+													id="feed-post-default-thumbnail" 
+													value="<?php echo esc_attr( implode( ',', $valid_thumbnail_ids ) ); ?>"
+												>
+											</div>
+										</div>
+									</div>
+									<div class="help-text pt-8">
+										<?php esc_html_e( 'Helpful for setting a fallback image for feed items without an image during the import process.', 'feedzy-rss-feeds' ); ?>
 									</div>
 								</div>
 							</div>
 						</div>
 					</div>
-					<?php if ( function_exists( 'icl_get_languages' ) ) : ?>
-						<div class="form-block form-block-two-column">
-							<div class="fz-left">
-								<h4 class="h4"><?php esc_html_e( 'Assign Language', 'feedzy-rss-feeds' ); ?><?php echo ! feedzy_is_pro() ? ' <span class="pro-label">PRO</span>' : ''; ?></h4>
-								<?php if ( ! feedzy_is_pro() ) : ?>
-									<div class="form-block-pro-text">
-									<?php esc_html_e( 'This feature is only for Pro users.', 'feedzy-rss-feeds' ); ?><br>
-										<a href="https://docs.themeisle.com/category/712-feedzy" target="_blank"><?php esc_html_e( 'Learn More', 'feedzy-rss-feeds' ); ?></a>
+					<div class="fz-tab-content" id="fz-advanced-settings">
+						<div class="fz-form-wrap">
+
+							<div class="form-block form-block-two-column no-border">
+								<div class="fz-left">
+									<h4 class="h4">
+										<?php esc_html_e( 'Remove Duplicates', 'feedzy-rss-feeds' ); ?>
+									</h4>
+								</div>
+								<div class="fz-right">
+									<div class="fz-form-group">
+										<div class="fz-form-switch">
+											<input
+												id="remove-duplicates"
+												name="feedzy_meta_data[import_remove_duplicates]"
+												class="fz-switch-toggle" type="checkbox" value="yes"
+												<?php echo esc_attr( $import_remove_duplicates ); ?>
+											>
+											<label class="feedzy-inline form-label" for="remove-duplicates">
+												<?php esc_html_e( 'Remove Duplicate Items', 'feedzy-rss-feeds' ); ?>
+											</label>
+										</div>
+									</div>
+									<div class="help-text">
+										<?php echo wp_sprintf( esc_html__( 'To understand how duplicates will be removed, check out our', 'feedzy-rss-feeds' ) ); ?>
+										<a href="<?php echo esc_url( 'https://docs.themeisle.com/article/638-how-to-eliminate-duplicate-feed-item' ); ?>" target="_blank"><?php esc_html_e( 'Documentation.', 'feedzy-rss-feeds' ); ?></a>
 									</div>
-								<?php endif; ?>
+								</div>
 							</div>
-							<div class="fz-right">
-								<div class="fz-form-group">
-									<label class="form-label"><?php esc_html_e( 'Content Language after import', 'feedzy-rss-feeds' ); ?></label>
-									<div class="mx-320">
-										<select id="feedzy_site_language" class="form-control feedzy-chosen" name="feedzy_meta_data[language]">
-											<?php
-											$current_language         = defined( 'ICL_LANGUAGE_CODE' ) ? ICL_LANGUAGE_CODE : '';
-											$import_selected_language = ! empty( $import_selected_language ) ? $import_selected_language : $current_language;
-											$languages                = icl_get_languages();
-											foreach ( $languages as $language ) {
-												$selected = '';
-												$code     = isset( $language['language_code'] ) ? $language['language_code'] : $language['code'];
-												$name     = isset( $language['translated_name'] ) && ! empty( $language['translated_name'] ) ? $language['translated_name'] : $language['native_name'];
-												if ( $code === $import_selected_language ) {
-													$selected = 'selected';
-												}
-												?>
-											<option value="<?php echo esc_attr( $code ); ?>" <?php echo esc_attr( $selected ); ?>>
-												<?php echo esc_html( $name ); ?></option>
-												<?php
-											}
-											?>
-										</select>
+							<div class="form-block form-block-two-column <?php echo esc_attr( apply_filters( 'feedzy_upsell_class', '' ) ); ?>">
+								<?php echo wp_kses_post( apply_filters( 'feedzy_upsell_content', '', 'remove-duplicates', 'import' ) ); ?>
+								<div class="fz-left">
+									<h4 class="h4"><?php esc_html_e( 'Duplication Key', 'feedzy-rss-feeds' ); ?> <?php echo ! feedzy_is_pro() ? ' <span class="pro-label">PRO</span>' : ''; ?></h4>
+								</div>
+								<div class="fz-right">
+									<div class="fz-form-group">
+										<label class="form-label"><?php esc_html_e( 'Set a custom duplication key to identify unique feed items', 'feedzy-rss-feeds' ); ?></label>
+										<input type="text" id="feedzy_mark_duplicate" name="feedzy_meta_data[mark_duplicate_tag]" class="form-control" value="<?php echo esc_attr( $mark_duplicate_tag ); ?>"<?php disabled( true, 'checked' !== $import_remove_duplicates ); ?> />
+										<div class="help-text pt-8">
+											<?php esc_html_e( 'Define a custom duplication key for identifying unique feed items when importing content. By default, items are considered unique based on their title and URL. Enter one or multiple magic tags.', 'feedzy-rss-feeds' ); ?>
+										</div>
+									</div>
+								</div>
+							</div>
+
+							<div class="form-block form-block-two-column">
+								<div class="fz-left">
+									<h4 class="h4"><?php esc_html_e( 'Strip HTML Tags', 'feedzy-rss-feeds' ); ?></h4>
+								</div>
+								<div class="fz-right">
+									<div class="fz-form-group">
+										<div class="fz-form-switch">
+											<input id="remove-html" name="feedzy_meta_data[import_remove_html]"
+													class="fz-switch-toggle" type="checkbox" value="yes"
+												<?php echo esc_attr( isset( $import_remove_html ) ? $import_remove_html : '' ); ?>>
+											<label class="feedzy-inline form-label" for="remove-html"><?php esc_html_e( 'Remove HTML tags from improted content', 'feedzy-rss-feeds' ); ?></label>
+										</div>
 									</div>
 									<div class="help-text">
-										<?php esc_html_e( 'Select the language the content will have when it will be imported.', 'feedzy-rss-feeds' ); ?>
+										<?php echo wp_sprintf( esc_html__( 'Enable this to automatically remove all HTML tags from feed content upon import. This can help ensure clean, plain-text output and is especially useful for feeds that contain unexpected or unsafe markup.', 'feedzy-rss-feeds' ) ); ?>
 									</div>
 								</div>
 							</div>
+
+							<div class="form-block form-block-two-column">
+								<div class="fz-left">
+									<h4 class="h4"><?php esc_html_e( 'Feed Order', 'feedzy-rss-feeds' ); ?></h4>
+								</div>
+								<div class="fz-right">
+									<div class="fz-form-row">
+
+										<div class="fz-form-col-6">
+											<div class="fz-form-group">
+												<select id="import-order" class="form-control fz-select-control" name="feedzy_meta_data[import_order]">
+													<?php
+													$orders = array(
+														'' => __( 'Original feed order', 'feedzy-rss-feeds' ),
+														'date_asc' => __( 'Latest items first', 'feedzy-rss-feeds' ),
+														'date_desc' => __( 'Oldest items first', 'feedzy-rss-feeds' ),
+													);
+													foreach ( $orders as $key => $value ) :
+														?>
+														<option data-order="<?php echo esc_attr( $key ); ?>" value="<?php echo esc_attr( $key ); ?>"<?php selected( isset( $import_order ) ? $import_order : '', $key ); ?>
+														>
+															<?php echo esc_html( $value ); ?>
+														</option>
+													<?php endforeach; ?>
+												</select>
+												<!-- <div class="help-text pt-8"><?php esc_html_e( 'How often Feedzy will run the import.', 'feedzy-rss-feeds' ); ?></div> -->
+											</div>
+										</div>
+									</div>
+								</div>
+							</div>
+
+							<?php if ( function_exists( 'icl_get_languages' ) ) : ?>
+								<div class="form-block form-block-two-column">
+									<div class="fz-left">
+										<h4 class="h4"><?php esc_html_e( 'Assign Language', 'feedzy-rss-feeds' ); ?><?php echo ! feedzy_is_pro() ? ' <span class="pro-label">PRO</span>' : ''; ?></h4>
+										<?php if ( ! feedzy_is_pro() ) : ?>
+											<div class="form-block-pro-text">
+											<?php esc_html_e( 'This feature is only for Pro users.', 'feedzy-rss-feeds' ); ?><br>
+												<a href="https://docs.themeisle.com/category/712-feedzy" target="_blank"><?php esc_html_e( 'Learn More', 'feedzy-rss-feeds' ); ?></a>
+											</div>
+										<?php endif; ?>
+									</div>
+									<div class="fz-right">
+										<div class="fz-form-group">
+											<label class="form-label"><?php esc_html_e( 'Content Language after import', 'feedzy-rss-feeds' ); ?></label>
+											<div class="mx-320">
+												<select id="feedzy_site_language" class="form-control feedzy-chosen" name="feedzy_meta_data[language]">
+													<?php
+													$current_language         = defined( 'ICL_LANGUAGE_CODE' ) ? ICL_LANGUAGE_CODE : '';
+													$import_selected_language = ! empty( $import_selected_language ) ? $import_selected_language : $current_language;
+													$languages                = icl_get_languages();
+													foreach ( $languages as $language ) {
+														$selected = '';
+														$code     = isset( $language['language_code'] ) ? $language['language_code'] : $language['code'];
+														$name     = isset( $language['translated_name'] ) && ! empty( $language['translated_name'] ) ? $language['translated_name'] : $language['native_name'];
+														if ( $code === $import_selected_language ) {
+															$selected = 'selected';
+														}
+														?>
+													<option value="<?php echo esc_attr( $code ); ?>" <?php echo esc_attr( $selected ); ?>>
+														<?php echo esc_html( $name ); ?></option>
+														<?php
+													}
+													?>
+												</select>
+											</div>
+											<div class="help-text">
+												<?php esc_html_e( 'Select the language the content will have when it will be imported.', 'feedzy-rss-feeds' ); ?>
+											</div>
+										</div>
+									</div>
+								</div>
+							<?php endif; ?>
 						</div>
-					<?php endif; ?>
+					</div>
+				</div>
+				<div class="fz-content">
 					<div class="form-block form-block-two-column">
 						<div class="cta-text pt-8">
 							<a href="javascript:void(0)" id="fz-feedback-btn" role="button"><?php esc_html_e( 'Help us improve Feedzy', 'feedzy-rss-feeds' ); ?></a>
diff --git a/includes/views/js/import-metabox-edit.js b/includes/views/js/import-metabox-edit.js
index bdd2bf45..fdcc6c77 100644
--- a/includes/views/js/import-metabox-edit.js
+++ b/includes/views/js/import-metabox-edit.js
@@ -3,136 +3,312 @@
  * import-metabox-edit.js
  *
  * @since	1.2.0
- * @package feedzy-rss-feeds-pro
+ * @package
  */
 /* global jQuery, ajaxurl, feedzy, tb_show */
 (function ($) {
 	function scroll_to_class(element_class, removed_height) {
-		var scroll_to = $(element_class).offset().top - removed_height;
+		const scroll_to = $(element_class).offset().top - removed_height;
 		if ($(window).scrollTop() !== scroll_to) {
-			$("html, body").stop().animate({ scrollTop: scroll_to }, 0);
+			$('html, body').stop().animate({ scrollTop: scroll_to }, 0);
 		}
 	}
 
 	function bar_progress(progress_line_object, direction) {
-		var number_of_steps = progress_line_object.data("number-of-steps");
-		var now_value = progress_line_object.data("now-value");
-		var new_value = 0;
-		if (direction === "right") {
+		const number_of_steps = progress_line_object.data('number-of-steps');
+		const now_value = progress_line_object.data('now-value');
+		let new_value = 0;
+		if (direction === 'right') {
 			new_value = now_value + 100 / number_of_steps;
-		} else if (direction === "left") {
+		} else if (direction === 'left') {
 			new_value = now_value - 100 / number_of_steps;
 		}
 		progress_line_object
-			.attr("style", "width: " + new_value + "%;")
-			.data("now-value", new_value);
+			.attr('style', 'width: ' + new_value + '%;')
+			.data('now-value', new_value);
 	}
 
 	function add_source() {
-		var field_name = $(this).data("field-name");
-		var field_tag = $(this).data("field-tag");
-		$('[name="feedzy_meta_data[' + field_name + ']"]').data('tagify')
+		const field_name = $(this).data('field-name');
+		const field_tag = $(this).data('field-tag');
+		$('[name="feedzy_meta_data[' + field_name + ']"]')
+			.data('tagify')
 			.addTags(field_tag);
-		$('[data-toggle="dropdown"]').parent().removeClass("open");
+		$('[data-toggle="dropdown"]').parent().removeClass('open');
 		$('[name="feedzy_meta_data[' + field_name + ']"]').focus();
 		return false;
 	}
 
-	function append_outside_tag() {
-		var outsideWrap = $( this ).parents( '.fz-form-group, .fz-input-group' );
-		var tags = outsideWrap.find( '.form-control' ).val();
+	/**
+	 * Lock a button with a spinner icon.
+	 * @param {HTMLElement} button The button to lock.
+	 * @return {{ release: () => void }} An object with a release method to unlock the button.
+	 */
+	function lock_btn_with_spinner(button) {
+		const $button = $(button);
+		const $icon = $button.find('i');
+		const originalClasses = $icon.attr('class');
+
+		$button.prop('disabled', true);
+		$icon.attr('class', 'spinner is-active');
+
+		return {
+			release() {
+				$button.prop('disabled', false);
+				$icon.attr('class', originalClasses);
+			},
+		};
+	}
 
-		if ( '' === tags ) {
+	/**
+	 * Add valid URLs to the tag list.
+	 *
+	 * @this {HTMLElement} this - The button that was clicked to trigger the function.
+	 *
+	 * @return {Promise<void>}
+	 */
+	async function add_valid_urls_to_tag_list() {
+		const parentFormGroup = $(this).parents(
+			'.fz-form-group, .fz-input-group'
+		);
+		const tags = parentFormGroup.find('.form-control').val();
+		const $input = parentFormGroup.find('.form-control');
+
+		if ('' === tags) {
 			return false;
 		}
 
-		outsideWrap.find( '.form-control .tag-list' )?.val('');
-		if ( outsideWrap.next( '.tag-list' ).length > 0 ) {
-			outsideWrap.
-			next( '.tag-list' )
-			.find( 'input.fz-tagify-outside, input.fz-tagify--outside' )
-			.data('tagify')
-			.addTags( tags );
+		$('.fz-validation-message').remove();
+
+		const { release: unlockButton } = lock_btn_with_spinner(this);
+
+		try {
+			const validationResult = await validate_feed_url(tags);
+
+			handle_validation_response(validationResult);
+
+			if (!validationResult.success) {
+				return;
+			}
+
+			const results = validationResult.data.results || [];
+
+			const validUrls = results
+				.filter(({ status }) => status === 'success')
+				.map(({ url }) => url);
+			const invalidUrls = results
+				.filter(({ status }) => status !== 'success')
+				.map(({ url }) => url);
+
+			$input.val(invalidUrls.join(', ')); // Keep invalid URLs in the input field.
+
+			parentFormGroup.find('.form-control .tag-list')?.val(''); // Clear existing tags if any.
+
+			// Add valid URLs to the tag list.
+			const $tagifyInput =
+				parentFormGroup.next('.tag-list').length > 0
+					? parentFormGroup
+							.next('.tag-list')
+							.find(
+								'input.fz-tagify-outside, input.fz-tagify--outside'
+							)
+					: parentFormGroup.find(
+							'input.fz-tagify-outside, input.fz-tagify--outside'
+						);
+			$tagifyInput.data('tagify').addTags(validUrls.join(', '));
+		} catch (error) {
+			console.error(error);
+		} finally {
+			unlockButton();
+		}
+	}
+
+	/**
+	 * Validate the feed URL.
+	 *
+	 * @param {string} feedUrl
+	 * @return {Promise<{ success: boolean, message: string, data: { results: Array<{ url: string, status: string, message: string }> } }>} The API response object.
+	 */
+	async function validate_feed_url(feedUrl) {
+		if (!feedUrl) {
+			return {
+				success: false,
+				message:
+					window.feedzy.i10n.validation_messages.invalid_feed_url,
+			};
+		}
+
+		try {
+			const response = await $.ajax({
+				url: window.feedzy.ajax.url,
+				method: 'POST',
+				data: {
+					nonce: window.feedzy.ajax.security,
+					action: 'feedzy_validate_feed',
+					feed_url: feedUrl,
+				},
+			});
+
+			return response;
+		} catch (error) {
+			return {
+				success: false,
+				message:
+					window.feedzy.i10n.validation_messages
+						.error_validating_feed_url +
+					': ' +
+					(error.responseJSON?.message || error.statusText),
+			};
+		}
+	}
+
+	/**
+	 * Handle validation response and display appropriate messages
+	 * @param {Object} response - The validation response
+	 */
+	function handle_validation_response(response) {
+		if (!response || !response.data || !response.data.results) {
+			showMessage('✗ ' + response?.message, false);
+			return;
+		}
+
+		let validationSummaryHtml = '<div class="fz-validation-summary">';
+
+		response.data.results.forEach(({ url, status, message }) => {
+			const icon =
+				'<span class="dashicons dashicons-' +
+				(status === 'success'
+					? 'yes'
+					: status === 'error'
+						? 'no'
+						: 'warning') +
+				'"></span>';
+
+			validationSummaryHtml += `<div class="${'fz-feed-result fz-' + status}">`;
+			validationSummaryHtml += `${icon} <span class="fz-feed-url">${url}</span>`;
+			validationSummaryHtml += ` - ${message}`;
+			validationSummaryHtml += `</div>`;
+		});
+
+		validationSummaryHtml += '</div>';
+
+		const hasErrors = response.data.results.some(
+			({ status }) => status !== 'success'
+		);
+
+		showMessage(validationSummaryHtml, !hasErrors);
+	}
+
+	function showMessage(message, autoDismiss = true) {
+		const $container = $('.fz-validation-summary');
+		if (!$container.length) {
+			return;
+		}
+
+		$container.find('.fz-validation-message').remove();
+
+		const $message = $('<div>', {
+			class: 'fz-validation-message',
+			html: message,
+		});
+
+		$container.append($message);
+		if (autoDismiss) {
+			$message.delay(5000).fadeOut(300, () => $message.remove());
 		} else {
-			outsideWrap.find( 'input.fz-tagify-outside, input.fz-tagify--outside' )
-			.data('tagify')
-			.addTags( tags );
+			const $closeButton = $('<button>', {
+				type: 'button',
+				class: 'button button-primary',
+				text: '✕'
+			});
+
+			$message.append($closeButton);
+			$closeButton.on('click', function (e) {
+				e.preventDefault();
+				$(this)
+					.parent()
+					.fadeOut(300, () => $(this).remove());
+			});
 		}
-		return false;
 	}
 
 	function append_tag() {
-		var field_name = $(this).data("field-name");
-		var field_tag = $(this).data("field-tag");
-		if (field_name === "import_post_date" || field_name === "import_post_featured_img") {
-			$('[name="feedzy_meta_data[' + field_name + ']"]').data('tagify').removeAllTags();
-			$('[name="feedzy_meta_data[' + field_name + ']"]').data('tagify').addTags(
-				"[#" + field_tag + "]"
-			);
-		} else if( field_name === "import_post_content" ) {
+		const field_name = $(this).data('field-name');
+		const field_tag = $(this).data('field-tag');
+		if (
+			field_name === 'import_post_date' ||
+			field_name === 'import_post_featured_img'
+		) {
+			$('[name="feedzy_meta_data[' + field_name + ']"]')
+				.data('tagify')
+				.removeAllTags();
+			$('[name="feedzy_meta_data[' + field_name + ']"]')
+				.data('tagify')
+				.addTags('[#' + field_tag + ']');
+		} else if (field_name === 'import_post_content') {
 			$('[name="feedzy_meta_data[' + field_name + ']"]').focus();
-			$('[name="feedzy_meta_data[' + field_name + ']"]').data('tagify').addTags(
-				"[#" + field_tag + "]"
-			);
+			$('[name="feedzy_meta_data[' + field_name + ']"]')
+				.data('tagify')
+				.addTags('[#' + field_tag + ']');
 			return false;
 		} else {
-			$('[name="feedzy_meta_data[' + field_name + ']"]').data('tagify').addTags(
-				"[#" + field_tag + "]"
-			);
+			$('[name="feedzy_meta_data[' + field_name + ']"]')
+				.data('tagify')
+				.addTags('[#' + field_tag + ']');
 		}
-		$('[data-toggle="dropdown"]').parent().removeClass("open");
+		$('[data-toggle="dropdown"]').parent().removeClass('open');
 		$('[name="feedzy_meta_data[' + field_name + ']"]').focus();
 		return false;
 	}
 
 	function remove_row() {
-		$(this).closest(".key-value-item").remove();
+		$(this).closest('.key-value-item').remove();
 		return false;
 	}
 
 	function new_row() {
-		var html_row = "";
-		html_row = $("#new_field_tpl").html();
-		$(".custom_fields").append(html_row);
-		$(".btn.btn-remove-fields").on("click", remove_row);
+		let html_row = '';
+		html_row = $('#new_field_tpl').html();
+		$('.custom_fields').append(html_row);
+		$('.btn.btn-remove-fields').on('click', remove_row);
 		initCustomFieldAutoComplete();
 		document.dispatchEvent(new Event('feedzy_new_row_added'));
 		return false;
 	}
 
 	function update_status() {
-		var toggle = $(this);
-		var post_id = $(this).val();
-		var status = $(this).is(":checked");
+		const toggle = $(this);
+		const post_id = $(this).val();
+		const status = $(this).is(':checked');
 
-		var data = {
+		const data = {
 			security: feedzy.ajax.security,
-			action: "feedzy",
-			_action: "import_status",
+			action: 'feedzy',
+			_action: 'import_status',
 			id: post_id,
-			status: status,
+			status,
 		};
 
 		showSpinner(toggle);
 		$.ajax({
 			url: ajaxurl,
-			data: data,
-			method: "POST",
-			success: function (data) {
+			data,
+			method: 'POST',
+			success(data) {
 				if (!data.success && status) {
 					toggle
-						.parents("tr")
-						.find("td.feedzy-source")
-						.find(".feedzy-error-critical")
+						.parents('tr')
+						.find('td.feedzy-source')
+						.find('.feedzy-error-critical')
 						.remove();
 					toggle
-						.parents("tr")
-						.find("td.feedzy-source")
+						.parents('tr')
+						.find('td.feedzy-source')
 						.append($(data.data.msg));
-					toggle.prop("checked", false);
+					toggle.prop('checked', false);
 				}
 			},
-			complete: function () {
+			complete() {
 				hideSpinner(toggle);
 			},
 		});
@@ -140,15 +316,19 @@
 	}
 
 	function toggle_dropdown() {
-		$( '.dropdown.open' ).not( $(this).parent() ).removeClass( 'open' );
-		$(this).parent().toggleClass("open");
+		$('.dropdown.open').not($(this).parent()).removeClass('open');
+		$(this).parent().toggleClass('open');
 	}
 
 	function in_array($key, $array) {
-		if (typeof $array === "undefined" || $array.length === 0 || $key === "") {
+		if (
+			typeof $array === 'undefined' ||
+			$array.length === 0 ||
+			$key === ''
+		) {
 			return false;
 		}
-		for (var i = 0; i < $array.length; i++) {
+		for (let i = 0; i < $array.length; i++) {
 			if ($array[i] === $key) {
 				return true;
 			}
@@ -157,86 +337,150 @@
 	}
 
 	function update_taxonomy() {
-		var selected = $(this).val();
-		var tax_selected = $(this).data("tax");
-		if (typeof tax_selected !== "undefined") {
-			tax_selected = tax_selected.split(",");
+		const selected = $(this).val();
+		let tax_selected = $(this).data('tax');
+		const custom_tag = $(this).data('custom-tag');
+		if (typeof tax_selected !== 'undefined') {
+			tax_selected = tax_selected.split(',');
 		} else {
-			tax_selected = "";
+			tax_selected = '';
 		}
 
-		var data = {
+		const data = {
 			security: feedzy.ajax.security,
-			action: "feedzy",
-			_action: "get_taxonomies",
+			action: 'feedzy',
+			_action: 'get_taxonomies',
 			post_type: selected,
 		};
 
-		$("#feedzy_post_terms")
-			.html($("#loading_select_tpl").html())
-			.trigger("chosen:updated");
-
-		$.post(ajaxurl, data, function (response) {
-			var show_terms = true;
-
-			var options = "";
-			if (response.length !== 0) {
-				$.each(response, function (index, terms) {
-					if (terms) {
-						var groupName = index;
-						if ( 'category' === groupName ) {
-							groupName = 'Category';
-						} else if( 'post_tag' === groupName ) {
-							groupName = 'Tag';
-						}
-						options += '<optgroup label="' + groupName + '">';
-						$.each(terms, function (i, term) {
-							var sel_option = "";
-							if (in_array(index + "_" + i, tax_selected)) {
-								sel_option = "selected";
-								if ( $("#feedzy_post_terms").hasClass('fz-chosen-custom-tag') ) {
-									var removeItem = index + "_" + i;
-									tax_selected = $.grep(tax_selected, function(value) {
-										return value != removeItem;
-									});
+		$('#feedzy_post_terms')
+			.html($('#loading_select_tpl').html())
+			.trigger('chosen:updated');
+
+		$.post(
+			ajaxurl,
+			data,
+			function (response) {
+				let show_terms = true;
+
+				let options = '';
+				if (response.length !== 0) {
+					$.each(response, function (index, terms) {
+						if (terms) {
+							let groupName = index;
+							if ('category' === groupName) {
+								groupName = 'Category';
+							} else if ('post_tag' === groupName) {
+								groupName = 'Tag';
+							}
+							options += '<optgroup label="' + groupName + '">';
+							$.each(terms, function (i, term) {
+								let sel_option = '';
+								if (in_array(index + '_' + i, tax_selected)) {
+									sel_option = 'selected';
+									if (
+										$('#feedzy_post_terms').hasClass(
+											'fz-chosen-custom-tag'
+										)
+									) {
+										const removeItem = index + '_' + i;
+										tax_selected = $.grep(
+											tax_selected,
+											function (value) {
+												return value != removeItem;
+											}
+										);
+									}
 								}
+								options +=
+									'<option value="' +
+									index +
+									'_' +
+									i +
+									'" ' +
+									sel_option +
+									'>' +
+									term +
+									'</option>';
+							});
+							options += '</optgroup>';
+						}
+					});
+					tax_selected = tax_selected.filter(function (item) {
+						return '' !== item;
+					});
+					const selected_tax_length = tax_selected.length;
+					if (!feedzy.i10n.is_pro) {
+						options +=
+							'<optgroup class="feedzy-pro-terms" label="Pro">';
+					}
+					options +=
+						'<option class="feedzy-separator">separator</option>';
+					$.each(custom_tag, function (key, customTag) {
+						let is_selected = '';
+						if (in_array(key, tax_selected)) {
+							is_selected = 'selected';
+							const index = tax_selected.indexOf(key);
+
+							if (-1 !== index) {
+								tax_selected.splice(index, 1);
 							}
+						}
+						options +=
+							'<option class="' +
+							(!feedzy.i10n.is_pro ? 'feedzy-pro-term' : '') +
+							'" value="' +
+							key +
+							'"' +
+							is_selected +
+							'>' +
+							customTag +
+							'</option></a>';
+					});
+
+					if (
+						selected_tax_length > 0 &&
+						$('#feedzy_post_terms').hasClass('fz-chosen-custom-tag')
+					) {
+						$.each(tax_selected, function (index, customTag) {
 							options +=
 								'<option value="' +
-								index +
-								"_" +
-								i +
-								'" ' +
-								sel_option +
-								">" +
-								term +
-								"</option>";
+								customTag +
+								'" selected>' +
+								customTag +
+								'</option>';
 						});
-						options += "</optgroup>";
 					}
-				});
-				tax_selected = tax_selected.filter( function(item) { return '' !== item; } );
-				if ( tax_selected.length > 0 && $("#feedzy_post_terms").hasClass('fz-chosen-custom-tag') ) {
-					$.each(tax_selected, function (index, customTag) {
-						options += '<option value="' + customTag + '" selected>' + customTag + '</option>';
-					} );
+
+					if (!feedzy.i10n.is_pro) {
+						options += '</optgroup>';
+					}
+				} else {
+					show_terms = false;
+					options = $('#empty_select_tpl').html();
 				}
-			} else {
-				show_terms = false;
-				options = $("#empty_select_tpl").html();
-			}
 
-			$("#feedzy_post_terms").html(options).trigger("chosen:updated");
-		}, 'json');
+				$('#feedzy_post_terms').html(options).trigger('chosen:updated');
+			},
+			'json'
+		);
 		return true;
 	}
 
 	function htmlEntities(str) {
-		return String(str).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, "&quot;").replace(/'/g, "&#039;");
+		return String(str)
+			.replace(/&/g, '&amp;')
+			.replace(/</g, '&lt;')
+			.replace(/>/g, '&gt;')
+			.replace(/"/g, '&quot;')
+			.replace(/'/g, '&#039;');
 	}
 
 	function escapeSelector(string) {
-		return String(string).replace(/([ !"#$%&'()*+,.\/:;<=>?@[\\\]^`{|}~])/g,'\\$1');
+		return String(string).replace(
+			/([ !"#$%&'()*+,.\/:;<=>?@[\\\]^`{|}~])/g,
+			'\\$1'
+		);
 	}
 
 	$(document).ready(function () {
@@ -247,286 +491,350 @@
 		feedzyTab();
 		feedzyMediaUploader();
 		initRemoveFallbackImageBtn();
+		initFallbackImageOptions();
 	});
 
 	function initImportScreen() {
-		$("button.btn-submit").on("click", function (e) {
-			$(window).unbind("beforeunload");
-			$("#custom_post_status").val($(this).val());
+		$('button.btn-submit').on('click', function (e) {
+			$(window).unbind('beforeunload');
+			$('#custom_post_status').val($(this).val());
 			e.preventDefault();
-			$("#post").submit();
+			$('#post').submit();
 			return false;
 		});
 
-		$( '#feedzy-import-source' ).on( 'blur', function(e) {
-			var addTagBtn = $( this ).parents( '.fz-input-icon' ).find( '.add-outside-tags' );
-			addTagBtn.trigger( 'click' );
-			$( this ).val('');
-		} );
-
-		$( '.feedzy-keyword-filter, #feedzy-import-source' ).on('keyup keypress', function(e) {
-			var keyCode = e.keyCode || e.which;
-			var addTagBtn = $( this ).parents( '.fz-input-icon' ).find( '.add-outside-tags' );
+		$('.feedzy-keyword-filter').on('keyup keypress', function (e) {
+			const keyCode = e.keyCode || e.which;
+			const addTagBtn = $(this)
+				.parents('.fz-input-icon')
+				.find('.add-outside-tags');
 
-			if ( '' === $( this ).val() ) {
-				addTagBtn.attr( 'disabled', true );
-			} else if ( addTagBtn.hasClass( 'fz-plus-btn' ) ) {
-				addTagBtn.removeAttr( 'disabled' );
+			if ('' === $(this).val()) {
+				addTagBtn.attr('disabled', true);
+			} else if (addTagBtn.hasClass('fz-plus-btn')) {
+				addTagBtn.removeAttr('disabled');
 			}
 
-			if ( keyCode === 13 ) {
+			if (keyCode === 13) {
 				e.preventDefault();
-				addTagBtn.trigger( 'click' );
-				$( this ).val('');
+				addTagBtn.trigger('click');
+				$(this).val('');
 				return false;
 			}
-		} );
-
-		$("a.dropdown-item:not(.source,[data-action_popup])").on("click", append_tag);
-		$(".add-outside-tags").on("click", append_outside_tag);
-		$("a.dropdown-item.source").on("click", add_source);
-		$( document ).on( 'click', '.btn-remove-fields', remove_row );
-		$("#new_custom_fields").on("click", new_row);
-
-		$(".feedzy-toggle").on("click", update_status);
-		$(".dropdown-toggle").on("click", toggle_dropdown);
-		if ($("#toplevel_page_feedzy-admin-menu li").hasClass("current")) {
-			$("#toplevel_page_feedzy-admin-menu")
-				.removeClass("wp-not-current-submenu")
-				.addClass("wp-has-current-submenu");
+		});
+
+		$('a.dropdown-item:not(.source,[data-action_popup])').on(
+			'click',
+			append_tag
+		);
+		$('.add-outside-tags').on('click', add_valid_urls_to_tag_list);
+		$('a.dropdown-item.source').on('click', add_source);
+		$(document).on('click', '.btn-remove-fields', remove_row);
+		$('#new_custom_fields').on('click', new_row);
+
+		$('.feedzy-toggle').on('click', update_status);
+		$('.dropdown-toggle').on('click', toggle_dropdown);
+		if ($('#toplevel_page_feedzy-admin-menu li').hasClass('current')) {
+			$('#toplevel_page_feedzy-admin-menu')
+				.removeClass('wp-not-current-submenu')
+				.addClass('wp-has-current-submenu');
 		}
-		$(".feedzy-chosen").chosen({ width: "100%" });
-		$("#feedzy_post_type").on("change", update_taxonomy);
-		$("#feedzy_post_status").trigger("change");
+		$('.feedzy-chosen').chosen({ width: '100%' });
+		$('#feedzy_post_type').on('change', update_taxonomy);
+		$('#feedzy_post_status').trigger('change');
 
 		// Add magic tag support for post taxonomy field.
-		$("#feedzy_post_terms.fz-chosen-custom-tag").on("chosen:no_results", function() {
-			var select = $(this);
-			var search = select.siblings(".chosen-container").find(".chosen-choices .search-field:last input");
-			var text = htmlEntities(search.val());
-    		// dont add if it already exists
-			if (! select.find('option[value=' + escapeSelector(search.val()) + ']').length) {
-				var btn = $('<li class="active-result highlighted">' + text + '</li>');
-				btn.on("mousedown mouseup click", function(e) {
-					var arr = select.val();
-					select.html(select.html() + "<option value='" + text + "'>" + text + "</option>");
-					select.val(arr.concat([text]));
-					select.trigger("chosen:updated").trigger('chosen:close');
-					// search.focus();
-					e.stopImmediatePropagation();
-					return false;
-				});
-				search.on("keydown", function(e) {
-					if (e.which == 13) {
-						btn.click();
+		$('#feedzy_post_terms.fz-chosen-custom-tag').on(
+			'chosen:no_results',
+			function () {
+				const select = $(this);
+				const search = select
+					.siblings('.chosen-container')
+					.find('.chosen-choices .search-field:last input');
+				const text = htmlEntities(search.val());
+				// dont add if it already exists
+				if (
+					!select.find(
+						'option[value=' + escapeSelector(search.val()) + ']'
+					).length
+				) {
+					const btn = $(
+						'<li class="active-result highlighted">' +
+							text +
+							'</li>'
+					);
+					btn.on('mousedown mouseup click', function (e) {
+						const arr = select.val();
+						select.html(
+							select.html() +
+								"<option value='" +
+								text +
+								"'>" +
+								text +
+								'</option>'
+						);
+						select.val(arr.concat([text]));
+						select
+							.trigger('chosen:updated')
+							.trigger('chosen:close');
+						// search.focus();
+						e.stopImmediatePropagation();
 						return false;
-					}
-				});
-				select.siblings(".chosen-container").find(".no-results").replaceWith(btn);
-			} else {
-				select.siblings(".chosen-container").find(".no-results").replaceWith('');
+					});
+					search.on('keydown', function (e) {
+						if (e.which == 13) {
+							btn.click();
+							return false;
+						}
+					});
+					select
+						.siblings('.chosen-container')
+						.find('.no-results')
+						.replaceWith(btn);
+				} else {
+					select
+						.siblings('.chosen-container')
+						.find('.no-results')
+						.replaceWith('');
+				}
 			}
-		})
+		);
 
 		// Add magic tag support for post taxonomy field.
-		$("#feedzy_post_author.fz-chosen-custom-tag").on("chosen:no_results", function() {
-			var select = $(this);
-			var search = select.siblings(".chosen-container").find(".chosen-search-input");
-			var text = htmlEntities(search.val().replace(/\s+/g, ''));
-			// dont add if it already exists
-			if (! select.find('option[value=' + escapeSelector(search.val().replace(/\s+/g, '')) + ']').length) {
-				var btn = $('<li class="active-result highlighted">' + text + '</li>');
-				btn.on("mousedown mouseup click", function(e) {
-					var arr = select.val() || [];
-					select.append("<option value='" + text + "' selected>" + text + "</option>");
-					select.trigger("chosen:updated").trigger('chosen:close');
-					e.stopImmediatePropagation();
-					return false;
-				});
-				search.on("keydown", function(e) {
-					if (e.which == 13) {
-						btn.click();
+		$('#feedzy_post_author.fz-chosen-custom-tag').on(
+			'chosen:no_results',
+			function () {
+				const select = $(this);
+				const search = select
+					.siblings('.chosen-container')
+					.find('.chosen-search-input');
+				const text = htmlEntities(search.val().replace(/\s+/g, ''));
+				// dont add if it already exists
+				if (
+					!select.find(
+						'option[value=' +
+							escapeSelector(search.val().replace(/\s+/g, '')) +
+							']'
+					).length
+				) {
+					const btn = $(
+						'<li class="active-result highlighted">' +
+							text +
+							'</li>'
+					);
+					btn.on('mousedown mouseup click', function (e) {
+						const arr = select.val() || [];
+						select.append(
+							"<option value='" +
+								text +
+								"' selected>" +
+								text +
+								'</option>'
+						);
+						select
+							.trigger('chosen:updated')
+							.trigger('chosen:close');
+						e.stopImmediatePropagation();
 						return false;
-					}
-				});
-				select.siblings(".chosen-container").find(".no-results").replaceWith(btn);
-				select.siblings(".chosen-container").find(".chosen-results").append('<li class="helper-text">' + feedzy.i10n.author_helper + '</li>');
-			} else {
-				select.siblings(".chosen-container").find(".no-results").replaceWith('');
+					});
+					search.on('keydown', function (e) {
+						if (e.which == 13) {
+							btn.click();
+							return false;
+						}
+					});
+					select
+						.siblings('.chosen-container')
+						.find('.no-results')
+						.replaceWith(btn);
+					select
+						.siblings('.chosen-container')
+						.find('.chosen-results')
+						.append(
+							'<li class="helper-text">' +
+								feedzy.i10n.author_helper +
+								'</li>'
+						);
+				} else {
+					select
+						.siblings('.chosen-container')
+						.find('.no-results')
+						.replaceWith('');
+				}
 			}
-		})
+		);
 
 		/*
          Form
          */
-		$(".f1 fieldset:first").fadeIn("slow");
+		$('.f1 fieldset:first').fadeIn('slow');
 
 		// next step
-		$(".f1 .btn-next").on("click", function () {
-			var parent_fieldset = $(this).parents("fieldset");
-			var next_step = true;
+		$('.f1 .btn-next').on('click', function () {
+			const parent_fieldset = $(this).parents('fieldset');
+			const next_step = true;
 			// navigation steps / progress steps
-			var current_active_step = $(this).parents(".f1").find(".f1-step.active");
-			var progress_line = $(this).parents(".f1").find(".f1-progress-line");
+			const current_active_step = $(this)
+				.parents('.f1')
+				.find('.f1-step.active');
+			const progress_line = $(this)
+				.parents('.f1')
+				.find('.f1-progress-line');
 
 			// fields validation
 			if (next_step) {
 				parent_fieldset.fadeOut(400, function () {
 					// change icons
 					current_active_step
-						.removeClass("active")
-						.addClass("activated")
+						.removeClass('active')
+						.addClass('activated')
 						.next()
-						.addClass("active");
+						.addClass('active');
 					// progress bar
-					bar_progress(progress_line, "right");
+					bar_progress(progress_line, 'right');
 					// show next step
 					$(this).next().fadeIn();
 					// scroll window to beginning of the form
-					scroll_to_class($(".f1"), 20);
+					scroll_to_class($('.f1'), 20);
 				});
 			}
 		});
 
 		// previous step
-		$(".f1 .btn-previous").on("click", function () {
+		$('.f1 .btn-previous').on('click', function () {
 			// navigation steps / progress steps
-			var current_active_step = $(this).parents(".f1").find(".f1-step.active");
-			var progress_line = $(this).parents(".f1").find(".f1-progress-line");
+			const current_active_step = $(this)
+				.parents('.f1')
+				.find('.f1-step.active');
+			const progress_line = $(this)
+				.parents('.f1')
+				.find('.f1-progress-line');
 
 			$(this)
-				.parents("fieldset")
+				.parents('fieldset')
 				.fadeOut(400, function () {
 					// change icons
 					current_active_step
-						.removeClass("active")
+						.removeClass('active')
 						.prev()
-						.removeClass("activated")
-						.addClass("active");
+						.removeClass('activated')
+						.addClass('active');
 					// progress bar
-					bar_progress(progress_line, "left");
+					bar_progress(progress_line, 'left');
 					// show previous step
 					$(this).prev().fadeIn();
 					// scroll window to beginning of the form
-					scroll_to_class($(".f1"), 20);
+					scroll_to_class($('.f1'), 20);
 				});
 		});
 
-		$("#feedzy-validate-feed").on("click", function (e) {
-			let $url = $("#feedzy-source-tags").val();
-			$url = $url.split( ',' );
-			$url = $.trim( $url.pop() );
-			let $anchor = $(this);
-			$anchor.attr("href", $anchor.attr("data-href-base") + $url);
-		});
-
-		$("#preflight").on("click", function (e) {
+		$('#preflight').on('click', function (e) {
 			e.preventDefault();
-			var $fields = {};
+			const $fields = {};
 			// collect all elements.
-			$("#feedzy-import-form")
-				.find(":input")
+			$('#feedzy-import-form')
+				.find(':input')
 				.each(function (index, element) {
-					if ("undefined" === typeof $(element).attr("name")) {
+					if ('undefined' === typeof $(element).attr('name')) {
 						return;
 					}
-					$fields[$(element).attr("name")] = $(element).val();
+					$fields[$(element).attr('name')] = $(element).val();
 				});
-			tb_show(feedzy.i10n.dry_run_title, "TB_inline?");
-			$("#TB_ajaxContent").html(feedzy.i10n.dry_run_loading);
+			tb_show(feedzy.i10n.dry_run_title, 'TB_inline?');
+			$('#TB_ajaxContent').html(feedzy.i10n.dry_run_loading);
 			$.ajax({
 				url: ajaxurl,
-				method: "post",
+				method: 'post',
 				data: {
 					security: feedzy.ajax.security,
 					fields: $.param($fields),
-					action: "feedzy",
-					_action: "dry_run",
+					action: 'feedzy',
+					_action: 'dry_run',
 				},
-				success: function (data) {
-					$("#TB_ajaxContent").addClass("loaded");
-					$("#TB_ajaxContent div").html(data.data.output);
+				success(data) {
+					$('#TB_ajaxContent').addClass('loaded');
+					$('#TB_ajaxContent div').html(data.data.output);
 				},
 			});
 		});
 
 		// Click on pro/upgrade button.
-		$(document).on("click", ".only-pro-inner a", function (e) {
-			if ($(this).parents(".only-pro-content").css("opacity") == 0) {
+		$(document).on('click', '.only-pro-inner a', function (e) {
+			if ($(this).parents('.only-pro-content').css('opacity') == 0) {
 				e.preventDefault();
 			}
 		});
 
 		// Click to hide upsell notice.
-		$(document).on("click", ".remove-alert", function (e) {
-			var upSellNotice = $(this).parents( '.upgrade-alert' );
-			upSellNotice.fadeOut( 500,
-				function() {
-					upSellNotice.remove();
-					jQuery.post(
-						ajaxurl,
-						{
-							security: feedzy.ajax.security,
-							action: "feedzy",
-							_action: "remove_upsell_notice"
-						}
-					);
-				}
-			);
+		$(document).on('click', '.remove-alert', function (e) {
+			const upSellNotice = $(this).parents('.upgrade-alert');
+			upSellNotice.fadeOut(500, function () {
+				upSellNotice.remove();
+				jQuery.post(ajaxurl, {
+					security: feedzy.ajax.security,
+					action: 'feedzy',
+					_action: 'remove_upsell_notice',
+				});
+			});
 		});
 
 		// Save/Update Post Title.
-		$(document).on('input', "#post_title", function (e) {
-			jQuery( '.fz-form-wrap input[name="post_title"]' ).val( $(this).val() );
+		$(document).on('input', '#post_title', function (e) {
+			jQuery('.fz-form-wrap input[name="post_title"]').val($(this).val());
 		});
 
 		// Close dropdown when user click on document.
-		$( 'body' ).on( 'click', function( e ) {
-			if ( $( e.target ).parent( '.dropdown-item' ).length > 0 ) {
+		$('body').on('click', function (e) {
+			if ($(e.target).parent('.dropdown-item').length > 0) {
 				return;
 			}
-			if ( $( e.target ).attr( 'disabled' ) ) {
+			if ($(e.target).attr('disabled')) {
 				return;
 			}
-			if ( $( e.target ).hasClass( 'dashicons-arrow-down-alt2' ) ) {
+			if ($(e.target).hasClass('dashicons-arrow-down-alt2')) {
 				return;
 			}
-			if ( $( e.target ).hasClass( 'dashicons-plus-alt2' ) ) {
+			if ($(e.target).hasClass('dashicons-plus-alt2')) {
 				return;
 			}
-			if ( $( e.target ).hasClass( 'dropdown-toggle' ) ) {
+			if ($(e.target).hasClass('dropdown-toggle')) {
 				return;
 			}
-			$( '.dropdown.open' ).removeClass( 'open' );
-		} );
+			$('.dropdown.open').removeClass('open');
+		});
 
 		// Tagify for normal textbox.
-		$( '.fz-input-tagify:not(.fz-tagify-image):not([name="feedzy_meta_data[import_post_title]"])' ).tagify( {
+		$(
+			'.fz-input-tagify:not(.fz-tagify-image):not([name="feedzy_meta_data[import_post_title]"])'
+		).tagify({
 			editTags: false,
-			originalInputValueFormat: function( valuesArr ) {
-				return valuesArr.map( function( item ) {
-					return item.value;
-				} )
-				.join( ', ' );
-			}
-		} );
+			originalInputValueFormat(valuesArr) {
+				return valuesArr
+					.map(function (item) {
+						return item.value;
+					})
+					.join(', ');
+			},
+		});
 
 		// Tagify for normal mix content field.
-		$( '.fz-tagify-image' ).tagify( {
+		$('.fz-tagify-image').tagify({
 			mode: 'mix',
 			editTags: true,
 			userInput: true,
 			addTagOn: [],
 			templates: {
-				tag: function(tagData) {
-					try{
-						var decodeTagData = decodeURIComponent(tagData.value);
-						var isEncoded = typeof tagData.value === "string" && decodeTagData !== tagData.value;
-						var tagLabel = tagData.value;
-						if ( isEncoded ) {
-							decodeTagData = JSON.parse( decodeTagData );
+				tag(tagData) {
+					try {
+						let decodeTagData = decodeURIComponent(tagData.value);
+						const isEncoded =
+							typeof tagData.value === 'string' &&
+							decodeTagData !== tagData.value;
+						let tagLabel = tagData.value;
+						if (isEncoded) {
+							decodeTagData = JSON.parse(decodeTagData);
 							decodeTagData = decodeTagData[0] || {};
-							tagLabel = decodeTagData.tag.replaceAll( '_', ' ' );
+							tagLabel = decodeTagData.tag.replaceAll('_', ' ');
 							tagData['data-actions'] = tagData.value;
 							tagData['data-field_id'] = 'fz-image-action-tags';
 						}
@@ -535,31 +843,34 @@
 							<x title='remove tag' class='tagify__tag__removeBtn'></x>
 							<div>
 								<span class='tagify__tag-text'>${tagLabel}</span>
-								${tagData['data-actions'] ?
-									`<a href="javascript:;" class="tagify__filter-icon" ${this.getAttributes(tagData)}></a>` : ''
+								${
+									tagData['data-actions']
+										? `<a href="javascript:;" class="tagify__filter-icon" ${this.getAttributes(tagData)}></a>`
+										: ''
 								}
 							</div>
-						</tag>`
-					}
-					catch(err){}
-				}
-			}
-		} );
+						</tag>`;
+					} catch (err) {}
+				},
+			},
+		});
 
 		// Tagify for normal mix content field.
-		var mixContent = $( '.fz-textarea-tagify' ).tagify( {
+		const mixContent = $('.fz-textarea-tagify').tagify({
 			mode: 'mix',
 			editTags: false,
 			templates: {
-				tag: function( tagData ) {
-					try{
-						var decodeTagData = decodeURIComponent(tagData.value);
-						var isEncoded = typeof tagData.value === "string" && decodeTagData !== tagData.value;
-						var tagLabel = tagData.value;
-						if ( isEncoded ) {
-							decodeTagData = JSON.parse( decodeTagData );
+				tag(tagData) {
+					try {
+						let decodeTagData = decodeURIComponent(tagData.value);
+						const isEncoded =
+							typeof tagData.value === 'string' &&
+							decodeTagData !== tagData.value;
+						let tagLabel = tagData.value;
+						if (isEncoded) {
+							decodeTagData = JSON.parse(decodeTagData);
 							decodeTagData = decodeTagData[0] || {};
-							tagLabel = decodeTagData.tag.replaceAll( '_', ' ' );
+							tagLabel = decodeTagData.tag.replaceAll('_', ' ');
 							tagData['data-actions'] = tagData.value;
 							tagData['data-field_id'] = 'fz-content-action-tags';
 						}
@@ -568,30 +879,35 @@
 							<x title='remove tag' class='tagify__tag__removeBtn'></x>
 							<div>
 								<span class='tagify__tag-text'>${tagLabel}</span>
-								${tagData['data-actions'] ?
-									`<a href="javascript:;" class="tagify__filter-icon" ${this.getAttributes(tagData)}></a>` : ''
+								${
+									tagData['data-actions']
+										? `<a href="javascript:;" class="tagify__filter-icon" ${this.getAttributes(tagData)}></a>`
+										: ''
 								}
 							</div>
-						</tag>`
-					}
-					catch(err){}
-				}
-			}
-		} );
+						</tag>`;
+					} catch (err) {}
+				},
+			},
+		});
 
-		$( '.fz-input-tagify[name="feedzy_meta_data[import_post_title]"]:not(.fz-tagify-image)' ).tagify( {
+		$(
+			'.fz-input-tagify[name="feedzy_meta_data[import_post_title]"]:not(.fz-tagify-image)'
+		).tagify({
 			mode: 'mix',
 			editTags: false,
 			templates: {
-				tag: function( tagData ) {
-					try{
-						var decodeTagData = decodeURIComponent(tagData.value);
-						var isEncoded = typeof tagData.value === "string" && decodeTagData !== tagData.value;
-						var tagLabel = tagData.value;
-						if ( isEncoded ) {
-							decodeTagData = JSON.parse( decodeTagData );
+				tag(tagData) {
+					try {
+						let decodeTagData = decodeURIComponent(tagData.value);
+						const isEncoded =
+							typeof tagData.value === 'string' &&
+							decodeTagData !== tagData.value;
+						let tagLabel = tagData.value;
+						if (isEncoded) {
+							decodeTagData = JSON.parse(decodeTagData);
 							decodeTagData = decodeTagData[0] || {};
-							tagLabel = decodeTagData.tag.replaceAll( '_', ' ' );
+							tagLabel = decodeTagData.tag.replaceAll('_', ' ');
 							tagData['data-actions'] = tagData.value;
 							tagData['data-field_id'] = 'fz-title-action-tags';
 						}
@@ -600,92 +916,107 @@
 							<x title='remove tag' class='tagify__tag__removeBtn'></x>
 							<div>
 								<span class='tagify__tag-text'>${tagLabel}</span>
-								${tagData['data-actions'] ?
-									`<a href="javascript:;" class="tagify__filter-icon" ${this.getAttributes(tagData)}></a>` : ''
+								${
+									tagData['data-actions']
+										? `<a href="javascript:;" class="tagify__filter-icon" ${this.getAttributes(tagData)}></a>`
+										: ''
 								}
 							</div>
-						</tag>`
-					}
-					catch(err){
+						</tag>`;
+					} catch (err) {
 						console.error(err);
 					}
-				}
-			}
-		} );
+				},
+			},
+		});
 
 		// Tagify for outside tags with allowed duplicates.
-		$( '.fz-tagify-outside' ).tagify( {
-			editTags: true,
-			duplicates: true,
-			userInput: false,
-			originalInputValueFormat: function( valuesArr ) {
-				return valuesArr.map( function( item ) {
-					return item.value;
-				} )
-				.join( ', ' );
-			}
-		} )
-		.on( 'add', function( e ) {
-			var target = $( e.target );
-			target.parents( '.tag-list' ).removeClass( 'hidden' );
-		} )
-		.on( 'removeTag', function( e, tagData ) {
-			var target = $( e.target );
-			var emptyTags = target.parents( '.tag-list' ).find( '.tagify--empty' ).length;
-			if ( emptyTags ) {
-				target.parents( '.tag-list' ).addClass( 'hidden' );
-			}
-		} );
+		$('.fz-tagify-outside')
+			.tagify({
+				editTags: true,
+				duplicates: true,
+				userInput: false,
+				originalInputValueFormat(valuesArr) {
+					return valuesArr
+						.map(function (item) {
+							return item.value;
+						})
+						.join(', ');
+				},
+			})
+			.on('add', function (e) {
+				const target = $(e.target);
+				target.parents('.tag-list').removeClass('hidden');
+			})
+			.on('removeTag', function (e, tagData) {
+				const target = $(e.target);
+				const emptyTags = target
+					.parents('.tag-list')
+					.find('.tagify--empty').length;
+				if (emptyTags) {
+					target.parents('.tag-list').addClass('hidden');
+				}
+			});
 
 		// Tagify for outside tags with not allowed duplicates.
-		$( '.fz-tagify--outside' ).tagify( {
-			editTags: true,
-			userInput: false,
-			originalInputValueFormat: function( valuesArr ) {
-				return valuesArr.map( function( item ) {
-					return item.value;
-				} )
-				.join( ', ' );
-			}
-		} )
-		.on( 'add', function( e ) {
-			var target = $( e.target );
-			target.parents( '.tag-list' ).removeClass( 'hidden' );
-		} )
-		.on( 'removeTag', function( e, tagData ) {
-			var target = $( e.target );
-			var tagList = target.parents( '.tag-list' );
-			if ( tagList.find( '.tagify__tag' ).length === 0 ) {
-				tagList.addClass( 'hidden' );
-				tagList.find( 'input:text' ).val( '' );
-			}
-		} );
+		$('.fz-tagify--outside')
+			.tagify({
+				editTags: true,
+				userInput: false,
+				originalInputValueFormat(valuesArr) {
+					return valuesArr
+						.map(function (item) {
+							return item.value;
+						})
+						.join(', ');
+				},
+			})
+			.on('add', function (e) {
+				const target = $(e.target);
+				target.parents('.tag-list').removeClass('hidden');
+			})
+			.on('removeTag', function (e, tagData) {
+				const target = $(e.target);
+				const tagList = target.parents('.tag-list');
+				if (tagList.find('.tagify__tag').length === 0) {
+					tagList.addClass('hidden');
+					tagList.find('input:text').val('');
+				}
+			});
 
-		$( document ).on( 'change', 'input#remove-duplicates', function() {
-			if ( $(this).is(':checked') ) {
-				$('input#feedzy_mark_duplicate').attr( 'disabled', false );
+		$(document).on('change', 'input#remove-duplicates', function () {
+			if ($(this).is(':checked')) {
+				$('input#feedzy_mark_duplicate').attr('disabled', false);
 			} else {
-				$('input#feedzy_mark_duplicate').attr( 'disabled', true );
+				$('input#feedzy_mark_duplicate').attr('disabled', true);
 			}
-		} );
-
-		$(document).on( 'input', 'input[name="custom_vars_value[]"]', function () {
-			$(this)
-			.next('.fz-action-icon')
-			.toggleClass( 'disabled', $(this).val() === '' );
+		});
 
-			$(this)
-			.parent( '.fz-form-group' )
-			.find( 'input:hidden' )
-			.attr( 'disabled', $(this).val() === '' );
-		} );
+		$(document).on(
+			'input',
+			'input[name="custom_vars_value[]"]',
+			function () {
+				$(this)
+					.next('.fz-action-icon')
+					.toggleClass('disabled', $(this).val() === '');
+
+				$(this)
+					.parent('.fz-form-group')
+					.find('input:hidden')
+					.attr('disabled', $(this).val() === '');
+			}
+		);
 
-    // Append import button.
-		$( feedzy.i10n.importButton ).insertAfter( $( '.page-title-action', document ) );
-		$( $( '.page-title-action', document ) ).wrapAll( '<div class="fz-header-action"></div>' );
+		// Append import button.
+		$(feedzy.i10n.importButton).insertAfter(
+			$('.page-title-action', document)
+		);
+		$($('.page-title-action', document)).wrapAll(
+			'<div class="fz-header-action"></div>'
+		);
 
 		// Create dialog box
-		$( '#fz_import_export_upsell' ).dialog( {
+		$('#fz_import_export_upsell').dialog({
 			title: '',
 			dialogClass: 'wp-dialog',
 			autoOpen: false,
@@ -695,40 +1026,49 @@
 			resizable: false,
 			closeOnEscape: true,
 			position: {
-				my: "center",
-				at: "center",
-				of: window
+				my: 'center',
+				at: 'center',
+				of: window,
 			},
-			open: function( event, ui ) {
-				$(".ui-dialog-titlebar-close", ui.dialog | ui).hide();
-				$(".ui-dialog-titlebar", ui.dialog | ui).hide();
+			open(event, ui) {
+				$('.ui-dialog-titlebar-close', ui.dialog | ui).hide();
+				$('.ui-dialog-titlebar', ui.dialog | ui).hide();
 			},
-			create: function() {
+			create() {
 				// style fix for WordPress admin
-				$( '.ui-dialog-titlebar-close' ).addClass( 'ui-button' );
+				$('.ui-dialog-titlebar-close').addClass('ui-button');
 			},
-		} );
-
-		$( '.fz-export-import-btn.only-pro, .fz-export-btn-pro' ).on( 'click', function( e ) {
-            e.preventDefault();
-            $( '#fz_import_export_upsell' ).dialog( 'open' );
-        });
-
-        $( '#fz_import_export_upsell' ).on( 'click', '.close-modal', function ( e ) {
-        	e.preventDefault();
-            $( '#fz_import_export_upsell' ).dialog( 'close' );
-        } );
-
-        $(document).on( 'click', '.fz-export-import-btn:not(.only-pro)', function( e ) {
-            e.preventDefault();
-            if ( $('.fz-import-field').length === 0 ) {
-	            var importField = $( '#fz_import_field_section' ).html();
-	            $( importField ).insertAfter( $( this ).parents( 'div.wrap' ).find( '.wp-header-end' ) );
-	        }
-            $('.fz-import-field').toggleClass('hidden');
-        });
-
-		let url = new URL(window.location.href);
+		});
+
+		$('.fz-export-import-btn.only-pro, .fz-export-btn-pro').on(
+			'click',
+			function (e) {
+				e.preventDefault();
+				$('#fz_import_export_upsell').dialog('open');
+			}
+		);
+
+		$('#fz_import_export_upsell').on('click', '.close-modal', function (e) {
+			e.preventDefault();
+			$('#fz_import_export_upsell').dialog('close');
+		});
+
+		$(document).on(
+			'click',
+			'.fz-export-import-btn:not(.only-pro)',
+			function (e) {
+				e.preventDefault();
+				if ($('.fz-import-field').length === 0) {
+					const importField = $('#fz_import_field_section').html();
+					$(importField).insertAfter(
+						$(this).parents('div.wrap').find('.wp-header-end')
+					);
+				}
+				$('.fz-import-field').toggleClass('hidden');
+			}
+		);
+
+		const url = new URL(window.location.href);
 		if (url.searchParams.has('imported')) {
 			url.searchParams.delete('imported');
 			history.replaceState(history.state, '', url.href);
@@ -736,44 +1076,48 @@
 	}
 
 	function initSummary() {
-		$("tr.type-feedzy_imports").each(function (i, e) {
-			var $lastRunData = $(e).find("script.feedzy-last-run-data").html();
+		$('tr.type-feedzy_imports').each(function (i, e) {
+			const $lastRunData = $(e)
+				.find('script.feedzy-last-run-data')
+				.html();
 			$($lastRunData).insertAfter(e);
 		});
 
 		// pop-ups for informational text
-		$(".feedzy-dialog").dialog({
+		$('.feedzy-dialog').dialog({
 			modal: true,
 			autoOpen: false,
 			height: 400,
 			classes: {
-				"ui-dialog-content": "feedzy-dialog-content",
+				'ui-dialog-content': 'feedzy-dialog-content',
 			},
 			width: 500,
-			buttons:[
+			buttons: [
 				{
 					text: feedzy.i10n.okButton,
-					click: function () {
+					click() {
 						$(this).dialog('close');
-					}
-				}
-			]
+					},
+				},
+			],
 		});
 
 		// Error logs popup.
-		$(".feedzy-errors-dialog").dialog({
+		$('.feedzy-errors-dialog').dialog({
 			modal: true,
 			autoOpen: false,
 			height: 400,
 			width: 500,
-			buttons:[
+			buttons: [
 				{
 					text: feedzy.i10n.clearLogButton,
 					class: 'button button-primary feedzy-clear-logs',
-					click: function (event) {
-						var clearButton = $(event.target);
-						var dialogBox = $(this);
-						$('<span class="feedzy-spinner spinner is-active"></span>').insertAfter(clearButton);
+					click(event) {
+						const clearButton = $(event.target);
+						const dialogBox = $(this);
+						$(
+							'<span class="feedzy-spinner spinner is-active"></span>'
+						).insertAfter(clearButton);
 						clearButton.attr('disabled', true);
 						$.post(
 							ajaxurl,
@@ -784,104 +1128,111 @@
 								_action: 'clear_error_logs',
 							},
 							function () {
-								clearButton
-								.next('.feedzy-spinner')
-								.remove();
+								clearButton.next('.feedzy-spinner').remove();
 
 								dialogBox
-								.find('.feedzy-error.feedzy-api-error')
-								.html('<div class="notice notice-success"><p>' + feedzy.i10n.removeErrorLogsMsg + '</p></div>')
+									.find('.feedzy-error.feedzy-api-error')
+									.html(
+										'<div class="notice notice-success fz-notice"><p>' +
+											feedzy.i10n.removeErrorLogsMsg +
+											'</p></div>'
+									);
 							}
 						);
-					}
+					},
 				},
 				{
 					text: feedzy.i10n.okButton,
 					class: 'alignright',
-					click: function () {
+					click() {
 						$(this).dialog('close');
-					}
-				}
-			]
+					},
+				},
+			],
 		});
 
-		$(".feedzy-dialog-open").on("click", function (e) {
+		$('.feedzy-dialog-open').on('click', function (e) {
 			e.preventDefault();
-			var dialog = $(this).attr("data-dialog");
-			$("." + dialog).dialog("open");
+			const dialog = $(this).attr('data-dialog');
+			$('.' + dialog).dialog('open');
 		});
 
 		// run now.
-		$(".feedzy-run-now").on("click", function (e) {
+		$('.feedzy-run-now').on('click', function (e) {
 			e.preventDefault();
-			var button = $(this);
+			const button = $(this);
 			button.val(feedzy.i10n.importing);
 
-			var numberRow = button
-				.parents("tr")
-				.find("~ tr.feedzy-import-status-row:first")
-				.find("td tr:first");
-			numberRow.find("td").hide();
+			const numberRow = button
+				.parents('tr')
+				.find('~ tr.feedzy-import-status-row:first')
+				.find('td tr:first');
+			numberRow.find('td').hide();
 			numberRow
-				.find("td:first")
-				.addClass("feedzy_run_now_msg")
-				.attr("colspan", 5)
+				.find('td:first')
+				.addClass('feedzy_run_now_msg')
+				.attr('colspan', 5)
 				.html(feedzy.i10n.importing)
 				.show();
 
 			$.ajax({
 				url: ajaxurl,
-				method: "post",
+				method: 'post',
 				data: {
 					security: feedzy.ajax.security,
-					id: $(this).attr("data-id"),
-					action: "feedzy",
-					_action: "run_now",
+					id: $(this).attr('data-id'),
+					action: 'feedzy',
+					_action: 'run_now',
 				},
-				success: function (data) {
-					if ( data.data.import_success ) {
-						numberRow.find("td:first").addClass('import_success');
+				success(data) {
+					if (data.data.import_success) {
+						numberRow.find('td:first').addClass('import_success');
 					}
-					numberRow.find("td:first").html(data.data.msg);
+					numberRow.find('td:first').html(data.data.msg);
 				},
-				complete: function () {
+				complete() {
 					button.val(feedzy.i10n.run_now);
 				},
 			});
 		});
 
 		// toggle the errors div to expand/collapse
-		$("td.column-feedzy-last_run .feedzy-api-error").on("click", function () {
-			if ($(this).hasClass("expand")) {
-				$(this).removeClass("expand");
-			} else {
-				$(this).addClass("expand");
+		$('td.column-feedzy-last_run .feedzy-api-error').on(
+			'click',
+			function () {
+				if ($(this).hasClass('expand')) {
+					$(this).removeClass('expand');
+				} else {
+					$(this).addClass('expand');
+				}
 			}
-		});
+		);
 
 		// purge data ajax call
-		$(".feedzy_purge").on("click", function (e) {
+		$('.feedzy_purge').on('click', function (e) {
 			e.preventDefault();
-			var element = $(this);
-			var deleteImportedPosts = confirm(feedzy.i10n.delete_post_message);
+			const element = $(this);
+			const deleteImportedPosts = confirm(
+				feedzy.i10n.delete_post_message
+			);
 			if (!deleteImportedPosts) {
 				return;
 			}
 			showSpinner(element);
 			$.ajax({
 				url: ajaxurl,
-				method: "post",
+				method: 'post',
 				data: {
 					security: feedzy.ajax.security,
-					id: $(this).find("a").attr("data-id"),
-					action: "feedzy",
-					_action: "purge",
-					del_imported_posts: deleteImportedPosts
+					id: $(this).find('a').attr('data-id'),
+					action: 'feedzy',
+					_action: 'purge',
+					del_imported_posts: deleteImportedPosts,
 				},
-				success: function () {
+				success() {
 					location.reload();
 				},
-				complete: function () {
+				complete() {
 					hideSpinner(element);
 				},
 			});
@@ -892,14 +1243,14 @@
 		$('input[name="custom_vars_key[]"]')
 			.autocomplete({
 				minLength: 0,
-				source: function (request, response) {
+				source(request, response) {
 					jQuery.post(
 						ajaxurl,
 						{
 							security: feedzy.ajax.security,
-							action: "feedzy",
-							_action: "fetch_custom_fields",
-							post_type: $("#feedzy_post_type").val(),
+							action: 'feedzy',
+							_action: 'fetch_custom_fields',
+							post_type: $('#feedzy_post_type').val(),
 							search_key: request.term,
 						},
 						function (res) {
@@ -909,155 +1260,262 @@
 								response([
 									{
 										label: res.data.not_found_msg,
-										value: "not_found_msg",
+										value: 'not_found_msg',
 									},
 								]);
 							}
 						}
 					);
 				},
-				select: function (event, ui) {
-					if ("not_found_msg" === ui.item.value) {
+				select(event, ui) {
+					if ('not_found_msg' === ui.item.value) {
 						setTimeout(function () {
-							$(event.target).val("");
+							$(event.target).val('');
 						});
 					}
 				},
-				focus: function () {
-					if ($(this).autocomplete("widget").is(":visible")) {
+				focus() {
+					if ($(this).autocomplete('widget').is(':visible')) {
 						return;
 					}
-					$(this).autocomplete("search", $(this).val());
+					$(this).autocomplete('search', $(this).val());
 				},
 			})
-			.on("click", function () {
+			.on('click', function () {
 				$(this).keydown();
 			});
 	}
 
 	function showSpinner(el) {
-		el.parent().find(".feedzy-spinner").addClass("is-active");
+		el.parent().find('.feedzy-spinner').addClass('is-active');
 	}
 	function hideSpinner(el) {
-		el.parent().find(".feedzy-spinner").removeClass("is-active");
+		el.parent().find('.feedzy-spinner').removeClass('is-active');
 	}
 
 	function feedzyAccordion() {
 		$(
-			".feedzy-accordion .feedzy-accordion-item .feedzy-accordion-item__button"
-		).on("click", function () {
-			var current_item = $(this).parents();
+			'.feedzy-accordion .feedzy-accordion-item .feedzy-accordion-item__button'
+		).on('click', function () {
+			const current_item = $(this).parents();
 			$(
-				".feedzy-accordion .feedzy-accordion-item .feedzy-accordion-item__content"
+				'.feedzy-accordion .feedzy-accordion-item .feedzy-accordion-item__content'
 			).each(function (i, el) {
 				if ($(el).parent().is(current_item)) {
-					$(el).prev().toggleClass("is-active");
+					$(el).prev().toggleClass('is-active');
 					$(el).slideToggle();
-					$(this).toggleClass("is-active");
+					$(this).toggleClass('is-active');
 				} else {
-					$(el).prev().removeClass("is-active");
+					$(el).prev().removeClass('is-active');
 					$(el).slideUp();
-					$(this).removeClass("is-active");
+					$(this).removeClass('is-active');
 				}
 			});
-			if ( $('#fz-import-map-content').hasClass('is-active') ) {
+			if ($('#fz-import-map-content').hasClass('is-active')) {
 				$('#feedzy_post_type').trigger('change');
 			}
 		});
-		$(".feedzy-accordion .feedzy-accordion-item .feedzy-accordion-item__button")
+		$(
+			'.feedzy-accordion .feedzy-accordion-item .feedzy-accordion-item__button'
+		)
 			.first()
 			.parent()
-			.addClass("is-active");
+			.addClass('is-active');
 		$(
-			".feedzy-accordion .feedzy-accordion-item > .feedzy-accordion-item__content"
+			'.feedzy-accordion .feedzy-accordion-item > .feedzy-accordion-item__content'
 		)
 			.first()
 			.show()
-			.addClass("is-active");
+			.addClass('is-active');
 	}
 
 	function feedzyTab() {
-		$(".fz-tabs-menu a").click(function () {
-			$(".fz-tabs-menu a").removeClass("active");
-			$(this).addClass("active");
-			var tagid = $(this).data("id");
-			$(".fz-tab-content").hide();
-			$("#" + tagid).show();
+		$('.fz-tabs-menu a').click(function () {
+			$(this).parents('.fz-tabs-menu').find('a').removeClass('active');
+			$(this).addClass('active');
+			const tagid = $(this).data('id');
+			$(this)
+				.parents('.feedzy-accordion-item__content')
+				.find('.fz-tabs-content .fz-tab-content')
+				.hide();
+			$('#' + tagid).show();
+		});
+		$('.fz-tabs-content .fz-tab-content').hide();
+		$('.fz-tabs-menu').each(function () {
+			$(this).find('a').first().addClass('active');
+		});
+		$('.fz-tabs-content').each(function () {
+			$(this).find('.fz-tab-content').first().show();
 		});
-		$(".fz-tabs-content .fz-tab-content").hide();
-		$(".fz-tabs-menu a").first().addClass("active");
-		$(".fz-tabs-content .fz-tab-content").first().show();
 	}
 
 	function feedzyMediaUploader() {
 		// on upload button click
-		$( 'body' ).on( 'click', '.feedzy-open-media', function( e ) {
+		$('body').on('click', '.feedzy-open-media', function (e) {
 			e.preventDefault();
-			var button = $( this ),
-			wp_media_uploader = wp.media( {
+			const button = $(this);
+			const wpMediaUploader = wp.media({
 				title: feedzy.i10n.media_iframe_title,
-				library : {
-					type : 'image'
+				library: {
+					type: 'image',
 				},
 				button: {
-					text: feedzy.i10n.media_iframe_button
+					text: feedzy.i10n.media_iframe_button,
 				},
-				multiple: true
-			} ).on( 'select', function() { // it also has "open" and "close" events
-				var selectedAttachments = wp_media_uploader.state().get( 'selection' );
-				var countSelected = selectedAttachments?.toJSON()?.length;
-				button.parents( '.fz-form-group' ).find( '.feedzy-media-preview' ).remove();
+				multiple: true,
+			});
+
+			wpMediaUploader.on('select', function () {
+				// it also has "open" and "close" events
+				const selectedAttachments = wpMediaUploader
+					.state()
+					.get('selection');
+				const countSelected = selectedAttachments?.toJSON()?.length;
+				button
+					.parents('.fz-form-group')
+					.find('.feedzy-media-preview')
+					.remove();
 				// Display image preview when a single image is selected.
-				if ( 1 === countSelected ) {
-					var attachment = selectedAttachments.first().toJSON();
-					var attachmentUrl = attachment.url;
-					if ( attachment.sizes.thumbnail ) {
+				if (1 === countSelected) {
+					const attachment = selectedAttachments.first().toJSON();
+					let attachmentUrl = attachment.url;
+					if (attachment.sizes?.thumbnail) {
 						attachmentUrl = attachment.sizes.thumbnail.url;
 					}
-					if ( $( '.feedzy-media-preview' ).length ) {
-						$( '.feedzy-media-preview' ).find( 'img' ).attr( 'src', attachmentUrl );
+					if ($('.feedzy-media-preview').length) {
+						$('.feedzy-media-preview')
+							.find('img')
+							.attr('src', attachmentUrl);
 					} else {
-						$( '<div class="fz-form-group mb-20 feedzy-media-preview"><img src="' + attachmentUrl + '"></div>' ).insertBefore( button.parent() );
+						$(
+							'<div class="fz-form-group mb-20 feedzy-media-preview"><img src="' +
+								attachmentUrl +
+								'"></div>'
+						).insertBefore(button.parent());
 					}
 				} else {
-					$( '<div class="fz-form-group mb-20 feedzy-media-preview"><a href="javascript:;" class="btn btn-outline-primary feedzy-images-selected">' + feedzy.i10n.action_btn_text_3.replace( '%d', countSelected ) + '</a></div>' ).insertBefore( button.parent() );
+					$(
+						'<div class="fz-form-group mb-20 feedzy-media-preview fz-fallback-images">' +
+							selectedAttachments
+								?.toJSON()
+								?.map(({ url, sizes }) => {
+									if (sizes?.thumbnail) {
+										url = sizes.thumbnail.url;
+									}
+									return `<img width="150" height="150" src="${url}" class="attachment-thumbnail size-thumbnail" alt="" decoding="async" loading="lazy">`;
+								})
+								.join('') +
+							'</div>'
+					).insertBefore(button.parent());
 				}
 				// Get all selected attachment ids.
-				var ids = selectedAttachments.map( function( attachment ) {
-					return attachment.id;
-				} ).join( ',' );
-
-				button.parent().find( '.feedzy-remove-media' ).addClass( 'is-show' );
-				button.parent().find( 'input:hidden' ).val( ids ).trigger( 'change' );
-				$( '.feedzy-open-media' ).html( feedzy.i10n.action_btn_text_2 );
-			} );
-
-			wp_media_uploader.on(' open', function() {
-				var selectedVal = button.parent().find( 'input:hidden' ).val();
-				if ( '' === selectedVal ) {
+				const ids = selectedAttachments
+					.map(function (attachment) {
+						return attachment.id;
+					})
+					.join(',');
+
+				button
+					.parent()
+					.find('.feedzy-remove-media')
+					.addClass('is-show');
+				button.parent().find('input:hidden').val(ids).trigger('change');
+				$('.feedzy-open-media').html(feedzy.i10n.action_btn_text_2);
+			});
+
+			wpMediaUploader.on(' open', function () {
+				const selectedVal = button.parent().find('input:hidden').val();
+				if ('' === selectedVal) {
 					return;
 				}
-				var selection = wp_media_uploader.state().get('selection');
+				const selection = wpMediaUploader.state().get('selection');
 
-				selectedVal.split(',').forEach(function( id ) {
-					var attachment = wp.media.attachment( id );
+				selectedVal.split(',').forEach(function (id) {
+					const attachment = wp.media.attachment(id);
 					attachment.fetch();
 					selection.add(attachment ? [attachment] : []);
 				});
-			} );
+			});
 
-			wp_media_uploader.open();
+			wpMediaUploader.open();
 		});
 
-		$(document).on( 'click', '.feedzy-images-selected', function( e ) {
+		$(document).on('click', '.feedzy-images-selected', function (e) {
 			$(this)
-			.parents( '.fz-form-group' )
-			.find( '.feedzy-open-media' )
-			.trigger( 'click' );
+				.parents('.fz-form-group')
+				.find('.feedzy-open-media')
+				.trigger('click');
 			e.preventDefault();
-		} );
+		});
+	}
+
+	function initFallbackImageOptions() {
+		$('#use-inherited-thumbnail').on('change', function () {
+			if ($(this).is(':checked')) {
+				$('#custom-fallback-image-section').hide();
+				$('#inherited-fallback-image-section').show();
+				$('#feed-post-default-thumbnail').val('');
+			} else {
+				$('#custom-fallback-image-section').show();
+				$('#inherited-fallback-image-section').hide();
+			}
+		});
+
+		$('.feedzy-remove-media').on('click', function () {
+			if (
+				$('#use-inherited-thumbnail').length &&
+				$('#use-inherited-thumbnail').is(':checked')
+			) {
+				return false;
+			}
+		});
+
+		$('input[name="feedzy_meta_data[fallback_image_option]"]').on(
+			'change',
+			function () {
+				const selectedValue = $(this).val();
+				const thumbnailValue = $(
+					'input[name="feedzy_meta_data[default_thumbnail_id]"]'
+				).val();
+				const hasImagePreview =
+					$('#custom-fallback-section .feedzy-media-preview').length >
+					0;
+				const hasThumbnails =
+					(thumbnailValue &&
+						thumbnailValue !== '' &&
+						thumbnailValue !== '0') ||
+					hasImagePreview;
+
+				if (selectedValue === 'custom') {
+					$('#custom-fallback-section').show();
+					$('#general-fallback-preview').hide();
+
+					if (hasThumbnails) {
+						$('.feedzy-open-media').html(
+							feedzy.i10n.action_btn_text_2
+						);
+						$('.feedzy-remove-media').addClass('is-show');
+					} else {
+						$('.feedzy-open-media').html(
+							feedzy.i10n.action_btn_text_1
+						);
+						$('.feedzy-remove-media').removeClass('is-show');
+					}
+				} else if (selectedValue === 'general') {
+					$('#custom-fallback-section').hide();
+					$('#general-fallback-preview').show();
+					$(
+						'input[name="feedzy_meta_data[default_thumbnail_id]"]'
+					).val('');
+				}
+			}
+		);
+
+		$(
+			'input[name="feedzy_meta_data[fallback_image_option]"]:checked'
+		).trigger('change');
 	}
-}(jQuery, feedzy));
+})(jQuery, feedzy);
 
 /**
  * Initialize the remove fallback image button from General Feed Settings tab.
@@ -1072,7 +1530,10 @@ function initRemoveFallbackImageBtn() {
 		removeFallbackImage.classList.remove('is-show');
 
 		// Reset the input.
-		document.querySelector('input[name="feedzy_meta_data[default_thumbnail_id]"]').value = '0';
-		document.querySelector('.feedzy-open-media').innerHTML = feedzy.i10n.action_btn_text_1;
+		document.querySelector(
+			'input[name="feedzy_meta_data[default_thumbnail_id]"]'
+		).value = '0';
+		document.querySelector('.feedzy-open-media').innerHTML =
+			feedzy.i10n.action_btn_text_1;
 	});
 }
diff --git a/includes/views/openai-view.php b/includes/views/openai-view.php
index 66b649d0..3095f15b 100644
--- a/includes/views/openai-view.php
+++ b/includes/views/openai-view.php
@@ -1,10 +1,13 @@
+<?php
+$content = ! apply_filters( 'feedzy_is_license_of_type', false, 'business' ) ? __( 'Your current plan does not include support for this feature.', 'feedzy-rss-feeds' ) . ' ' : __( 'You are using Feedzy Lite.', 'feedzy-rss-feeds' ) . ' ';
+?>
+
 <div class="fz-form-wrap">
 	<div class="form-block">
 		<div class="upgrade-alert mb-24">
 			<?php
 				$upgrade_url = tsdk_translate_link( tsdk_utmify( FEEDZY_UPSELL_LINK, 'openai' ) );
 
-				$content = __( 'You are using Feedzy Lite.', 'feedzy-rss-feeds' ) . ' ';
 				// translators: %1$s: opening anchor tag, %2$s: closing anchor tag.
 				$content .= wp_sprintf( __( 'Unlock more powerful features, by %1$s upgrading to Feedzy Pro %2$s', 'feedzy-rss-feeds' ), '<a href="' . esc_url( $upgrade_url ) . '" target="_blank">', '</a>' );
 				echo wp_kses_post( $content );
diff --git a/includes/views/openrouter-view.php b/includes/views/openrouter-view.php
index 3f6cc061..27a0d233 100644
--- a/includes/views/openrouter-view.php
+++ b/includes/views/openrouter-view.php
@@ -1,10 +1,13 @@
+<?php
+$content = ! apply_filters( 'feedzy_is_license_of_type', false, 'business' ) ? __( 'Your current plan does not include support for this feature.', 'feedzy-rss-feeds' ) . ' ' : __( 'You are using Feedzy Lite.', 'feedzy-rss-feeds' ) . ' ';
+?>
+
 <div class="fz-form-wrap">
 	<div class="form-block">
 		<div class="upgrade-alert mb-24">
 			<?php
 				$upgrade_url = tsdk_translate_link( tsdk_utmify( FEEDZY_UPSELL_LINK, 'openrouter' ) );
 
-				$content = __( 'You are using Feedzy Lite.', 'feedzy-rss-feeds' ) . ' ';
 				// translators: %1$s: opening anchor tag, %2$s: closing anchor tag.
 				$content .= wp_sprintf( __( 'Unlock more powerful features, by %1$s upgrading to Feedzy Pro %2$s', 'feedzy-rss-feeds' ), '<a href="' . esc_url( $upgrade_url ) . '" target="_blank">', '</a>' );
 				echo wp_kses_post( $content );
diff --git a/includes/views/spinnerchief-view.php b/includes/views/spinnerchief-view.php
index feba644d..a289d36e 100644
--- a/includes/views/spinnerchief-view.php
+++ b/includes/views/spinnerchief-view.php
@@ -1,16 +1,17 @@
+<?php
+$content = ! apply_filters( 'feedzy_is_license_of_type', false, 'business' ) ? __( 'Your current plan does not include support for this feature.', 'feedzy-rss-feeds' ) . ' ' : __( 'You are using Feedzy Lite.', 'feedzy-rss-feeds' ) . ' ';
+?>
+
 <div class="fz-form-wrap">
 	<div class="form-block">
 		<div class="upgrade-alert mb-24">
 			<?php
-				echo wp_kses_post(
-					__( 'You\'re using Feedzy Lite.', 'feedzy-rss-feeds' ) . ' ' . wp_sprintf(
-						// translators: %1$s: opening anchor tag, %2$s: closing anchor tag.
-						__( 'Unlock more powerful features, by %1$s upgrading to Feedzy Pro %2$s', 'feedzy-rss-feeds' ),
-						'<a target="_blank" href="' . esc_url( tsdk_translate_link( tsdk_utmify( FEEDZY_UPSELL_LINK, 'spinnerchief' ) ) ) . '">',
-						'</a>'
-					)
-				);
-				?>
+				$upgrade_url = tsdk_translate_link( tsdk_utmify( FEEDZY_UPSELL_LINK, 'spinnerchief' ) );
+
+				// translators: %1$s: opening anchor tag, %2$s: closing anchor tag.
+				$content .= wp_sprintf( __( 'Unlock more powerful features, by %1$s upgrading to Feedzy Pro %2$s', 'feedzy-rss-feeds' ), '<a href="' . esc_url( $upgrade_url ) . '" target="_blank">', '</a>' );
+				echo wp_kses_post( $content );
+			?>
 		</div>
 		<div class="locked-form-block">
 			<div class="fz-form-group">
diff --git a/includes/views/wordai-view.php b/includes/views/wordai-view.php
index 9c651130..8cdf146b 100644
--- a/includes/views/wordai-view.php
+++ b/includes/views/wordai-view.php
@@ -1,10 +1,13 @@
+<?php
+$content = ! apply_filters( 'feedzy_is_license_of_type', false, 'business' ) ? __( 'Your current plan does not include support for this feature.', 'feedzy-rss-feeds' ) . ' ' : __( 'You are using Feedzy Lite.', 'feedzy-rss-feeds' ) . ' ';
+?>
+
 <div class="fz-form-wrap">
 	<div class="form-block">
 		<div class="upgrade-alert mb-24">
 			<?php
 				$upgrade_url = tsdk_translate_link( tsdk_utmify( FEEDZY_UPSELL_LINK, 'wordai' ) );
 
-				$content = __( 'You are using Feedzy Lite.', 'feedzy-rss-feeds' ) . ' ';
 				// translators: %1$s: opening anchor tag, %2$s: closing anchor tag.
 				$content .= wp_sprintf( __( 'Unlock more powerful features, by %1$s upgrading to Feedzy Pro %2$s', 'feedzy-rss-feeds' ), '<a href="' . esc_url( $upgrade_url ) . '" target="_blank">', '</a>' );
 
diff --git a/js/ActionPopup/RewriteActionItem.js b/js/ActionPopup/RewriteActionItem.js
new file mode 100644
index 00000000..db55c074
--- /dev/null
+++ b/js/ActionPopup/RewriteActionItem.js
@@ -0,0 +1,343 @@
+import { __, sprintf } from '@wordpress/i18n';
+import { unescape } from 'lodash';
+import { Icon, dragHandle, external } from '@wordpress/icons';
+
+import {
+	Button,
+	ExternalLink,
+	PanelBody,
+	PanelRow,
+	BaseControl,
+	TextareaControl,
+	SelectControl,
+	Notice,
+} from '@wordpress/components';
+
+import { sortableHandle } from 'react-sortable-hoc';
+
+const DragHandle = sortableHandle(() => (
+	<Icon icon={dragHandle} size={18} className="components-panel__icon" />
+));
+
+const UpgradeNotice = ({ higherPlanNotice, utmCampaign }) => {
+	const upsellLink = `https://themeisle.com/plugins/feedzy-rss-feeds/upgrade/?utm_source=wpadmin&utm_medium=import&utm_campaign=${utmCampaign}&utm_content=feedzy-rss-feeds`;
+	if (window.feedzyData.isPro) {
+		if (higherPlanNotice) {
+			return (
+				<>
+					<div className="fz-notice-wrap">
+						<Notice
+							status="info"
+							isDismissible={false}
+							className="fz-upgrade-notice"
+						>
+							<p>
+								<span>PRO</span>{' '}
+								{__(
+									'This action requires an upgrade to a higher plan.',
+									'feedzy-rss-feeds'
+								)}
+							</p>{' '}
+							<ExternalLink href={upsellLink}>
+								{__(
+									'Upgrade to Feedzy PRO',
+									'feedzy-rss-feeds'
+								)}
+							</ExternalLink>
+						</Notice>
+					</div>
+				</>
+			);
+		}
+		return <></>;
+	}
+	return (
+		<>
+			<div className="fz-notice-wrap">
+				<Notice
+					status="info"
+					isDismissible={false}
+					className="fz-upgrade-notice"
+				>
+					<p>
+						<span>PRO</span>{' '}
+						{__(
+							'This action is a Premium feature.',
+							'feedzy-rss-feeds'
+						)}
+					</p>{' '}
+					<ExternalLink href={upsellLink}>
+						{__('Upgrade to Feedzy PRO', 'feedzy-rss-feeds')}
+					</ExternalLink>
+				</Notice>
+			</div>
+		</>
+	);
+};
+
+const ErrorMessage = ({ provider, isHighPrivileges }) => {
+	if (isHighPrivileges) {
+		return (
+			<span className="error-message">
+				{__('Invalid API Key', 'feedzy-rss-feeds')}{' '}
+				<ExternalLink
+					href={`admin.php?page=feedzy-integration&tab=${provider}`}
+				>
+					<Icon icon={external} size={16} fill="#F00" />
+				</ExternalLink>
+			</span>
+		);
+	}
+
+	return (
+		<span className="error-message">
+			{__(
+				'Invalid API Key, Please contact the administrator',
+				'feedzy-rss-feeds'
+			)}
+		</span>
+	);
+};
+
+const ProviderSelect = ({ selectedProvider, loopIndex, propRef, isPro }) => (
+	<BaseControl __nextHasNoMarginBottom className="mb-20">
+		<SelectControl
+			__nextHasNoMarginBottom
+			label={__('Choose an AI Provider', 'feedzy-rss-feeds')}
+			value={selectedProvider}
+			options={[
+				{ label: __('OpenAI', 'feedzy-rss-feeds'), value: 'openai' },
+				{
+					label: __('OpenRouter', 'feedzy-rss-feeds'),
+					value: 'openrouter',
+				},
+			]}
+			onChange={(currentValue) => {
+				propRef.onChangeHandler({
+					index: loopIndex,
+					aiProvider: currentValue ?? '',
+					aiModel: '',
+				});
+			}}
+			disabled={!isPro}
+		/>
+	</BaseControl>
+);
+
+const ModelSelect = ({
+	selectedProvider,
+	selectedAIModel,
+	defaultModel,
+	loopIndex,
+	propRef,
+	isPro,
+	providerLicenseStatus,
+}) => {
+	if (selectedProvider !== 'openai') {
+		return null;
+	}
+
+	return (
+		<BaseControl __nextHasNoMarginBottom className="mb-20">
+			<SelectControl
+				__nextHasNoMarginBottom
+				label={__('Choose Model', 'feedzy-rss-feeds')}
+				value={selectedAIModel}
+				onChange={(currentValue) => {
+					propRef.onChangeHandler({
+						index: loopIndex,
+						aiModel:
+							currentValue !== defaultModel ? currentValue : '',
+					});
+				}}
+				disabled={!isPro || !providerLicenseStatus}
+			>
+				{window.feedzyData.activeOpenAIModels.length > 0 && (
+					<optgroup label={__('Latest models', 'feedzy-rss-feeds')}>
+						{window.feedzyData.activeOpenAIModels.map((model) => (
+							<option key={model} value={model}>
+								{model}
+							</option>
+						))}
+					</optgroup>
+				)}
+				{window.feedzyData.deprecatedOpenAIModels.length > 0 && (
+					<optgroup
+						label={__('Deprecated models', 'feedzy-rss-feeds')}
+					>
+						{window.feedzyData.deprecatedOpenAIModels.map(
+							(model) => (
+								<option key={model} value={model}>
+									{model}
+								</option>
+							)
+						)}
+					</optgroup>
+				)}
+			</SelectControl>
+		</BaseControl>
+	);
+};
+
+const PromptControls = ({
+	item,
+	loopIndex,
+	propRef,
+	isPro,
+	providerLicenseStatus,
+	selectedProvider,
+}) => (
+	<BaseControl __nextHasNoMarginBottom>
+		<TextareaControl
+			__nextHasNoMarginBottom
+			label={__('Main Prompt', 'feedzy-rss-feeds')}
+			help={sprintf(
+				// translators: %1$s is the tag content: {content}
+				__(
+					'You can use %1$s in the textarea such as: "Rephrase my %1$s for better SEO."',
+					'feedzy-rss-feeds'
+				),
+				'{content}'
+			)}
+			value={
+				item.data.ChatGPT
+					? unescape(item.data.ChatGPT.replaceAll('&#039;', "'"))
+					: ''
+			}
+			onChange={(currentValue) =>
+				propRef.onChangeHandler({
+					index: loopIndex,
+					ChatGPT: currentValue ?? '',
+					aiProvider: selectedProvider,
+				})
+			}
+			disabled={!isPro || !providerLicenseStatus}
+		/>
+		<div className="fz-prompt-button">
+			{['summarize', 'paraphase', 'change_tone'].map((type) => (
+				<Button
+					key={type}
+					variant="secondary"
+					onClick={() =>
+						propRef.updatePromptText({ index: loopIndex, type })
+					}
+					disabled={!isPro || !providerLicenseStatus}
+				>
+					{type === 'summarize' &&
+						__('Summarize', 'feedzy-rss-feeds')}
+					{type === 'paraphase' &&
+						__('Paraphrase', 'feedzy-rss-feeds')}
+					{type === 'change_tone' &&
+						__('Change tone', 'feedzy-rss-feeds')}
+				</Button>
+			))}
+		</div>
+	</BaseControl>
+);
+
+const RewriteActionItem = ({ counter, item, loopIndex, propRef }) => {
+	const {
+		isPro,
+		isBusinessPlan,
+		isAgencyPlan,
+		isHighPrivileges,
+		apiLicenseStatus,
+	} = window.feedzyData;
+
+	let defaultProvider;
+	if (apiLicenseStatus.openaiStatus) {
+		defaultProvider = 'openai';
+	} else if (apiLicenseStatus.openRouterStatus) {
+		defaultProvider = 'openrouter';
+	} else {
+		defaultProvider = 'openai';
+	}
+
+	const selectedProvider = item.data.aiProvider || defaultProvider;
+	const providerLicenseStatus =
+		selectedProvider === 'openai'
+			? apiLicenseStatus.openaiStatus
+			: apiLicenseStatus.openRouterStatus;
+
+	const defaultModel =
+		selectedProvider === 'openai'
+			? window.feedzyData?.integrations?.openAIModel
+			: '';
+	const selectedAIModel = item.data.aiModel || defaultModel;
+
+	const showError =
+		isPro && (isBusinessPlan || isAgencyPlan) && !providerLicenseStatus;
+	const showUpgradeNotice = !isBusinessPlan && !isAgencyPlan;
+
+	return (
+		<li
+			className="fz-action-control fz-chat-cpt-action"
+			data-counter={counter}
+		>
+			<div className="fz-action-event">
+				{showError && (
+					<ErrorMessage
+						provider={selectedProvider}
+						isHighPrivileges={isHighPrivileges}
+					/>
+				)}
+				<PanelBody
+					title={__('Rewrite with AI', 'feedzy-rss-feeds')}
+					icon={DragHandle}
+					initialOpen={false}
+				>
+					<PanelRow>
+						<UpgradeNotice
+							higherPlanNotice={showUpgradeNotice}
+							utmCampaign="action-paraphrase-chatgpt"
+						/>
+						<ProviderSelect
+							selectedProvider={selectedProvider}
+							loopIndex={loopIndex}
+							propRef={propRef}
+							isPro={isPro}
+						/>
+						<ModelSelect
+							selectedProvider={selectedProvider}
+							selectedAIModel={selectedAIModel}
+							defaultModel={defaultModel}
+							loopIndex={loopIndex}
+							propRef={propRef}
+							isPro={isPro}
+							providerLicenseStatus={providerLicenseStatus}
+						/>
+						<PromptControls
+							item={item}
+							loopIndex={loopIndex}
+							propRef={propRef}
+							isPro={isPro}
+							providerLicenseStatus={providerLicenseStatus}
+							selectedProvider={selectedProvider}
+						/>
+					</PanelRow>
+				</PanelBody>
+			</div>
+			<div className="fz-trash-action">
+				<button
+					type="button"
+					onClick={() => propRef.removeCallback(loopIndex)}
+				>
+					<svg
+						xmlns="http://www.w3.org/2000/svg"
+						width="24"
+						height="24"
+						viewBox="0 0 24 24"
+						fill="none"
+					>
+						<path
+							d="M20 5.0002H14.3C14.3 3.7002 13.3 2.7002 12 2.7002C10.7 2.7002 9.7 3.7002 9.7 5.0002H4V7.0002H5.5V7.3002L7.2 18.4002C7.3 19.4002 8.2 20.1002 9.2 20.1002H14.9C15.9 20.1002 16.7 19.4002 16.9 18.4002L18.6 7.3002V7.0002H20V5.0002ZM16.8 7.0002L15.1 18.1002C15.1 18.2002 15 18.3002 14.8 18.3002H9.1C9 18.3002 8.8 18.2002 8.8 18.1002L7.2 7.0002H16.8Z"
+							fill="black"
+						/>
+					</svg>
+				</button>
+			</div>
+		</li>
+	);
+};
+
+export default RewriteActionItem;
diff --git a/js/ActionPopup/SortableItem.js b/js/ActionPopup/SortableItem.js
index 8dbe2bdb..19c2278b 100644
--- a/js/ActionPopup/SortableItem.js
+++ b/js/ActionPopup/SortableItem.js
@@ -8,7 +8,7 @@ import {
 	close,
 	plus,
 	trash,
-	external
+	external,
 } from '@wordpress/icons';
 
 import {
@@ -26,45 +26,95 @@ import {
 	ItemGroup,
 	Item,
 	ToggleControl,
-	SelectControl
+	SelectControl,
 } from '@wordpress/components';
 
-const DragHandle = sortableHandle(() => <Icon icon={dragHandle} size={18} className="components-panel__icon" />);
+import RewriteActionItem from './RewriteActionItem';
 
-const UpgradeNotice = ({higherPlanNotice, utmCampaign}) => {
+const DragHandle = sortableHandle(() => (
+	<Icon icon={dragHandle} size={18} className="components-panel__icon" />
+));
+
+const UpgradeNotice = ({ higherPlanNotice, utmCampaign }) => {
 	const upsellLink = `https://themeisle.com/plugins/feedzy-rss-feeds/upgrade/?utm_source=wpadmin&utm_medium=import&utm_campaign=${utmCampaign}&utm_content=feedzy-rss-feeds`;
-	if ( feedzyData.isPro ) {
-		if ( higherPlanNotice ) {
-			return(
+	if (feedzyData.isPro) {
+		if (higherPlanNotice) {
+			return (
 				<>
-				<div className="fz-notice-wrap">
-					<Notice status="info" isDismissible={false} className="fz-upgrade-notice"><p><span>PRO</span> {__('This action requires an upgrade to a higher plan.', 'feedzy-rss-feeds')}</p> <ExternalLink href={upsellLink}>{ __( 'Upgrade Feedzy PRO Plan', 'feedzy-rss-feeds' ) }</ExternalLink></Notice>
-				</div>
+					<div className="fz-notice-wrap">
+						<Notice
+							status="info"
+							isDismissible={false}
+							className="fz-upgrade-notice"
+						>
+							<p>
+								<span>PRO</span>{' '}
+								{__(
+									'This action requires an upgrade to a higher plan.',
+									'feedzy-rss-feeds'
+								)}
+							</p>{' '}
+							<ExternalLink href={upsellLink}>
+								{__(
+									'Upgrade Feedzy PRO Plan',
+									'feedzy-rss-feeds'
+								)}
+							</ExternalLink>
+						</Notice>
+					</div>
 				</>
-				);
+			);
 		}
-		return(
-			<></>
-		);
+		return <></>;
 	}
-	return(
+	return (
 		<>
-		<div className="fz-notice-wrap">
-			<Notice status="info" isDismissible={false} className="fz-upgrade-notice"><p><span>PRO</span> {__('This action is a Premium feature.', 'feedzy-rss-feeds')}</p> <ExternalLink href={upsellLink}>{ __( 'Upgrade to Feedzy PRO', 'feedzy-rss-feeds' ) }</ExternalLink></Notice>
-		</div>
+			<div className="fz-notice-wrap">
+				<Notice
+					status="info"
+					isDismissible={false}
+					className="fz-upgrade-notice"
+				>
+					<p>
+						<span>PRO</span>{' '}
+						{__(
+							'This action is a Premium feature.',
+							'feedzy-rss-feeds'
+						)}
+					</p>{' '}
+					<ExternalLink href={upsellLink}>
+						{__('Upgrade to Feedzy PRO', 'feedzy-rss-feeds')}
+					</ExternalLink>
+				</Notice>
+			</div>
 		</>
 	);
 };
 
 const CreditNotice = () => {
-	return(
+	return (
 		<>
-		<div className="fz-notice-wrap">
-			<Notice status="warning" isDismissible={false} className="fz-credit-notice"><p><span></span> {__( 'You need more credits to use this actions!', 'feedzy-rss-feeds' )}</p><ExternalLink href="https://themeisle.com/plugins/feedzy-rss-feeds/upgrade/?utm_source=wpadmin&utm_medium=import&utm_campaign=upsell-content&utm_content=feedzy-rss-feeds">{ __( 'Buy Credits', 'feedzy-rss-feeds' ) }</ExternalLink></Notice>
-		</div>
+			<div className="fz-notice-wrap">
+				<Notice
+					status="warning"
+					isDismissible={false}
+					className="fz-credit-notice"
+				>
+					<p>
+						<span></span>{' '}
+						{__(
+							'You need more credits to use this actions!',
+							'feedzy-rss-feeds'
+						)}
+					</p>
+					<ExternalLink href="https://themeisle.com/plugins/feedzy-rss-feeds/upgrade/?utm_source=wpadmin&utm_medium=import&utm_campaign=upsell-content&utm_content=feedzy-rss-feeds">
+						{__('Buy Credits', 'feedzy-rss-feeds')}
+					</ExternalLink>
+				</Notice>
+			</div>
 		</>
-	)
-}
+	);
+};
 
 const getCurrentLanguage = () => {
 	// This is for backward compatibility for the previous language control that sit outside the action modal.
@@ -73,33 +123,63 @@ const getCurrentLanguage = () => {
 };
 
 const SortableItem = ({ propRef, loopIndex, item }) => {
-	let counter = loopIndex + 1;
-	if ( 'trim' === item.id ) {
-		return(
+	const counter = loopIndex + 1;
+
+	if ('trim' === item.id) {
+		return (
 			<li className="fz-action-control" data-counter={counter}>
 				<div className="fz-action-event">
-					<PanelBody title={ __( 'Trim Content', 'feedzy-rss-feeds' ) } icon={ DragHandle } initialOpen={ false }>
+					<PanelBody
+						title={__('Trim Content', 'feedzy-rss-feeds')}
+						icon={DragHandle}
+						initialOpen={false}
+					>
 						<PanelRow>
 							<BaseControl>
 								<TextControl
 									type="number"
-									help={ __( 'Define the trimmed content length', 'feedzy-rss-feeds' ) }
-									label={__( 'Enter number of words', 'feedzy-rss-feeds' )}
+									help={__(
+										'Define the trimmed content length',
+										'feedzy-rss-feeds'
+									)}
+									label={__(
+										'Enter number of words',
+										'feedzy-rss-feeds'
+									)}
 									placeholder="45"
-									value={ item.data.trimLength || '' }
+									value={item.data.trimLength || ''}
 									max=""
 									min="1"
 									step="1"
-									onChange={ ( currentValue ) => propRef.onChangeHandler( { 'index': loopIndex, 'trimLength': currentValue ?? '' } ) }
+									onChange={(currentValue) =>
+										propRef.onChangeHandler({
+											index: loopIndex,
+											trimLength: currentValue ?? '',
+										})
+									}
 								/>
 							</BaseControl>
 						</PanelRow>
 					</PanelBody>
 				</div>
 				<div className="fz-trash-action">
-					<button type="button" onClick={() => { propRef.removeCallback(loopIndex) }}>
-						<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
-							<path d="M20 5.0002H14.3C14.3 3.7002 13.3 2.7002 12 2.7002C10.7 2.7002 9.7 3.7002 9.7 5.0002H4V7.0002H5.5V7.3002L7.2 18.4002C7.3 19.4002 8.2 20.1002 9.2 20.1002H14.9C15.9 20.1002 16.7 19.4002 16.9 18.4002L18.6 7.3002V7.0002H20V5.0002ZM16.8 7.0002L15.1 18.1002C15.1 18.2002 15 18.3002 14.8 18.3002H9.1C9 18.3002 8.8 18.2002 8.8 18.1002L7.2 7.0002H16.8Z" fill="black"/>
+					<button
+						type="button"
+						onClick={() => {
+							propRef.removeCallback(loopIndex);
+						}}
+					>
+						<svg
+							xmlns="http://www.w3.org/2000/svg"
+							width="24"
+							height="24"
+							viewBox="0 0 24 24"
+							fill="none"
+						>
+							<path
+								d="M20 5.0002H14.3C14.3 3.7002 13.3 2.7002 12 2.7002C10.7 2.7002 9.7 3.7002 9.7 5.0002H4V7.0002H5.5V7.3002L7.2 18.4002C7.3 19.4002 8.2 20.1002 9.2 20.1002H14.9C15.9 20.1002 16.7 19.4002 16.9 18.4002L18.6 7.3002V7.0002H20V5.0002ZM16.8 7.0002L15.1 18.1002C15.1 18.2002 15 18.3002 14.8 18.3002H9.1C9 18.3002 8.8 18.2002 8.8 18.1002L7.2 7.0002H16.8Z"
+								fill="black"
+							/>
 						</svg>
 					</button>
 				</div>
@@ -107,58 +187,127 @@ const SortableItem = ({ propRef, loopIndex, item }) => {
 		);
 	}
 
-	if ( 'search_replace' === item.id ) {
-		return(
+	if ('search_replace' === item.id) {
+		return (
 			<li className="fz-action-control" data-counter={counter}>
 				<div className="fz-action-event">
-					<PanelBody title={ __( 'Search and Replace', 'feedzy-rss-feeds' ) } icon={ DragHandle } initialOpen={ false }>
+					<PanelBody
+						title={__('Search and Replace', 'feedzy-rss-feeds')}
+						icon={DragHandle}
+						initialOpen={false}
+					>
 						<PanelRow>
 							<BaseControl>
 								<SelectControl
-									label={ __( 'Type', 'feedzy-rss-feeds' ) }
-									value={ item.data.mode || 'text' }
+									label={__('Type', 'feedzy-rss-feeds')}
+									value={item.data.mode || 'text'}
 									options={[
 										{
-											label: __( 'Text', 'feedzy-rss-feeds' ),
+											label: __(
+												'Text',
+												'feedzy-rss-feeds'
+											),
 											value: 'text',
 										},
 										{
-											label: __( 'Regex', 'feedzy-rss-feeds' ),
+											label: __(
+												'Regex',
+												'feedzy-rss-feeds'
+											),
 											value: 'regex',
 										},
 										{
-											label: __( 'Wildcard', 'feedzy-rss-feeds' ),
+											label: __(
+												'Wildcard',
+												'feedzy-rss-feeds'
+											),
 											value: 'wildcard',
-										}
+										},
 									]}
-									onChange={ ( currentValue ) => propRef.onChangeHandler( { 'index': loopIndex, 'mode': currentValue ?? 'text' } ) }
+									onChange={(currentValue) =>
+										propRef.onChangeHandler({
+											index: loopIndex,
+											mode: currentValue ?? 'text',
+										})
+									}
 								/>
 							</BaseControl>
 							<BaseControl>
 								<TextControl
 									type="text"
-									label={__( 'Search', 'feedzy-rss-feeds' )}
-									placeholder={__( 'Enter term or regex', 'feedzy-rss-feeds' )}
-									value={ item.data.search ? unescape(item.data.search.replaceAll('&#039;', '\'')) : '' }
-									onChange={ ( currentValue ) => propRef.onChangeHandler( { 'index': loopIndex, 'search': currentValue ?? '' } ) }
+									label={__('Search', 'feedzy-rss-feeds')}
+									placeholder={__(
+										'Enter term or regex',
+										'feedzy-rss-feeds'
+									)}
+									value={
+										item.data.search
+											? unescape(
+													item.data.search.replaceAll(
+														'&#039;',
+														"'"
+													)
+												)
+											: ''
+									}
+									onChange={(currentValue) =>
+										propRef.onChangeHandler({
+											index: loopIndex,
+											search: currentValue ?? '',
+										})
+									}
 								/>
 							</BaseControl>
 							<BaseControl>
 								<TextControl
 									type="text"
-									label={__( 'Replace with', 'feedzy-rss-feeds' )}
-									placeholder={__( 'Enter term', 'feedzy-rss-feeds' )}
-									value={ item.data.searchWith ? unescape(item.data.searchWith.replaceAll('&#039;', '\'')) : '' }
-									onChange={ ( currentValue ) => propRef.onChangeHandler( { 'index': loopIndex, 'searchWith': currentValue ?? '' } ) }
+									label={__(
+										'Replace with',
+										'feedzy-rss-feeds'
+									)}
+									placeholder={__(
+										'Enter term',
+										'feedzy-rss-feeds'
+									)}
+									value={
+										item.data.searchWith
+											? unescape(
+													item.data.searchWith.replaceAll(
+														'&#039;',
+														"'"
+													)
+												)
+											: ''
+									}
+									onChange={(currentValue) =>
+										propRef.onChangeHandler({
+											index: loopIndex,
+											searchWith: currentValue ?? '',
+										})
+									}
 								/>
 							</BaseControl>
 						</PanelRow>
 					</PanelBody>
 				</div>
 				<div className="fz-trash-action">
-					<button type="button" onClick={() => { propRef.removeCallback(loopIndex) }}>
-						<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
-							<path d="M20 5.0002H14.3C14.3 3.7002 13.3 2.7002 12 2.7002C10.7 2.7002 9.7 3.7002 9.7 5.0002H4V7.0002H5.5V7.3002L7.2 18.4002C7.3 19.4002 8.2 20.1002 9.2 20.1002H14.9C15.9 20.1002 16.7 19.4002 16.9 18.4002L18.6 7.3002V7.0002H20V5.0002ZM16.8 7.0002L15.1 18.1002C15.1 18.2002 15 18.3002 14.8 18.3002H9.1C9 18.3002 8.8 18.2002 8.8 18.1002L7.2 7.0002H16.8Z" fill="black"/>
+					<button
+						type="button"
+						onClick={() => {
+							propRef.removeCallback(loopIndex);
+						}}
+					>
+						<svg
+							xmlns="http://www.w3.org/2000/svg"
+							width="24"
+							height="24"
+							viewBox="0 0 24 24"
+							fill="none"
+						>
+							<path
+								d="M20 5.0002H14.3C14.3 3.7002 13.3 2.7002 12 2.7002C10.7 2.7002 9.7 3.7002 9.7 5.0002H4V7.0002H5.5V7.3002L7.2 18.4002C7.3 19.4002 8.2 20.1002 9.2 20.1002H14.9C15.9 20.1002 16.7 19.4002 16.9 18.4002L18.6 7.3002V7.0002H20V5.0002ZM16.8 7.0002L15.1 18.1002C15.1 18.2002 15 18.3002 14.8 18.3002H9.1C9 18.3002 8.8 18.2002 8.8 18.1002L7.2 7.0002H16.8Z"
+								fill="black"
+							/>
 						</svg>
 					</button>
 				</div>
@@ -166,18 +315,43 @@ const SortableItem = ({ propRef, loopIndex, item }) => {
 		);
 	}
 
-	if ( 'fz_paraphrase' === item.id ) {
-		return(
+	if ('fz_paraphrase' === item.id) {
+		return (
 			<li className="fz-action-control" data-counter={counter}>
 				<div className="fz-action-event">
-					<PanelBody title={ __( 'Paraphrase with Feedzy', 'feedzy-rss-feeds' ) } icon={ DragHandle } initialOpen={ false } className="fz-hide-icon">
-						<UpgradeNotice higherPlanNotice={!feedzyData.isBusinessPlan && !feedzyData.isAgencyPlan} utmCampaign="action-paraphrase-feedzy"/>
+					<PanelBody
+						title={__('Paraphrase with Feedzy', 'feedzy-rss-feeds')}
+						icon={DragHandle}
+						initialOpen={false}
+						className="fz-hide-icon"
+					>
+						<UpgradeNotice
+							higherPlanNotice={
+								!feedzyData.isBusinessPlan &&
+								!feedzyData.isAgencyPlan
+							}
+							utmCampaign="action-paraphrase-feedzy"
+						/>
 					</PanelBody>
 				</div>
 				<div className="fz-trash-action">
-					<button type="button" onClick={() => { propRef.removeCallback(loopIndex) }}>
-						<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
-							<path d="M20 5.0002H14.3C14.3 3.7002 13.3 2.7002 12 2.7002C10.7 2.7002 9.7 3.7002 9.7 5.0002H4V7.0002H5.5V7.3002L7.2 18.4002C7.3 19.4002 8.2 20.1002 9.2 20.1002H14.9C15.9 20.1002 16.7 19.4002 16.9 18.4002L18.6 7.3002V7.0002H20V5.0002ZM16.8 7.0002L15.1 18.1002C15.1 18.2002 15 18.3002 14.8 18.3002H9.1C9 18.3002 8.8 18.2002 8.8 18.1002L7.2 7.0002H16.8Z" fill="black"/>
+					<button
+						type="button"
+						onClick={() => {
+							propRef.removeCallback(loopIndex);
+						}}
+					>
+						<svg
+							xmlns="http://www.w3.org/2000/svg"
+							width="24"
+							height="24"
+							viewBox="0 0 24 24"
+							fill="none"
+						>
+							<path
+								d="M20 5.0002H14.3C14.3 3.7002 13.3 2.7002 12 2.7002C10.7 2.7002 9.7 3.7002 9.7 5.0002H4V7.0002H5.5V7.3002L7.2 18.4002C7.3 19.4002 8.2 20.1002 9.2 20.1002H14.9C15.9 20.1002 16.7 19.4002 16.9 18.4002L18.6 7.3002V7.0002H20V5.0002ZM16.8 7.0002L15.1 18.1002C15.1 18.2002 15 18.3002 14.8 18.3002H9.1C9 18.3002 8.8 18.2002 8.8 18.1002L7.2 7.0002H16.8Z"
+								fill="black"
+							/>
 						</svg>
 					</button>
 				</div>
@@ -185,118 +359,56 @@ const SortableItem = ({ propRef, loopIndex, item }) => {
 		);
 	}
 
-	if ( 'chat_gpt_rewrite' === item.id ) {
-		let defaultProvider = 'openai';
-		let providerLicenseStatus = false;
-		if ( feedzyData.apiLicenseStatus.openaiStatus ) {
-			defaultProvider = 'openai';
-		} else if ( feedzyData.apiLicenseStatus.openRouterStatus ) {
-			defaultProvider = 'openrouter';
-		}
-
-		let selectedProvider = item.data.aiProvider || defaultProvider;
-		if ( 'openai' === selectedProvider ) {
-			providerLicenseStatus = feedzyData.apiLicenseStatus.openaiStatus;
-		} else if ( 'openrouter' === selectedProvider ) {
-			providerLicenseStatus = feedzyData.apiLicenseStatus.openRouterStatus;
-		}
-		return(
-			<li className="fz-action-control fz-chat-cpt-action" data-counter={counter}>
-				<div className="fz-action-event">
-					{feedzyData.isPro && (feedzyData.isBusinessPlan || feedzyData.isAgencyPlan) && !providerLicenseStatus && (feedzyData.isHighPrivileges ? <span className="error-message">{__( 'Invalid API Key', 'feedzy-rss-feeds' )} <ExternalLink href={`admin.php?page=feedzy-integration&tab=${item.data.aiProvider || defaultProvider}`}><Icon icon={external} size={16} fill="#F00"/></ExternalLink></span> : <span className="error-message">{__( 'Invalid API Key, Please contact the administrator', 'feedzy-rss-feeds' )}</span> )}
-					<PanelBody title={ __( 'Rewrite with AI', 'feedzy-rss-feeds' ) } icon={ DragHandle } initialOpen={ false }>
-						<PanelRow>
-							<UpgradeNotice higherPlanNotice={!feedzyData.isBusinessPlan && !feedzyData.isAgencyPlan} utmCampaign="action-paraphrase-chatgpt"/>
-							<BaseControl
-								__nextHasNoMarginBottom
-								className="mb-20"
-							>
-								<SelectControl
-									__nextHasNoMarginBottom
-									label={__('Choose an AI Provider', 'feedzy-rss-feeds')}
-									value={ selectedProvider }
-									options={[
-										{
-											label: __('OpenAI', 'feedzy-rss-feeds'),
-											value: 'openai'
-										},
-										{
-											label: __('OpenRouter', 'feedzy-rss-feeds'),
-											value: 'openrouter'
-										},
-									]}
-									onChange={ ( currentValue ) => propRef.onChangeHandler( { 'index': loopIndex, 'aiProvider': currentValue ?? '' } ) }
-									disabled={!feedzyData.isPro}
-								/>
-							</BaseControl>
-							<BaseControl
-								__nextHasNoMarginBottom
-							>
-								<TextareaControl
-									__nextHasNoMarginBottom
-									label={ __( 'Main Prompt', 'feedzy-rss-feeds' ) }
-									help={
-										sprintf(
-											// translators: %1$s is the tag content: {content}
-											__( 'You can use %1$s in the textarea such as: "Rephrase my %1$s for better SEO."', 'feedzy-rss-feeds' ),
-											'{content}' 
-										)
-									}
-									value={ item.data.ChatGPT ? unescape(item.data.ChatGPT.replaceAll('&#039;', '\'')) : '' }
-									onChange={ ( currentValue ) => propRef.onChangeHandler( { 'index': loopIndex, 'ChatGPT': currentValue ?? '', aiProvider: selectedProvider } ) }
-									disabled={!feedzyData.isPro || !providerLicenseStatus}
-								/>
-								<div className="fz-prompt-button">
-									<Button
-										variant="secondary"
-										onClick={ () => propRef.updatePromptText( { 'index': loopIndex, 'type': 'summarize' } ) }
-										disabled={!feedzyData.isPro || !providerLicenseStatus}
-										>{ __( 'Summarize', 'feedzy-rss-feeds' ) }
-									</Button>
-									<Button
-										variant="secondary"
-										onClick={ () => propRef.updatePromptText( { 'index': loopIndex, 'type': 'paraphase' } ) }
-										disabled={!feedzyData.isPro || !providerLicenseStatus}
-									>{ __( 'Paraphrase', 'feedzy-rss-feeds' ) }
-									</Button>
-									<Button
-										variant="secondary"
-										onClick={ () => propRef.updatePromptText( { 'index': loopIndex, 'type': 'change_tone' } ) }
-										disabled={!feedzyData.isPro || !providerLicenseStatus}
-										>{ __( 'Change tone', 'feedzy-rss-feeds' ) }
-									</Button>
-								</div>
-							</BaseControl>
-						</PanelRow>
-					</PanelBody>
-				</div>
-				<div className="fz-trash-action">
-					<button type="button" onClick={() => { propRef.removeCallback(loopIndex) }}>
-						<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
-							<path d="M20 5.0002H14.3C14.3 3.7002 13.3 2.7002 12 2.7002C10.7 2.7002 9.7 3.7002 9.7 5.0002H4V7.0002H5.5V7.3002L7.2 18.4002C7.3 19.4002 8.2 20.1002 9.2 20.1002H14.9C15.9 20.1002 16.7 19.4002 16.9 18.4002L18.6 7.3002V7.0002H20V5.0002ZM16.8 7.0002L15.1 18.1002C15.1 18.2002 15 18.3002 14.8 18.3002H9.1C9 18.3002 8.8 18.2002 8.8 18.1002L7.2 7.0002H16.8Z" fill="black"/>
-						</svg>
-					</button>
-				</div>
-			</li>
+	if ('chat_gpt_rewrite' === item.id) {
+		return (
+			<RewriteActionItem
+				counter={counter}
+				item={item}
+				loopIndex={loopIndex}
+				propRef={propRef}
+			/>
 		);
 	}
 
-	if ( 'fz_translate' === item.id ) {
-		return(
-			<li className="fz-action-control fz-translate-action" data-counter={counter}>
+	if ('fz_translate' === item.id) {
+		return (
+			<li
+				className="fz-action-control fz-translate-action"
+				data-counter={counter}
+			>
 				<div className="fz-action-event">
-					<PanelBody title={ __( 'Translate with Feedzy', 'feedzy-rss-feeds' ) } icon={ DragHandle } initialOpen={ false } className="fz-hide-icon">
+					<PanelBody
+						title={__('Translate with Feedzy', 'feedzy-rss-feeds')}
+						icon={DragHandle}
+						initialOpen={false}
+						className="fz-hide-icon"
+					>
 						<PanelRow>
-							<UpgradeNotice higherPlanNotice={!feedzyData.isAgencyPlan} utmCampaign="action-translate-feedzy"/>
+							<UpgradeNotice
+								higherPlanNotice={!feedzyData.isAgencyPlan}
+								utmCampaign="action-translate-feedzy"
+							/>
 							<BaseControl className="mb-20">
 								<SelectControl
-									label={ __('Target Language', 'feedzy-rss-feeds') }
-									value={ item.data.lang || getCurrentLanguage() }
-									options={ Object.entries(window.feedzyData.languageList).map(([key, value]) => ({
+									label={__(
+										'Target Language',
+										'feedzy-rss-feeds'
+									)}
+									value={
+										item.data.lang || getCurrentLanguage()
+									}
+									options={Object.entries(
+										window.feedzyData.languageList
+									).map(([key, value]) => ({
 										label: value,
 										value: key,
-									})) }
-									onChange={ ( currentValue ) => propRef.onChangeHandler( { 'index': loopIndex, 'lang': currentValue ?? '' } ) }
+									}))}
+									onChange={(currentValue) =>
+										propRef.onChangeHandler({
+											index: loopIndex,
+											lang: currentValue ?? '',
+										})
+									}
 									disabled={!feedzyData.isAgencyPlan}
 								/>
 							</BaseControl>
@@ -304,9 +416,23 @@ const SortableItem = ({ propRef, loopIndex, item }) => {
 					</PanelBody>
 				</div>
 				<div className="fz-trash-action">
-					<button type="button" onClick={() => { propRef.removeCallback(loopIndex) }}>
-						<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
-							<path d="M20 5.0002H14.3C14.3 3.7002 13.3 2.7002 12 2.7002C10.7 2.7002 9.7 3.7002 9.7 5.0002H4V7.0002H5.5V7.3002L7.2 18.4002C7.3 19.4002 8.2 20.1002 9.2 20.1002H14.9C15.9 20.1002 16.7 19.4002 16.9 18.4002L18.6 7.3002V7.0002H20V5.0002ZM16.8 7.0002L15.1 18.1002C15.1 18.2002 15 18.3002 14.8 18.3002H9.1C9 18.3002 8.8 18.2002 8.8 18.1002L7.2 7.0002H16.8Z" fill="black"/>
+					<button
+						type="button"
+						onClick={() => {
+							propRef.removeCallback(loopIndex);
+						}}
+					>
+						<svg
+							xmlns="http://www.w3.org/2000/svg"
+							width="24"
+							height="24"
+							viewBox="0 0 24 24"
+							fill="none"
+						>
+							<path
+								d="M20 5.0002H14.3C14.3 3.7002 13.3 2.7002 12 2.7002C10.7 2.7002 9.7 3.7002 9.7 5.0002H4V7.0002H5.5V7.3002L7.2 18.4002C7.3 19.4002 8.2 20.1002 9.2 20.1002H14.9C15.9 20.1002 16.7 19.4002 16.9 18.4002L18.6 7.3002V7.0002H20V5.0002ZM16.8 7.0002L15.1 18.1002C15.1 18.2002 15 18.3002 14.8 18.3002H9.1C9 18.3002 8.8 18.2002 8.8 18.1002L7.2 7.0002H16.8Z"
+								fill="black"
+							/>
 						</svg>
 					</button>
 				</div>
@@ -314,19 +440,65 @@ const SortableItem = ({ propRef, loopIndex, item }) => {
 		);
 	}
 
-	if ( 'spinnerchief' === item.id ) {
-		return(
+	if ('spinnerchief' === item.id) {
+		return (
 			<li className="fz-action-control" data-counter={counter}>
 				<div className="fz-action-event">
-					{(feedzyData.isPro && feedzyData.isAgencyPlan) && !feedzyData.apiLicenseStatus.spinnerChiefStatus && (feedzyData.isHighPrivileges ? <span className="error-message">{__( 'Invalid API Key', 'feedzy-rss-feeds' )} <ExternalLink href="admin.php?page=feedzy-integration&tab=spinnerchief"><Icon icon={external} size={16} fill="#F00"/></ExternalLink></span> : <span className="error-message">{__( 'Invalid API Key, Please contact the administrator', 'feedzy-rss-feeds' )}</span> )}
-					<PanelBody title={ __( 'Spin using SpinnerChief', 'feedzy-rss-feeds' ) } icon={ DragHandle } initialOpen={ false } className="fz-hide-icon">
-						<UpgradeNotice higherPlanNotice={!feedzyData.isAgencyPlan} utmCampaign="action-spinnerchief"/>
+					{feedzyData.isPro &&
+						feedzyData.isAgencyPlan &&
+						!feedzyData.apiLicenseStatus.spinnerChiefStatus &&
+						(feedzyData.isHighPrivileges ? (
+							<span className="error-message">
+								{__('Invalid API Key', 'feedzy-rss-feeds')}{' '}
+								<ExternalLink href="admin.php?page=feedzy-integration&tab=spinnerchief">
+									<Icon
+										icon={external}
+										size={16}
+										fill="#F00"
+									/>
+								</ExternalLink>
+							</span>
+						) : (
+							<span className="error-message">
+								{__(
+									'Invalid API Key, Please contact the administrator',
+									'feedzy-rss-feeds'
+								)}
+							</span>
+						))}
+					<PanelBody
+						title={__(
+							'Spin using SpinnerChief',
+							'feedzy-rss-feeds'
+						)}
+						icon={DragHandle}
+						initialOpen={false}
+						className="fz-hide-icon"
+					>
+						<UpgradeNotice
+							higherPlanNotice={!feedzyData.isAgencyPlan}
+							utmCampaign="action-spinnerchief"
+						/>
 					</PanelBody>
 				</div>
 				<div className="fz-trash-action">
-					<button type="button" onClick={() => { propRef.removeCallback(loopIndex) }}>
-						<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
-							<path d="M20 5.0002H14.3C14.3 3.7002 13.3 2.7002 12 2.7002C10.7 2.7002 9.7 3.7002 9.7 5.0002H4V7.0002H5.5V7.3002L7.2 18.4002C7.3 19.4002 8.2 20.1002 9.2 20.1002H14.9C15.9 20.1002 16.7 19.4002 16.9 18.4002L18.6 7.3002V7.0002H20V5.0002ZM16.8 7.0002L15.1 18.1002C15.1 18.2002 15 18.3002 14.8 18.3002H9.1C9 18.3002 8.8 18.2002 8.8 18.1002L7.2 7.0002H16.8Z" fill="black"/>
+					<button
+						type="button"
+						onClick={() => {
+							propRef.removeCallback(loopIndex);
+						}}
+					>
+						<svg
+							xmlns="http://www.w3.org/2000/svg"
+							width="24"
+							height="24"
+							viewBox="0 0 24 24"
+							fill="none"
+						>
+							<path
+								d="M20 5.0002H14.3C14.3 3.7002 13.3 2.7002 12 2.7002C10.7 2.7002 9.7 3.7002 9.7 5.0002H4V7.0002H5.5V7.3002L7.2 18.4002C7.3 19.4002 8.2 20.1002 9.2 20.1002H14.9C15.9 20.1002 16.7 19.4002 16.9 18.4002L18.6 7.3002V7.0002H20V5.0002ZM16.8 7.0002L15.1 18.1002C15.1 18.2002 15 18.3002 14.8 18.3002H9.1C9 18.3002 8.8 18.2002 8.8 18.1002L7.2 7.0002H16.8Z"
+								fill="black"
+							/>
 						</svg>
 					</button>
 				</div>
@@ -334,19 +506,62 @@ const SortableItem = ({ propRef, loopIndex, item }) => {
 		);
 	}
 
-	if ( 'wordAI' === item.id ) {
-		return(
+	if ('wordAI' === item.id) {
+		return (
 			<li className="fz-action-control" data-counter={counter}>
 				<div className="fz-action-event">
-					{(feedzyData.isPro && feedzyData.isAgencyPlan) && !feedzyData.apiLicenseStatus.wordaiStatus && (feedzyData.isHighPrivileges ? <span className="error-message">{__( 'Invalid API Key', 'feedzy-rss-feeds' )} <ExternalLink href="admin.php?page=feedzy-integration&tab=wordai"><Icon icon={external} size={16} fill="#F00"/></ExternalLink></span> : <span className="error-message">{__( 'Invalid API Key, Please contact the administrator', 'feedzy-rss-feeds' )}</span> )}
-					<PanelBody title={ __( 'Spin using WordAI', 'feedzy-rss-feeds' ) } icon={ DragHandle } initialOpen={ false } className="fz-hide-icon">
-						<UpgradeNotice higherPlanNotice={!feedzyData.isAgencyPlan} utmCampaign="action-wordai"/>
+					{feedzyData.isPro &&
+						feedzyData.isAgencyPlan &&
+						!feedzyData.apiLicenseStatus.wordaiStatus &&
+						(feedzyData.isHighPrivileges ? (
+							<span className="error-message">
+								{__('Invalid API Key', 'feedzy-rss-feeds')}{' '}
+								<ExternalLink href="admin.php?page=feedzy-integration&tab=wordai">
+									<Icon
+										icon={external}
+										size={16}
+										fill="#F00"
+									/>
+								</ExternalLink>
+							</span>
+						) : (
+							<span className="error-message">
+								{__(
+									'Invalid API Key, Please contact the administrator',
+									'feedzy-rss-feeds'
+								)}
+							</span>
+						))}
+					<PanelBody
+						title={__('Spin using WordAI', 'feedzy-rss-feeds')}
+						icon={DragHandle}
+						initialOpen={false}
+						className="fz-hide-icon"
+					>
+						<UpgradeNotice
+							higherPlanNotice={!feedzyData.isAgencyPlan}
+							utmCampaign="action-wordai"
+						/>
 					</PanelBody>
 				</div>
 				<div className="fz-trash-action">
-					<button type="button" onClick={() => { propRef.removeCallback(loopIndex) }}>
-						<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
-							<path d="M20 5.0002H14.3C14.3 3.7002 13.3 2.7002 12 2.7002C10.7 2.7002 9.7 3.7002 9.7 5.0002H4V7.0002H5.5V7.3002L7.2 18.4002C7.3 19.4002 8.2 20.1002 9.2 20.1002H14.9C15.9 20.1002 16.7 19.4002 16.9 18.4002L18.6 7.3002V7.0002H20V5.0002ZM16.8 7.0002L15.1 18.1002C15.1 18.2002 15 18.3002 14.8 18.3002H9.1C9 18.3002 8.8 18.2002 8.8 18.1002L7.2 7.0002H16.8Z" fill="black"/>
+					<button
+						type="button"
+						onClick={() => {
+							propRef.removeCallback(loopIndex);
+						}}
+					>
+						<svg
+							xmlns="http://www.w3.org/2000/svg"
+							width="24"
+							height="24"
+							viewBox="0 0 24 24"
+							fill="none"
+						>
+							<path
+								d="M20 5.0002H14.3C14.3 3.7002 13.3 2.7002 12 2.7002C10.7 2.7002 9.7 3.7002 9.7 5.0002H4V7.0002H5.5V7.3002L7.2 18.4002C7.3 19.4002 8.2 20.1002 9.2 20.1002H14.9C15.9 20.1002 16.7 19.4002 16.9 18.4002L18.6 7.3002V7.0002H20V5.0002ZM16.8 7.0002L15.1 18.1002C15.1 18.2002 15 18.3002 14.8 18.3002H9.1C9 18.3002 8.8 18.2002 8.8 18.1002L7.2 7.0002H16.8Z"
+								fill="black"
+							/>
 						</svg>
 					</button>
 				</div>
@@ -354,42 +569,136 @@ const SortableItem = ({ propRef, loopIndex, item }) => {
 		);
 	}
 
-	if ( 'fz_image' === item.id ) {
-		return(
-			<li className="fz-action-control fz-chat-cpt-action" data-counter={counter}>
+	if ('fz_image' === item.id) {
+		return (
+			<li
+				className="fz-action-control fz-chat-cpt-action"
+				data-counter={counter}
+			>
 				<div className="fz-action-event">
-					{feedzyData.isPro && (feedzyData.isBusinessPlan || feedzyData.isAgencyPlan) && !feedzyData.apiLicenseStatus.openaiStatus && (feedzyData.isHighPrivileges ? <span className="error-message">{__( 'Invalid API Key', 'feedzy-rss-feeds' )} <ExternalLink href="admin.php?page=feedzy-integration&tab=openai"><Icon icon={external} size={16} fill="#F00"/></ExternalLink></span> : <span className="error-message">{__( 'Invalid API Key, Please contact the administrator', 'feedzy-rss-feeds' )}</span> )}
-					<PanelBody title={ __( 'Generate Image with OpenAI', 'feedzy-rss-feeds' ) } icon={ DragHandle } initialOpen={ false }>
+					{feedzyData.isPro &&
+						(feedzyData.isBusinessPlan ||
+							feedzyData.isAgencyPlan) &&
+						!feedzyData.apiLicenseStatus.openaiStatus &&
+						(feedzyData.isHighPrivileges ? (
+							<span className="error-message">
+								{__('Invalid API Key', 'feedzy-rss-feeds')}{' '}
+								<ExternalLink href="admin.php?page=feedzy-integration&tab=openai">
+									<Icon
+										icon={external}
+										size={16}
+										fill="#F00"
+									/>
+								</ExternalLink>
+							</span>
+						) : (
+							<span className="error-message">
+								{__(
+									'Invalid API Key, Please contact the administrator',
+									'feedzy-rss-feeds'
+								)}
+							</span>
+						))}
+					<PanelBody
+						title={__(
+							'Generate Image with OpenAI',
+							'feedzy-rss-feeds'
+						)}
+						icon={DragHandle}
+						initialOpen={false}
+					>
 						<PanelRow>
-							<UpgradeNotice higherPlanNotice={!feedzyData.isBusinessPlan && !feedzyData.isAgencyPlan} utmCampaign="action-generate-image-chatgpt"/>
+							<UpgradeNotice
+								higherPlanNotice={
+									!feedzyData.isBusinessPlan &&
+									!feedzyData.isAgencyPlan
+								}
+								utmCampaign="action-generate-image-chatgpt"
+							/>
 							<BaseControl>
 								<ToggleControl
-									checked={ item.data.generateOnlyMissingImages ?? true }
-									label={ __( 'Generate only for missing images', 'feedzy-rss-feeds' ) }
-									onChange={ ( currentValue ) => propRef.onChangeHandler( { 'index': loopIndex, 'generateOnlyMissingImages': currentValue ?? '' } ) }
-									help={ __( 'Only generate the featured image if it\'s missing in the source XML RSS Feed.', 'feedzy-rss-feeds' ) }
-									disabled={!feedzyData.isPro || !feedzyData.apiLicenseStatus.openaiStatus}
+									checked={
+										item.data.generateOnlyMissingImages ??
+										true
+									}
+									label={__(
+										'Generate only for missing images',
+										'feedzy-rss-feeds'
+									)}
+									onChange={(currentValue) =>
+										propRef.onChangeHandler({
+											index: loopIndex,
+											generateOnlyMissingImages:
+												currentValue ?? '',
+										})
+									}
+									help={__(
+										"Only generate the featured image if it's missing in the source XML RSS Feed.",
+										'feedzy-rss-feeds'
+									)}
+									disabled={
+										!feedzyData.isPro ||
+										!feedzyData.apiLicenseStatus
+											.openaiStatus
+									}
 								/>
 							</BaseControl>
-							<BaseControl
-								__nextHasNoMarginBottom
-							>
+							<BaseControl __nextHasNoMarginBottom>
 								<TextareaControl
 									__nextHasNoMarginBottom
-									label={ __( 'Additional Prompt', 'feedzy-rss-feeds' ) }
-									value={ item.data.generateImagePrompt ? unescape(item.data.generateImagePrompt.replaceAll('&#039;', '\'')) : '' }
-									onChange={ ( currentValue ) => propRef.onChangeHandler( { 'index': loopIndex, 'generateImagePrompt': currentValue ?? '' } ) }
-									help={ __( 'Add specific instructions to customize the image generation. By default, images are based on the item’s title and content. Use this field to guide the style of the image, for example: Realistic, artistic, comic-style, etc.', 'feedzy-rss-feeds' ) }
-									disabled={!feedzyData.isPro || !feedzyData.apiLicenseStatus.openaiStatus}
+									label={__(
+										'Additional Prompt',
+										'feedzy-rss-feeds'
+									)}
+									value={
+										item.data.generateImagePrompt
+											? unescape(
+													item.data.generateImagePrompt.replaceAll(
+														'&#039;',
+														"'"
+													)
+												)
+											: ''
+									}
+									onChange={(currentValue) =>
+										propRef.onChangeHandler({
+											index: loopIndex,
+											generateImagePrompt:
+												currentValue ?? '',
+										})
+									}
+									help={__(
+										'Add specific instructions to customize the image generation. By default, images are based on the item’s title and content. Use this field to guide the style of the image, for example: Realistic, artistic, comic-style, etc.',
+										'feedzy-rss-feeds'
+									)}
+									disabled={
+										!feedzyData.isPro ||
+										!feedzyData.apiLicenseStatus
+											.openaiStatus
+									}
 								/>
 							</BaseControl>
 						</PanelRow>
 					</PanelBody>
 				</div>
 				<div className="fz-trash-action">
-					<button type="button" onClick={() => { propRef.removeCallback(loopIndex) }}>
-						<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
-							<path d="M20 5.0002H14.3C14.3 3.7002 13.3 2.7002 12 2.7002C10.7 2.7002 9.7 3.7002 9.7 5.0002H4V7.0002H5.5V7.3002L7.2 18.4002C7.3 19.4002 8.2 20.1002 9.2 20.1002H14.9C15.9 20.1002 16.7 19.4002 16.9 18.4002L18.6 7.3002V7.0002H20V5.0002ZM16.8 7.0002L15.1 18.1002C15.1 18.2002 15 18.3002 14.8 18.3002H9.1C9 18.3002 8.8 18.2002 8.8 18.1002L7.2 7.0002H16.8Z" fill="black"/>
+					<button
+						type="button"
+						onClick={() => {
+							propRef.removeCallback(loopIndex);
+						}}
+					>
+						<svg
+							xmlns="http://www.w3.org/2000/svg"
+							width="24"
+							height="24"
+							viewBox="0 0 24 24"
+							fill="none"
+						>
+							<path
+								d="M20 5.0002H14.3C14.3 3.7002 13.3 2.7002 12 2.7002C10.7 2.7002 9.7 3.7002 9.7 5.0002H4V7.0002H5.5V7.3002L7.2 18.4002C7.3 19.4002 8.2 20.1002 9.2 20.1002H14.9C15.9 20.1002 16.7 19.4002 16.9 18.4002L18.6 7.3002V7.0002H20V5.0002ZM16.8 7.0002L15.1 18.1002C15.1 18.2002 15 18.3002 14.8 18.3002H9.1C9 18.3002 8.8 18.2002 8.8 18.1002L7.2 7.0002H16.8Z"
+								fill="black"
+							/>
 						</svg>
 					</button>
 				</div>
@@ -397,82 +706,148 @@ const SortableItem = ({ propRef, loopIndex, item }) => {
 		);
 	}
 
-	if ( 'modify_links' === item.id ) {
-		return(
-			<li className="fz-action-control fz-modify-links" data-counter={counter}>
+	if ('modify_links' === item.id) {
+		return (
+			<li
+				className="fz-action-control fz-modify-links"
+				data-counter={counter}
+			>
 				<div className="fz-action-event">
-					<PanelBody title={ __( 'Modify Links', 'feedzy-rss-feeds' ) } icon={ DragHandle } initialOpen={ false }>
+					<PanelBody
+						title={__('Modify Links', 'feedzy-rss-feeds')}
+						icon={DragHandle}
+						initialOpen={false}
+					>
 						<PanelRow>
-							<UpgradeNotice higherPlanNotice={false} utmCampaign="action-modify-links"/>
+							<UpgradeNotice
+								higherPlanNotice={false}
+								utmCampaign="action-modify-links"
+							/>
 							<BaseControl className="mb-20">
 								<ToggleControl
-									checked={ item.data.remove_links ?? false }
-									label={ __( 'Remove links from the content?', 'feedzy-rss-feeds' ) }
-									onChange={ ( currentValue ) => propRef.onChangeHandler( { 'index': loopIndex, 'remove_links': currentValue ?? '' } ) }
+									checked={item.data.remove_links ?? false}
+									label={__(
+										'Remove links from the content?',
+										'feedzy-rss-feeds'
+									)}
+									onChange={(currentValue) =>
+										propRef.onChangeHandler({
+											index: loopIndex,
+											remove_links: currentValue ?? '',
+										})
+									}
 									disabled={!feedzyData.isPro}
 								/>
 							</BaseControl>
-							{ true !== item.data.remove_links &&
+							{true !== item.data.remove_links && (
 								<BaseControl className="mb-20">
 									<SelectControl
-										label={__('Open Links In', 'feedzy-rss-feeds')}
-										value={ item.data.target || '' }
+										label={__(
+											'Open Links In',
+											'feedzy-rss-feeds'
+										)}
+										value={item.data.target || ''}
 										options={[
 											{
-												label: __('Default', 'feedzy-rss-feeds'),
+												label: __(
+													'Default',
+													'feedzy-rss-feeds'
+												),
 												value: '',
 											},
 											{
-												label: __('New Tab', 'feedzy-rss-feeds'),
+												label: __(
+													'New Tab',
+													'feedzy-rss-feeds'
+												),
 												value: '_blank',
 											},
 											{
-												label: __('Same Tab', 'feedzy-rss-feeds'),
+												label: __(
+													'Same Tab',
+													'feedzy-rss-feeds'
+												),
 												value: '_self',
 											},
 										]}
-										onChange={ ( currentValue ) => propRef.onChangeHandler( { 'index': loopIndex, 'target': currentValue ?? '' } ) }
+										onChange={(currentValue) =>
+											propRef.onChangeHandler({
+												index: loopIndex,
+												target: currentValue ?? '',
+											})
+										}
 										disabled={!feedzyData.isPro}
 									/>
 								</BaseControl>
-							}
-							{ true !== item.data.remove_links &&
+							)}
+							{true !== item.data.remove_links && (
 								<BaseControl>
 									<SelectControl
-										label={__( 'Make this link a "nofollow" link?', 'feedzy-rss-feeds' )}
-										value={ item.data.follow || '' }
-										onChange={ ( currentValue ) => propRef.onChangeHandler( { 'index': loopIndex, 'follow': currentValue ?? '' } ) }
+										label={__(
+											'Make this link a "nofollow" link?',
+											'feedzy-rss-feeds'
+										)}
+										value={item.data.follow || ''}
+										onChange={(currentValue) =>
+											propRef.onChangeHandler({
+												index: loopIndex,
+												follow: currentValue ?? '',
+											})
+										}
 										options={[
 											{
-												label: __('Default', 'feedzy-rss-feeds'),
+												label: __(
+													'Default',
+													'feedzy-rss-feeds'
+												),
 												value: '',
 											},
 											{
-												label: __('No', 'feedzy-rss-feeds'),
+												label: __(
+													'No',
+													'feedzy-rss-feeds'
+												),
 												value: 'no',
 											},
 											{
-												label: __('Yes', 'feedzy-rss-feeds'),
+												label: __(
+													'Yes',
+													'feedzy-rss-feeds'
+												),
 												value: 'yes',
 											},
 										]}
 										disabled={!feedzyData.isPro}
 									/>
 								</BaseControl>
-							}
+							)}
 						</PanelRow>
 					</PanelBody>
 				</div>
 				<div className="fz-trash-action">
-					<button type="button" onClick={() => { propRef.removeCallback(loopIndex) }}>
-						<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
-							<path d="M20 5.0002H14.3C14.3 3.7002 13.3 2.7002 12 2.7002C10.7 2.7002 9.7 3.7002 9.7 5.0002H4V7.0002H5.5V7.3002L7.2 18.4002C7.3 19.4002 8.2 20.1002 9.2 20.1002H14.9C15.9 20.1002 16.7 19.4002 16.9 18.4002L18.6 7.3002V7.0002H20V5.0002ZM16.8 7.0002L15.1 18.1002C15.1 18.2002 15 18.3002 14.8 18.3002H9.1C9 18.3002 8.8 18.2002 8.8 18.1002L7.2 7.0002H16.8Z" fill="black"/>
+					<button
+						type="button"
+						onClick={() => {
+							propRef.removeCallback(loopIndex);
+						}}
+					>
+						<svg
+							xmlns="http://www.w3.org/2000/svg"
+							width="24"
+							height="24"
+							viewBox="0 0 24 24"
+							fill="none"
+						>
+							<path
+								d="M20 5.0002H14.3C14.3 3.7002 13.3 2.7002 12 2.7002C10.7 2.7002 9.7 3.7002 9.7 5.0002H4V7.0002H5.5V7.3002L7.2 18.4002C7.3 19.4002 8.2 20.1002 9.2 20.1002H14.9C15.9 20.1002 16.7 19.4002 16.9 18.4002L18.6 7.3002V7.0002H20V5.0002ZM16.8 7.0002L15.1 18.1002C15.1 18.2002 15 18.3002 14.8 18.3002H9.1C9 18.3002 8.8 18.2002 8.8 18.1002L7.2 7.0002H16.8Z"
+								fill="black"
+							/>
 						</svg>
 					</button>
 				</div>
 			</li>
 		);
 	}
-}
+};
 
 export default SortableElement(SortableItem);
diff --git a/js/ActionPopup/index.js b/js/ActionPopup/index.js
index c59c17d5..5124c8d6 100644
--- a/js/ActionPopup/index.js
+++ b/js/ActionPopup/index.js
@@ -5,93 +5,94 @@ import Actions from './Actions.js';
 
 import { __ } from '@wordpress/i18n';
 
-import {
-	Button,
-	Modal,
-	ExternalLink,
-	Popover
-} from '@wordpress/components';
+import { Button, Modal, ExternalLink, Popover } from '@wordpress/components';
 
 import {
 	Fragment,
 	useEffect,
 	useRef,
 	useState,
-	useCallback
+	useCallback,
 } from '@wordpress/element';
 
-import {
-	Icon,
-	dragHandle,
-	close,
-	plus,
-	trash
-} from '@wordpress/icons';
+import { Icon, dragHandle, close, plus, trash } from '@wordpress/icons';
 
 const ActionModal = () => {
 	// useRef
 	const userRef = useRef(null);
 	// State
-	const [ isOpen, setOpen ] = useState(false);
-	const [ isHideMsg, setHideMeg ] = useState(false);
-	const [ isVisible, setIsVisible ] = useState( false );
-	const [ action, setAction ] = useState([]);
-	const [ shortCode, setShortCode ] = useState('');
-	const [ fieldName, setFieldName ] = useState('');
-	const [ editModeTag, setEditModeTag ] = useState(null);
-	const [ isDisabledAddNew, setDisabledAddNew ] = useState(false);
-	const [ isLoading, setLoading ] = useState(false);
-	const [ currentCustomRow, setcurrentCustomRow ] = useState(null);
+	const [isOpen, setOpen] = useState(false);
+	const [isHideMsg, setHideMeg] = useState(false);
+	const [isVisible, setIsVisible] = useState(false);
+	const [action, setAction] = useState([]);
+	const [shortCode, setShortCode] = useState('');
+	const [fieldName, setFieldName] = useState('');
+	const [editModeTag, setEditModeTag] = useState(null);
+	const [isDisabledAddNew, setDisabledAddNew] = useState(false);
+	const [isLoading, setLoading] = useState(false);
+	const [currentCustomRow, setcurrentCustomRow] = useState(null);
 
 	// Close the popup when click on outside the modal.
-	const exitModalOnOutsideClick = useCallback(( e ) => {
-		if ( ! isVisible || ! e.target.closest( '.fz-action-popup' ) ) {
-			return;
-		}
-		toggleVisible( false );
-	}, [isVisible]);
+	const exitModalOnOutsideClick = useCallback(
+		(e) => {
+			if (!isVisible || !e.target.closest('.fz-action-popup')) {
+				return;
+			}
+			toggleVisible(false);
+		},
+		[isVisible]
+	);
 
-	useEffect( () => {
-		window.wp.api.loadPromise.then( () => {
+	useEffect(() => {
+		window.wp.api.loadPromise.then(() => {
 			// Fetch user.
-			userRef.current = new window.wp.api.models.User( { id: 'me' } );
+			userRef.current = new window.wp.api.models.User({ id: 'me' });
 			userRef.current.fetch();
 		});
 	}, []);
 
 	useEffect(() => {
-		document.addEventListener( 'click', exitModalOnOutsideClick );
+		document.addEventListener('click', exitModalOnOutsideClick);
 		return () => {
-			document.removeEventListener( 'click', exitModalOnOutsideClick );
+			document.removeEventListener('click', exitModalOnOutsideClick);
 		};
-	}, [isVisible, exitModalOnOutsideClick] );
+	}, [isVisible, exitModalOnOutsideClick]);
 
 	const handleChange = (args) => {
-		let id = args.index;
+		const id = args.index;
 		delete args.index;
-		let prevState = action[id].data || {};
-		let updatedState = {...prevState, ...args};
-		action[id]['data'] = updatedState;
-		setAction( () => ([...action.filter((e)=>{return e})]));
-
+		const prevState = action[id].data || {};
+		const updatedState = { ...prevState, ...args };
+		action[id].data = updatedState;
+		setAction(() => [
+			...action.filter((e) => {
+				return e;
+			}),
+		]);
 	};
 
 	const demoPromptText = (args) => {
-		let id = args.index;
-		let type = args.type;
+		const id = args.index;
+		const type = args.type;
 		delete args.index;
 		delete args.type;
-		let prevState = action[id].data || {};
-		let updatedState = {...prevState, ...args};
-		if ( 'summarize' === type ) {
-			updatedState['ChatGPT'] = 'Summarize this article {content} for better SEO.';
-		} else if ( 'paraphase' === type ) {
-			updatedState['ChatGPT'] = 'Rephrase my {content} for better SEO.';
-		} else if ( 'change_tone' === type ) {
-			updatedState['ChatGPT'] = 'Change tone of my {content} for a more friendly approach.';
+		const prevState = action[id].data || {};
+		const updatedState = { ...prevState, ...args };
+		if ('summarize' === type) {
+			updatedState.ChatGPT =
+				'Summarize this article {content} for better SEO.';
+		} else if ('paraphase' === type) {
+			updatedState.ChatGPT = 'Rephrase my {content} for better SEO.';
+		} else if ('change_tone' === type) {
+			updatedState.ChatGPT =
+				'Change tone of my {content} for a more friendly approach.';
 		}
-		action[id]['data'] = updatedState;
-		setAction( () => ([...action.filter((e)=>{return e})]));
+		action[id].data = updatedState;
+		setAction(() => [
+			...action.filter((e) => {
+				return e;
+			}),
+		]);
 	};
 
 	const openModal = () => {
@@ -99,8 +100,8 @@ const ActionModal = () => {
 		setOpen(true);
 	};
 	const toggleVisible = (status) => {
-		if ( status ) {
-			setIsVisible( (state) => !state );
+		if (status) {
+			setIsVisible((state) => !state);
 		} else {
 			setIsVisible(status);
 		}
@@ -114,68 +115,82 @@ const ActionModal = () => {
 		setLoading(false);
 		setcurrentCustomRow(null);
 	};
-	const hideIntroMessage = ( status ) => setHideMeg( status );
-	const removeAction = ( index ) => {
+	const hideIntroMessage = (status) => setHideMeg(status);
+	const removeAction = (index) => {
 		delete action[index];
-		setAction( () => ([...action.filter((e)=>{return e})]));
+		setAction(() => [
+			...action.filter((e) => {
+				return e;
+			}),
+		]);
 		setDisabledAddNew(false);
 	};
 
-	const addAction = ( actionId ) => {
-		let actionData = {
+	const addAction = (actionId) => {
+		const actionData = {
 			id: actionId,
 			tag: shortCode,
-			data: {
-
-			}
+			data: {},
 		};
 
-		if ( ['fz_translate', 'fz_paraphrase', 'fz_summarize', 'wordAI', 'spinnerchief'].indexOf( actionId ) > -1 ) {
+		if (
+			[
+				'fz_translate',
+				'fz_paraphrase',
+				'fz_summarize',
+				'wordAI',
+				'spinnerchief',
+			].indexOf(actionId) > -1
+		) {
 			actionData.data[actionId] = true;
 		}
 
-		if ( ['fz_translate'].indexOf( actionId ) > -1 ) {
-			const langInput = document.getElementById('feedzy_auto_translate_lang');
-			actionData.data['lang'] = langInput ? langInput.value : 'eng_Latn';
+		if (['fz_translate'].indexOf(actionId) > -1) {
+			const langInput = document.getElementById(
+				'feedzy_auto_translate_lang'
+			);
+			actionData.data.lang = langInput ? langInput.value : 'eng_Latn';
 		}
 
-		if ( ['fz_image'].indexOf( actionId ) > -1 ) {
-			actionData.data['generateOnlyMissingImages'] = true;
+		if (['fz_image'].indexOf(actionId) > -1) {
+			actionData.data.generateOnlyMissingImages = true;
 		}
 
-		let newAction = [actionData];
-		setDisabledAddNew(() => 'item_image' === shortCode );
-		setAction(prevState => ([...prevState, ...newAction]));
+		const newAction = [actionData];
+		setDisabledAddNew(() => 'item_image' === shortCode);
+		setAction((prevState) => [...prevState, ...newAction]);
 		toggleVisible(false);
 	};
 
 	const onSortEnd = ({ oldIndex, newIndex }) => {
-		setAction(prevItem => (arrayMoveImmutable(prevItem, oldIndex, newIndex)));
+		setAction((prevItem) =>
+			arrayMoveImmutable(prevItem, oldIndex, newIndex)
+		);
 	};
 
 	/**
 	 * Hide action popup.
 	 */
 	const hideActionIntroMessage = () => {
-		if ( isOpen ) {
+		if (isOpen) {
 			hideIntroMessage(false);
 		}
 		const model = new window.wp.api.models.User({
 			// eslint-disable-next-line camelcase
 			id: 'me',
 			meta: {
-				feedzy_hide_action_message: true
-			}
+				feedzy_hide_action_message: true,
+			},
 		});
 
 		const save = model.save();
 
-		save.success( () => {
+		save.success(() => {
 			userRef.current.fetch();
 		});
 
-		save.error( ( response ) => {
-			console.warn( response.responseJSON.message );
+		save.error((response) => {
+			console.warn(response.responseJSON.message);
 		});
 	};
 
@@ -183,84 +198,101 @@ const ActionModal = () => {
 	 * Save actions.
 	 */
 	const saveAction = () => {
-		if ( 'function' !== typeof jQuery ) {
+		if ('function' !== typeof jQuery) {
 			return;
 		}
 
-		action?.forEach( ( item, index ) => {
-			window?.tiTrk?.with('feedzy').add( { feature: 'import_action', featureValue: item?.id, groupId: item?.tag ?? '' } );
+		action?.forEach((item, index) => {
+			window?.tiTrk?.with('feedzy').add({
+				feature: 'import_action',
+				featureValue: item?.id,
+				groupId: item?.tag ?? '',
+			});
 		});
 
 		// Serialize the action.
-		let _action = encodeURIComponent( JSON.stringify( action ) );
-		if ( action.length === 0 ) {
+		let _action = encodeURIComponent(JSON.stringify(action));
+		if (action.length === 0) {
 			setAction([]);
-			_action = encodeURIComponent( JSON.stringify( [ { id: '', tag: shortCode, data: {} } ] ) );
+			_action = encodeURIComponent(
+				JSON.stringify([{ id: '', tag: shortCode, data: {} }])
+			);
 		}
-		if ( 'import_custom_field' === fieldName ) {
-			if ( currentCustomRow ) {
+		if ('import_custom_field' === fieldName) {
+			if (currentCustomRow) {
 				currentCustomRow.value = _action;
 			}
 			closeModal();
 			return;
 		}
 
-		const inputField = jQuery( `[name="feedzy_meta_data[${fieldName}]"]:is(textarea, input)` ).data('tagify');
+		const inputField = jQuery(
+			`[name="feedzy_meta_data[${fieldName}]"]:is(textarea, input)`
+		).data('tagify');
 
-		if ( 'import_post_featured_img' === fieldName ) {
+		if ('import_post_featured_img' === fieldName) {
 			inputField.removeAllTags();
 			inputField.addEmptyTag();
 			inputField.clearPersistedData();
 		}
-		if ( null === editModeTag || 'import_post_featured_img' === fieldName ) {
-			let tagElm = inputField.createTagElem({value: _action})
-			inputField.injectAtCaret(tagElm)
-			let elm = inputField.insertAfterTag(tagElm)
-			inputField.placeCaretAfterNode(elm)
+		if (null === editModeTag || 'import_post_featured_img' === fieldName) {
+			const tagElm = inputField.createTagElem({ value: _action });
+			inputField.injectAtCaret(tagElm);
+			const elm = inputField.insertAfterTag(tagElm);
+			inputField.placeCaretAfterNode(elm);
 		} else {
-			inputField.replaceTag(editModeTag.closest( '.fz-content-action' ), {value: _action});
+			inputField.replaceTag(editModeTag.closest('.fz-content-action'), {
+				value: _action,
+			});
 		}
 		closeModal();
 	};
 
 	const helperContainer = () => {
-		return document.querySelector( '.fz-action-popup .fz-action-panel ul' );
+		return document.querySelector('.fz-action-popup .fz-action-panel ul');
 	};
 
 	// Click to open action popup.
-	document.querySelectorAll( '[data-action_popup]' ).forEach( actionItem => {
-		actionItem.addEventListener( 'click', ( event ) => {
+	document.querySelectorAll('[data-action_popup]').forEach((actionItem) => {
+		actionItem.addEventListener('click', (event) => {
 			event.preventDefault();
-			if ( userRef.current ) {
-				if ( ! userRef.current.attributes.meta.feedzy_hide_action_message ) {
+			if (userRef.current) {
+				if (
+					!userRef.current.attributes.meta.feedzy_hide_action_message
+				) {
 					hideActionIntroMessage();
 				} else {
 					hideIntroMessage(true);
 				}
 			}
-			let tag = event.target.getAttribute( 'data-action_popup' ) || '';
-			let dataFieldName = event.target.getAttribute( 'data-field-name' ) || '';
-			if ( '' === tag ) {
+			const tag = event.target.getAttribute('data-action_popup') || '';
+			const dataFieldName =
+				event.target.getAttribute('data-field-name') || '';
+			if ('' === tag) {
 				event.target.closest('.dropdown-item').click();
 				return;
 			}
-			setShortCode( tag );
-			setFieldName( dataFieldName );
+			setShortCode(tag);
+			setFieldName(dataFieldName);
 			openModal();
-		} );
-	} );
+		});
+	});
 
 	// Init custom field actions.
 	const initCustomFieldActions = () => {
-		const customFieldElement = document.querySelectorAll( '.custom_fields .fz-action-icon' ) || [];
-		if ( customFieldElement.length === 0 ) {
+		const customFieldElement =
+			document.querySelectorAll('.custom_fields .fz-action-icon') || [];
+		if (customFieldElement.length === 0) {
 			return;
 		}
-		customFieldElement.forEach( actionButton => {
-			actionButton.addEventListener( 'click', ( event ) => {
+		customFieldElement.forEach((actionButton) => {
+			actionButton.addEventListener('click', (event) => {
 				event.preventDefault();
-				if ( userRef.current ) {
-					if ( ! userRef.current.attributes.meta.feedzy_hide_action_message ) {
+				if (userRef.current) {
+					if (
+						!userRef.current.attributes.meta
+							.feedzy_hide_action_message
+					) {
 						hideActionIntroMessage();
 					} else {
 						hideIntroMessage(true);
@@ -268,183 +300,508 @@ const ActionModal = () => {
 				}
 
 				let editAction = event?.target?.nextElementSibling?.value || '';
-				if ( editAction ) {
-					editAction = JSON.parse( decodeURIComponent( editAction ) );
-					setAction( () => ([...editAction.filter((e)=>{return e.id !== ''})]));
+				if (editAction) {
+					editAction = JSON.parse(decodeURIComponent(editAction));
+					setAction(() => [
+						...editAction.filter((e) => {
+							return e.id !== '';
+						}),
+					]);
 				}
-				setShortCode( 'custom_field' );
-				setFieldName( 'import_custom_field' );
-				setcurrentCustomRow( event?.target?.nextElementSibling );
+				setShortCode('custom_field');
+				setFieldName('import_custom_field');
+				setcurrentCustomRow(event?.target?.nextElementSibling);
 				openModal();
-			} );
-		} );
+			});
+		});
 	};
 	// Attach click event to the newly added custom field row.
-	document.addEventListener( 'feedzy_new_row_added', initCustomFieldActions );
+	document.addEventListener('feedzy_new_row_added', initCustomFieldActions);
 
 	const initEditHooks = () => {
-		if ( isLoading ) {
+		if (isLoading) {
 			return;
 		}
 		// Click to open edit action popup.
-		setTimeout( function() {
-			const editActionElement = document.querySelectorAll( '.fz-content-action .tagify__filter-icon' ) || [];
-			if ( editActionElement.length === 0 ) {
+		setTimeout(function () {
+			const editActionElement =
+				document.querySelectorAll(
+					'.fz-content-action .tagify__filter-icon'
+				) || [];
+			if (editActionElement.length === 0) {
 				initCustomFieldActions();
 				initEditHooks();
 				return;
 			}
-			if ( editActionElement.length > 0 ) {
-				editActionElement.forEach( editItem => {
-					editItem.addEventListener( 'click', ( event ) => {
-						if ( event.target.parentNode ) {
-							let editAction = event.target.getAttribute( 'data-actions' ) || '';
-							let fieldId = event.target.getAttribute( 'data-field_id' ) || '';
-							editAction = JSON.parse( decodeURIComponent( editAction ) );
-							setAction(() => (
+			if (editActionElement.length > 0) {
+				editActionElement.forEach((editItem) => {
+					editItem.addEventListener('click', (event) => {
+						if (event.target.parentNode) {
+							let editAction =
+								event.target.getAttribute('data-actions') || '';
+							const fieldId =
+								event.target.getAttribute('data-field_id') ||
+								'';
+							editAction = JSON.parse(
+								decodeURIComponent(editAction)
+							);
+							setAction(() =>
 								editAction
-								.filter((e) => e.id !== '')
-								.map((e) => {
-								  	// Replace 'fz_summarize' with 'chat_gpt_rewrite' for backward compatible.
-									if (e.id === 'fz_summarize') {
-										return { 
-											...e, 
-											id: 'chat_gpt_rewrite', 
-											data: { ChatGPT: "Summarize this article {content} for better SEO." } 
-										};
-									}
-									return e;
-								})
-							));
-							let magicTag = editAction[0] || {};
-							let tag = magicTag.tag;
+									.filter((e) => e.id !== '')
+									.map((e) => {
+										// Replace 'fz_summarize' with 'chat_gpt_rewrite' for backward compatible.
+										if (e.id === 'fz_summarize') {
+											return {
+												...e,
+												id: 'chat_gpt_rewrite',
+												data: {
+													ChatGPT:
+														'Summarize this article {content} for better SEO.',
+												},
+											};
+										}
+										return e;
+									})
+							);
+							const magicTag = editAction[0] || {};
+							const tag = magicTag.tag;
 							setEditModeTag(event.target.parentNode);
-							setDisabledAddNew(() => Object.keys(magicTag.data).length && 'item_image' === tag );
-							let actionGroup = document.querySelector( '.' + fieldId );
-							actionGroup.querySelector( '[data-action_popup="' + tag + '"]' ).click();
+							setDisabledAddNew(
+								() =>
+									Object.keys(magicTag.data).length &&
+									'item_image' === tag
+							);
+							const actionGroup = document.querySelector(
+								'.' + fieldId
+							);
+							actionGroup
+								.querySelector(
+									'[data-action_popup="' + tag + '"]'
+								)
+								.click();
 						}
-					} );
-				} );
+					});
+				});
 			}
 			initCustomFieldActions();
-		}, 500 );
+		}, 500);
 	};
 	initEditHooks();
 	return (
 		<Fragment>
-		{ isOpen && (
-			<Modal isDismissible={ false } className="fz-action-popup" overlayClassName="fz-popup-wrap">
-				<div className="fz-action-content">
-					<div className="fz-action-header">
-						<div className="fz-modal-title">
-							<h2>{ __('Add actions to this tag', 'feedzy-rss-feeds') }</h2> { ! isHideMsg && ( <span>{ __( 'New!', 'feedzy-rss-feeds' ) }</span> ) }
-						</div>
-						<Button variant="secondary" className="fz-close-popup" onClick={ closeModal }><Icon icon={ close } /></Button>
-					</div>
-					<div className="fz-action-body">
-						{ ! isHideMsg && (
-							<div className="fz-action-intro">
-								<p>{ __( 'Feedzy now supports adding and chaining actions into a single tag. Add an action by clicking the Add new button below. You can add multiple actions in each tag.', 'feedzy-rss-feeds' ) }<br/>
-								<ExternalLink href="https://docs.themeisle.com/article/1154-how-to-use-feed-to-post-feature-in-feedzy#tag-actions">{ __( 'Learn more about this feature.', 'feedzy-rss-feeds' ) }</ExternalLink></p>
-							</div>
-						) }
-
-						{ action.length === 0 && (
-							<div className="fz-action-intro">
-								<p>{ __( 'If no action is needed, continue with using the original tag by clicking on the Save Actions button.', 'feedzy-rss-feeds' ) }</p>
+			{isOpen && (
+				<Modal
+					isDismissible={false}
+					onRequestClose={closeModal}
+					className="fz-action-popup"
+					overlayClassName="fz-popup-wrap"
+				>
+					<div className="fz-action-content">
+						<div className="fz-action-header">
+							<div className="fz-modal-title">
+								<h2>
+									{__(
+										'Add actions to this tag',
+										'feedzy-rss-feeds'
+									)}
+								</h2>{' '}
+								{!isHideMsg && (
+									<span>
+										{__('New!', 'feedzy-rss-feeds')}
+									</span>
+								)}
 							</div>
-						) }
-
-						{action.length > 0 && ( <Actions data={action} removeCallback={removeAction} onChangeHandler={handleChange} updatePromptText={demoPromptText} onSortEnd={onSortEnd} useDragHandle lockAxis="y" helperClass="draggable-item" distance={1} lockToContainerEdges={true} lockOffset="0%"/> )}
-
-						<div className="fz-action-btn">
-							<div className="fz-action-relative">
-								<Button isSecondary className="fz-new-action" onClick={ () => { toggleVisible(true) } } disabled={isDisabledAddNew}>
-									{ __( 'Add new', 'feedzy-rss-feeds' ) } <Icon icon={ plus } />
-								</Button>
-								{ isVisible && (
-									<div className="popover-action-list">
-										<ul>
-											{
-												'item_image' === shortCode ? ([
-													feedzyData.isPro && ( feedzyData.isBusinessPlan || feedzyData.isAgencyPlan ) ? (
-														<li key="action-1" onClick={ () => addAction('fz_image') }>{__( 'Generate with OpenAI', 'feedzy-rss-feeds' )}</li>
-													) : (
-														<li key="action-1" onClick={ () => addAction('fz_image') }>{__( 'Generate with OpenAI', 'feedzy-rss-feeds' )} <span className="pro-label">PRO</span></li>
-													)]
-												) : ([
-													<li key="action-2" onClick={ () => addAction('trim') }>{__( 'Trim Content', 'feedzy-rss-feeds' )}</li>,
-													(
-														feedzyData.isPro && feedzyData.isAgencyPlan ? (
-															<li key="action-3" onClick={ () => addAction('fz_translate') }>{__( 'Translate with Feedzy', 'feedzy-rss-feeds' )}</li>
-														) : (
-															<li key="action-3" onClick={ () => addAction('fz_translate') }>{__( 'Translate with Feedzy', 'feedzy-rss-feeds' )} <span className="pro-label">PRO</span></li>
-														)
-													),
-													<li key="action-4" onClick={ () => addAction('search_replace') }>{__( 'Search / Replace', 'feedzy-rss-feeds' )}</li>,
-													(
-														'item_categories' !== shortCode && (
-															feedzyData.isPro ? (
-																<li key="action-5" onClick={ () => addAction('modify_links') }>{__( 'Modify Links', 'feedzy-rss-feeds' )}</li>
-															) : (
-																<li key="action-5" onClick={ () => addAction('modify_links') }>{__( 'Modify Links', 'feedzy-rss-feeds' )} <span className="pro-label">PRO</span></li>
-															)
-														)
-													),
-													(
-														'item_categories' !== shortCode && (
-															feedzyData.isPro && ( feedzyData.isBusinessPlan || feedzyData.isAgencyPlan ) ? (
-																<li key="action-6" onClick={ () => addAction('fz_paraphrase') }>{__( 'Paraphrase with Feedzy', 'feedzy-rss-feeds' )}</li>
-															) : (
-																<li key="action-6" onClick={ () => addAction('fz_paraphrase') }>{__( 'Paraphrase with Feedzy', 'feedzy-rss-feeds' )} <span className="pro-label">PRO</span></li>
-															)
-														)
-													),
-													(
-														'item_categories' !== shortCode && (
-															feedzyData.isPro && feedzyData.isAgencyPlan ? (
-																<li key="action-7" onClick={ () => addAction('spinnerchief') }>{__( 'Spin using SpinnerChief', 'feedzy-rss-feeds' )}</li>
-															) : (
-																<li key="action-7" onClick={ () => addAction('spinnerchief') }>{__( 'Spin using SpinnerChief', 'feedzy-rss-feeds' )} <span className="pro-label">PRO</span></li>
-															)
-														)
-													),
-													(
-														'item_categories' !== shortCode && (
-															feedzyData.isPro && feedzyData.isAgencyPlan ? (
-																<li key="action-8" onClick={ () => addAction('wordAI') }>{__( 'Spin using WordAI', 'feedzy-rss-feeds' )}</li>
+							<Button
+								variant="secondary"
+								className="fz-close-popup"
+								onClick={closeModal}
+							>
+								<Icon icon={close} />
+							</Button>
+						</div>
+						<div className="fz-action-body">
+							{!isHideMsg && (
+								<div className="fz-action-intro">
+									<p>
+										{__(
+											'Feedzy now supports adding and chaining actions into a single tag. Add an action by clicking the Add new button below. You can add multiple actions in each tag.',
+											'feedzy-rss-feeds'
+										)}
+										<br />
+										<ExternalLink href="https://docs.themeisle.com/article/1154-how-to-use-feed-to-post-feature-in-feedzy#tag-actions">
+											{__(
+												'Learn more about this feature.',
+												'feedzy-rss-feeds'
+											)}
+										</ExternalLink>
+									</p>
+								</div>
+							)}
+
+							{action.length === 0 && (
+								<div className="fz-action-intro">
+									<p>
+										{__(
+											'If no action is needed, continue with using the original tag by clicking on the Save Actions button.',
+											'feedzy-rss-feeds'
+										)}
+									</p>
+								</div>
+							)}
+
+							{action.length > 0 && (
+								<Actions
+									data={action}
+									removeCallback={removeAction}
+									onChangeHandler={handleChange}
+									updatePromptText={demoPromptText}
+									onSortEnd={onSortEnd}
+									useDragHandle
+									lockAxis="y"
+									helperClass="draggable-item"
+									distance={1}
+									lockToContainerEdges={true}
+									lockOffset="0%"
+								/>
+							)}
+
+							<div className="fz-action-btn">
+								<div className="fz-action-relative">
+									<Button
+										isSecondary
+										className="fz-new-action"
+										onClick={() => {
+											toggleVisible(true);
+										}}
+										disabled={isDisabledAddNew}
+									>
+										{__('Add new', 'feedzy-rss-feeds')}{' '}
+										<Icon icon={plus} />
+									</Button>
+									{isVisible && (
+										<div className="popover-action-list">
+											<ul>
+												{'item_image' === shortCode
+													? [
+															window.feedzyData
+																.isPro &&
+															(window.feedzyData
+																.isBusinessPlan ||
+																window
+																	.feedzyData
+																	.isAgencyPlan) ? (
+																<li key="action-1">
+																	<button
+																		onClick={() =>
+																			addAction(
+																				'fz_image'
+																			)
+																		}
+																	>
+																		{__(
+																			'Generate with OpenAI',
+																			'feedzy-rss-feeds'
+																		)}
+																	</button>
+																</li>
 															) : (
-																<li key="action-8" onClick={ () => addAction('wordAI') }>{__( 'Spin using WordAI', 'feedzy-rss-feeds' )} <span className="pro-label">PRO</span></li>
-															)
-														)
-													),
-													(
-														'item_categories' !== shortCode && (
-															feedzyData.isPro && ( feedzyData.isBusinessPlan || feedzyData.isAgencyPlan ) ? (
-																<li key="action-9" onClick={ () => addAction('chat_gpt_rewrite') }>{__( 'Rewrite with AI', 'feedzy-rss-feeds' )}</li>
+																<li
+																	key="action-1-disabled"
+																	className="fz-action-disabled"
+																>
+																	{__(
+																		'Generate with OpenAI',
+																		'feedzy-rss-feeds'
+																	)}
+																	<span className="pro-label">
+																		PRO
+																	</span>
+																</li>
+															),
+														]
+													: [
+															<li key="action-2">
+																<button
+																	className="feedzy-action-button"
+																	onClick={() =>
+																		addAction(
+																			'trim'
+																		)
+																	}
+																>
+																	{__(
+																		'Trim Content',
+																		'feedzy-rss-feeds'
+																	)}
+																</button>
+															</li>,
+															window.feedzyData
+																.isPro &&
+															window.feedzyData
+																.isAgencyPlan ? (
+																<li key="action-3">
+																	<button
+																		className="feedzy-action-button"
+																		onClick={() =>
+																			addAction(
+																				'fz_translate'
+																			)
+																		}
+																	>
+																		{__(
+																			'Translate with Feedzy',
+																			'feedzy-rss-feeds'
+																		)}
+																	</button>
+																</li>
 															) : (
-																<li key="action-9" onClick={ () => addAction('chat_gpt_rewrite') }>{__( 'Rewrite with AI', 'feedzy-rss-feeds' )} <span className="pro-label">PRO</span></li>
-															)
-														)
-													)
-												])
-											}
-											<li className="link-item"><ExternalLink href="https://docs.themeisle.com/article/1154-how-to-use-feed-to-post-feature-in-feedzy#tag-actions">{ __( 'Learn more about this feature.', 'feedzy-rss-feeds' ) }</ExternalLink></li>
-										</ul>
-									</div>
+																<li
+																	key="action-3-disabled"
+																	className="fz-action-disabled"
+																>
+																	{__(
+																		'Translate with Feedzy',
+																		'feedzy-rss-feeds'
+																	)}
+																	<span className="pro-label">
+																		PRO
+																	</span>
+																</li>
+															),
+															<li key="action-4">
+																<button
+																	className="feedzy-action-button"
+																	onClick={() =>
+																		addAction(
+																			'search_replace'
+																		)
+																	}
+																>
+																	{__(
+																		'Search / Replace',
+																		'feedzy-rss-feeds'
+																	)}
+																</button>
+															</li>,
+															'item_categories' !==
+																shortCode &&
+																(window
+																	.feedzyData
+																	.isPro ? (
+																	<li key="action-5">
+																		<button
+																			className="feedzy-action-button"
+																			onClick={() =>
+																				addAction(
+																					'modify_links'
+																				)
+																			}
+																		>
+																			{__(
+																				'Modify Links',
+																				'feedzy-rss-feeds'
+																			)}
+																		</button>
+																	</li>
+																) : (
+																	<li
+																		key="action-5-disabled"
+																		className="fz-action-disabled"
+																	>
+																		{__(
+																			'Modify Links',
+																			'feedzy-rss-feeds'
+																		)}
+																		<span className="pro-label">
+																			PRO
+																		</span>
+																	</li>
+																)),
+															'item_categories' !==
+																shortCode &&
+																(window
+																	.feedzyData
+																	.isPro &&
+																(window
+																	.feedzyData
+																	.isBusinessPlan ||
+																	window
+																		.feedzyData
+																		.isAgencyPlan) ? (
+																	<li key="action-6">
+																		<button
+																			className="feedzy-action-button"
+																			onClick={() =>
+																				addAction(
+																					'fz_paraphrase'
+																				)
+																			}
+																		>
+																			{__(
+																				'Paraphrase with Feedzy',
+																				'feedzy-rss-feeds'
+																			)}
+																		</button>
+																	</li>
+																) : (
+																	<li
+																		key="action-6-disabled"
+																		className="fz-action-disabled"
+																	>
+																		{__(
+																			'Paraphrase with Feedzy',
+																			'feedzy-rss-feeds'
+																		)}
+																		<span className="pro-label">
+																			PRO
+																		</span>
+																	</li>
+																)),
+															'item_categories' !==
+																shortCode &&
+																(window
+																	.feedzyData
+																	.isPro &&
+																window
+																	.feedzyData
+																	.isAgencyPlan ? (
+																	<li key="action-7">
+																		<button
+																			className="feedzy-action-button"
+																			onClick={() =>
+																				addAction(
+																					'spinnerchief'
+																				)
+																			}
+																		>
+																			{__(
+																				'Spin using SpinnerChief',
+																				'feedzy-rss-feeds'
+																			)}
+																		</button>
+																	</li>
+																) : (
+																	<li
+																		key="action-7-disabled"
+																		className="fz-action-disabled"
+																	>
+																		{__(
+																			'Spin using SpinnerChief',
+																			'feedzy-rss-feeds'
+																		)}
+																		<span className="pro-label">
+																			PRO
+																		</span>
+																	</li>
+																)),
+															'item_categories' !==
+																shortCode &&
+																(window
+																	.feedzyData
+																	.isPro &&
+																window
+																	.feedzyData
+																	.isAgencyPlan ? (
+																	<li key="action-8">
+																		<button
+																			className="feedzy-action-button"
+																			onClick={() =>
+																				addAction(
+																					'wordAI'
+																				)
+																			}
+																		>
+																			{__(
+																				'Spin using WordAI',
+																				'feedzy-rss-feeds'
+																			)}
+																		</button>
+																	</li>
+																) : (
+																	<li
+																		key="action-8-disabled"
+																		className="fz-action-disabled"
+																	>
+																		{__(
+																			'Spin using WordAI',
+																			'feedzy-rss-feeds'
+																		)}
+																		<span className="pro-label">
+																			PRO
+																		</span>
+																	</li>
+																)),
+															'item_categories' !==
+																shortCode &&
+																(window
+																	.feedzyData
+																	.isPro &&
+																(window
+																	.feedzyData
+																	.isBusinessPlan ||
+																	window
+																		.feedzyData
+																		.isAgencyPlan) ? (
+																	<li key="action-9">
+																		<button
+																			className="feedzy-action-button"
+																			onClick={() =>
+																				addAction(
+																					'chat_gpt_rewrite'
+																				)
+																			}
+																		>
+																			{__(
+																				'Rewrite with AI',
+																				'feedzy-rss-feeds'
+																			)}
+																		</button>
+																	</li>
+																) : (
+																	<li
+																		key="action-9-disabled"
+																		className="fz-action-disabled"
+																	>
+																		{__(
+																			'Rewrite with AI',
+																			'feedzy-rss-feeds'
+																		)}
+																		<span className="pro-label">
+																			PRO
+																		</span>
+																	</li>
+																)),
+														]}
+												<li className="link-item">
+													<ExternalLink href="https://docs.themeisle.com/article/1154-how-to-use-feed-to-post-feature-in-feedzy#tag-actions">
+														{__(
+															'Learn more about this feature.',
+															'feedzy-rss-feeds'
+														)}
+													</ExternalLink>
+												</li>
+											</ul>
+										</div>
+									)}
+								</div>
+								{action && (
+									<Button
+										isPrimary
+										className="fz-save-action"
+										onClick={() => {
+											saveAction();
+										}}
+									>
+										{__('Save Actions', 'feedzy-rss-feeds')}
+									</Button>
 								)}
 							</div>
-						{ action && ( <Button isPrimary className="fz-save-action" onClick={ () => { saveAction() } }>{ __( 'Save Actions', 'feedzy-rss-feeds' ) }</Button> ) }
 						</div>
 					</div>
-				</div>
-			</Modal>
-			) }
+				</Modal>
+			)}
 		</Fragment>
-		);
-	};
+	);
+};
 
-ReactDOM.render(
-	<ActionModal />,
-	document.querySelector('#fz-action-popup')
-);
+ReactDOM.render(<ActionModal />, document.querySelector('#fz-action-popup'));
diff --git a/js/Conditions/ConditionsControl.js b/js/Conditions/ConditionsControl.js
index 8bf0103b..14406d3a 100644
--- a/js/Conditions/ConditionsControl.js
+++ b/js/Conditions/ConditionsControl.js
@@ -53,6 +53,11 @@ const SUPPORTED_FIELDS = [
 		value: 'featured_image',
 		unsupportedOperators: ['greater_than', 'gte', 'less_than', 'lte'],
 	},
+	{
+		label: __('Link', 'feedzy-rss-feeds'),
+		value: 'link',
+		unsupportedOperators: ['greater_than', 'gte', 'less_than', 'lte'],
+	},
 ];
 const isPro = window.feedzyData.isPro;
 
@@ -144,7 +149,7 @@ const ConditionsControl = ({ conditions, setConditions }) => {
 				);
 				const operators = Object.keys(
 					window?.feedzyConditionsData?.operators
-				).filter((key) => !field.unsupportedOperators?.includes(key));
+				).filter((key) => !field?.unsupportedOperators?.includes(key));
 
 				return (
 					<PanelTab
diff --git a/js/FeedzyBlock/Editor.js b/js/FeedzyBlock/Editor.js
index 91a6022f..902c9ee2 100644
--- a/js/FeedzyBlock/Editor.js
+++ b/js/FeedzyBlock/Editor.js
@@ -8,6 +8,7 @@ import {
 	Button,
 	Spinner,
 	Disabled,
+	Notice,
 } from '@wordpress/components';
 
 import queryString from 'query-string';
@@ -15,6 +16,7 @@ import Inspector from './inspector';
 import { __, sprintf } from '@wordpress/i18n';
 import apiFetch from '@wordpress/api-fetch';
 import { Component, Fragment } from '@wordpress/element';
+import { InspectorControls } from '@wordpress/block-editor';
 import {
 	unescapeHTML,
 	filterData,
@@ -53,6 +55,7 @@ class Editor extends Component {
 		this.onThumb = this.onThumb.bind(this);
 		this.onDefault = this.onDefault.bind(this);
 		this.onSize = this.onSize.bind(this);
+		this.onAspectRatio = this.onAspectRatio.bind(this);
 		this.onReferralURL = this.onReferralURL.bind(this);
 		this.onColumns = this.onColumns.bind(this);
 		this.onTemplate = this.onTemplate.bind(this);
@@ -77,7 +80,7 @@ class Editor extends Component {
 			// reload: when the feed needs to be refetched
 			route: this.props.attributes.route,
 			loading: false,
-			error: false,
+			validationResults: [],
 		};
 	}
 
@@ -103,12 +106,81 @@ class Editor extends Component {
 		}
 	}
 
-	loadFeed() {
-		let url = this.props.attributes.feeds;
+	async loadFeed() {
+		const url = this.props.attributes.feeds;
 		if (url === undefined) {
 			return;
 		}
 
+		this.setState({
+			route: 'home',
+			loading: true,
+			validationResults: [],
+		});
+
+		if (inArray(url, this.props.attributes.categories)) {
+			this.loadFeedData(url);
+			return;
+		}
+
+		try {
+			const formData = new FormData();
+			formData.append('action', 'feedzy_validate_feed');
+			formData.append('feed_url', url);
+			formData.append('nonce', window.feedzyjs?.nonce);
+
+			const validationResponse = await fetch(window.feedzyjs?.url, {
+				method: 'POST',
+				body: formData,
+			});
+
+			const validationData = await validationResponse.json();
+
+			if (validationData.success && validationData.data?.results) {
+				const results = validationData.data.results;
+
+				this.setState({
+					validationResults: results,
+					loading: false,
+				});
+
+				const hasErrors = results.some(
+					(result) => result.status === 'error'
+				);
+
+				if (!hasErrors) {
+					this.loadFeedData(url);
+				}
+			} else if (!validationData.success) {
+				this.setState({
+					validationResults: [
+						{
+							status: 'error',
+							message:
+								validationData.data?.message ||
+								__('Validation failed', 'feedzy-rss-feeds'),
+						},
+					],
+					loading: false,
+				});
+			}
+		} catch (error) {
+			this.setState({
+				validationResults: [
+					{
+						status: 'error',
+						message: __(
+							'Failed to validate feed. Please check your connection and try again.',
+							'feedzy-rss-feeds'
+						),
+					},
+				],
+				loading: false,
+			});
+		}
+	}
+
+	loadFeedData(url) {
 		if (inArray(url, this.props.attributes.categories)) {
 			const category = url;
 			url = queryString.stringify(
@@ -123,11 +195,6 @@ class Editor extends Component {
 			url = queryString.stringify({ url }, { arrayFormat: 'bracket' });
 		}
 
-		this.setState({
-			route: 'home',
-			loading: true,
-		});
-
 		apiFetch({
 			path: `/feedzy/v1/feed?${url}`,
 			method: 'POST',
@@ -142,13 +209,24 @@ class Editor extends Component {
 					this.setState({
 						route: 'fetched',
 						loading: false,
+						validationResults: [],
 					});
 					return data;
 				}
 				this.setState({
 					route: 'home',
 					loading: false,
-					error: true,
+					validationResults: [
+						{
+							status: 'error',
+							message:
+								data.message ||
+								__(
+									'Feed URL is invalid or unreachable',
+									'feedzy-rss-feeds'
+								),
+						},
+					],
 				});
 				return data;
 			})
@@ -156,7 +234,15 @@ class Editor extends Component {
 				this.setState({
 					route: 'home',
 					loading: false,
-					error: true,
+					validationResults: [
+						{
+							status: 'error',
+							message: __(
+								'Error loading feed. Please check your feed URL and try again.',
+								'feedzy-rss-feeds'
+							),
+						},
+					],
 				});
 				return err;
 			});
@@ -225,7 +311,7 @@ class Editor extends Component {
 
 	getImageURL(item, background) {
 		let url;
-		if (item.thumbnail) {
+		if (item.thumbnail && this.props.attributes.thumb === 'auto') {
 			url = item.thumbnail;
 		} else if (this.props.attributes.default) {
 			url = this.props.attributes.default.url;
@@ -247,6 +333,9 @@ class Editor extends Component {
 			featureValue: value,
 		});
 		this.props.setAttributes({ feeds: value });
+		this.setState({
+			validationResults: [],
+		});
 	}
 	onChangeMax(value) {
 		this.props.setAttributes({ max: !value ? 5 : Number(value) });
@@ -326,6 +415,9 @@ class Editor extends Component {
 	onSize(value) {
 		this.props.setAttributes({ size: !value ? 150 : Number(value) });
 	}
+	onAspectRatio(value) {
+		this.props.setAttributes({ aspectRatio: value });
+	}
 	onReferralURL(value) {
 		window.tiTrk?.with('feedzy').add({ feature: 'block-referral-url' });
 		this.props.setAttributes({ referral_url: value });
@@ -418,12 +510,49 @@ class Editor extends Component {
 		}
 	}
 
+	renderValidationResults() {
+		if (
+			!this.state.validationResults ||
+			this.state.validationResults.length === 0
+		) {
+			return null;
+		}
+
+		return (
+			<div className="feedzy-validation-results">
+				{this.state.validationResults.map((result, index) => (
+					<Notice
+						key={`result-${index}`}
+						status={result.status}
+						isDismissible={false}
+					>
+						{result.url && (
+							<>
+								<strong>{result.url}</strong>
+								<br />
+							</>
+						)}
+						{result.message}
+					</Notice>
+				))}
+			</div>
+		);
+	}
+
 	render() {
 		return (
 			<Fragment>
-				{'fetched' === this.state.route && (
-					<Inspector edit={this} state={this.state} {...this.props} />
-				)}
+				<InspectorControls key="inspector">
+					<div>
+						{'fetched' === this.state.route && (
+							<Inspector
+								edit={this}
+								state={this.state}
+								{...this.props}
+							/>
+						)}
+					</div>
+				</InspectorControls>
 				{'home' === this.state.route && (
 					<div className={this.props.className}>
 						<Placeholder
@@ -437,61 +566,68 @@ class Editor extends Component {
 									className="wp-block-embed is-loading"
 								>
 									<Spinner />
-									<p>{__('Fetching…', 'feedzy-rss-feeds')}</p>
-								</div>
-							) : (
-								<Fragment>
-									<div className="feedzy-source-wrap">
-										<TextControl
-											type="url"
-											className="feedzy-source"
-											placeholder={__(
-												'Enter URL or group of your feed here…',
-												'feedzy-rss-feeds'
-											)}
-											onChange={this.onChangeFeed}
-											onKeyUp={this.handleKeyUp}
-											value={this.props.attributes.feeds}
-										/>
-										{this.props.attributes.categories &&
-											this.props.attributes.categories
-												.length > 0 && (
-												// eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions
-												<span
-													className="dashicons dashicons-arrow-down-alt2"
-													onClick={
-														this
-															.feedzyCategoriesList
-													}
-												></span>
-											)}
-									</div>
-									<Button
-										isLarge
-										isPrimary
-										type="submit"
-										onClick={this.loadFeed}
-									>
-										{__('Load Feed', 'feedzy-rss-feeds')}
-									</Button>
-									<ExternalLink
-										href={this.getValidateURL()}
-										title={__(
-											'Validate Feed',
+									<p>
+										{__(
+											'Validating and fetching feed…',
 											'feedzy-rss-feeds'
 										)}
+									</p>
+								</div>
+							) : (
+								<div
+									style={{
+										display: 'flex',
+										flexDirection: 'column',
+									}}
+								>
+									<div
+										style={{
+											display: 'flex',
+											flexDirection: 'row',
+										}}
 									>
-										{__('Validate', 'feedzy-rss-feeds')}
-									</ExternalLink>
-
-									{this.state.error && (
-										<div>
+										<div className="feedzy-source-wrap">
+											<TextControl
+												type="url"
+												className="feedzy-source"
+												placeholder={__(
+													'Enter URL or group of your feed here…',
+													'feedzy-rss-feeds'
+												)}
+												onChange={this.onChangeFeed}
+												onKeyUp={this.handleKeyUp}
+												value={
+													this.props.attributes.feeds
+												}
+											/>
+											{this.props.attributes.categories &&
+												this.props.attributes.categories
+													.length > 0 && (
+													// eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions
+													<span
+														className="dashicons dashicons-arrow-down-alt2"
+														onClick={
+															this
+																.feedzyCategoriesList
+														}
+													></span>
+												)}
+										</div>
+										<Button
+											isLarge
+											isPrimary
+											type="submit"
+											onClick={this.loadFeed}
+										>
 											{__(
-												'Feed URL is invalid or unreachable by WordPress SimplePie and will NOT display items.',
+												'Load Feed',
 												'feedzy-rss-feeds'
 											)}
-										</div>
-									)}
+										</Button>
+									</div>
+
+									{this.renderValidationResults()}
+
 									<p>
 										{__(
 											"Enter the full URL of the feed source you wish to display here, or the name of a group you've created. Also you can add multiple URLs just separate them with a comma. You can manage your groups feed from",
@@ -508,7 +644,7 @@ class Editor extends Component {
 											{__('here', 'feedzy-rss-feeds')}
 										</a>
 									</p>
-								</Fragment>
+								</div>
 							)}
 						</Placeholder>
 					</div>
@@ -669,9 +805,9 @@ class Editor extends Component {
 											<div
 												className="rss_image"
 												style={{
-													width:
+													aspectRatio:
 														this.props.attributes
-															.size + 'px',
+															.aspectRatio,
 													height:
 														this.props.attributes
 															.size + 'px',
@@ -684,11 +820,10 @@ class Editor extends Component {
 															item.title
 														)}
 														style={{
-															width:
+															aspectRatio:
 																this.props
 																	.attributes
-																	.size +
-																'px',
+																	.aspectRatio,
 															height:
 																this.props
 																	.attributes
@@ -696,29 +831,26 @@ class Editor extends Component {
 																'px',
 														}}
 													>
-														<span
-															className="fetched"
+														<img
+															src={this.getImageURL(
+																item,
+																false
+															)}
+															alt={unescapeHTML(
+																item.title
+															)}
 															style={{
-																width:
+																aspectRatio:
 																	this.props
 																		.attributes
-																		.size +
-																	'px',
+																		.aspectRatio,
 																height:
 																	this.props
 																		.attributes
 																		.size +
 																	'px',
-																backgroundImage:
-																	this.getImageURL(
-																		item,
-																		true
-																	),
 															}}
-															title={unescapeHTML(
-																item.title
-															)}
-														></span>
+														/>
 													</a>
 												</Disabled>
 											</div>
diff --git a/js/FeedzyBlock/attributes.js b/js/FeedzyBlock/attributes.js
index 79a83159..c39c401c 100644
--- a/js/FeedzyBlock/attributes.js
+++ b/js/FeedzyBlock/attributes.js
@@ -117,7 +117,7 @@ const attributes = {
 	disableStyle: {
 		type: 'boolean',
 		default: false,
-  },
+	},
 	follow: {
 		type: 'string',
 		default: 'no',
@@ -137,7 +137,11 @@ const attributes = {
 	_dry_run_tags_: {
 		type: 'string',
 		default: '',
-	}
+	},
+	aspectRatio: {
+		type: 'string',
+		default: '1',
+	},
 };
 
-export default attributes;
\ No newline at end of file
+export default attributes;
diff --git a/js/FeedzyBlock/inspector.js b/js/FeedzyBlock/inspector.js
index 1d68c3a9..7c25b024 100644
--- a/js/FeedzyBlock/inspector.js
+++ b/js/FeedzyBlock/inspector.js
@@ -12,7 +12,7 @@ import RadioImageControl from './radio-image-control/';
 import classnames from 'classnames';
 import { __, sprintf } from '@wordpress/i18n';
 import { applyFilters } from '@wordpress/hooks';
-import { InspectorControls, MediaUpload } from '@wordpress/block-editor';
+import { MediaUpload } from '@wordpress/block-editor';
 import {
 	BaseControl,
 	ExternalLink,
@@ -25,12 +25,13 @@ import {
 	SelectControl,
 	ResponsiveWrapper,
 	Dashicon,
+	// eslint-disable-next-line @wordpress/no-unsafe-wp-apis
+	__experimentalHStack as HStack,
 } from '@wordpress/components';
 
 /**
  * Create an Inspector Controls wrapper Component
  */
-
 class Inspector extends Component {
 	constructor() {
 		super(...arguments);
@@ -60,288 +61,478 @@ class Inspector extends Component {
 
 		return (
 			<Fragment>
-				<InspectorControls key="inspector">
-					<PanelBody className="fz-section-header-panel">
-						<Button
-							className={classnames('header-tab', {
-								'is-selected': 'content' === this.state.tab,
-							})}
-							onClick={() => this.setState({ tab: 'content' })}
+				<PanelBody className="fz-section-header-panel">
+					<Button
+						className={classnames('header-tab', {
+							'is-selected': 'content' === this.state.tab,
+						})}
+						onClick={() => this.setState({ tab: 'content' })}
+					>
+						<span>
+							<Dashicon icon="editor-table" />
+							{__('Content', 'feedzy-rss-feeds')}
+						</span>
+					</Button>
+					<Button
+						className={classnames('header-tab', {
+							'is-selected': 'style' === this.state.tab,
+						})}
+						onClick={() => this.setState({ tab: 'style' })}
+					>
+						<span>
+							<Dashicon icon="admin-customizer" />
+							{__('Style', 'feedzy-rss-feeds')}
+						</span>
+					</Button>
+					<Button
+						className={classnames('header-tab', {
+							'is-selected': 'advanced' === this.state.tab,
+						})}
+						onClick={() => this.setState({ tab: 'advanced' })}
+					>
+						<span>
+							<Dashicon icon="admin-generic" />
+							{__('Advanced', 'feedzy-rss-feeds')}
+						</span>
+					</Button>
+				</PanelBody>
+				{'content' === this.state.tab && (
+					<Fragment>
+						<PanelBody
+							title={__('General', 'feedzy-rss-feeds')}
+							initialOpen={true}
 						>
-							<span>
-								<Dashicon icon="editor-table" />
-								{__('Content', 'feedzy-rss-feeds')}
-							</span>
-						</Button>
-						<Button
-							className={classnames('header-tab', {
-								'is-selected': 'style' === this.state.tab,
-							})}
-							onClick={() => this.setState({ tab: 'style' })}
+							{this.props.attributes.status !== 0 && (
+								<Fragment>
+									<TextControl
+										label={__(
+											'Feed Source',
+											'feedzy-rss-feeds'
+										)}
+										className="feedzy-source"
+										value={this.props.attributes.feeds}
+										onChange={this.props.edit.onChangeFeed}
+									/>
+									<Button
+										isLarge
+										isPrimary
+										type="submit"
+										onClick={this.props.edit.loadFeed}
+										className="loadFeed"
+									>
+										{__('Load Feed', 'feedzy-rss-feeds')}
+									</Button>
+								</Fragment>
+							)}
+							{'fetched' === this.props.state.route && (
+								<Fragment>
+									<RangeControl
+										label={__(
+											'Number of Items',
+											'feedzy-rss-feeds'
+										)}
+										value={
+											Number(this.props.attributes.max) ||
+											5
+										}
+										onChange={this.props.edit.onChangeMax}
+										min={1}
+										max={
+											this.props.attributes.feedData.items
+												.length || 10
+										}
+										beforeIcon="sort"
+										className="feedzy-max"
+									/>
+									<SelectControl
+										label={__(
+											'Sorting Order',
+											'feedzy-rss-feeds'
+										)}
+										value={this.props.attributes.sort}
+										options={[
+											{
+												label: __(
+													'Default',
+													'feedzy-rss-feeds'
+												),
+												value: 'default',
+											},
+											{
+												label: __(
+													'Date Descending',
+													'feedzy-rss-feeds'
+												),
+												value: 'date_desc',
+											},
+											{
+												label: __(
+													'Date Ascending',
+													'feedzy-rss-feeds'
+												),
+												value: 'date_asc',
+											},
+											{
+												label: __(
+													'Title Descending',
+													'feedzy-rss-feeds'
+												),
+												value: 'title_desc',
+											},
+											{
+												label: __(
+													'Title Ascending',
+													'feedzy-rss-feeds'
+												),
+												value: 'title_asc',
+											},
+										]}
+										onChange={this.props.edit.onSort}
+										className="feedzy-sort"
+									/>
+								</Fragment>
+							)}
+						</PanelBody>
+
+						<PanelBody
+							title={__('Item Options', 'feedzy-rss-feeds')}
+							initialOpen={false}
+							className="feedzy-item-options"
 						>
-							<span>
-								<Dashicon icon="admin-customizer" />
-								{__('Style', 'feedzy-rss-feeds')}
-							</span>
-						</Button>
-						<Button
-							className={classnames('header-tab', {
-								'is-selected': 'advanced' === this.state.tab,
-							})}
-							onClick={() => this.setState({ tab: 'advanced' })}
+							<ToggleControl
+								label={__(
+									'Display item Title',
+									'feedzy-rss-feeds'
+								)}
+								checked={!!this.props.attributes.itemTitle}
+								onChange={this.props.edit.onToggleItemTitle}
+								className="feedzy-summary"
+							/>
+
+							{this.props.attributes.itemTitle && (
+								<TextControl
+									label={__(
+										'Title Character Limit',
+										'feedzy-rss-feeds'
+									)}
+									help={__(
+										'Leave empty to show full title. A value of 0 will remove the title.',
+										'feedzy-rss-feeds'
+									)}
+									type="number"
+									value={this.props.attributes.title}
+									onChange={this.props.edit.onTitle}
+									className="feedzy-title-length"
+								/>
+							)}
+
+							<ToggleControl
+								label={__(
+									'Display post description?',
+									'feedzy-rss-feeds'
+								)}
+								checked={!!this.props.attributes.summary}
+								onChange={this.props.edit.onToggleSummary}
+								className="feedzy-summary"
+							/>
+
+							{this.props.attributes.summary && (
+								<TextControl
+									label={__(
+										'Description Character Limit',
+										'feedzy-rss-feeds'
+									)}
+									help={__(
+										'Leave empty to show full description.',
+										'feedzy-rss-feeds'
+									)}
+									type="number"
+									value={this.props.attributes.summarylength}
+									onChange={this.props.edit.onSummaryLength}
+									className="feedzy-summary-length"
+									min={0}
+								/>
+							)}
+						</PanelBody>
+
+						<PanelBody
+							title={[
+								__('Filter items', 'feedzy-rss-feeds'),
+								!window.feedzyjs.isPro && (
+									<span className="fz-pro-label">Pro</span>
+								),
+							]}
+							initialOpen={false}
+							className={
+								window.feedzyjs.isPro
+									? 'feedzy-item-filter'
+									: 'feedzy-item-filter fz-locked'
+							}
 						>
-							<span>
-								<Dashicon icon="admin-generic" />
-								{__('Advanced', 'feedzy-rss-feeds')}
-							</span>
-						</Button>
-					</PanelBody>
-					{'content' === this.state.tab && (
+							{!window.feedzyjs.isPro && (
+								<div className="fz-upsell-notice">
+									{__(
+										'Unlock this feature and more advanced options with',
+										'feedzy-rss-feeds'
+									)}{' '}
+									<ExternalLink href="https://themeisle.com/plugins/feedzy-rss-feeds/upgrade/?utm_source=wpadmin&utm_medium=blockeditor&utm_campaign=keywordsfilter&utm_content=feedzy-rss-feeds">
+										{__('Feedzy Pro', 'feedzy-rss-feeds')}
+									</ExternalLink>
+								</div>
+							)}
+							<TextControl
+								label={__(
+									'Only display if selected field contains:',
+									'feedzy-rss-feeds'
+								)}
+								help={__(
+									'Use comma(,) and plus(+) keyword',
+									'feedzy-rss-feeds'
+								)}
+								value={this.props.attributes.keywords_title}
+								onChange={this.props.edit.onKeywordsTitle}
+								className="feedzy-include"
+							/>
+							<SelectControl
+								label={__(
+									'Select a field if you want to inc keyword.',
+									'feedzy-rss-feeds'
+								)}
+								value={this.props.attributes.keywords_inc_on}
+								options={[
+									{
+										label: __('Title', 'feedzy-rss-feeds'),
+										value: 'title',
+									},
+									{
+										label: __('Author', 'feedzy-rss-feeds'),
+										value: 'author',
+									},
+									{
+										label: __(
+											'Description',
+											'feedzy-rss-feeds'
+										),
+										value: 'description',
+									},
+								]}
+								onChange={this.props.edit.onKeywordsIncludeOn}
+							/>
+							<TextControl
+								label={__(
+									'Exclude if selected field contains:',
+									'feedzy-rss-feeds'
+								)}
+								help={__(
+									'Use comma(,) and plus(+) keyword',
+									'feedzy-rss-feeds'
+								)}
+								value={this.props.attributes.keywords_ban}
+								onChange={this.props.edit.onKeywordsBan}
+								className="feedzy-ban"
+							/>
+							<SelectControl
+								label={__(
+									'Select a field if you want to exc keyword.',
+									'feedzy-rss-feeds'
+								)}
+								value={this.props.attributes.keywords_exc_on}
+								options={[
+									{
+										label: __('Title', 'feedzy-rss-feeds'),
+										value: 'title',
+									},
+									{
+										label: __('Author', 'feedzy-rss-feeds'),
+										value: 'author',
+									},
+									{
+										label: __(
+											'Description',
+											'feedzy-rss-feeds'
+										),
+										value: 'description',
+									},
+								]}
+								onChange={this.props.edit.onKeywordsExcludeOn}
+							/>
+							<p className="fz-main-label">
+								{__(
+									'Filter feed item by date range.',
+									'feedzy-rss-feeds'
+								)}
+							</p>
+							<TextControl
+								type="datetime-local"
+								label={__('From:', 'feedzy-rss-feeds')}
+								value={this.props.attributes.from_datetime}
+								onChange={this.props.edit.onFromDateTime}
+							/>
+							<TextControl
+								type="datetime-local"
+								label={__('To:', 'feedzy-rss-feeds')}
+								value={this.props.attributes.to_datetime}
+								onChange={this.props.edit.onToDateTime}
+							/>
+						</PanelBody>
+					</Fragment>
+				)}
+
+				{'fetched' === this.props.state.route &&
+					'style' === this.state.tab && (
 						<Fragment>
 							<PanelBody
-								title={__('Feed Source', 'feedzy-rss-feeds')}
+								title={__(
+									'Item Image Options',
+									'feedzy-rss-feeds'
+								)}
 								initialOpen={true}
+								className="feedzy-image-options"
 							>
-								{this.props.attributes.status !== 0 && (
+								<SelectControl
+									label={__(
+										'Display first image if available?',
+										'feedzy-rss-feeds'
+									)}
+									value={this.props.attributes.thumb}
+									options={[
+										{
+											label: __(
+												'Yes (without a fallback image)',
+												'feedzy-rss-feeds'
+											),
+											value: 'auto',
+										},
+										{
+											label: __(
+												'Yes (with a fallback image)',
+												'feedzy-rss-feeds'
+											),
+											value: 'yes',
+										},
+										{
+											label: __('No', 'feedzy-rss-feeds'),
+											value: 'no',
+										},
+									]}
+									onChange={this.props.edit.onThumb}
+									className="feedzy-thumb"
+								/>
+
+								{this.props.attributes.thumb !== 'no' && (
 									<Fragment>
+										{this.props.attributes.thumb !==
+											'auto' && (
+											<FallbackImageLoader
+												props={this.props}
+											/>
+										)}
 										<TextControl
 											label={__(
-												'Feed Source',
+												'Thumbnails dimension.',
 												'feedzy-rss-feeds'
 											)}
-											className="feedzy-source"
-											value={this.props.attributes.feeds}
-											onChange={
-												this.props.edit.onChangeFeed
-											}
+											type="number"
+											value={this.props.attributes.size}
+											onChange={this.props.edit.onSize}
 										/>
-										<Button
-											isLarge
-											isPrimary
-											type="submit"
-											onClick={this.props.edit.loadFeed}
-											className="loadFeed"
-										>
-											{__(
-												'Load Feed',
-												'feedzy-rss-feeds'
-											)}
-										</Button>
-										<TextareaControl
+										<SelectControl
 											label={__(
-												'Message to show when feed is empty',
+												'Aspect Ratio',
 												'feedzy-rss-feeds'
 											)}
 											value={
 												this.props.attributes
-													.error_empty
-											}
-											onChange={
-												this.props.edit.onErrorEmpty
-											}
-										/>
-									</Fragment>
-								)}
-								{'fetched' === this.props.state.route && (
-									<Fragment>
-										<RangeControl
-											label={__(
-												'Number of Items',
-												'feedzy-rss-feeds'
-											)}
-											value={
-												Number(
-													this.props.attributes.max
-												) || 5
-											}
-											onChange={
-												this.props.edit.onChangeMax
+													.aspectRatio
 											}
-											min={1}
-											max={
-												this.props.attributes.feedData
-													.items.length || 10
-											}
-											beforeIcon="sort"
-											className="feedzy-max"
-										/>
-										<SelectControl
-											label={__(
-												'Sorting Order',
-												'feedzy-rss-feeds'
-											)}
-											value={this.props.attributes.sort}
 											options={[
 												{
 													label: __(
-														'Default',
+														'Original',
+														'feedzy-rss-feeds'
+													),
+													value: 'auto',
+												},
+												{
+													label: __(
+														'1:1 (Square)',
+														'feedzy-rss-feeds'
+													),
+													value: '1',
+												},
+												{
+													label: __(
+														'4:3 (Standard)',
 														'feedzy-rss-feeds'
 													),
-													value: 'default',
+													value: '4/3',
 												},
 												{
 													label: __(
-														'Date Descending',
+														'3:4 (Portrait)',
 														'feedzy-rss-feeds'
 													),
-													value: 'date_desc',
+													value: '3/4',
 												},
 												{
 													label: __(
-														'Date Ascending',
+														'3:2 (Classic)',
 														'feedzy-rss-feeds'
 													),
-													value: 'date_asc',
+													value: '3 / 2',
 												},
 												{
 													label: __(
-														'Title Descending',
+														'2:3 (Clasic Portrait)',
 														'feedzy-rss-feeds'
 													),
-													value: 'title_desc',
+													value: '2/3',
 												},
 												{
 													label: __(
-														'Title Ascending',
+														'16:9 (Widescreen)',
 														'feedzy-rss-feeds'
 													),
-													value: 'title_asc',
+													value: '16/9',
+												},
+												{
+													label: __(
+														'9:16 (Vertical)',
+														'feedzy-rss-feeds'
+													),
+													value: '9/16',
 												},
 											]}
-											onChange={this.props.edit.onSort}
-											className="feedzy-sort"
-										/>
-										<SelectControl
-											label={__(
-												'Feed Caching Time',
-												'feedzy-rss-feeds'
-											)}
-											value={
-												this.props.attributes.refresh
+											onChange={
+												this.props.edit.onAspectRatio
 											}
-											options={refreshFeed}
-											onChange={this.props.edit.onRefresh}
-											className="feedzy-refresh"
+											className="feedzy-aspect-ratio-select"
 										/>
 									</Fragment>
 								)}
-							</PanelBody>
-
-							<PanelBody
-								title={__('Item Options', 'feedzy-rss-feeds')}
-								initialOpen={false}
-								className="feedzy-item-options"
-							>
-								<SelectControl
-									label={__(
-										'Open Links In',
-										'feedzy-rss-feeds'
-									)}
-									value={this.props.attributes.target}
-									options={[
-										{
-											label: __(
-												'New Tab',
-												'feedzy-rss-feeds'
-											),
-											value: '_blank',
-										},
-										{
-											label: __(
-												'Same Tab',
-												'feedzy-rss-feeds'
-											),
-											value: '_self',
-										},
-									]}
-									onChange={this.props.edit.onTarget}
-								/>
-
-								<SelectControl
-									label={__(
-										'Make this link a "nofollow" link?',
-										'feedzy-rss-feeds'
-									)}
-									value={this.props.attributes.follow}
-									options={[
-										{
-											label: __('No', 'feedzy-rss-feeds'),
-											value: 'no',
-										},
-										{
-											label: __(
-												'Yes',
-												'feedzy-rss-feeds'
-											),
-											value: 'yes',
-										},
-									]}
-									onChange={this.props.edit.onLinkNoFollow}
-								/>
 
 								<ToggleControl
 									label={__(
-										'Display item Title',
+										'Disable default style?',
 										'feedzy-rss-feeds'
 									)}
-									checked={!!this.props.attributes.itemTitle}
-									onChange={this.props.edit.onToggleItemTitle}
+									checked={
+										!!this.props.attributes.disableStyle
+									}
+									onChange={
+										this.props.edit.onToggleDisableStyle
+									}
 									className="feedzy-summary"
-								/>
-
-								{this.props.attributes.itemTitle && (
-									<TextControl
-										label={__(
-											'Title Character Limit',
-											'feedzy-rss-feeds'
-										)}
-										help={__(
-											'Leave empty to show full title. A value of 0 will remove the title.',
-											'feedzy-rss-feeds'
-										)}
-										type="number"
-										value={this.props.attributes.title}
-										onChange={this.props.edit.onTitle}
-										className="feedzy-title-length"
-									/>
-								)}
-
-								<ToggleControl
-									label={__(
-										'Display post description?',
+									help={__(
+										'If disabled, it will be considered the global setting.',
 										'feedzy-rss-feeds'
 									)}
-									checked={!!this.props.attributes.summary}
-									onChange={this.props.edit.onToggleSummary}
-									className="feedzy-summary"
 								/>
-
-								{this.props.attributes.summary && (
-									<TextControl
-										label={__(
-											'Description Character Limit',
-											'feedzy-rss-feeds'
-										)}
-										help={__(
-											'Leave empty to show full description.',
-											'feedzy-rss-feeds'
-										)}
-										type="number"
-										value={
-											this.props.attributes.summarylength
-										}
-										onChange={
-											this.props.edit.onSummaryLength
-										}
-										className="feedzy-summary-length"
-										min={0}
-									/>
-								)}
 							</PanelBody>
 
 							<PanelBody
 								title={[
-									__('Filter items', 'feedzy-rss-feeds'),
+									__('Feed Layout', 'feedzy-rss-feeds'),
 									!window.feedzyjs.isPro && (
 										<span className="fz-pro-label">
 											Pro
@@ -351,8 +542,8 @@ class Inspector extends Component {
 								initialOpen={false}
 								className={
 									window.feedzyjs.isPro
-										? 'feedzy-item-filter'
-										: 'feedzy-item-filter fz-locked'
+										? 'feedzy-layout'
+										: 'feedzy-layout fz-locked'
 								}
 							>
 								{!window.feedzyjs.isPro && (
@@ -361,7 +552,7 @@ class Inspector extends Component {
 											'Unlock this feature and more advanced options with',
 											'feedzy-rss-feeds'
 										)}{' '}
-										<ExternalLink href="https://themeisle.com/plugins/feedzy-rss-feeds/upgrade/?utm_source=wpadmin&utm_medium=blockeditor&utm_campaign=keywordsfilter&utm_content=feedzy-rss-feeds">
+										<ExternalLink href="https://themeisle.com/plugins/feedzy-rss-feeds/upgrade/?utm_source=wpadmin&utm_medium=blockeditor&utm_campaign=layouts&utm_content=feedzy-rss-feeds">
 											{__(
 												'Feedzy Pro',
 												'feedzy-rss-feeds'
@@ -369,710 +560,450 @@ class Inspector extends Component {
 										</ExternalLink>
 									</div>
 								)}
-								<TextControl
-									label={__(
-										'Only display if selected field contains:',
-										'feedzy-rss-feeds'
-									)}
+
+								<RangeControl
+									label={__('Columns', 'feedzy-rss-feeds')}
 									help={__(
-										'Use comma(,) and plus(+) keyword',
+										'How many columns we should use to display the feed items?',
 										'feedzy-rss-feeds'
 									)}
-									value={this.props.attributes.keywords_title}
-									onChange={this.props.edit.onKeywordsTitle}
-									className="feedzy-include"
+									value={this.props.attributes.columns || 1}
+									onChange={this.props.edit.onColumns}
+									min={1}
+									max={6}
+									beforeIcon="sort"
+									allowReset
 								/>
-								<SelectControl
-									label={__(
-										'Select a field if you want to inc keyword.',
-										'feedzy-rss-feeds'
-									)}
-									value={
-										this.props.attributes.keywords_inc_on
-									}
+
+								<RadioImageControl
+									label={__('Template', 'feedzy-rss-feeds')}
+									selected={this.props.attributes.template}
 									options={[
 										{
 											label: __(
-												'Title',
+												'Default',
 												'feedzy-rss-feeds'
 											),
-											value: 'title',
+											src:
+												window.feedzyjs.imagepath +
+												'feedzy-default-template.png',
+											value: 'default',
 										},
 										{
 											label: __(
-												'Author',
+												'Round',
 												'feedzy-rss-feeds'
 											),
-											value: 'author',
+											src:
+												window.feedzyjs.imagepath +
+												'feedzy-style1-template.png',
+											value: 'style1',
 										},
 										{
 											label: __(
-												'Description',
+												'Cards',
 												'feedzy-rss-feeds'
 											),
-											value: 'description',
+											src:
+												window.feedzyjs.imagepath +
+												'feedzy-style2-template.png',
+											value: 'style2',
 										},
 									]}
-									onChange={
-										this.props.edit.onKeywordsIncludeOn
-									}
+									onChange={this.props.edit.onTemplate}
 								/>
-								<TextControl
+							</PanelBody>
+						</Fragment>
+					)}
+				{'fetched' === this.props.state.route &&
+					'advanced' === this.state.tab && (
+						<Fragment>
+							<PanelBody
+								title={__(
+									'Feed Items Custom Options',
+									'feedzy-rss-feeds'
+								)}
+								className="feedzy-advanced-options"
+								initialOpen={true}
+							>
+								<BaseControl>
+									<TextControl
+										label={__(
+											'Meta fields to show',
+											'feedzy-rss-feeds'
+										)}
+										help={sprintf(
+											//translators: %s: the keyword for the user to introduce.
+											__(
+												'Leave empty to display all and "%s" to display nothing.',
+												'feedzy-rss-feeds'
+											),
+											'no'
+										)}
+										placeholder={decodeHtmlEntities(
+											'(' +
+												sprintf(
+													// translators: %s is the list of examples.
+													__(
+														'eg: %s',
+														'feedzy-rss-feeds'
+													),
+													window.feedzyjs.isPro
+														? 'author, date, time, tz=local, categories'
+														: 'author, date, time, tz=local'
+												) +
+												')'
+										)}
+										value={this.props.attributes.metafields}
+										onChange={this.props.edit.onChangeMeta}
+										className="feedzy-meta"
+									/>
+									<TextControl
+										label={__(
+											'Meta fields for sources.',
+											'feedzy-rss-feeds'
+										)}
+										placeholder={decodeHtmlEntities(
+											'(' +
+												sprintf(
+													// translators: %s is the list of examples.
+													__(
+														'eg: %s',
+														'feedzy-rss-feeds'
+													),
+													'source'
+												) +
+												')'
+										)}
+										value={
+											this.props.attributes.multiple_meta
+										}
+										onChange={
+											this.props.edit.onChangeMultipleMeta
+										}
+										className="feedzy-multiple-meta"
+									/>
+								</BaseControl>
+
+								<ToggleControl
 									label={__(
-										'Exclude if selected field contains:',
+										'Display price if available?',
 										'feedzy-rss-feeds'
 									)}
-									help={__(
-										'Use comma(,) and plus(+) keyword',
-										'feedzy-rss-feeds'
-									)}
-									value={this.props.attributes.keywords_ban}
-									onChange={this.props.edit.onKeywordsBan}
-									className="feedzy-ban"
+									help={
+										this.props.attributes.price &&
+										this.props.attributes.template ===
+											'default'
+											? __(
+													'Choose a different template for this to work.',
+													'feedzy-rss-feeds'
+												)
+											: null
+									}
+									checked={!!this.props.attributes.price}
+									onChange={this.props.edit.onTogglePrice}
+									className={
+										window.feedzyjs.isPro
+											? 'feedzy-pro-price'
+											: 'feedzy-pro-price fz-locked'
+									}
 								/>
+
+								{this.props.attributes.feedData.channel !==
+									null && (
+									<ToggleControl
+										label={__(
+											'Display feed title?',
+											'feedzy-rss-feeds'
+										)}
+										checked={
+											!!this.props.attributes.feed_title
+										}
+										onChange={
+											this.props.edit.onToggleFeedTitle
+										}
+										className="feedzy-title"
+									/>
+								)}
+
 								<SelectControl
 									label={__(
-										'Select a field if you want to exc keyword.',
+										'Open Links In',
 										'feedzy-rss-feeds'
 									)}
-									value={
-										this.props.attributes.keywords_exc_on
-									}
+									value={this.props.attributes.target}
 									options={[
 										{
 											label: __(
-												'Title',
+												'New Tab',
 												'feedzy-rss-feeds'
 											),
-											value: 'title',
+											value: '_blank',
 										},
 										{
 											label: __(
-												'Author',
+												'Same Tab',
 												'feedzy-rss-feeds'
 											),
-											value: 'author',
+											value: '_self',
+										},
+									]}
+									onChange={this.props.edit.onTarget}
+								/>
+
+								<SelectControl
+									label={__(
+										'Make this link a "nofollow" link?',
+										'feedzy-rss-feeds'
+									)}
+									value={this.props.attributes.follow}
+									options={[
+										{
+											label: __('No', 'feedzy-rss-feeds'),
+											value: 'no',
 										},
 										{
 											label: __(
-												'Description',
+												'Yes',
 												'feedzy-rss-feeds'
 											),
-											value: 'description',
+											value: 'yes',
 										},
 									]}
-									onChange={
-										this.props.edit.onKeywordsExcludeOn
-									}
+									onChange={this.props.edit.onLinkNoFollow}
 								/>
-								<p className="fz-main-label">
-									{__(
-										'Filter feed item by date range.',
+
+								<RangeControl
+									label={__(
+										'Ignore first N items',
 										'feedzy-rss-feeds'
 									)}
-								</p>
-								<TextControl
-									type="datetime-local"
-									label={__('From:', 'feedzy-rss-feeds')}
-									value={this.props.attributes.from_datetime}
-									onChange={this.props.edit.onFromDateTime}
-								/>
-								<TextControl
-									type="datetime-local"
-									label={__('To:', 'feedzy-rss-feeds')}
-									value={this.props.attributes.to_datetime}
-									onChange={this.props.edit.onToDateTime}
+									value={
+										Number(this.props.attributes.offset) ||
+										0
+									}
+									onChange={this.props.edit.onChangeOffset}
+									min={0}
+									max={
+										this.props.attributes.feedData.items
+											.length
+									}
+									beforeIcon="sort"
+									className="feedzy-offset"
 								/>
-							</PanelBody>
-						</Fragment>
-					)}
 
-					{'fetched' === this.props.state.route &&
-						'style' === this.state.tab && (
-							<Fragment>
-								<PanelBody
-									title={__(
-										'Item Image Options',
+								<ToggleControl
+									label={__(
+										'Lazy load feed?',
 										'feedzy-rss-feeds'
 									)}
-									initialOpen={false}
-									className="feedzy-image-options"
-								>
-									<SelectControl
-										label={__(
-											'Display first image if available?',
-											'feedzy-rss-feeds'
-										)}
-										value={this.props.attributes.thumb}
-										options={[
-											{
-												label: __(
-													'Yes (without a fallback image)',
-													'feedzy-rss-feeds'
-												),
-												value: 'auto',
-											},
-											{
-												label: __(
-													'Yes (with a fallback image)',
-													'feedzy-rss-feeds'
-												),
-												value: 'yes',
-											},
-											{
-												label: __(
-													'No',
-													'feedzy-rss-feeds'
-												),
-												value: 'no',
-											},
-										]}
-										onChange={this.props.edit.onThumb}
-										className="feedzy-thumb"
-									/>
-
-									{this.props.attributes.thumb !== 'no' && (
-										<Fragment>
-											{this.props.attributes.thumb !==
-												'auto' && (
-												<div className="feedzy-blocks-base-control">
-													<label
-														className="blocks-base-control__label"
-														htmlFor="inspector-media-upload"
-													>
-														{__(
-															'Fallback image if no image is found.',
-															'feedzy-rss-feeds'
-														)}
-													</label>
-													<MediaUpload
-														type="image"
-														id="inspector-media-upload"
-														value={
-															this.props
-																.attributes
-																.default
-														}
-														onSelect={
-															this.props.edit
-																.onDefault
-														}
-														render={({ open }) => (
-															<Fragment>
-																{this.props
-																	.attributes
-																	.default !==
-																	undefined && (
-																	<Fragment>
-																		<ResponsiveWrapper
-																			naturalWidth={
-																				this
-																					.props
-																					.attributes
-																					.default
-																					.width
-																			}
-																			naturalHeight={
-																				this
-																					.props
-																					.attributes
-																					.default
-																					.height
-																			}
-																		>
-																			<img
-																				src={
-																					this
-																						.props
-																						.attributes
-																						.default
-																						.url
-																				}
-																				alt={__(
-																					'Featured image',
-																					'feedzy-rss-feeds'
-																				)}
-																			/>
-																		</ResponsiveWrapper>
-
-																		<Button
-																			isLarge
-																			isSecondary
-																			onClick={() =>
-																				this.props.setAttributes(
-																					{
-																						default:
-																							undefined,
-																					}
-																				)
-																			}
-																			style={{
-																				marginTop:
-																					'10px',
-																			}}
-																		>
-																			{__(
-																				'Remove Image',
-																				'feedzy-rss-feeds'
-																			)}
-																		</Button>
-																	</Fragment>
-																)}
-																<Button
-																	isLarge
-																	isPrimary
-																	onClick={
-																		open
-																	}
-																	style={{
-																		marginTop:
-																			'10px',
-																	}}
-																	className={
-																		this
-																			.props
-																			.attributes
-																			.default ===
-																			undefined &&
-																		'feedzy_image_upload'
-																	}
-																>
-																	{__(
-																		'Upload Image',
-																		'feedzy-rss-feeds'
-																	)}
-																</Button>
-															</Fragment>
-														)}
-													/>
-												</div>
-											)}
-											<TextControl
-												label={__(
-													'Thumbnails dimension.',
-													'feedzy-rss-feeds'
-												)}
-												type="number"
-												value={
-													this.props.attributes.size
-												}
-												onChange={
-													this.props.edit.onSize
-												}
-											/>
-										</Fragment>
+									checked={!!this.props.attributes.lazy}
+									onChange={this.props.edit.onToggleLazy}
+									className="feedzy-lazy"
+									help={__(
+										'Only on the front end.',
+										'feedzy-rss-feeds'
 									)}
-								</PanelBody>
+								/>
+							</PanelBody>
 
-								<PanelBody
-									title={[
-										__('Feed Layout', 'feedzy-rss-feeds'),
-										!window.feedzyjs.isPro && (
-											<span className="fz-pro-label">
-												Pro
-											</span>
-										),
-									]}
-									initialOpen={false}
-									className={
-										window.feedzyjs.isPro
-											? 'feedzy-layout'
-											: 'feedzy-layout fz-locked'
-									}
-								>
-									{!window.feedzyjs.isPro && (
-										<div className="fz-upsell-notice">
+							<PanelBody
+								title={[
+									__('Referral URL', 'feedzy-rss-feeds'),
+									!window.feedzyjs.isPro && (
+										<span className="fz-pro-label">
+											Pro
+										</span>
+									),
+								]}
+								initialOpen={false}
+								className={
+									window.feedzyjs.isPro
+										? 'feedzy-pro-options'
+										: 'feedzy-pro-options fz-locked'
+								}
+							>
+								{!window.feedzyjs.isPro && (
+									<div className="fz-upsell-notice">
+										{__(
+											'Unlock this feature and more advanced options with',
+											'feedzy-rss-feeds'
+										)}{' '}
+										<ExternalLink href="https://themeisle.com/plugins/feedzy-rss-feeds/upgrade/?utm_source=wpadmin&utm_medium=blockeditor&utm_campaign=refferal&utm_content=feedzy-rss-feeds">
 											{__(
-												'Unlock this feature and more advanced options with',
+												'Feedzy Pro',
 												'feedzy-rss-feeds'
-											)}{' '}
-											<ExternalLink href="https://themeisle.com/plugins/feedzy-rss-feeds/upgrade/?utm_source=wpadmin&utm_medium=blockeditor&utm_campaign=layouts&utm_content=feedzy-rss-feeds">
-												{__(
-													'Feedzy Pro',
-													'feedzy-rss-feeds'
-												)}
-											</ExternalLink>
-										</div>
-									)}
-
-									<RangeControl
-										label={__(
-											'Columns',
-											'feedzy-rss-feeds'
-										)}
-										help={__(
-											'How many columns we should use to display the feed items?',
-											'feedzy-rss-feeds'
-										)}
-										value={
-											this.props.attributes.columns || 1
-										}
-										onChange={this.props.edit.onColumns}
-										min={1}
-										max={6}
-										beforeIcon="sort"
-										allowReset
-									/>
-
-									<RadioImageControl
-										label={__(
-											'Template',
-											'feedzy-rss-feeds'
-										)}
-										selected={
-											this.props.attributes.template
-										}
-										options={[
-											{
-												label: __(
-													'Default',
-													'feedzy-rss-feeds'
-												),
-												src:
-													window.feedzyjs.imagepath +
-													'feedzy-default-template.png',
-												value: 'default',
-											},
-											{
-												label: __(
-													'Round',
-													'feedzy-rss-feeds'
-												),
-												src:
-													window.feedzyjs.imagepath +
-													'feedzy-style1-template.png',
-												value: 'style1',
-											},
-											{
-												label: __(
-													'Cards',
-													'feedzy-rss-feeds'
-												),
-												src:
-													window.feedzyjs.imagepath +
-													'feedzy-style2-template.png',
-												value: 'style2',
-											},
-										]}
-										onChange={this.props.edit.onTemplate}
-									/>
-								</PanelBody>
-
-								<PanelBody
-									title={__(
-										'Disable default style',
+											)}
+										</ExternalLink>
+									</div>
+								)}
+								<TextControl
+									label={__(
+										'Referral URL parameters.',
 										'feedzy-rss-feeds'
 									)}
-									initialOpen={false}
-									className="feedzy-disable-style"
-								>
-									<ToggleControl
-										label={__(
-											'Disable default style?',
-											'feedzy-rss-feeds'
-										)}
-										checked={
-											!!this.props.attributes.disableStyle
-										}
-										onChange={
-											this.props.edit.onToggleDisableStyle
-										}
-										className="feedzy-summary"
-										help={__(
-											'If disabled, it will be considered the global setting.',
-											'feedzy-rss-feeds'
-										)}
-									/>
-								</PanelBody>
-							</Fragment>
-						)}
-					{'fetched' === this.props.state.route &&
-						'advanced' === this.state.tab && (
-							<Fragment>
-								<PanelBody
-									title={__(
-										'Feed Items Custom Options',
+									help={__(
+										'Without ("?")',
 										'feedzy-rss-feeds'
 									)}
-									className="feedzy-advanced-options"
-									initialOpen={false}
-								>
-									<BaseControl>
-										<TextControl
-											label={
-												window.feedzyjs.isPro
-													? __(
-															'Should we display additional meta fields out of author, date, time or categories? (comma-separated list, in order of display).',
-															'feedzy-rss-feeds'
-														)
-													: __(
-															'Should we display additional meta fields out of author, date or time? (comma-separated list, in order of display).',
-															'feedzy-rss-feeds'
-														)
-											}
-											help={sprintf(
-												//translators: %s: the keyword for the user to introduce.
+									placeholder={decodeHtmlEntities(
+										'(' +
+											sprintf(
+												// translators: %s is the list of examples.
 												__(
-													'Leave empty to display all and "%s" to display nothing.',
+													'eg: %s',
 													'feedzy-rss-feeds'
 												),
-												'no'
-											)}
-											placeholder={decodeHtmlEntities(
-												'(' +
-													sprintf(
-														// translators: %s is the list of examples.
-														__(
-															'eg: %s',
-															'feedzy-rss-feeds'
-														),
-														window.feedzyjs.isPro
-															? 'author, date, time, tz=local, categories'
-															: 'author, date, time, tz=local'
-													) +
-													')'
-											)}
-											value={
-												this.props.attributes.metafields
-											}
-											onChange={
-												this.props.edit.onChangeMeta
-											}
-											className="feedzy-meta"
-										/>
-										<TextControl
-											label={__(
-												'When using multiple sources, should we display additional meta fields? - source (comma-separated list).',
-												'feedzy-rss-feeds'
-											)}
-											placeholder={decodeHtmlEntities(
-												'(' +
-													sprintf(
-														// translators: %s is the list of examples.
-														__(
-															'eg: %s',
-															'feedzy-rss-feeds'
-														),
-														'source'
-													) +
-													')'
-											)}
-											value={
-												this.props.attributes
-													.multiple_meta
-											}
-											onChange={
-												this.props.edit
-													.onChangeMultipleMeta
-											}
-											className="feedzy-multiple-meta"
-										/>
-
-										<ExternalLink href="https://docs.themeisle.com/article/1089-how-to-display-author-date-or-time-from-the-feed">
-											{__(
-												'You can find more info about available meta field values here.',
-												'feedzy-rss-feeds'
-											)}
-										</ExternalLink>
-									</BaseControl>
-
-									<ToggleControl
-										label={__(
-											'Display price if available?',
-											'feedzy-rss-feeds'
-										)}
-										help={
-											this.props.attributes.price &&
-											this.props.attributes.template ===
-												'default'
-												? __(
-														'Choose a different template for this to work.',
-														'feedzy-rss-feeds'
-													)
-												: null
-										}
-										checked={!!this.props.attributes.price}
-										onChange={this.props.edit.onTogglePrice}
-										className={
-											window.feedzyjs.isPro
-												? 'feedzy-pro-price'
-												: 'feedzy-pro-price fz-locked'
-										}
-									/>
-
-									{this.props.attributes.feedData.channel !==
-										null && (
-										<ToggleControl
-											label={__(
-												'Display feed title?',
-												'feedzy-rss-feeds'
-											)}
-											checked={
-												!!this.props.attributes
-													.feed_title
-											}
-											onChange={
-												this.props.edit
-													.onToggleFeedTitle
-											}
-											className="feedzy-title"
-										/>
+												'promo_code=feedzy_is_awesome'
+											) +
+											')'
 									)}
+									value={this.props.attributes.referral_url}
+									onChange={this.props.edit.onReferralURL}
+								/>
+							</PanelBody>
 
-									<RangeControl
-										label={__(
-											'Ignore first N items',
-											'feedzy-rss-feeds'
-										)}
-										value={
-											Number(
-												this.props.attributes.offset
-											) || 0
-										}
-										onChange={
-											this.props.edit.onChangeOffset
-										}
-										min={0}
-										max={
-											this.props.attributes.feedData.items
-												.length
-										}
-										beforeIcon="sort"
-										className="feedzy-offset"
-									/>
-
-									<ToggleControl
-										label={__(
-											'Lazy load feed?',
-											'feedzy-rss-feeds'
-										)}
-										checked={!!this.props.attributes.lazy}
-										onChange={this.props.edit.onToggleLazy}
-										className="feedzy-lazy"
-										help={__(
-											'Only on the front end.',
-											'feedzy-rss-feeds'
-										)}
-									/>
-								</PanelBody>
+							<PanelBody
+								title={__(
+									'Additional options',
+									'feedzy-rss-feeds'
+								)}
+								initialOpen={false}
+								className="feedzy-additional-options"
+							>
+								<TextControl
+									label={__(
+										'Wrap custom class',
+										'feedzy-rss-feeds'
+									)}
+									value={this.props.attributes.className}
+									onChange={this.props.edit.onclassName}
+								/>
 
-								<PanelBody
-									title={[
-										__('Referral URL', 'feedzy-rss-feeds'),
-										!window.feedzyjs.isPro && (
-											<span className="fz-pro-label">
-												Pro
-											</span>
-										),
-									]}
-									initialOpen={false}
-									className={
-										window.feedzyjs.isPro
-											? 'feedzy-pro-options'
-											: 'feedzy-pro-options fz-locked'
-									}
-								>
-									{!window.feedzyjs.isPro && (
-										<div className="fz-upsell-notice">
-											{__(
-												'Unlock this feature and more advanced options with',
+								<SelectControl
+									label={__('Dry run?', 'feedzy-rss-feeds')}
+									value={this.props.attributes._dryrun_}
+									options={[
+										{
+											label: __('No', 'feedzy-rss-feeds'),
+											value: 'no',
+										},
+										{
+											label: __(
+												'Yes',
 												'feedzy-rss-feeds'
-											)}{' '}
-											<ExternalLink href="https://themeisle.com/plugins/feedzy-rss-feeds/upgrade/?utm_source=wpadmin&utm_medium=blockeditor&utm_campaign=refferal&utm_content=feedzy-rss-feeds">
-												{__(
-													'Feedzy Pro',
-													'feedzy-rss-feeds'
-												)}
-											</ExternalLink>
-										</div>
-									)}
-									<TextControl
-										label={__(
-											'Referral URL parameters.',
-											'feedzy-rss-feeds'
-										)}
-										help={__(
-											'Without ("?")',
-											'feedzy-rss-feeds'
-										)}
-										placeholder={decodeHtmlEntities(
-											'(' +
-												sprintf(
-													// translators: %s is the list of examples.
-													__(
-														'eg: %s',
-														'feedzy-rss-feeds'
-													),
-													'promo_code=feedzy_is_awesome'
-												) +
-												')'
-										)}
-										value={
-											this.props.attributes.referral_url
-										}
-										onChange={this.props.edit.onReferralURL}
-									/>
-								</PanelBody>
+											),
+											value: 'yes',
+										},
+									]}
+									onChange={this.props.edit.onDryRun}
+								/>
 
-								<PanelBody
-									title={__(
-										'Additional options',
+								<TextControl
+									label={__(
+										'Dry run tags',
 										'feedzy-rss-feeds'
 									)}
-									initialOpen={false}
-									className="feedzy-additional-options"
-								>
-									<TextControl
-										label={__(
-											'Wrap custom class',
-											'feedzy-rss-feeds'
-										)}
-										value={this.props.attributes.className}
-										onChange={this.props.edit.onclassName}
-									/>
+									value={this.props.attributes._dry_run_tags_}
+									onChange={this.props.edit.onDryRunTags}
+								/>
 
-									<SelectControl
-										label={__(
-											'Dry run?',
-											'feedzy-rss-feeds'
-										)}
-										value={this.props.attributes._dryrun_}
-										options={[
-											{
-												label: __(
-													'No',
-													'feedzy-rss-feeds'
-												),
-												value: 'no',
-											},
-											{
-												label: __(
-													'Yes',
-													'feedzy-rss-feeds'
-												),
-												value: 'yes',
-											},
-										]}
-										onChange={this.props.edit.onDryRun}
-									/>
+								<TextareaControl
+									label={__(
+										'Message to show when feed is empty',
+										'feedzy-rss-feeds'
+									)}
+									value={this.props.attributes.error_empty}
+									onChange={this.props.edit.onErrorEmpty}
+								/>
 
-									<TextControl
-										label={__(
-											'Dry run tags',
-											'feedzy-rss-feeds'
-										)}
-										value={
-											this.props.attributes._dry_run_tags_
-										}
-										onChange={this.props.edit.onDryRunTags}
-									/>
-								</PanelBody>
-							</Fragment>
-						)}
-				</InspectorControls>
+								<SelectControl
+									label={__(
+										'Feed Caching Time',
+										'feedzy-rss-feeds'
+									)}
+									value={this.props.attributes.refresh}
+									options={refreshFeed}
+									onChange={this.props.edit.onRefresh}
+									className="feedzy-refresh"
+								/>
+							</PanelBody>
+						</Fragment>
+					)}
 			</Fragment>
 		);
 	}
 }
 
+function FallbackImageLoader({ props }) {
+	return (
+		<div className="feedzy-blocks-base-control">
+			<label
+				className="blocks-base-control__label"
+				htmlFor="inspector-media-upload"
+			>
+				{__('Fallback image if no image is found.', 'feedzy-rss-feeds')}
+			</label>
+			<MediaUpload
+				type="image"
+				id="inspector-media-upload"
+				value={props.attributes.default}
+				onSelect={props.edit.onDefault}
+				render={({ open }) => (
+					<Fragment>
+						{props.attributes.default !== undefined && (
+							<ResponsiveWrapper
+								naturalWidth={props.attributes.default.width}
+								naturalHeight={props.attributes.default.height}
+							>
+								<img
+									src={props.attributes.default.url}
+									alt={__(
+										'Featured image',
+										'feedzy-rss-feeds'
+									)}
+								/>
+							</ResponsiveWrapper>
+						)}
+
+						<HStack>
+							{props.attributes.default !== undefined && (
+								<Button
+									isLarge
+									isSecondary
+									onClick={() =>
+										props.setAttributes({
+											default: undefined,
+										})
+									}
+									style={{
+										marginTop: '10px',
+									}}
+								>
+									{__('Remove Image', 'feedzy-rss-feeds')}
+								</Button>
+							)}
+
+							<Button
+								isLarge
+								isPrimary
+								onClick={open}
+								style={{
+									marginTop: '10px',
+								}}
+								className={
+									props.attributes.default === undefined &&
+									'feedzy_image_upload'
+								}
+							>
+								{__('Upload Image', 'feedzy-rss-feeds')}
+							</Button>
+						</HStack>
+					</Fragment>
+				)}
+			/>
+		</div>
+	);
+}
+
 export default Inspector;
diff --git a/js/FeedzyBlock/style.scss b/js/FeedzyBlock/style.scss
index a94aacf7..bb771e7f 100644
--- a/js/FeedzyBlock/style.scss
+++ b/js/FeedzyBlock/style.scss
@@ -1,6 +1,7 @@
 .wp-block-feedzy-rss-feeds-feedzy-block {
 	.feedzy-source-wrap {
 		position: relative;
+		width: max-content;
 	}
 	.feedzy-source {
 		margin-right: 10px;
@@ -221,4 +222,9 @@
     font-size: 13px;
     line-height: 1.4em;
     color: #3c434a;
+}
+.feedzy-validation-results {
+    display: flex;
+    flex-direction: column;
+    gap: 10px;
 }
\ No newline at end of file
diff --git a/js/FeedzyLoop/placeholder.js b/js/FeedzyLoop/placeholder.js
index d36561f4..9e0160cc 100644
--- a/js/FeedzyLoop/placeholder.js
+++ b/js/FeedzyLoop/placeholder.js
@@ -3,16 +3,15 @@
  * WordPress dependencies.
  */
 import { __ } from '@wordpress/i18n';
-
+import { useState } from '@wordpress/element';
 import {
 	BaseControl,
 	Button,
 	Placeholder,
 	Spinner,
+	Notice,
 } from '@wordpress/components';
-
 import { useSelect } from '@wordpress/data';
-
 import { store as coreStore } from '@wordpress/core-data';
 
 /**
@@ -21,6 +20,9 @@ import { store as coreStore } from '@wordpress/core-data';
 import FeedControl from './components/FeedControl';
 
 const BlockPlaceholder = ({ attributes, setAttributes, onSaveFeed }) => {
+	const [isValidating, setIsValidating] = useState(false);
+	const [validationResults, setValidationResults] = useState([]);
+
 	const { categories, isLoading } = useSelect((select) => {
 		const { getEntityRecords, isResolving } = select(coreStore);
 
@@ -33,20 +35,132 @@ const BlockPlaceholder = ({ attributes, setAttributes, onSaveFeed }) => {
 		};
 	}, []);
 
+	const handleLoadFeed = async () => {
+		if (!attributes?.feed?.source) {
+			return;
+		}
+
+		setIsValidating(true);
+		setValidationResults([]);
+
+		const isCategory = categories.some(
+			(cat) => cat.id === attributes.feed.source
+		);
+
+		if (isCategory && 'group' === attributes.feed.type) {
+			onSaveFeed();
+			setIsValidating(false);
+			return;
+		}
+
+		try {
+			const formData = new FormData();
+			formData.append('action', 'feedzy_validate_feed');
+			formData.append('feed_url', attributes.feed.source);
+			formData.append('nonce', window.feedzyData?.nonce);
+
+			const response = await fetch(window.feedzyData?.url, {
+				method: 'POST',
+				body: formData,
+			});
+
+			const data = await response.json();
+
+			if (data.success && data.data?.results) {
+				const results = data.data.results;
+				setValidationResults(results);
+
+				const hasErrors = results.some(
+					(result) => result.status === 'error'
+				);
+
+				if (!hasErrors) {
+					onSaveFeed();
+				}
+			} else if (!data.success) {
+				setValidationResults([
+					{
+						status: 'error',
+						message:
+							data.data?.message ||
+							__('Validation failed', 'feedzy-rss-feeds'),
+					},
+				]);
+			}
+		} catch (error) {
+			setValidationResults([
+				{
+					status: 'error',
+					message: __(
+						'Failed to validate feed. Please check your connection and try again.',
+						'feedzy-rss-feeds'
+					),
+				},
+			]);
+		} finally {
+			setIsValidating(false);
+		}
+	};
+
+	const handleFeedChange = (value) => {
+		setAttributes({ feed: value });
+	};
+
+	const renderValidationResults = () => {
+		if (!validationResults || validationResults.length === 0) {
+			return null;
+		}
+
+		return (
+			<div
+				className="feedzy-validation-results"
+				style={{
+					display: 'flex',
+					flexDirection: 'column',
+					gap: '10px',
+					marginTop: '15px',
+				}}
+			>
+				{validationResults.map((result, index) => (
+					<Notice
+						key={`result-${index}`}
+						status={result.status}
+						isDismissible={false}
+					>
+						{result.url && (
+							<>
+								<strong>{result.url}</strong>
+								<br />
+							</>
+						)}
+						{result.message}
+					</Notice>
+				))}
+			</div>
+		);
+	};
+
 	return (
 		<Placeholder
 			key="placeholder"
 			icon="rss"
 			label={__('Feedzy RSS Feeds', 'feedzy-rss-feeds')}
 		>
-			{isLoading && (
+			{(isLoading || isValidating) && (
 				<div key="loading" className="wp-block-embed is-loading">
 					<Spinner />
-					<p>{__('Fetching…', 'feedzy-rss-feeds')}</p>
+					<p>
+						{isValidating
+							? __(
+									'Validating and fetching feed…',
+									'feedzy-rss-feeds'
+								)
+							: __('Loading…', 'feedzy-rss-feeds')}
+					</p>
 				</div>
 			)}
 
-			{!isLoading && (
+			{!isLoading && !isValidating && (
 				<>
 					<BaseControl
 						label={__('Feed Source', 'feedzy-rss-feeds')}
@@ -60,9 +174,11 @@ const BlockPlaceholder = ({ attributes, setAttributes, onSaveFeed }) => {
 									value: category.id,
 								})),
 							]}
-							onChange={(value) => setAttributes({ feed: value })}
+							onChange={handleFeedChange}
 						/>
 
+						{renderValidationResults()}
+
 						<p>
 							{__(
 								'Enter the full URL of the feed source you wish to display here, or select a Feed Group. Also you can add multiple URLs separated with a comma. You can manage your feed groups from',
@@ -79,24 +195,9 @@ const BlockPlaceholder = ({ attributes, setAttributes, onSaveFeed }) => {
 					</BaseControl>
 
 					<div>
-						<Button
-							variant="primary"
-							onClick={() => {
-								if (attributes?.feed?.source) {
-									onSaveFeed();
-								}
-							}}
-						>
+						<Button variant="primary" onClick={() => handleLoadFeed()}>
 							{__('Load Feed', 'feedzy-rss-feeds')}
 						</Button>
-
-						<Button
-							variant="link"
-							href="https://validator.w3.org/feed/"
-							target="_blank"
-						>
-							{__('Validate', 'feedzy-rss-feeds')}
-						</Button>
 					</div>
 				</>
 			)}
diff --git a/js/feedzy-license.js b/js/feedzy-license.js
new file mode 100644
index 00000000..6f740ca5
--- /dev/null
+++ b/js/feedzy-license.js
@@ -0,0 +1,72 @@
+(function ($) {
+	/**
+	 * Toggles check button state based on license key input and syncs value across inputs
+	 * @param {window.jQuery} $input - License key input element
+	 */
+	const handleLicenseKeyInput = ($input) => {
+		const licenseKey = $input.val();
+		const $checkButton = $('#check_ti_license');
+
+		if (licenseKey !== '') {
+			$checkButton.removeAttr('disabled');
+		} else {
+			$checkButton.attr('disabled', true);
+		}
+
+		$('.fz-license-section input[name="license_key"]').val(licenseKey);
+	};
+
+	/**
+	 * Handles license validation response - shows errors or reloads page on success
+	 * @param {Object}        response - API response with success flag and message
+	 * @param {window.jQuery} $button  - Check license button element
+	 */
+	const handleLicenseResponse = (response, $button) => {
+		if (!response.success) {
+			const $errorMessage = $(
+				'<p class="feedzy-api-error">' + response.message + '</p>'
+			);
+			$errorMessage.insertAfter(
+				$('.fz-license-section').find('.help-text')
+			);
+			$button.removeAttr('disabled').removeClass('fz-checking');
+			return;
+		}
+		window.location.reload();
+	};
+
+	/**
+	 * Validates license via AJAX, disables button and clears previous errors
+	 * @param {Event} e - Click event from check license button
+	 */
+	const checkLicense = (e) => {
+		e.preventDefault();
+		const $button = $(e.currentTarget);
+
+		$button.attr('disabled', true).addClass('fz-checking');
+		$button
+			.parents('.fz-license-section')
+			.find('.feedzy-api-error')
+			.remove();
+
+		const licenseData = $button
+			.parent('.fz-input-group-btn')
+			.find('input')
+			.serialize();
+
+		$.post(
+			window.ajaxurl,
+			licenseData,
+			(response) => handleLicenseResponse(response, $button),
+			'json'
+		);
+	};
+
+	$(document).ready(() => {
+		$('.fz-license-section #license_key').on('input', function () {
+			handleLicenseKeyInput($(this));
+		});
+
+		$('.fz-license-section #check_ti_license').on('click', checkLicense);
+	});
+})(window.jQuery);
diff --git a/js/feedzy-setting.js b/js/feedzy-setting.js
index 375c581c..51fe0741 100644
--- a/js/feedzy-setting.js
+++ b/js/feedzy-setting.js
@@ -98,50 +98,6 @@ jQuery(function ($) {
 		}
 	});
 
-
-	// License key.
-	jQuery('.fz-license-section #license_key').on('input', function () {
-		const licenseKey = jQuery(this).val();
-		if (licenseKey !== '') {
-			jQuery('#check_ti_license').removeAttr('disabled');
-		} else {
-			jQuery('#check_ti_license').attr('disabled', true);
-		}
-		jQuery('.fz-license-section input[name="license_key"]').val(licenseKey);
-	});
-
-	jQuery('.fz-license-section #check_ti_license').on('click', function (e) {
-		e.preventDefault();
-		const _this = jQuery(this);
-		_this.attr('disabled', true).addClass('fz-checking');
-
-		_this.parents('.fz-license-section').find('.feedzy-api-error').remove();
-
-		const LicenseData = _this
-			.parent('.fz-input-group-btn')
-			.find('input')
-			.serialize();
-
-		jQuery.post(
-			ajaxurl,
-			LicenseData,
-			function (response) {
-				if (!response.success) {
-					jQuery(
-						'<p class="feedzy-api-error">' +
-							response.message +
-							'</p>'
-					).insertAfter(
-						jQuery('.fz-license-section').find('.help-text')
-					);
-					_this.removeAttr('disabled').removeClass('fz-checking');
-				} else {
-					window.location.reload();
-				}
-			},
-			'json'
-		);
-	});
 	snackbarNotice();
 
 	const initializeAutoCatActions = () => {
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index d32b2fff..48144c95 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -630,11 +630,6 @@ parameters:
 			count: 1
 			path: includes/admin/feedzy-rss-feeds-admin.php
 
-		-
-			message: "#^Method Feedzy_Rss_Feeds_Admin\\:\\:feedzy_menu_pages\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: includes/admin/feedzy-rss-feeds-admin.php
-
 		-
 			message: "#^Method Feedzy_Rss_Feeds_Admin\\:\\:feedzy_remove_elementor_feature\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -1757,7 +1752,7 @@ parameters:
 
 		-
 			message: "#^Parameter \\#1 \\$text of function esc_attr expects string, int given\\.$#"
-			count: 2
+			count: 1
 			path: includes/views/import-metabox-edit.php
 
 		-
@@ -1795,16 +1790,6 @@ parameters:
 			count: 1
 			path: includes/views/import-metabox-edit.php
 
-		-
-			message: "#^Variable \\$import_feed_delete_days might not be defined\\.$#"
-			count: 1
-			path: includes/views/import-metabox-edit.php
-
-		-
-			message: "#^Variable \\$import_feed_delete_media might not be defined\\.$#"
-			count: 1
-			path: includes/views/import-metabox-edit.php
-
 		-
 			message: "#^Variable \\$import_feed_limit might not be defined\\.$#"
 			count: 1
@@ -1883,4 +1868,4 @@ parameters:
 		-
 			message: "#^Variable \\$published_status might not be defined\\.$#"
 			count: 1
-			path: includes/views/import-metabox-edit.php
+			path: includes/views/import-metabox-edit.php
\ No newline at end of file
diff --git a/tests/e2e/specs/classic-block.spec.js b/tests/e2e/specs/classic-block.spec.js
new file mode 100644
index 00000000..f70e7741
--- /dev/null
+++ b/tests/e2e/specs/classic-block.spec.js
@@ -0,0 +1,127 @@
+/**
+ * WordPress dependencies
+ */
+import { test, expect } from '@wordpress/e2e-test-utils-playwright';
+
+test.describe('Feedzy Classic Block', () => {
+	test('check validation for invalid URL', async ({
+		editor,
+		page,
+		admin,
+	}) => {
+		await admin.createNewPost();
+
+		await editor.insertBlock({
+			name: 'feedzy-rss-feeds/feedzy-block',
+		});
+
+		await page
+			.getByPlaceholder('Enter URL or group of your')
+			.fill('http://invalid-url.com/feed');
+
+		await page.getByRole('button', { name: 'Load Feed' }).click();
+
+		await page.waitForSelector('.feedzy-validation-results');
+
+		await expect(
+			page
+				.locator('.feedzy-validation-results .is-error')
+				.getByText('http://invalid-url.com/feed', { exact: true })
+		).toBeVisible();
+	});
+
+	test('check validation for invalid and valid URL', async ({
+		editor,
+		page,
+		admin,
+	}) => {
+		await admin.createNewPost();
+
+		await editor.insertBlock({
+			name: 'feedzy-rss-feeds/feedzy-block',
+		});
+
+		await page
+			.getByPlaceholder('Enter URL or group of your')
+			.fill(
+				'http://invalid-url.com/feed, https://www.nasa.gov/feeds/iotd-feed/'
+			);
+
+		await page.getByRole('button', { name: 'Load Feed' }).click();
+
+		await page.waitForSelector('.feedzy-validation-results');
+
+		await expect(
+			page
+				.locator('.feedzy-validation-results .is-error')
+				.getByText('http://invalid-url.com/feed', { exact: true })
+		).toBeVisible();
+
+		await expect(
+			page
+				.locator('.feedzy-validation-results .is-success')
+				.getByText('https://www.nasa.gov/feeds/iotd-feed/', {
+					exact: true,
+				})
+		).toBeVisible();
+	});
+
+	test('check aspect ratio default', async ({ editor, page, admin }) => {
+		await admin.createNewPost();
+
+		await editor.insertBlock({
+			name: 'feedzy-rss-feeds/feedzy-block',
+			attributes: {
+				feeds: 'https://www.nasa.gov/feeds/iotd-feed/',
+				max: 1,
+			},
+		});
+
+		const postId = await editor.publishPost();
+		await page.goto(`/?p=${postId}`);
+
+		const image = page.locator('.feedzy-rss .rss_image img');
+		await expect(image).toHaveAttribute(
+			'style',
+			'height:150px;width:150px;'
+		);
+	});
+
+	test('check aspect ratio (3/2)', async ({ editor, page, admin }) => {
+		await admin.createNewPost();
+
+		await editor.insertBlock({
+			name: 'feedzy-rss-feeds/feedzy-block',
+			attributes: {
+				aspectRatio: '3/2',
+				feeds: 'https://www.nasa.gov/feeds/iotd-feed/',
+				max: 1,
+			},
+		});
+
+		const postId = await editor.publishPost();
+		await page.goto(`/?p=${postId}`);
+
+		const image = page.locator('.feedzy-rss .rss_image img');
+		await expect(image).toHaveAttribute('style', /aspect-ratio:\s*3\/2;/i);
+	});
+
+	test('check aspect ratio auto', async ({ editor, page, admin }) => {
+		await admin.createNewPost();
+
+		await editor.insertBlock({
+			name: 'feedzy-rss-feeds/feedzy-block',
+			attributes: {
+				aspectRatio: 'auto',
+				feeds: 'https://www.nasa.gov/feeds/iotd-feed/',
+				max: 1,
+			},
+		});
+
+		const postId = await editor.publishPost();
+		await page.goto(`/?p=${postId}`);
+
+		const image = page.locator('.feedzy-rss .rss_image img');
+		await expect(image).toHaveAttribute('style', /aspect-ratio:\s*auto;/i);
+	});
+});
diff --git a/tests/e2e/specs/feed.spec.js b/tests/e2e/specs/feed.spec.js
index 31421f97..f1eb67c1 100644
--- a/tests/e2e/specs/feed.spec.js
+++ b/tests/e2e/specs/feed.spec.js
@@ -29,10 +29,6 @@ test.describe( 'Feed Settings', () => {
         await page.getByPlaceholder('Add a name for your import').fill(importName);
 
         // Add feed URL via tag input.
-        await page.getByPlaceholder('Paste your feed URL and click').fill(FEED_URL);
-        await page.getByPlaceholder('Paste your feed URL and click').press('Enter');
-        await expect( page.getByText( FEED_URL ) ).toBeVisible();
-
         await addFeeds( page, [FEED_URL] );
 
         await page.getByRole('button', { name: 'Save', exact: true }).click({ force: true, clickCount: 1 });
diff --git a/tests/e2e/specs/loop.spec.js b/tests/e2e/specs/loop.spec.js
index 5583a119..37ebd186 100644
--- a/tests/e2e/specs/loop.spec.js
+++ b/tests/e2e/specs/loop.spec.js
@@ -106,4 +106,40 @@ test.describe('Feedzy Loop', () => {
 		const feedzyLoopChildren = await feedzyLoop.$$(':scope > *');
 		expect(feedzyLoopChildren.length).toBe(5);
 	});
+
+	test('check validation for invalid URL', async ({ editor, page, admin }) => {
+		await admin.createNewPost();
+
+		await editor.insertBlock({
+			name: 'feedzy-rss-feeds/loop',
+		});
+
+		await page.getByPlaceholder('Enter URLs or select a Feed').fill(
+			'http://invalid-url.com/feed'
+		);
+		await page.getByRole('button', { name: 'Load Feed' }).click();
+
+		await page.waitForSelector('.feedzy-validation-results');
+
+		await expect( page.locator('.feedzy-validation-results .is-error').getByText('http://invalid-url.com/feed', { exact: true }) ).toBeVisible();
+	});
+
+	test('check validation for invalid and valid url', async ({ editor, page, admin }) => {
+		await admin.createNewPost();
+
+		await editor.insertBlock({
+			name: 'feedzy-rss-feeds/loop',
+		});
+
+		await page.getByPlaceholder('Enter URLs or select a Feed').fill(
+			'http://invalid-url.com/feed, https://www.nasa.gov/feeds/iotd-feed/'
+		);
+		await page.getByRole('button', { name: 'Load Feed' }).click();
+
+		await page.waitForSelector('.feedzy-validation-results');
+
+		await expect( page.locator('.feedzy-validation-results .is-error').getByText('http://invalid-url.com/feed', { exact: true }) ).toBeVisible();
+
+		await expect( page.locator('.feedzy-validation-results .is-success').getByText('https://www.nasa.gov/feeds/iotd-feed/', { exact: true }) ).toBeVisible();
+	});
 });
diff --git a/tests/e2e/specs/upsell.spec.js b/tests/e2e/specs/upsell.spec.js
index 9c00a542..f8204412 100644
--- a/tests/e2e/specs/upsell.spec.js
+++ b/tests/e2e/specs/upsell.spec.js
@@ -40,9 +40,8 @@ test.describe( 'Upsell', () => {
         upgradeAlert = page.locator('#feedzy-import-form a[href*="utm_campaign=schedule-import-job"]');
         await expect( upgradeAlert ).toBeVisible();
 
-        await page.locator('.fz-form-group:has( #delete-attached-media )').hover({ force: true });
-        upgradeAlert = page.locator('#feedzy-import-form a[href*="utm_campaign=delete-featured-image"]');
-        await expect( upgradeAlert ).toBeVisible();
+        // Click the advanced settings tab.
+        await page.click('[data-id="fz-advanced-settings"]');
 
         await page.locator('.fz-form-group:has( #feedzy_mark_duplicate )').hover({ force: true });
         upgradeAlert = page.locator('#feedzy-import-form a[href*="utm_campaign=remove-duplicates"]');