improved toolbar structure