reorganize toolbar slightly.