Improved toolbar layout