diff --git a/js/FeedzyBlock/inspector.js b/js/FeedzyBlock/inspector.js
index 1d68c3a9..1615ce57 100644
--- a/js/FeedzyBlock/inspector.js
+++ b/js/FeedzyBlock/inspector.js
@@ -99,7 +99,7 @@ class Inspector extends Component {
 					{'content' === this.state.tab && (
 						<Fragment>
 							<PanelBody
-								title={__('Feed Source', 'feedzy-rss-feeds')}
+								title={__('General', 'feedzy-rss-feeds')}
 								initialOpen={true}
 							>
 								{this.props.attributes.status !== 0 && (
@@ -127,19 +127,6 @@ class Inspector extends Component {
 												'feedzy-rss-feeds'
 											)}
 										</Button>
-										<TextareaControl
-											label={__(
-												'Message to show when feed is empty',
-												'feedzy-rss-feeds'
-											)}
-											value={
-												this.props.attributes
-													.error_empty
-											}
-											onChange={
-												this.props.edit.onErrorEmpty
-											}
-										/>
 									</Fragment>
 								)}
 								{'fetched' === this.props.state.route && (
@@ -211,73 +198,8 @@ class Inspector extends Component {
 											onChange={this.props.edit.onSort}
 											className="feedzy-sort"
 										/>
-										<SelectControl
-											label={__(
-												'Feed Caching Time',
-												'feedzy-rss-feeds'
-											)}
-											value={
-												this.props.attributes.refresh
-											}
-											options={refreshFeed}
-											onChange={this.props.edit.onRefresh}
-											className="feedzy-refresh"
-										/>
 									</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={__(
@@ -495,7 +417,7 @@ class Inspector extends Component {
 										'Item Image Options',
 										'feedzy-rss-feeds'
 									)}
-									initialOpen={false}
+									initialOpen={true}
 									className="feedzy-image-options"
 								>
 									<SelectControl
@@ -563,38 +485,52 @@ class Inspector extends Component {
 																	.attributes
 																	.default !==
 																	undefined && (
-																	<Fragment>
-																		<ResponsiveWrapper
-																			naturalWidth={
+																	<ResponsiveWrapper
+																		naturalWidth={
+																			this
+																				.props
+																				.attributes
+																				.default
+																				.width
+																		}
+																		naturalHeight={
+																			this
+																				.props
+																				.attributes
+																				.default
+																				.height
+																		}
+																	>
+																		<img
+																			src={
 																				this
 																					.props
 																					.attributes
 																					.default
-																					.width
+																					.url
 																			}
-																			naturalHeight={
-																				this
-																					.props
-																					.attributes
-																					.default
-																					.height
-																			}
-																		>
-																			<img
-																				src={
-																					this
-																						.props
-																						.attributes
-																						.default
-																						.url
-																				}
-																				alt={__(
-																					'Featured image',
-																					'feedzy-rss-feeds'
-																				)}
-																			/>
-																		</ResponsiveWrapper>
-
+																			alt={__(
+																				'Featured image',
+																				'feedzy-rss-feeds'
+																			)}
+																		/>
+																	</ResponsiveWrapper>
+																)}
+																<div
+																	className={`${
+																		this
+																			.props
+																			.attributes
+																			.default !==
+																		undefined
+																			? 'feedzy-image-buttons'
+																			: ''
+																	}`}
+																>
+																	{this.props
+																		.attributes
+																		.default !==
+																		undefined && (
 																		<Button
 																			isLarge
 																			isSecondary
@@ -616,32 +552,33 @@ class Inspector extends Component {
 																				'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>
+
+																	<Button
+																		isLarge
+																		isPrimary
+																		onClick={
+																			open
+																		}
+																		style={{
+																			marginTop:
+																				'10px',
+																		}}
+																		className={
+																			this
+																				.props
+																				.attributes
+																				.default ===
+																				undefined &&
+																			'feedzy_image_upload'
+																		}
+																	>
+																		{__(
+																			'Upload Image',
+																			'feedzy-rss-feeds'
+																		)}
+																	</Button>
+																</div>
 															</Fragment>
 														)}
 													/>
@@ -662,6 +599,24 @@ class Inspector extends Component {
 											/>
 										</Fragment>
 									)}
+
+									<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>
 
 								<PanelBody
@@ -757,33 +712,6 @@ class Inspector extends Component {
 										onChange={this.props.edit.onTemplate}
 									/>
 								</PanelBody>
-
-								<PanelBody
-									title={__(
-										'Disable default style',
-										'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 &&
@@ -795,21 +723,14 @@ class Inspector extends Component {
 										'feedzy-rss-feeds'
 									)}
 									className="feedzy-advanced-options"
-									initialOpen={false}
+									initialOpen={true}
 								>
 									<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'
-														)
-											}
+											label={__(
+												'Meta fields to show',
+												'feedzy-rss-feeds'
+											)}
 											help={sprintf(
 												//translators: %s: the keyword for the user to introduce.
 												__(
@@ -842,7 +763,7 @@ class Inspector extends Component {
 										/>
 										<TextControl
 											label={__(
-												'When using multiple sources, should we display additional meta fields? - source (comma-separated list).',
+												'Meta fields for sources',
 												'feedzy-rss-feeds'
 											)}
 											placeholder={decodeHtmlEntities(
@@ -867,13 +788,6 @@ class Inspector extends Component {
 											}
 											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
@@ -919,6 +833,58 @@ class Inspector extends Component {
 										/>
 									)}
 
+									<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
+										}
+									/>
+
 									<RangeControl
 										label={__(
 											'Ignore first N items',
@@ -1066,6 +1032,28 @@ class Inspector extends Component {
 										}
 										onChange={this.props.edit.onDryRunTags}
 									/>
+
+									<TextareaControl
+										label={__(
+											'Message to show when feed is empty',
+											'feedzy-rss-feeds'
+										)}
+										value={
+											this.props.attributes.error_empty
+										}
+										onChange={this.props.edit.onErrorEmpty}
+									/>
+
+									<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>
 						)}
diff --git a/js/FeedzyBlock/style.scss b/js/FeedzyBlock/style.scss
index a94aacf7..f5a63c35 100644
--- a/js/FeedzyBlock/style.scss
+++ b/js/FeedzyBlock/style.scss
@@ -221,4 +221,11 @@
     font-size: 13px;
     line-height: 1.4em;
     color: #3c434a;
+}
+
+.feedzy-image-buttons {
+	display: flex;
+	flex-wrap: wrap;
+	justify-content: space-evenly;
+	gap: 15px;
 }
\ No newline at end of file