clean up
clean up
merge encrypt branch
clean up
codec DefineButtonTag
refactor
merge branch with button tags