Optimize toolbar disposition, correct bug with delete button