add sidebar
manual merge with upstream