diff --git a/changelog.txt b/changelog.txt
index dd30d928..0c21d0b9 100755
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,6 @@
+= 1.6.6 - 2020-08-03 =
+* Fixes - Frontend submission form
+
 = 1.6.5 - 2020-07-29 =
 * Fixes - Settings
 
diff --git a/inc/submission/class-metabox-property-submission.php b/inc/submission/class-metabox-property-submission.php
index e2ab42b5..43473ffc 100755
--- a/inc/submission/class-metabox-property-submission.php
+++ b/inc/submission/class-metabox-property-submission.php
@@ -144,26 +144,34 @@ class Opalestate_Property_MetaBox_Submission {
 				'description' => esc_html__( 'After Price Label (e.g. "per month")', 'opalestate-pro' ),
 			],
 			[
-				'name'       => esc_html__( 'Statuses', 'opalestate-pro' ),
+				'name'       => esc_html__( 'Status', 'opalestate-pro' ),
 				'id'         => $prefix . 'status',
 				'type'       => 'taxonomy_select',
 				'taxonomy'   => 'opalestate_status',
 				'class'      => 'form-control',
-				'attributes' => [
-					'required' => 'required',
-				],
 				'before_row' => '</div><hr><div class="field-row-2">', // callback
 			],
 			[
-				'name'       => esc_html__( 'Types', 'opalestate-pro' ),
-				'id'         => $prefix . 'type',
-				'type'       => 'taxonomy_select',
-				'taxonomy'   => 'opalestate_types',
-				'class'      => 'form-control',
-				'attributes' => [
-					'required' => 'required',
-				],
-				'after_row'  => '</div><hr><button type="button" class="submission-next-btn btn btn-primary">' . esc_html__( 'Next Step', 'opalestate-pro' ) . '</button></div>', // callback
+				'name'     => esc_html__( 'Label', 'opalestate-pro' ),
+				'id'       => $prefix . 'label',
+				'type'     => 'taxonomy_select',
+				'taxonomy' => 'opalestate_label',
+				'class'    => 'form-control',
+			],
+			[
+				'name'     => esc_html__( 'Category', 'opalestate-pro' ),
+				'id'       => $prefix . 'category',
+				'type'     => 'taxonomy_select',
+				'taxonomy' => 'property_category',
+				'class'    => 'form-control',
+			],
+			[
+				'name'      => esc_html__( 'Type', 'opalestate-pro' ),
+				'id'        => $prefix . 'type',
+				'type'      => 'taxonomy_select',
+				'taxonomy'  => 'opalestate_types',
+				'class'     => 'form-control',
+				'after_row' => '</div><hr><button type="button" class="submission-next-btn btn btn-primary">' . esc_html__( 'Next Step', 'opalestate-pro' ) . '</button></div>', // callback
 			],
 		];
 
diff --git a/opal-estate-pro.php b/opal-estate-pro.php
index e8a110ec..d50c2c0e 100755
--- a/opal-estate-pro.php
+++ b/opal-estate-pro.php
@@ -3,7 +3,7 @@
  * Plugin Name: Opal Estate Pro
  * Plugin URI: https://wpdocs.gitbook.io/opal-estate/
  * Description: Opal Real Estate Plugin is an ideal solution and brilliant choice for you to set up a professional estate website.
- * Version: 1.6.5
+ * Version: 1.6.6
  * Author: WPOPAL
  * Author URI: http://www.wpopal.com
  * Requires at least: 4.9
@@ -154,7 +154,7 @@ if ( ! class_exists( 'OpalEstate' ) ) {
 		 */
 		public function __clone() {
 			// Cloning instances of the class is forbidden
-			_doing_it_wrong( __FUNCTION__, esc_html__( 'Cheatin&#8217; huh?', 'opalestate-pro' ), '1.6.5' );
+			_doing_it_wrong( __FUNCTION__, esc_html__( 'Cheatin&#8217; huh?', 'opalestate-pro' ), '1.6.6' );
 		}
 
 		/**
@@ -163,7 +163,7 @@ if ( ! class_exists( 'OpalEstate' ) ) {
 		public function setup_constants() {
 			// Plugin version
 			if ( ! defined( 'OPALESTATE_VERSION' ) ) {
-				define( 'OPALESTATE_VERSION', '1.6.5' );
+				define( 'OPALESTATE_VERSION', '1.6.6' );
 			}
 
 			// Plugin Folder Path
diff --git a/readme.txt b/readme.txt
index 35f23efd..b1207501 100755
--- a/readme.txt
+++ b/readme.txt
@@ -4,7 +4,7 @@ Donate link: https://wpdocs.gitbook.io/opal-estate/
 Tags: estate, property, opalestate, house for rent, agency for lease, estate submission, agents estate property, property marketplace
 Requires at least: 4.9
 Tested up to: 5.3.2
-Stable tag: 1.6.4
+Stable tag: 1.6.6
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 
@@ -150,6 +150,9 @@ This section describes how to install the plugin and get it working.
 * System tickets support 24/7 available : [free support](https://themelexus.ticksy.com/ "Visit the Plugin support Page")
 
 == Changelog ==
+= 1.6.6 - 2020-08-03 =
+* Fixes - Frontend submission form
+
 = 1.6.5 - 2020-07-29 =
 * Fixes - Settings
 
diff --git a/templates/single-property/attachments.php b/templates/single-property/attachments.php
index bff067ed..428ea35b 100755
--- a/templates/single-property/attachments.php
+++ b/templates/single-property/attachments.php
@@ -12,15 +12,22 @@ $attachments = $property->get_attachments();
         <h5 class="list-group-item-heading"><?php esc_html_e( 'Attachments', 'opalestate-pro' ); ?></h5>
         <div class="list-group-item-text">
             <div class="<?php echo apply_filters( 'opalestate_row_container_class', 'opal-row' ); ?>">
-				<?php foreach ( $attachments as $id => $attachment ) :
-					$attachment_title = get_the_title( $id );
-					?>
+				<?php if ( is_array( $attachments ) ) : ?>
+					<?php foreach ( $attachments as $id => $attachment ) : ?>
+                        <div class="col-lg-4 col-sm-4">
+                            <i class="text-secondary fa fa-file-text-o"></i>
+                            <a class="property-attachments__name" href="<?php echo esc_url( $attachment ); ?>"><?php echo esc_html( get_the_title( $id ) ); ?></a>
+                            <a class="property-attachments__download" href="<?php echo esc_url( $attachment ); ?>" download><?php esc_html_e( 'Download', 'opalestate-pro' ); ?></a>
+                        </div>
+					<?php endforeach; ?>
+				<?php else : ?>
+					<?php $attachment_id = absint( $attachments ); ?>
                     <div class="col-lg-4 col-sm-4">
                         <i class="text-secondary fa fa-file-text-o"></i>
-                        <a class="property-attachments__name" href="<?php echo esc_url( $attachment ); ?>" target="_blank"><?php echo esc_html( $attachment_title ); ?></a>
-                        <a class="property-attachments__download" href="<?php echo esc_url( $attachment ); ?>" target="_blank"><?php esc_html_e( 'Download', 'opalestate-pro' ); ?></a>
+                        <a class="property-attachments__name" href="<?php echo esc_url( get_permalink( $attachment_id ) ); ?>"><?php echo esc_html( get_the_title( $attachment_id ) ); ?></a>
+                        <a class="property-attachments__download" href="<?php echo esc_url( get_permalink( $attachment_id ) ); ?>" download><?php esc_html_e( 'Download', 'opalestate-pro' ); ?></a>
                     </div>
-				<?php endforeach; ?>
+				<?php endif; ?>
             </div>
         </div>
     </div>