add modal & modify some point
add key/value/expt to modal
Merge branch 'ph6_dev' into ph6_review