Config and SideBar changes