Improve toolbar design