Final toolbar tweaks