// Toolbar improvement
// Some fix