Add more & clean up sidebars