Improved the markup from the sidebar