diff --git a/src/Access.php b/src/Access.php
index f9ae737..8de0176 100644
--- a/src/Access.php
+++ b/src/Access.php
@@ -388,11 +388,11 @@ public function setup_nav_menu_item( $item ) {
 	 */
 	public function hide_menu_items() {
 		?>
-        <style type="text/css">
-            .ssc-hide {
-                display: none !important;
-            }
-        </style>
+		<style type="text/css">
+			.ssc-hide {
+				display: none !important;
+			}
+		</style>
 		<?php
 	}
 
diff --git a/src/Admin.php b/src/Admin.php
index bed05c6..bda6aa4 100644
--- a/src/Admin.php
+++ b/src/Admin.php
@@ -160,31 +160,31 @@ public function publishing_actions() {
 		global $post;
 		if ( $post && $post->post_type == $mg_post_type ) {
 			echo '<style type="text/css">
-            .misc-pub-section.misc-pub-visibility,
-            .misc-pub-section.curtime
-            {
-                display:none;
-            }
-            </style>';
+			.misc-pub-section.misc-pub-visibility,
+			.misc-pub-section.curtime
+			{
+				display:none;
+			}
+			</style>';
 		} ?>
 
-        <!-- SSC TinyMCE Shortcode Plugin -->
-        <script type='text/javascript'>
-            var sscContentGroups = [];
-            sscContentGroups.push({
-                text: 'Vyberte skupinu',
-                value: ''
-            });
+		<!-- SSC TinyMCE Shortcode Plugin -->
+		<script type='text/javascript'>
+			var sscContentGroups = [];
+			sscContentGroups.push({
+				text: 'Vyberte skupinu',
+				value: ''
+			});
 			<?php
 			$group = new Group();
 			$groups = $group->get_groups();
 			foreach ($groups as $key => $group) { ?>
-            sscContentGroups.push({
-                text: '<?php echo $group; ?>',
-                value: '<?php echo $key; ?>'
-            });
+			sscContentGroups.push({
+				text: '<?php echo $group; ?>',
+				value: '<?php echo $key; ?>'
+			});
 			<?php }  ?>
-        </script>
+		</script>
 
 		<?php
 
diff --git a/src/Membership.php b/src/Membership.php
index ae0454e..b700a06 100644
--- a/src/Membership.php
+++ b/src/Membership.php
@@ -30,13 +30,13 @@ public function __construct( $user_id = '' ) {
 	 */
 	public function get() {
 		$ssc_groups = new Group();
-		$groups     = $ssc_groups->get_user_groups( $this->user_id );
+		$groups     = $ssc_groups->get_user_groups( $this->user_id ) ?: [];
 
 		foreach ( $groups as $group ) {
 			$this->groups[ $group ] = [
 				'group_id'          => $group,
 				'subscription_date' => $this->get_subscription_date( $group ),
-				'valid_to'          => $this->get_valid_to( $group )
+				'valid_to'          => $this->get_valid_to( $group ),
 			];
 		}
 	}
diff --git a/src/Metaboxes.php b/src/Metaboxes.php
index a77bf26..fb2e716 100644
--- a/src/Metaboxes.php
+++ b/src/Metaboxes.php
@@ -8,6 +8,8 @@
 
 namespace Redbit\SimpleShop\WpPlugin;
 
+use WP_User;
+
 class Metaboxes {
 	public $prefix = '_ssc_';
 
@@ -17,7 +19,10 @@ class Metaboxes {
 	public function __construct( Plugin $loader ) {
 		$this->loader = $loader;
 		add_action( 'cmb2_admin_init', [ $this, 'page_metaboxes' ] );
-		add_action( 'cmb2_admin_init', [ $this, 'user_metaboxes' ] );
+		add_action( 'show_user_profile', [ $this, 'render_user_profile_groups' ] );
+		add_action( 'edit_user_profile', [ $this, 'render_user_profile_groups' ] );
+		add_action( 'personal_options_update', [ $this, 'save_user_profile_groups' ] );
+		add_action( 'edit_user_profile_update', [ $this, 'save_user_profile_groups' ] );
 	}
 
 	/**
@@ -25,7 +30,6 @@ public function __construct( Plugin $loader ) {
 	 * TODO: find a way to add custom post types
 	 */
 	public function page_metaboxes() {
-
 		$ssc_group  = new Group();
 		$groups     = $ssc_group->get_groups();
 		$ssc_access = $this->loader->get_access();
@@ -36,46 +40,60 @@ public function page_metaboxes() {
 			/**
 			 * Initiate the metabox
 			 */
-			$cmb = new_cmb2_box( [
-				'id'           => 'ssc_page_groups',
-				'title'        => __( 'SimpleShop - Member sections', 'simpleshop-cz' ),
-				'object_types' => $post_types,
-				'context'      => 'normal',
-				'priority'     => 'high',
-				'show_names'   => true,
-			] );
-
-			$cmb->add_field( [
-				'name'    => __( 'Member section with allowed access to page', 'simpleshop-cz' ),
-				'desc'    => __( 'Access to this page is permit only for users of selected Member Sections. If no one section selected, all users is permit to access this page.',
-					'simpleshop-cz' ),
-				'id'      => $this->prefix . 'groups',
-				'type'    => 'multicheck',
-				'options' => $groups,
-			] );
+			$cmb = new_cmb2_box(
+				[
+					'id'           => 'ssc_page_groups',
+					'title'        => __( 'SimpleShop - Member sections', 'simpleshop-cz' ),
+					'object_types' => $post_types,
+					'context'      => 'normal',
+					'priority'     => 'high',
+					'show_names'   => true,
+				]
+			);
+
+			$cmb->add_field(
+				[
+					'name'    => __( 'Member section with allowed access to page', 'simpleshop-cz' ),
+					'desc'    => __(
+						'Access to this page is permit only for users of selected Member Sections. If no one section selected, all users is permit to access this page.',
+						'simpleshop-cz'
+					),
+					'id'      => $this->prefix . 'groups',
+					'type'    => 'multicheck',
+					'options' => $groups,
+				]
+			);
 
 			$tmp_post_types = $post_types;
 			unset( $tmp_post_types['attachment'] );
 
-			$cmb->add_field( [
-				'name'            => __( 'Page ID to redirect', 'simpleshop-cz' ),
-				'desc'            => __( 'Select one Page to which user will be redirected when uses is logged in, but have no access to page. This is preffered way. Redirect will works even if target page URL will be changer in future.',
-					'simpleshop-cz' ),
-				'id'              => $this->prefix . 'no_access_redirect_post_id',
-				'type'            => 'post_search_text',
-				'select_type'     => 'radio',
-				'select_behavior' => 'replace',
-				'post_type'       => $tmp_post_types
-			] );
-
-
-			$cmb->add_field( [
-				'name' => __( 'Manual URL to redirect', 'simpleshop-cz' ),
-				'desc' => __( 'Put URL to which user will be redirected when uses is logged in, but have no access to page. If you want to use this method, keep previous field empty.',
-					'simpleshop-cz' ),
-				'id'   => $this->prefix . 'no_access_redirect',
-				'type' => 'text'
-			] );
+			$cmb->add_field(
+				[
+					'name'            => __( 'Page ID to redirect', 'simpleshop-cz' ),
+					'desc'            => __(
+						'Select one Page to which user will be redirected when uses is logged in, but have no access to page. This is preffered way. Redirect will works even if target page URL will be changer in future.',
+						'simpleshop-cz'
+					),
+					'id'              => $this->prefix . 'no_access_redirect_post_id',
+					'type'            => 'post_search_text',
+					'select_type'     => 'radio',
+					'select_behavior' => 'replace',
+					'post_type'       => $tmp_post_types,
+				]
+			);
+
+
+			$cmb->add_field(
+				[
+					'name' => __( 'Manual URL to redirect', 'simpleshop-cz' ),
+					'desc' => __(
+						'Put URL to which user will be redirected when uses is logged in, but have no access to page. If you want to use this method, keep previous field empty.',
+						'simpleshop-cz'
+					),
+					'id'   => $this->prefix . 'no_access_redirect',
+					'type' => 'text',
+				]
+			);
 
 //            $cmb->add_field(array(
 //                'name' => __('Přesměrovat na přihlášení', 'ssc'),
@@ -85,99 +103,159 @@ public function page_metaboxes() {
 //            ));
 
 
-			$cmb->add_field( [
-				'name' => __( 'Delay access to content (days from group assign)', 'simpleshop-cz' ),
-				'desc' => __( 'Put number of days to delay before access to content is allowed after registration. For example: If registration to group is at January 1st and you set delay to 5 days, user get access to content from January 6th.',
-					'simpleshop-cz' ),
-				'id'   => $this->prefix . 'days_to_access',
-				'type' => 'text'
-			] );
-
-			$cmb->add_field( [
-				'name'        => __( 'Allow access from date', 'simpleshop-cz' ),
-				'desc'        => __( 'Put date which will be access to content allowed (applied to all groups)',
-					'simpleshop-cz' ),
-				'id'          => $this->prefix . 'date_to_access',
-				'type'        => 'text_date',
-				'date_format' => 'Y-m-d',
-			] );
-
-			$cmb->add_field( [
-				'name'        => __( 'Allow access to date', 'simpleshop-cz' ),
-				'desc'        => __( 'Put date until will be access to content allowed (applied to all groups)',
-					'simpleshop-cz' ),
-				'id'          => $this->prefix . 'date_until_to_access',
-				'type'        => 'text_date',
-				'date_format' => 'Y-m-d',
-			] );
-
-			$cmb->add_field( [
-				'name' => __( 'Subject of email when content access allowed', 'simpleshop-cz' ),
-				'desc' => __( 'Enter the subject of the email that will automatically be sent to the user when gains access to this content based on the days set above.',
-					'simpleshop-cz' ),
-				'id'   => $this->prefix . 'email_subject_user_can_access',
-				'type' => 'text'
-			] );
-
-			$cmb->add_field( [
-				'name' => __( 'Email message when content access allowed', 'simpleshop-cz' ),
-				'desc' => __( 'Enter an email that will automatically be sent to the user when gains access to this content based on the days set above.',
-					'simpleshop-cz' ),
-				'id'   => $this->prefix . 'email_user_can_access',
-				'type' => 'wysiwyg'
-			] );
+			$cmb->add_field(
+				[
+					'name' => __( 'Delay access to content (days from group assign)', 'simpleshop-cz' ),
+					'desc' => __(
+						'Put number of days to delay before access to content is allowed after registration. For example: If registration to group is at January 1st and you set delay to 5 days, user get access to content from January 6th.',
+						'simpleshop-cz'
+					),
+					'id'   => $this->prefix . 'days_to_access',
+					'type' => 'text',
+				]
+			);
+
+			$cmb->add_field(
+				[
+					'name'        => __( 'Allow access from date', 'simpleshop-cz' ),
+					'desc'        => __(
+						'Put date which will be access to content allowed (applied to all groups)',
+						'simpleshop-cz'
+					),
+					'id'          => $this->prefix . 'date_to_access',
+					'type'        => 'text_date',
+					'date_format' => 'Y-m-d',
+				]
+			);
+
+			$cmb->add_field(
+				[
+					'name'        => __( 'Allow access to date', 'simpleshop-cz' ),
+					'desc'        => __(
+						'Put date until will be access to content allowed (applied to all groups)',
+						'simpleshop-cz'
+					),
+					'id'          => $this->prefix . 'date_until_to_access',
+					'type'        => 'text_date',
+					'date_format' => 'Y-m-d',
+				]
+			);
+
+			$cmb->add_field(
+				[
+					'name' => __( 'Subject of email when content access allowed', 'simpleshop-cz' ),
+					'desc' => __(
+						'Enter the subject of the email that will automatically be sent to the user when gains access to this content based on the days set above.',
+						'simpleshop-cz'
+					),
+					'id'   => $this->prefix . 'email_subject_user_can_access',
+					'type' => 'text',
+				]
+			);
+
+			$cmb->add_field(
+				[
+					'name' => __( 'Email message when content access allowed', 'simpleshop-cz' ),
+					'desc' => __(
+						'Enter an email that will automatically be sent to the user when gains access to this content based on the days set above.',
+						'simpleshop-cz'
+					),
+					'id'   => $this->prefix . 'email_user_can_access',
+					'type' => 'wysiwyg',
+				]
+			);
 		}
 	}
 
 	/**
-	 * Add metabox to user profile
+	 * Add groups table to user profile
+	 *
+	 * @param WP_User $user WP User
 	 */
-	public function user_metaboxes() {
-
-		/**
-		 * Initiate the metabox
-		 */
-		$cmb = new_cmb2_box( [
-			'id'           => 'ssc_user_groups',
-			'title'        => __( 'SimpleShop', 'simpleshop-cz' ),
-			'object_types' => [ 'user' ],
-			'context'      => 'normal',
-			'priority'     => 'high',
-			'show_names'   => true,
-		] );
-
-		$ssc_group = new Group();
-		$groups    = $ssc_group->get_groups();
+	public function render_user_profile_groups( $user ) {
+		$ssc_group  = new Group();
+		$groups     = $ssc_group->get_groups();
+		$membership = new Membership( $user->ID );
+		$access     = $this->loader->get_access(); ?>
+		<style type="text/css">
+			#simpleshop__groups th {
+				padding: 15px 10px;
+			}
+		</style>
+		<table id="custom_user_field_table" class="form-table">
+			<tr id="simpleshop__groups">
+				<th>
+					<label for="custom_field"><?php _e( 'Simpleshop Groups', 'simpleshop-cz' ); ?></label>
+				</th>
+				<td>
+					<table>
+						<thead>
+						<tr>
+							<th><?php _e( 'Group name', 'simpleshop-cz' ); ?></th>
+							<th><?php _e( 'Is member', 'simpleshop-cz' ); ?></th>
+							<th><?php _e( 'Membership from', 'simpleshop-cz' ); ?></th>
+							<th><?php _e( 'Membership to', 'simpleshop-cz' ); ?></th>
 
+						</tr>
+						</thead>
+						<tbody>
+						<?php foreach ( $groups as $group_id => $group_name ) { ?>
+							<tr>
+								<td><?php echo $group_name; ?></td>
+								<td>
+									<?php if ( $access->user_is_admin() ) { ?>
+										<input type="checkbox" name="ssc_groups[<?php echo $group_id ?>][is_member]" value="on" <?php checked( array_key_exists( $group_id, $membership->groups ), true ); ?>/>
+									<?php } else {
+										echo array_key_exists( $group_id, $membership->groups ) ? __( 'Yes', 'simpleshop-cz' ) : __( 'No', 'simpleshop-cz' );
+									} ?>
+								</td>
+								<td>
+									<?php if ( $access->user_is_admin() ) { ?>
+										<input type="text" name="ssc_groups[<?php echo $group_id ?>][subscription_date]" value="<?php echo get_user_meta( $user->ID, $this->prefix . 'group_subscription_date_' . $group_id, true ) ?>"/>
+									<?php } else {
+										echo get_user_meta( $user->ID, $this->prefix . 'group_subscription_date_' . $group_id, true );
+									} ?>
+								</td>
+								<td>
+									<?php if ( $access->user_is_admin() ) { ?>
+										<input type="text" name="ssc_groups[<?php echo $group_id ?>][subscription_valid_to]" value="<?php echo get_user_meta( $user->ID, $this->prefix . 'group_subscription_valid_to_' . $group_id, true ) ?>"/>
+									<?php } else {
+										echo get_user_meta( $user->ID, $this->prefix . 'group_subscription_valid_to_' . $group_id, true );
+									} ?>
+								</td>
+							</tr>
+						<?php } ?>
+						</tbody>
+					</table>
+				</td>
+			</tr>
+		</table>
+		<?php
+	}
 
+	/**
+	 * Save user groups to profile
+	 *
+	 * @param $user_id
+	 */
+	public function save_user_profile_groups( $user_id ) {
 		$access = $this->loader->get_access();
+		if ( ! $access->user_is_admin() ) {
+			return;
+		}
 
-		if ( $access->user_is_admin() ) {
-			$cmb->add_field( [
-				'name'    => __( 'SimpleShop - member sections<br/><small style=\"font-weight:normal;\">Choose which member sections the user should have access to.</small>',
-					'simpleshop-cz' ),
-//            'desc' => __('Vyberte, do kterých členských sekcí má mít uživatel přístup','ssc'),
-				'id'      => $this->prefix . 'user_groups',
-				'type'    => 'multicheck',
-				'options' => $groups,
-			] );
-
-			foreach ( $groups as $key => $group ) {
-				$cmb->add_field( [
-					'name'        => '<small style="font-weight:normal;">' . sprintf( __( 'Registration date to group %s.',
-							'simpleshop-cz' ), $group ) . '</small>',
-					'id'          => $this->prefix . 'group_subscription_date_' . $key,
-					'type'        => 'text_date',
-					'date_format' => 'Y-m-d',
-				] );
-				$cmb->add_field( [
-					'name'        => '<small style="font-weight:normal;">' . sprintf( __( 'Expiration date of registration to group %s.',
-							'simpleshop-cz' ), $group ) . '</small>',
-					'id'          => $this->prefix . 'group_subscription_valid_to_' . $key,
-					'type'        => 'text_date',
-					'date_format' => 'Y-m-d',
-				] );
+		$groups = [];
+		foreach ( $_POST['ssc_groups'] as $group_id => $group ) {
+			if ( ! empty( $group['is_member'] ) && $group['is_member'] ) {
+				$groups[] = $group_id;
+				if ( empty( $group['subscription_date'] ) ) {
+					$group['subscription_date'] = date( 'Y-m-d' );
+				}
 			}
+
+			update_user_meta( $user_id, $this->prefix . 'user_groups', $groups );
+			update_user_meta( $user_id, $this->prefix . 'group_subscription_date_' . $group_id, empty( $group['subscription_date'] ) ? '' : date( 'Y-m-d', strtotime( $group['subscription_date'] ) ) );
+			update_user_meta( $user_id, $this->prefix . 'group_subscription_valid_to_' . $group_id, empty( $group['subscription_valid_to'] ) ? '' : date( 'Y-m-d', strtotime( $group['subscription_valid_to'] ) ) );
 		}
 	}
 }
diff --git a/src/Settings.php b/src/Settings.php
index 3012ccc..36af331 100644
--- a/src/Settings.php
+++ b/src/Settings.php
@@ -82,8 +82,8 @@ public function field_type_disconnect_button(
 		$field_type_object
 	) {
 		echo '<a href="' . admin_url( 'admin.php?page=ssc_options&disconnect_simpleshop=1' ) . '">'
-		     . _e( 'Disconnect Simple Shop', 'simpleshop-cz' )
-		     . '</a>';
+			 . _e( 'Disconnect Simple Shop', 'simpleshop-cz' )
+			 . '</a>';
 	}
 
 	/**
@@ -128,10 +128,10 @@ public function add_options_page() {
 	 */
 	public function admin_page_display() {
 		?>
-        <div class="wrap cmb2-options-page <?php echo $this->key; ?>">
-            <h2><?php echo esc_html( get_admin_page_title() ); ?></h2>
+		<div class="wrap cmb2-options-page <?php echo $this->key; ?>">
+			<h2><?php echo esc_html( get_admin_page_title() ); ?></h2>
 			<?php cmb2_metabox_form( $this->metabox_id, $this->key ); ?>
-        </div>
+		</div>
 		<?php
 	}
 
@@ -198,13 +198,13 @@ public function add_options_page_metabox() {
 			[
 				'name'       => __( 'Email message', 'simpleshop-cz' ),
 				'desc'       => __( '<u>Povolené zástupné znaky:</u><br/>'
-				                    . '<div style="font-style:normal;"><b>{login}</b> = login<br/>'
-				                    . '<b>{password}</b> = heslo<br/>'
-				                    . '<b>{login_url}</b> = adresa, na které je možné se přihlásit<br/>'
-				                    . '<b>{pages}</b> = seznam stránek, do kterých má uživatel zakoupený přístup<br/>'
-				                    . '<b>{mail}</b> = e-mail uživatele (většinou stejný jako login)<br/>'
-				                    . '</div>'
-				                    . '', 'simpleshop-cz' ),
+									. '<div style="font-style:normal;"><b>{login}</b> = login<br/>'
+									. '<b>{password}</b> = heslo<br/>'
+									. '<b>{login_url}</b> = adresa, na které je možné se přihlásit<br/>'
+									. '<b>{pages}</b> = seznam stránek, do kterých má uživatel zakoupený přístup<br/>'
+									. '<b>{mail}</b> = e-mail uživatele (většinou stejný jako login)<br/>'
+									. '</div>'
+									. '', 'simpleshop-cz' ),
 				'id'         => 'ssc_email_text',
 				'type'       => 'wysiwyg',
 				'classes_cb' => [ $this, 'hide_when_invalid_keys' ],