Extract add toolbar (not finished)