Merge pull request #761 from archshift/better-toolbar Changed main toolbar to be flush with the rest of the window.
