Changes on Template and Plan Panels