improve the toolbar & menu examples