Change the toolbar into a class to clear out main init