Improved integration of Header Toolbars