update layout and json
clean up