Added manual toolbar management section