Refactored toolbar component

Refactored inline with the grid component conventions