more updates to the toolbar/buttons.