Arranged the toolbar according to #137.