refactored toolbar block and added text and button included blocks