diff --git a/includes/admin/core/class-admin-settings.php b/includes/admin/core/class-admin-settings.php
index 825b518f..e1c490b4 100644
--- a/includes/admin/core/class-admin-settings.php
+++ b/includes/admin/core/class-admin-settings.php
@@ -908,89 +908,89 @@ if ( ! class_exists( 'um\admin\core\Admin_Settings' ) ) {
 							'title'     => __( 'Registration Form', 'ultimate-member' ),
 							'fields'    => array(
 								array(
-									'id'       		=> 'register_template',
-									'type'     		=> 'select',
-									'label'    		=> __( 'Registration Default Template','ultimate-member' ),
-									'tooltip' 	=> __( 'This will be the default template to output registration' ),
-									'default'  		=> um_get_metadefault('register_template'),
-									'options' 		=> UM()->shortcodes()->get_templates( 'register' ),
-									'size'          => 'small'
+									'id'        => 'register_template',
+									'type'      => 'select',
+									'label'     => __( 'Registration Default Template', 'ultimate-member' ),
+									'tooltip'   => __( 'This will be the default template to output registration', 'ultimate-member' ),
+									'default'   => um_get_metadefault('register_template'),
+									'options'   => UM()->shortcodes()->get_templates( 'register' ),
+									'size'      => 'small',
 								),
 								array(
-									'id'      		=> 'register_max_width',
-									'type'     		=> 'text',
-									'label'    		=> __( 'Registration Maximum Width','ultimate-member' ),
-									'default'  		=> um_get_metadefault('register_max_width'),
-									'tooltip' 	=> __('The maximum width this shortcode can take from the page width','ultimate-member'),
-									'size'          => 'small'
+									'id'        => 'register_max_width',
+									'type'      => 'text',
+									'label'     => __( 'Registration Maximum Width', 'ultimate-member' ),
+									'default'   => um_get_metadefault('register_max_width'),
+									'tooltip'   => __( 'The maximum width this shortcode can take from the page width', 'ultimate-member' ),
+									'size'      => 'small'
 								),
 								array(
-									'id'       		=> 'register_align',
-									'type'     		=> 'select',
-									'label'    		=> __( 'Registration Shortcode Alignment','ultimate-member' ),
-									'tooltip' 	=> __( 'The shortcode is centered by default unless you specify otherwise here','ultimate-member' ),
-									'default'  		=> um_get_metadefault('register_align'),
-									'options' 		=> array(
-										'center' 			=> __('Centered'),
-										'left' 				=> __('Left aligned'),
-										'right' 			=> __('Right aligned'),
+									'id'        => 'register_align',
+									'type'      => 'select',
+									'label'     => __( 'Registration Shortcode Alignment', 'ultimate-member' ),
+									'tooltip'   => __( 'The shortcode is centered by default unless you specify otherwise here', 'ultimate-member' ),
+									'default'   => um_get_metadefault( 'register_align' ),
+									'options'   => array(
+										'center'    => __( 'Centered', 'ultimate-member' ),
+										'left'      => __( 'Left aligned', 'ultimate-member' ),
+										'right'     => __( 'Right aligned', 'ultimate-member' ),
 									),
-									'size'          => 'small'
+									'size'      => 'small'
 								),
 								array(
-									'id'       		=> 'register_icons',
-									'type'     		=> 'select',
-									'label'    		=> __( 'Registration Field Icons','ultimate-member' ),
-									'tooltip' 	=> __( 'This controls the display of field icons in the registration form','ultimate-member' ),
-									'default'  		=> um_get_metadefault('register_icons'),
-									'options' 		=> array(
-										'field' 			=> __('Show inside text field'),
-										'label' 			=> __('Show with label'),
-										'off' 				=> __('Turn off'),
+									'id'        => 'register_icons',
+									'type'      => 'select',
+									'label'     => __( 'Registration Field Icons', 'ultimate-member' ),
+									'tooltip'   => __( 'This controls the display of field icons in the registration form', 'ultimate-member' ),
+									'default'   => um_get_metadefault( 'register_icons' ),
+									'options'   => array(
+										'field' => __( 'Show inside text field', 'ultimate-member' ),
+										'label' => __( 'Show with label', 'ultimate-member' ),
+										'off'   => __( 'Turn off', 'ultimate-member' ),
 									),
-									'size'          => 'small'
+									'size'      => 'small'
 								),
 								array(
-									'id'      		=> 'register_primary_btn_word',
-									'type'     		=> 'text',
-									'label'    		=> __( 'Registration Primary Button Text','ultimate-member' ),
-									'default'  		=> um_get_metadefault('register_primary_btn_word'),
-									'tooltip' 	   		=> __('The text that is used for primary button text','ultimate-member'),
+									'id'        => 'register_primary_btn_word',
+									'type'      => 'text',
+									'label'     => __( 'Registration Primary Button Text', 'ultimate-member' ),
+									'default'   => um_get_metadefault('register_primary_btn_word'),
+									'tooltip'   => __( 'The text that is used for primary button text', 'ultimate-member' ),
+									'size'      => 'medium'
+								),
+								array(
+									'id'        => 'register_secondary_btn',
+									'type'      => 'checkbox',
+									'label'     => __( 'Registration Secondary Button', 'ultimate-member' ),
+									'default'   => 1,
+									'tooltip'   => __( 'Switch on/off the secondary button display in the form', 'ultimate-member' ),
+								),
+								array(
+									'id'            => 'register_secondary_btn_word',
+									'type'          => 'text',
+									'label'         => __( 'Registration Secondary Button Text', 'ultimate-member' ),
+									'default'       => um_get_metadefault( 'register_secondary_btn_word' ),
+									'tooltip'       => __( 'The text that is used for the secondary button text', 'ultimate-member' ),
+									'conditional'   => array( 'register_secondary_btn', '=', 1 ),
 									'size'          => 'medium'
 								),
 								array(
-									'id'       		=> 'register_secondary_btn',
-									'type'     		=> 'checkbox',
-									'label'    		=> __( 'Registration Secondary Button','ultimate-member' ),
-									'default' 		=> 1,
-									'tooltip' 	=> __('Switch on/off the secondary button display in the form','ultimate-member'),
-								),
-								array(
-									'id'      		=> 'register_secondary_btn_word',
-									'type'     		=> 'text',
-									'label'    		=> __( 'Registration Secondary Button Text','ultimate-member' ),
-									'default'  		=> um_get_metadefault('register_secondary_btn_word'),
-									'tooltip' 	=> __('The text that is used for the secondary button text','ultimate-member'),
-									'conditional'		=> array( 'register_secondary_btn', '=', 1 ),
+									'id'            => 'register_secondary_btn_url',
+									'type'          => 'text',
+									'label'         => __( 'Registration Secondary Button URL', 'ultimate-member' ),
+									'default'       => um_get_metadefault('register_secondary_btn_url'),
+									'tooltip'       => __( 'You can replace default link for this button by entering custom URL', 'ultimate-member' ),
+									'conditional'   => array( 'register_secondary_btn', '=', 1 ),
 									'size'          => 'medium'
 								),
 								array(
-									'id'      		=> 'register_secondary_btn_url',
-									'type'     		=> 'text',
-									'label'    		=> __( 'Registration Secondary Button URL','ultimate-member' ),
-									'default'  		=> um_get_metadefault('register_secondary_btn_url'),
-									'tooltip' 	=> __('You can replace default link for this button by entering custom URL','ultimate-member'),
-									'conditional'		=> array( 'register_secondary_btn', '=', 1 ),
-									'size'          => 'medium'
-								),
-								array(
-									'id'       		=> 'register_role',
-									'type'     		=> 'select',
-									'label'    		=> __( 'Registration Default Role','ultimate-member' ),
-									'tooltip' 	=> __( 'This will be the default role assigned to users registering thru registration form','ultimate-member' ),
-									'default'  		=> um_get_metadefault('register_role'),
-									'options' 		=> UM()->roles()->get_roles( $add_default = 'Default' ),
-									'size'          => 'small'
+									'id'        => 'register_role',
+									'type'      => 'select',
+									'label'     => __( 'Registration Default Role', 'ultimate-member' ),
+									'tooltip'   => __( 'This will be the default role assigned to users registering thru registration form', 'ultimate-member' ),
+									'default'   => um_get_metadefault( 'register_role' ),
+									'options'   => UM()->roles()->get_roles( $add_default = 'Default' ),
+									'size'      => 'small'
 								)
 							)
 						),
@@ -998,94 +998,94 @@ if ( ! class_exists( 'um\admin\core\Admin_Settings' ) ) {
 							'title'     => __( 'Login Form', 'ultimate-member' ),
 							'fields'    => array(
 								array(
-									'id'       		=> 'login_template',
-									'type'     		=> 'select',
-									'label'    		=> __( 'Login Default Template','ultimate-member' ),
-									'tooltip' 	=> __( 'This will be the default template to output login','ultimate-member' ),
-									'default'  		=> um_get_metadefault('login_template'),
-									'options' 		=> UM()->shortcodes()->get_templates( 'login' ),
-									'size'          => 'small'
+									'id'        => 'login_template',
+									'type'      => 'select',
+									'label'     => __( 'Login Default Template', 'ultimate-member' ),
+									'tooltip'   => __( 'This will be the default template to output login', 'ultimate-member' ),
+									'default'   => um_get_metadefault( 'login_template' ),
+									'options'   => UM()->shortcodes()->get_templates( 'login' ),
+									'size'      => 'small'
 								),
 								array(
-									'id'      		=> 'login_max_width',
-									'type'     		=> 'text',
-									'label'    		=> __( 'Login Maximum Width','ultimate-member' ),
-									'default'  		=> um_get_metadefault('login_max_width'),
-									'tooltip' 	=> __('The maximum width this shortcode can take from the page width','ultimate-member'),
-									'size'          => 'small'
+									'id'        => 'login_max_width',
+									'type'      => 'text',
+									'label'     => __( 'Login Maximum Width', 'ultimate-member' ),
+									'default'   => um_get_metadefault( 'login_max_width' ),
+									'tooltip'   => __( 'The maximum width this shortcode can take from the page width', 'ultimate-member' ),
+									'size'      => 'small'
 								),
 								array(
-									'id'       		=> 'login_align',
-									'type'     		=> 'select',
-									'label'    		=> __( 'Login Shortcode Alignment','ultimate-member' ),
-									'tooltip' 	=> __( 'The shortcode is centered by default unless you specify otherwise here','ultimate-member' ),
-									'default'  		=> um_get_metadefault('login_align'),
-									'options' 		=> array(
-										'center' 			=> __('Centered','ultimate-member'),
-										'left' 				=> __('Left aligned','ultimate-member'),
-										'right' 			=> __('Right aligned','ultimate-member'),
+									'id'        => 'login_align',
+									'type'      => 'select',
+									'label'     => __( 'Login Shortcode Alignment', 'ultimate-member' ),
+									'tooltip'   => __( 'The shortcode is centered by default unless you specify otherwise here', 'ultimate-member' ),
+									'default'   => um_get_metadefault( 'login_align' ),
+									'options'   => array(
+										'center'    => __( 'Centered', 'ultimate-member' ),
+										'left'      => __( 'Left aligned', 'ultimate-member' ),
+										'right'     => __( 'Right aligned', 'ultimate-member' ),
 									),
-									'size'          => 'small'
+									'size'      => 'small'
 								),
 								array(
-									'id'       		=> 'login_icons',
-									'type'     		=> 'select',
-									'label'    		=> __( 'Login Field Icons','ultimate-member' ),
-									'tooltip' 	=> __( 'This controls the display of field icons in the login form','ultimate-member' ),
-									'default'  		=> um_get_metadefault('login_icons'),
-									'options' 		=> array(
-										'field' 			=> __('Show inside text field','ultimate-member'),
-										'label' 			=> __('Show with label','ultimate-member'),
-										'off' 				=> __('Turn off','ultimate-member'),
+									'id'        => 'login_icons',
+									'type'      => 'select',
+									'label'     => __( 'Login Field Icons', 'ultimate-member' ),
+									'tooltip'   => __( 'This controls the display of field icons in the login form', 'ultimate-member' ),
+									'default'   => um_get_metadefault( 'login_icons' ),
+									'options'   => array(
+										'field' => __( 'Show inside text field', 'ultimate-member' ),
+										'label' => __( 'Show with label', 'ultimate-member' ),
+										'off'   => __( 'Turn off', 'ultimate-member' ),
 									),
-									'size'          => 'small'
+									'size'      => 'small'
 								),
 								array(
-									'id'      		=> 'login_primary_btn_word',
-									'type'     		=> 'text',
-									'label'    		=> __( 'Login Primary Button Text','ultimate-member' ),
-									'default'  		=> um_get_metadefault('login_primary_btn_word'),
-									'tooltip' 	=> __('The text that is used for primary button text','ultimate-member'),
+									'id'        => 'login_primary_btn_word',
+									'type'      => 'text',
+									'label'     => __( 'Login Primary Button Text','ultimate-member' ),
+									'default'   => um_get_metadefault( 'login_primary_btn_word' ),
+									'tooltip'   => __( 'The text that is used for primary button text', 'ultimate-member' ),
+									'size'      => 'medium'
+								),
+								array(
+									'id'        => 'login_secondary_btn',
+									'type'      => 'checkbox',
+									'label'     => __( 'Login Secondary Button', 'ultimate-member' ),
+									'default'   => 1,
+									'tooltip'   => __( 'Switch on/off the secondary button display in the form', 'ultimate-member' ),
+								),
+								array(
+									'id'            => 'login_secondary_btn_word',
+									'type'          => 'text',
+									'label'         => __( 'Login Secondary Button Text', 'ultimate-member' ),
+									'default'       => um_get_metadefault( 'login_secondary_btn_word' ),
+									'tooltip'       => __('The text that is used for the secondary button text', 'ultimate-member' ),
+									'conditional'   => array( 'login_secondary_btn', '=', 1 ),
 									'size'          => 'medium'
 								),
 								array(
-									'id'       		=> 'login_secondary_btn',
-									'type'     		=> 'checkbox',
-									'label'    		=> __( 'Login Secondary Button','ultimate-member' ),
-									'default' 		=> 1,
-									'tooltip' 	=> __('Switch on/off the secondary button display in the form','ultimate-member'),
-								),
-								array(
-									'id'      		=> 'login_secondary_btn_word',
-									'type'     		=> 'text',
-									'label'    		=> __( 'Login Secondary Button Text','ultimate-member' ),
-									'default'  		=> um_get_metadefault('login_secondary_btn_word'),
-									'tooltip' 	=> __('The text that is used for the secondary button text','ultimate-member'),
-									'conditional'		=> array( 'login_secondary_btn', '=', 1 ),
+									'id'            => 'login_secondary_btn_url',
+									'type'          => 'text',
+									'label'         => __( 'Login Secondary Button URL', 'ultimate-member' ),
+									'default'       => um_get_metadefault( 'login_secondary_btn_url' ),
+									'tooltip'       => __( 'You can replace default link for this button by entering custom URL', 'ultimate-member' ),
+									'conditional'   => array( 'login_secondary_btn', '=', 1 ),
 									'size'          => 'medium'
 								),
 								array(
-									'id'      		=> 'login_secondary_btn_url',
-									'type'     		=> 'text',
-									'label'    		=> __( 'Login Secondary Button URL','ultimate-member' ),
-									'default'  		=> um_get_metadefault('login_secondary_btn_url'),
-									'tooltip' 	=> __('You can replace default link for this button by entering custom URL','ultimate-member'),
-									'conditional'		=> array( 'login_secondary_btn', '=', 1 ),
-									'size'          => 'medium'
+									'id'        => 'login_forgot_pass_link',
+									'type'      => 'checkbox',
+									'label'     => __( 'Login Forgot Password Link', 'ultimate-member' ),
+									'default'   => 1,
+									'tooltip'   => __( 'Switch on/off the forgot password link in login form', 'ultimate-member' ),
 								),
 								array(
-									'id'       		=> 'login_forgot_pass_link',
-									'type'     		=> 'checkbox',
-									'label'    		=> __( 'Login Forgot Password Link','ultimate-member' ),
-									'default' 		=> 1,
-									'tooltip' 	=> __('Switch on/off the forgot password link in login form','ultimate-member'),
-								),
-								array(
-									'id'       		=> 'login_show_rememberme',
-									'type'     		=> 'checkbox',
-									'label'    		=> __( 'Show "Remember Me"','ultimate-member' ),
-									'default' 		=> 1,
-									'tooltip' 	=> __('Allow users to choose If they want to stay signed in even after closing the browser. If you do not show this option, the default will be to not remember login session.','ultimate-member'),
+									'id'        => 'login_show_rememberme',
+									'type'      => 'checkbox',
+									'label'     => __( 'Show "Remember Me"', 'ultimate-member' ),
+									'default'   => 1,
+									'tooltip'   => __( 'Allow users to choose If they want to stay signed in even after closing the browser. If you do not show this option, the default will be to not remember login session.', 'ultimate-member' ),
 								)
 							)
 						)
diff --git a/includes/class-dependencies.php b/includes/class-dependencies.php
index 93d43c49..361556b6 100644
--- a/includes/class-dependencies.php
+++ b/includes/class-dependencies.php
@@ -33,31 +33,31 @@ if ( ! class_exists( 'um\Dependencies' ) ) {
 		 * @var array
 		 */
 		public $ext_required_version = array(
-			'bbpress'               => '2.0.7',
-			'followers'             => '2.1.6',
+			'bbpress'               => '2.0.7-rc.1',
+			'followers'             => '2.1.6-rc.1',
 			'forumwp'               => '2.0.1',
-			'friends'               => '2.1.4',
-			'groups'                => '2.1.7',
-			'instagram'             => '2.0.5',
-			'mailchimp'             => '2.2.0',
-			'messaging'             => '2.2.5',
-			'mycred'                => '2.1.6',
-			'notices'               => '2.0.5',
-			'notifications'         => '2.1.3',
-			'online'                => '2.1.1',
+			'friends'               => '2.1.4-rc.1',
+			'groups'                => '2.1.7-rc.1',
+			'instagram'             => '2.0.5-rc.1',
+			'mailchimp'             => '2.2.0-rc.1',
+			'messaging'             => '2.2.5-rc.1',
+			'mycred'                => '2.1.6-rc.1',
+			'notices'               => '2.0.5-rc.1',
+			'notifications'         => '2.1.3-rc.1',
+			'online'                => '2.1.1-rc.1',
 			'private-content'       => '2.0.5',
-			'profile-completeness'  => '2.1.2',
-			'recaptcha'             => '2.1.2',
-			'reviews'               => '2.1.5',
-			'social-activity'       => '2.2.0',
-			'social-login'          => '2.2.0',
+			'profile-completeness'  => '2.1.2-rc.1',
+			'recaptcha'             => '2.1.2-rc.1',
+			'reviews'               => '2.1.5-rc.1',
+			'social-activity'       => '2.2.0-rc.1',
+			'social-login'          => '2.2.0-rc.1',
 			'terms-conditions'      => '2.1.1',
-			'unsplash'              => '2.0.2',
-			'user-bookmarks'        => '2.0.2',
-			'user-photos'           => '2.0.4',
-			'user-tags'             => '2.1.0',
-			'verified-users'        => '2.0.5',
-			'woocommerce'           => '2.1.9',
+			'unsplash'              => '2.0.2-rc.1',
+			'user-bookmarks'        => '2.0.2-rc.1',
+			'user-photos'           => '2.0.4-rc.1',
+			'user-tags'             => '2.1.0-rc.1',
+			'verified-users'        => '2.0.5-rc.1',
+			'woocommerce'           => '2.1.9-rc.1',
 
 			/*????*/
 			'restrict-content'      => '2.0',
diff --git a/includes/core/class-common.php b/includes/core/class-common.php
index e2fff5a5..77f6e7f9 100644
--- a/includes/core/class-common.php
+++ b/includes/core/class-common.php
@@ -1,17 +1,21 @@
 <?php
 namespace um\core;
 
-// Exit if accessed directly.
+
 if ( ! defined( 'ABSPATH' ) ) exit;
 
+
 if ( ! class_exists( 'um\core\Common' ) ) {
 
 
 	/**
 	 * Class Common
+	 *
 	 * @package um\core
 	 */
 	class Common {
+
+
 		/**
 		 * Common constructor.
 		 */
@@ -33,7 +37,7 @@ if ( ! class_exists( 'um\core\Common' ) ) {
 
 			if ( is_user_logged_in() ) {
 				if ( um_user( 'can_not_see_adminbar' ) ) {
-					$search = array_search( "admin-bar", $classes );
+					$search = array_search( 'admin-bar', $classes );
 					if ( ! empty( $search ) ) {
 						unset( $classes[ $search ] );
 					}
@@ -50,17 +54,17 @@ if ( ! class_exists( 'um\core\Common' ) ) {
 		function create_post_types() {
 
 			register_post_type( 'um_form', array(
-				'labels' => array(
-					'name' => __( 'Forms' ),
-					'singular_name' => __( 'Form' ),
-					'add_new' => __( 'Add New' ),
-					'add_new_item' => __('Add New Form' ),
-					'edit_item' => __('Edit Form'),
-					'not_found' => __('You did not create any forms yet'),
-					'not_found_in_trash' => __('Nothing found in Trash'),
-					'search_items' => __('Search Forms')
+				'labels'        => array(
+					'name'                  => __( 'Forms', 'ultimate-member' ),
+					'singular_name'         => __( 'Form', 'ultimate-member' ),
+					'add_new'               => __( 'Add New', 'ultimate-member' ),
+					'add_new_item'          => __( 'Add New Form', 'ultimate-member' ),
+					'edit_item'             => __( 'Edit Form', 'ultimate-member' ),
+					'not_found'             => __( 'You did not create any forms yet', 'ultimate-member' ),
+					'not_found_in_trash'    => __( 'Nothing found in Trash', 'ultimate-member' ),
+					'search_items'          => __( 'Search Forms', 'ultimate-member' ),
 				),
-				'capabilities' => array(
+				'capabilities'  => array(
 					'edit_post'          => 'manage_options',
 					'read_post'          => 'manage_options',
 					'delete_post'        => 'manage_options',
@@ -68,29 +72,29 @@ if ( ! class_exists( 'um\core\Common' ) ) {
 					'edit_others_posts'  => 'manage_options',
 					'delete_posts'       => 'manage_options',
 					'publish_posts'      => 'manage_options',
-					'read_private_posts' => 'manage_options'
+					'read_private_posts' => 'manage_options',
 				),
-				'show_ui' => true,
-				'show_in_menu' => false,
-				'public' => false,
-				'show_in_rest' => true,
-				'supports' => array('title')
+				'show_ui'       => true,
+				'show_in_menu'  => false,
+				'public'        => false,
+				'show_in_rest'  => true,
+				'supports'      => array( 'title' ),
 			) );
 
 			if ( UM()->options()->get( 'members_page' ) || ! get_option( 'um_options' ) ) {
 
 				register_post_type( 'um_directory', array(
-					'labels' => array(
-						'name' => __( 'Member Directories' ),
-						'singular_name' => __( 'Member Directory' ),
-						'add_new' => __( 'Add New' ),
-						'add_new_item' => __('Add New Member Directory' ),
-						'edit_item' => __('Edit Member Directory'),
-						'not_found' => __('You did not create any member directories yet'),
-						'not_found_in_trash' => __('Nothing found in Trash'),
-						'search_items' => __('Search Member Directories')
+					'labels'        => array(
+						'name'                  => __( 'Member Directories', 'ultimate-member' ),
+						'singular_name'         => __( 'Member Directory', 'ultimate-member' ),
+						'add_new'               => __( 'Add New', 'ultimate-member' ),
+						'add_new_item'          => __( 'Add New Member Directory', 'ultimate-member' ),
+						'edit_item'             => __( 'Edit Member Directory', 'ultimate-member' ),
+						'not_found'             => __( 'You did not create any member directories yet', 'ultimate-member' ),
+						'not_found_in_trash'    => __( 'Nothing found in Trash', 'ultimate-member' ),
+						'search_items'          => __( 'Search Member Directories', 'ultimate-member' ),
 					),
-					'capabilities' => array(
+					'capabilities'  => array(
 						'edit_post'          => 'manage_options',
 						'read_post'          => 'manage_options',
 						'delete_post'        => 'manage_options',
@@ -98,13 +102,13 @@ if ( ! class_exists( 'um\core\Common' ) ) {
 						'edit_others_posts'  => 'manage_options',
 						'delete_posts'       => 'manage_options',
 						'publish_posts'      => 'manage_options',
-						'read_private_posts' => 'manage_options'
+						'read_private_posts' => 'manage_options',
 					),
-					'show_ui' => true,
-					'show_in_menu' => false,
-					'public' => false,
-					'show_in_rest' => true,
-					'supports' => array('title')
+					'show_ui'       => true,
+					'show_in_menu'  => false,
+					'public'        => false,
+					'show_in_rest'  => true,
+					'supports'      => array( 'title' ),
 				) );
 
 			}
diff --git a/languages/ultimate-member-en_US.po b/languages/ultimate-member-en_US.po
index 6bab61d6..8e86f9f5 100644
--- a/languages/ultimate-member-en_US.po
+++ b/languages/ultimate-member-en_US.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Ultimate Member\n"
-"POT-Creation-Date: 2019-10-24 16:16+0300\n"
-"PO-Revision-Date: 2019-10-24 16:16+0300\n"
+"POT-Creation-Date: 2019-10-25 01:04+0300\n"
+"PO-Revision-Date: 2019-10-25 01:04+0300\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: en_US\n"
@@ -470,7 +470,7 @@ msgid "Dashboard"
 msgstr ""
 
 #: includes/admin/core/class-admin-menu.php:159
-#: includes/admin/templates/gdpr.php:7 includes/core/class-common.php:54
+#: includes/admin/templates/gdpr.php:7 includes/core/class-common.php:58
 msgid "Forms"
 msgstr ""
 
@@ -481,7 +481,7 @@ msgid "User Roles"
 msgstr ""
 
 #: includes/admin/core/class-admin-menu.php:164
-#: includes/core/class-common.php:84
+#: includes/core/class-common.php:88
 msgid "Member Directories"
 msgstr ""
 
@@ -3324,7 +3324,7 @@ msgstr ""
 #: includes/admin/core/list-tables/roles-list-table.php:485
 #: includes/admin/core/packages/2.0-beta1/user_roles.php:14
 #: includes/admin/templates/role/role-edit.php:153
-#: includes/core/class-common.php:56 includes/core/class-common.php:86
+#: includes/core/class-common.php:60 includes/core/class-common.php:90
 msgid "Add New"
 msgstr ""
 
@@ -3479,7 +3479,7 @@ msgid "You did not create any user roles yet"
 msgstr ""
 
 #: includes/admin/core/packages/2.0-beta1/user_roles.php:18
-#: includes/core/class-common.php:60 includes/core/class-common.php:90
+#: includes/core/class-common.php:64 includes/core/class-common.php:94
 msgid "Nothing found in Trash"
 msgstr ""
 
@@ -3519,19 +3519,19 @@ msgstr ""
 msgid "Upgrade user roles..."
 msgstr ""
 
-#: includes/admin/core/packages/2.1.0/functions.php:11
+#: includes/admin/core/packages/2.1.0-beta1/functions.php:11
 msgid "Usermeta was upgraded successfully"
 msgstr ""
 
-#: includes/admin/core/packages/2.1.0/functions.php:24
+#: includes/admin/core/packages/2.1.0-beta1/functions.php:24
 msgid "Member directories were upgraded successfully"
 msgstr ""
 
-#: includes/admin/core/packages/2.1.0/init.php:7
+#: includes/admin/core/packages/2.1.0-beta1/init.php:7
 msgid "Upgrade user metadata..."
 msgstr ""
 
-#: includes/admin/core/packages/2.1.0/init.php:33
+#: includes/admin/core/packages/2.1.0-beta1/init.php:33
 msgid "Upgrade Member Directories..."
 msgstr ""
 
@@ -6833,43 +6833,43 @@ msgstr ""
 msgid "Zimbabwe"
 msgstr ""
 
-#: includes/core/class-common.php:55
+#: includes/core/class-common.php:59
 msgid "Form"
 msgstr ""
 
-#: includes/core/class-common.php:57
+#: includes/core/class-common.php:61
 msgid "Add New Form"
 msgstr ""
 
-#: includes/core/class-common.php:58
+#: includes/core/class-common.php:62
 msgid "Edit Form"
 msgstr ""
 
-#: includes/core/class-common.php:59
+#: includes/core/class-common.php:63
 msgid "You did not create any forms yet"
 msgstr ""
 
-#: includes/core/class-common.php:61
+#: includes/core/class-common.php:65
 msgid "Search Forms"
 msgstr ""
 
-#: includes/core/class-common.php:85
+#: includes/core/class-common.php:89
 msgid "Member Directory"
 msgstr ""
 
-#: includes/core/class-common.php:87
+#: includes/core/class-common.php:91
 msgid "Add New Member Directory"
 msgstr ""
 
-#: includes/core/class-common.php:88
+#: includes/core/class-common.php:92
 msgid "Edit Member Directory"
 msgstr ""
 
-#: includes/core/class-common.php:89
+#: includes/core/class-common.php:93
 msgid "You did not create any member directories yet"
 msgstr ""
 
-#: includes/core/class-common.php:91
+#: includes/core/class-common.php:95
 msgid "Search Member Directories"
 msgstr ""