More updates to Toolbar