Rearrange design to match adam's spec