Last changes on Plan panel