Made the toolbar optional.