fixed Rich's buttons
Merge branch 'jpbranch2' into jp_leo