Rework of the sidebar
merge sidebar