Put the toolbar buttons back in the correct order.
Redesigned toolbar to be rid of duplication.
Merge pull request #41 from snwh/devel

Redesigned main toolbar to be rid of duplication.