Sidebar and estimate transition cleanup