Replaced show by edit_panel
Fixex bugs