Rearrange layouts to keep things nice