Updated to include velocity and sidebarItemViews