finish add block with one add block menu setting
change
Merge branch '0627-1'
change height