Reinstate sidebar, rearrange some links