Fixed a bunch of arrangement issues.