Made a bunch of layout changes.