Rearranged to better work in space.

I just love this new arrangement, very efficient.