Sidebar Update
Sidebar Update
Sidebar Update
Merge fixes