More updates to Edit Panel view.