Refactored how sidebars are included