changed 'onload' to 'ready' in show and edit. Added JSONObj to edit
merge