Better layout of toolbar