Updated for sidebar