Organized the Toolbar tab; added some margins and stuff to make it look pretty (blame Glade for the other code that got moved around)