Redesigned toolbar to be rid of duplication.