Updated with new sidebar