Rearrange sidebars a bit