diff --git a/includes/admin/class-forms.php b/includes/admin/class-forms.php
index 6ef0649f4..1856ce56f 100644
--- a/includes/admin/class-forms.php
+++ b/includes/admin/class-forms.php
@@ -1,4 +1,5 @@
-<?php namespace jb\admin;
+<?php
+namespace jb\admin;
 
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
diff --git a/includes/class-jb-functions.php b/includes/class-jb-functions.php
index 78952db58..31b594284 100644
--- a/includes/class-jb-functions.php
+++ b/includes/class-jb-functions.php
@@ -405,7 +405,7 @@ public function get_allowed_html( $context = '' ) {
 				'code'   => array(),
 			);
 
-			$allowed_html = array_merge( $global_allowed, $allowed_html );
+			$allowed_html = array_merge_recursive( $global_allowed, $allowed_html );
 			$allowed_html = array_map( '_wp_add_global_attributes', $allowed_html );
 
 			/**
diff --git a/includes/frontend/class-enqueue.php b/includes/frontend/class-enqueue.php
index 7b4cd973e..c01957f37 100644
--- a/includes/frontend/class-enqueue.php
+++ b/includes/frontend/class-enqueue.php
@@ -1,13 +1,12 @@
-<?php namespace jb\frontend;
+<?php
+namespace jb\frontend;
 
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
 
-
 if ( ! class_exists( 'jb\frontend\Enqueue' ) ) {
 
-
 	/**
 	 * Class Enqueue
 	 *
@@ -15,7 +14,6 @@
 	 */
 	class Enqueue extends \jb\common\Enqueue {
 
-
 		/**
 		 * Enqueue constructor.
 		 */
@@ -31,7 +29,6 @@ public function __construct() {
 			add_action( 'wp_enqueue_scripts', array( &$this, 'enqueue_gmap' ), 19 );
 		}
 
-
 		/**
 		 * Google Maps enqueue
 		 *