Rearrange

Looks better now...