added more functionality for edit/new, cleaned up look of JSON objs