Redesigned main toolbar to be rid of duplication.