Pulled the toolbar into its own class