Apple Mail Folder Layout in Big Sur

I meant to attach a screenshot before, apologies... I can see them in the Favorites area, that is not the issue. the folders are all duplicated in the mailboxes themselves... whereas they used to only display at the top under "Mailboxes" before. I don't have a before screenshot but I'm attaching what I see now.

Prior to the update, the mailboxes only displayed the additional folders that I created, not also Inbox, Trash, etc.

Thank you - that is helpful but then I still have the folders under each mailbox as well. So there is the All Trash folder in Favorites and still Trash folders under each of my mailboxes... Is there a way to have the Trash folders only be displayed under All Trash and not also under each individual mailbox?

Sorry - missed that. Thank you for the info!

I did that... but they are still visible below so if I want to access folders at the bottom I have to scroll a lot further to get to them.

Point being that it now requires more scrolling to get to the folders I need. Sure, in the scheme of things not the worst thing in the world but if there is a way to modify this, it would be helpful.