HOTFIX: revise buttons