Small fixes on the sidebar
We have to do something about these conflicts