Add sidebars and fixup a few things