improved toolbar partial