Fix toolbar styles and modals with structure