Fix the sidebar, affix issues