diff --git a/includes/admin/templates/role/admin-permissions.php b/includes/admin/templates/role/admin-permissions.php
index 0ca00b4d..553ed177 100644
--- a/includes/admin/templates/role/admin-permissions.php
+++ b/includes/admin/templates/role/admin-permissions.php
@@ -1,61 +1,66 @@
-<?php if ( ! defined( 'ABSPATH' ) ) exit; ?>
-
-
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+$role = $object['data'];
+?>
 <div class="um-admin-metabox">
-	<?php $role = $object['data'];
-
-	UM()->admin_forms( array(
-		'class'     => 'um-role-admin um-half-column',
-		'prefix_id' => 'role',
-		'fields'    => array(
-			array(
-				'id'        => '_um_can_access_wpadmin',
-				'type'      => 'checkbox',
-				'label'     => __( 'Can access wp-admin?', 'ultimate-member' ),
-				'tooltip'   => __( 'The core admin role must always have access to wp-admin / WordPress backend', 'ultimate-member' ),
-				'value'     => ! empty( $role['_um_can_access_wpadmin'] ) ? $role['_um_can_access_wpadmin'] : 0,
+	<?php
+	UM()->admin_forms(
+		array(
+			'class'     => 'um-role-admin um-half-column',
+			'prefix_id' => 'role',
+			'fields'    => array(
+				array(
+					'id'      => '_um_can_access_wpadmin',
+					'type'    => 'checkbox',
+					'label'   => __( 'Can access wp-admin?', 'ultimate-member' ),
+					'tooltip' => __( 'The core admin role must always have access to wp-admin / WordPress backend', 'ultimate-member' ),
+					'value'   => ! empty( $role['_um_can_access_wpadmin'] ) ? $role['_um_can_access_wpadmin'] : 0,
+				),
+				array(
+					'id'      => '_um_can_not_see_adminbar',
+					'type'    => 'checkbox',
+					'label'   => __( 'Force hiding adminbar in frontend?', 'ultimate-member' ),
+					'tooltip' => __( 'Mark this option if you need to hide the adminbar on frontend for this role', 'ultimate-member' ),
+					'value'   => isset( $role['_um_can_not_see_adminbar'] ) ? $role['_um_can_not_see_adminbar'] : 1,
+				),
+				array(
+					'id'      => '_um_can_edit_everyone',
+					'type'    => 'checkbox',
+					'label'   => __( 'Can edit other member accounts?', 'ultimate-member' ),
+					'tooltip' => __( 'Allow this role to edit accounts of other members', 'ultimate-member' ),
+					'value'   => ! empty( $role['_um_can_edit_everyone'] ) ? $role['_um_can_edit_everyone'] : 0,
+				),
+				array(
+					'id'          => '_um_can_edit_roles',
+					'type'        => 'select',
+					'label'       => __( 'Can edit these user roles only', 'ultimate-member' ),
+					'tooltip'     => __( 'Multiple selections of which roles this role can edit, none selected to allow this role to edit all member roles.', 'ultimate-member' ),
+					'options'     => UM()->roles()->get_roles(),
+					'multi'       => true,
+					'value'       => ! empty( $role['_um_can_edit_roles'] ) ? $role['_um_can_edit_roles'] : array(),
+					'conditional' => array( '_um_can_edit_everyone', '=', '1' )
+				),
+				array(
+					'id'      => '_um_can_delete_everyone',
+					'type'    => 'checkbox',
+					'label'   => __( 'Can delete other member accounts?', 'ultimate-member' ),
+					'tooltip' => __( 'Allow this role to delete other user accounts.', 'ultimate-member' ),
+					'value'   => ! empty( $role['_um_can_delete_everyone'] ) ? $role['_um_can_delete_everyone'] : 0,
+				),
+				array(
+					'id'          => '_um_can_delete_roles',
+					'type'        => 'select',
+					'label'       => __( 'Can delete these user roles only', 'ultimate-member' ),
+					'tooltip'     => __( 'Multiple selections of which roles this role can delete, none selected to allow this role to delete all member roles', 'ultimate-member' ),
+					'options'     => UM()->roles()->get_roles(),
+					'multi'       => true,
+					'value'       => ! empty( $role['_um_can_delete_roles'] ) ? $role['_um_can_delete_roles'] : array(),
+					'conditional' => array( '_um_can_delete_everyone', '=', '1' )
+				)
 			),
-			array(
-				'id'        => '_um_can_not_see_adminbar',
-				'type'      => 'checkbox',
-				'label'     => __( 'Force hiding adminbar in frontend?', 'ultimate-member' ),
-				'tooltip'   => __( 'Mark this option if you need to hide the adminbar on frontend for this role', 'ultimate-member' ),
-				'value'     => isset( $role['_um_can_not_see_adminbar'] ) ? $role['_um_can_not_see_adminbar'] : 1,
-			),
-			array(
-				'id'        => '_um_can_edit_everyone',
-				'type'      => 'checkbox',
-				'label'     => __( 'Can edit other member accounts?', 'ultimate-member' ),
-				'tooltip'   => __( 'Allow this role to edit accounts of other members', 'ultimate-member' ),
-				'value'     => ! empty( $role['_um_can_edit_everyone'] ) ? $role['_um_can_edit_everyone'] : 0,
-			),
-			array(
-				'id'            => '_um_can_edit_roles',
-				'type'          => 'select',
-				'label'         => __( 'Can edit these user roles only', 'ultimate-member' ),
-				'tooltip'       => __( 'Multiple selections of which roles this role can edit, none selected to allow this role to edit all member roles.', 'ultimate-member' ),
-				'options'       => UM()->roles()->get_roles(),
-				'multi'         => true,
-				'value'         => ! empty( $role['_um_can_edit_roles'] ) ? $role['_um_can_edit_roles'] : array(),
-				'conditional'   => array( '_um_can_edit_everyone', '=', '1' )
-			),
-			array(
-				'id'        => '_um_can_delete_everyone',
-				'type'      => 'checkbox',
-				'label'     => __( 'Can delete other member accounts?', 'ultimate-member' ),
-				'tooltip'   => __( 'Allow this role to delete other user accounts.', 'ultimate-member' ),
-				'value'     => ! empty( $role['_um_can_delete_everyone'] ) ? $role['_um_can_delete_everyone'] : 0,
-			),
-			array(
-				'id'            => '_um_can_delete_roles',
-				'type'          => 'select',
-				'label'         => __( 'Can delete these user roles only', 'ultimate-member' ),
-				'tooltip'       => __( 'Multiple selections of which roles this role can delete, none selected to allow this role to delete all member roles', 'ultimate-member' ),
-				'options'       => UM()->roles()->get_roles(),
-				'multi'         => true,
-				'value'         => ! empty( $role['_um_can_delete_roles'] ) ? $role['_um_can_delete_roles'] : array(),
-				'conditional'   => array( '_um_can_delete_everyone', '=', '1' )
-			)
 		)
-	) )->render_form(); ?>
+	)->render_form();
+	?>
 </div>
diff --git a/includes/admin/templates/role/profile.php b/includes/admin/templates/role/profile.php
index 79769c35..4a7440be 100644
--- a/includes/admin/templates/role/profile.php
+++ b/includes/admin/templates/role/profile.php
@@ -1,61 +1,65 @@
-<?php if ( ! defined( 'ABSPATH' ) ) exit; ?>
-
-
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+$role = $object['data'];
+?>
 <div class="um-admin-metabox">
-	<?php $role = $object['data'];
-
-	UM()->admin_forms( array(
-		'class'     => 'um-role-profile um-half-column',
-		'prefix_id' => 'role',
-		'fields'    => array(
-			array(
-				'id'        => '_um_can_view_all',
-				'type'      => 'checkbox',
-				'label'     => __( 'Can view other member profiles?', 'ultimate-member' ),
-				'tooltip'   => __( 'Can this role view all member profiles?', 'ultimate-member' ),
-				'value'     => ! empty( $role['_um_can_view_all'] ) ? $role['_um_can_view_all'] : 0,
+	<?php
+	UM()->admin_forms(
+		array(
+			'class'     => 'um-role-profile um-half-column',
+			'prefix_id' => 'role',
+			'fields'    => array(
+				array(
+					'id'      => '_um_can_view_all',
+					'type'    => 'checkbox',
+					'label'   => __( 'Can view other member profiles?', 'ultimate-member' ),
+					'tooltip' => __( 'Can this role view all member profiles?', 'ultimate-member' ),
+					'value'   => ! empty( $role['_um_can_view_all'] ) ? $role['_um_can_view_all'] : 0,
+				),
+				array(
+					'id'          => '_um_can_view_roles',
+					'type'        => 'select',
+					'label'       => __( 'Can view these user roles only', 'ultimate-member' ),
+					'tooltip'     => __( 'Multiple selections of which roles this role can view, none selected to allow this role to view all member roles.', 'ultimate-member' ),
+					'options'     => UM()->roles()->get_roles(),
+					'multi'       => true,
+					'value'       => ! empty( $role['_um_can_view_roles'] ) ? $role['_um_can_view_roles'] : array(),
+					'conditional' => array( '_um_can_view_all', '=', '1' )
+				),
+				array(
+					'id'      => '_um_can_make_private_profile',
+					'type'    => 'checkbox',
+					'name'    => '_um_can_make_private_profile',
+					'label'   => __( 'Can make their profile private?', 'ultimate-member' ),
+					'tooltip' => __( 'Can this role make their profile private?', 'ultimate-member' ),
+					'value'   => ! empty( $role['_um_can_make_private_profile'] ) ? $role['_um_can_make_private_profile'] : 0,
+				),
+				array(
+					'id'      => '_um_can_access_private_profile',
+					'type'    => 'checkbox',
+					'name'    => '_um_can_access_private_profile',
+					'label'   => __( 'Can view/access private profiles?', 'ultimate-member' ),
+					'tooltip' => __( 'Can this role view private profiles?', 'ultimate-member' ),
+					'value'   => ! empty( $role['_um_can_access_private_profile'] ) ? $role['_um_can_access_private_profile'] : 0,
+				),
+				array(
+					'id'      => '_um_profile_noindex',
+					'type'    => 'select',
+					'size'    => 'medium',
+					'name'    => '_um_profile_noindex',
+					'label'   => __( 'Avoid indexing profile by search engines', 'ultimate-member' ),
+					'tooltip' => __( 'Hides the profile page for robots. The default value depends on the General > Users setting.', 'ultimate-member' ),
+					'options' => array(
+						''  => __( 'Default', 'ultimate-member' ),
+						'0' => __( 'No', 'ultimate-member' ),
+						'1' => __( 'Yes', 'ultimate-member' ),
+					),
+					'value'   => array_key_exists( '_um_profile_noindex', $role ) ? $role['_um_profile_noindex'] : '',
+				),
 			),
-			array(
-				'id'            => '_um_can_view_roles',
-				'type'          => 'select',
-				'label'         => __( 'Can view these user roles only', 'ultimate-member' ),
-				'tooltip'       => __( 'Multiple selections of which roles this role can view, none selected to allow this role to view all member roles.', 'ultimate-member' ),
-				'options'       => UM()->roles()->get_roles(),
-				'multi'         => true,
-				'value'         => ! empty( $role['_um_can_view_roles'] ) ? $role['_um_can_view_roles'] : array(),
-				'conditional'   => array( '_um_can_view_all', '=', '1' )
-			),
-			array(
-				'id'        => '_um_can_make_private_profile',
-				'type'      => 'checkbox',
-				'name'      => '_um_can_make_private_profile',
-				'label'     => __( 'Can make their profile private?', 'ultimate-member' ),
-				'tooltip'   => __( 'Can this role make their profile private?', 'ultimate-member' ),
-				'value'     => ! empty( $role['_um_can_make_private_profile'] ) ? $role['_um_can_make_private_profile'] : 0,
-			),
-			array(
-				'id'        => '_um_can_access_private_profile',
-				'type'      => 'checkbox',
-				'name'      => '_um_can_access_private_profile',
-				'label'     => __( 'Can view/access private profiles?', 'ultimate-member' ),
-				'tooltip'   => __( 'Can this role view private profiles?', 'ultimate-member' ),
-				'value'     => ! empty( $role['_um_can_access_private_profile'] ) ? $role['_um_can_access_private_profile'] : 0,
-			),
-			array(
-				'id'        => '_um_profile_noindex',
-				'type'      => 'select',
-				'size'      => 'medium',
-				'name'      => '_um_profile_noindex',
-				'label'     => __( 'Avoid indexing profile by search engines', 'ultimate-member' ),
-				'tooltip'   => __( 'Hides the profile page for robots. The default value depends on the General > Users setting.', 'ultimate-member' ),
-				'options'   => [
-					''  => __( 'Default', 'ultimate-member' ),
-					'0' => __( 'No', 'ultimate-member' ),
-					'1' => __( 'Yes', 'ultimate-member' ),
-				],
-				'value'     => array_key_exists( '_um_profile_noindex', $role ) ? $role['_um_profile_noindex'] : '',
-			)
 		)
-	) )->render_form(); ?>
-
+	)->render_form();
+	?>
 </div>