Button, option control reform