new json api decorators, and rearrangement of form page