Improved the editing system in control panel.