add ubtton
some fixes
Merge branch 'hotfix/fix_functioanl'

* hotfix/fix_functioanl:
  some fixes
  add ubtton