Fix minor issues in UserMenu