Some work on the toolbar style