Changing User Profile Tab Menus and their contents

This what I have written so far for trying to customize the layout under each user tab.

The thing I try here is to place the "user picture/avatar" field in a different tab "Picture" .

I try it in two different ways, with the _user hook and with the _menu hook.

I cannot get in one way the Submit button to actually submit and in other case ..

Can anyone help me fix this out please?

<?php
// $Id: user_profile_menu.module,v 1.745.2.26 2008/01/07 02:30:35 drumm Exp $



/**
 * Implementation of hook_menu().
 */
function user_profile_menu_menu($may_cache) {
  global $user;

  $items = array();
/**/
  $admin_access = user_access('administer users');
  $access_access = user_access('administer access control');
  $view_access = user_access('access user profiles');

  if ($may_cache) {

    // Your personal page
    if ($user->uid) {
      $items[] = array('path' => 'user/'. $user->uid, 'title' => t('My account'),
        'callback' => 'user_view', 'callback arguments' => array(arg(1)), 'access' => TRUE,
        'type' => MENU_DYNAMIC_ITEM);
    }

    $items[] = array('path' => 'logout', 'title' => t('Log out'),
      'access' => $user->uid,
      'callback' => 'user_logout',
      'weight' => 10);
  }


  else {
    // Add the CSS for this module. We put this in !$may_cache so it is only
    // added once per request.
    drupal_add_css(drupal_get_path('module', 'user') .'/user.css', 'module');
    if ($_GET['q'] == 'user' && $user->uid) {
      // We want to make the current user's profile accessible without knowing
      // their uid, so just linking to /user is enough.
      drupal_goto('user/'. $user->uid);
    }

    if (arg(0) == 'user' && is_numeric(arg(1)) && arg(1) > 0) {
      $account = user_load(array('uid' => arg(1)));

      if ($user !== FALSE) {
        // Always let a user view their own account
        $view_access |= $user->uid == arg(1);
        // Only admins can view blocked accounts
        $view_access &= $account->status || $admin_access;


        $pic_category = array('name' => "picture" , 'title' => 'Picture', 'weight' => 2 );
        $categories = _user_categories($account) ;
        array_push(  $categories, $pic_category )  ; 

        if (arg(2) == 'edit') {
          if ($categories && (count($categories) > 1)) {

            foreach ($categories as $key => $category) {

              $items[] = array(
                'path' => 'user/'. arg(1) .'/edit/'. $category['name'],
                'title' => $category['title'] ,
                'type' => $category['name'] == 'account' ? MENU_DEFAULT_LOCAL_TASK : MENU_LOCAL_TASK,
                'weight' => $category['weight'],
                'access' => ($admin_access || $user->uid == arg(1)));
            }
          }
        }
      }
    }






     $items[] = array('path' => 'user/'. arg(1) .'/edit/image', 'title' => t('Image'),
        'callback' => 'user_profile_menu_edit_form', 'callback arguments' => array( 'user_edit'), 
	'access' => $user->uid == arg(1) , 'type' => MENU_LOCAL_TASK);


  }

  return $items;
}


/**
 * Implementation of hook_user().
 */

function user_profile_menu_user($op, &$edit, &$account, $category = NULL) {

  if ($op == 'form' ) {

	 // Picture/avatar:
	  if (variable_get('user_pictures', 0) && !$register) {
	    $form['picture'] = array('#type' => 'fieldset', '#title' => t('Picture'), '#weight' => 1);
	    $picture = theme('user_picture', (object)$edit);
	    if ($picture) {
	      $form['picture']['current_picture'] = array('#value' => $picture);
	      $form['picture']['picture_delete'] = array('#type' => 'checkbox', '#title' => t('Delete picture'), '#description' => t('Check this box to delete your current picture.'));
	    }
	    else {
	      $form['picture']['picture_delete'] = array('#type' => 'hidden');
	    }
	    $form['picture']['picture_upload'] = array('#type' => 'file', '#title' => t('Upload picture'), '#size' => 48, '#description' => t('Your virtual face or picture. Maximum dimensions are %dimensions and the maximum size is %size kB.', array('%dimensions' => variable_get('user_picture_dimensions', '85x85'), '%size' => variable_get('user_picture_file_size', '30'))) .' '. variable_get('user_picture_guidelines', ''));
	  }
	  
	return $form;
  }



  if (($op == 'update' || $op == 'insert' || $op == 'submit') ) {
	return _user_edit_submit(arg(1), $edit);
  }
}

function user_profile_menu_edit_form($uid, $edit, $register = FALSE) {
  $admin = user_access('administer users');

  // Account information:
  $form['account'] = array('#type' => 'fieldset',
    '#title' => t('Account information'),
  );


  // Picture/avatar:
  if (variable_get('user_pictures', 0) && !$register) {
    $form['picture'] = array('#type' => 'fieldset', '#title' => t('Picture'), '#weight' => 1);
    $picture = theme('user_picture', (object)$edit);
    if ($picture) {
      $form['picture']['current_picture'] = array('#value' => $picture);
      $form['picture']['picture_delete'] = array('#type' => 'checkbox', '#title' => t('Delete picture'), '#description' => t('Check this box to delete your current picture.'));
    }
    else {
      $form['picture']['picture_delete'] = array('#type' => 'hidden');
    }
    $form['picture']['picture_upload'] = array('#type' => 'file', '#title' => t('Upload picture'), '#size' => 48, '#description' => t('Your virtual face or picture. Maximum dimensions are %dimensions and the maximum size is %size kB.', array('%dimensions' => variable_get('user_picture_dimensions', '85x85'), '%size' => variable_get('user_picture_file_size', '30'))) .' '. variable_get('user_picture_guidelines', ''));
  }


  $form = _user_forms($edit, $account, $category);
  $form['_category'] = array('#type' => 'value', '#value' => $category);
  $form['_account'] = array('#type' => 'value', '#value' => $account);
  $form['submit'] = array('#type' => 'submit', '#value' => t('Submit'), '#weight' => 30);
  if (user_access('administer users')) {
    $form['delete'] = array('#type' => 'submit', '#value' => t('Delete'), '#weight' => 31);
  }
  $form['#attributes']['enctype'] = 'multipart/form-data';

//  return $form;
  $output = drupal_render(theme('table', $form['header']['#value'], $rows));
  $output.= drupal_render($form); // Process any other fields and display them
  return $output;
}



function generate_user_picture_form(){

	 // Picture/avatar:
	  if (variable_get('user_pictures', 0) && !$register) {
	    $form['picture'] = array('#type' => 'fieldset', '#title' => t('Picture'), '#weight' => 1);
	    $picture = theme('user_picture', (object)$edit);
	    if ($picture) {
	      $form['picture']['current_picture'] = array('#value' => $picture);
	      $form['picture']['picture_delete'] = array('#type' => 'checkbox', '#title' => t('Delete picture'), '#description' => t('Check this box to delete your current picture.'));
	    }
	    else {
	      $form['picture']['picture_delete'] = array('#type' => 'hidden');
	    }
	    $form['picture']['picture_upload'] = array('#type' => 'file', '#title' => t('Upload picture'), '#size' => 48, '#description' => t('Your virtual face or picture. Maximum dimensions are %dimensions and the maximum size is %size kB.', array('%dimensions' => variable_get('user_picture_dimensions', '85x85'), '%size' => variable_get('user_picture_file_size', '30'))) .' '. variable_get('user_picture_guidelines', ''));
	  }
	  
	$form['_category'] = array('#type' => 'value', '#value' => $category);
	  $form['_account'] = array('#type' => 'value', '#value' => $account);
	  $form['submit'] = array('#type' => 'submit', '#value' => t('Submit'), '#weight' => 30);
	  if (user_access('administer users')) {
	    $form['delete'] = array('#type' => 'submit', '#value' => t('Delete'), '#weight' => 31);
	  }
	  $form['#attributes']['enctype'] = 'multipart/form-data';

  $output = drupal_render(theme('table', $form['header']['#value'], $rows));
  $output.= drupal_render($form); // Process any other fields and display them
  return $output;

}