Fixed the toolbar and made it its own thing