Add some sidebars and other minor fixes