Sidebar formatting
Fixed merge conflicts