Program window controls in task bar?

I was playing around with different themes and on the modern theme which I like, for some reason the app controls are in the same place as wifi/sound/power control as well as icons in the tray. Is there a way to change this?
Not forgetting to mention some programs such as brave show its own control panel which makes it look stupid.
Help would be appreciated.

disable the Unite extension, I think it gets automatically turned on with the modern layout. Might have to reload Gnome after.

Thanks. How do I do this?

Open Extensions from the application menu and toggle Unite off.

Ah through this I realised I could customise Unite and set the window button positions which I set to right which now looks much better with the buttons being on the far right with a space in between. Thanks a lot for the help guys:)