Adjust to new handler ids and add some toolbar items