Feature/inline block

Makes the toolbar inline