Final toolbar changes