code clean
new toolbar style