Fixes: #2234 reorganize the user tabs