Include all the controls on the toolbar that we previously had.