add prepare
add terminology
Revert "add terminology"

This reverts commit 578e3cb84fbdc2a6e5379ae2788807e1dbb79aa1.
change markup
fix menu
Merge branch 'release/release1'