Changing the layout around a bit.