fixed the toolbar which is okay for the time being, though the save button doesn't work.