Modified to use container for figure managers and for toolbars