Rework of the sidebar