SidePanel rework