Stopped some crashing and reordered tabs a bit.