added dynamic buttons, no functionality yet
Merge branch 'jpbranch2' into jp_leo