Sidebar and navbar changes