reformat sidebar, add close button
fix merge conflicts