Edit panel almost complete