Fix Sidebar
Feedback CRs